odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] 

bzr revid: uco@tinyerp.com-20100719045133-8t9r1n0koa2fean6
This commit is contained in:
uco 2010-07-19 10:21:33 +05:30
parent a0cc40bd33 b4fa5d1fa5
commit 1d74f0c01c
52 changed files with 3127 additions and 1798 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/account/account_invoice_view.xml
View File

@ -201,13 +201,13 @@
<field name="amount_total"/>
<field name="state"/>
<field name="residual"/>
<group col="4" colspan="4">
<group col="6" colspan="4">
<button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
<button name="%(action_account_invoice_refund)d" type='action' string='Credit Note' states='open,paid' icon="gtk-execute"/>
<button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="gtk-ok"/>
<button name="%(action_account_state_open)d" type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
<button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="terp-gtk-stop"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
<button name="%(action_account_state_open)d" type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
</group>
</group>
</page>
@ -295,14 +295,14 @@
<field name="amount_total"/>
<field name="state"/>
<field name="residual"/>
<group col="6" colspan="4" groups="base.group_user">
<group col="7" colspan="4" groups="base.group_user">
<button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-check"/>
<button name="invoice_open" states="draft,proforma2" string="Create" icon="terp-document-new"/>
<button name="%(action_account_invoice_refund)d" type='action' string='Credit Note' states='open,paid' icon="gtk-execute"/>
<button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="gtk-ok"/>
<button name='%(action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
<button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
<button name='%(action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
</group>
</group>
</page>

60
addons/account/account_invoice_workflow.xml
View File

@ -12,17 +12,19 @@
<field name="flow_start">True</field>
<field name="name">draft</field>
</record>
<!-- <record model="workflow.activity" id="act_confirm">
<field name="wkf_id" ref="wkf"/>
<field name="name">confirm</field>
</record> -->
<record id="act_proforma" model="workflow.activity">
<field name="wkf_id" ref="wkf"/>
<field name="name">proforma</field>
<field name="action">action_move_create()
write({'state':'proforma'})</field>
<field name="kind">function</field>
</record>
<!-- <record id="act_proforma" model="workflow.activity">-->
<!-- <field name="wkf_id" ref="wkf"/>-->
<!-- <field name="name">proforma</field>-->
<!-- <field name="action">action_move_create()-->
<!--write({'state':'proforma'})</field>-->
<!-- <field name="kind">function</field>-->
<!-- </record>-->
<record id="act_proforma2" model="workflow.activity">
<field name="wkf_id" ref="wkf"/>
@ -70,28 +72,28 @@ write({'state':'cancel'})</field>
</record>
-->
<record id="t3" model="workflow.transition">
<field name="act_from" ref="act_draft"/>
<field name="act_to" ref="act_proforma"/>
<field name="signal">invoice_proforma</field>
</record>
<!-- <record id="t3" model="workflow.transition">-->
<!-- <field name="act_from" ref="act_draft"/>-->
<!-- <field name="act_to" ref="act_proforma"/>-->
<!-- <field name="signal">invoice_proforma</field>-->
<!-- </record>-->
<record id="t4" model="workflow.transition">
<field name="act_from" ref="act_draft"/>
<field name="act_to" ref="act_open"/>
<field name="signal">invoice_open</field>
</record>
<record id="t5" model="workflow.transition">
<field name="act_from" ref="act_proforma"/>
<field name="act_to" ref="act_open"/>
<field name="signal">invoice_open</field>
</record>
<record id="t7" model="workflow.transition">
<field name="act_from" ref="act_proforma"/>
<field name="act_to" ref="act_paid"/>
<field name="trigger_model">account.move.line</field>
<field name="trigger_expr_id">move_line_id_payment_get()</field>
<field name="condition">test_paid()</field>
</record>
<!-- <record id="t5" model="workflow.transition">-->
<!-- <field name="act_from" ref="act_proforma"/>-->
<!-- <field name="act_to" ref="act_open"/>-->
<!-- <field name="signal">invoice_open</field>-->
<!-- </record>-->
<!-- <record id="t7" model="workflow.transition">-->
<!-- <field name="act_from" ref="act_proforma"/>-->
<!-- <field name="act_to" ref="act_paid"/>-->
<!-- <field name="trigger_model">account.move.line</field>-->
<!-- <field name="trigger_expr_id">move_line_id_payment_get()</field>-->
<!-- <field name="condition">test_paid()</field>-->
<!-- </record>-->
<record id="t8" model="workflow.transition">
<field name="act_from" ref="act_open"/>
<field name="act_to" ref="act_paid"/>
@ -104,11 +106,11 @@ write({'state':'cancel'})</field>
<field name="act_to" ref="act_cancel"/>
<field name="signal">invoice_cancel</field>
</record>
<record id="t11" model="workflow.transition">
<field name="act_from" ref="act_proforma"/>
<field name="act_to" ref="act_cancel"/>
<field name="signal">invoice_cancel</field>
</record>
<!-- <record id="t11" model="workflow.transition">-->
<!-- <field name="act_from" ref="act_proforma"/>-->
<!-- <field name="act_to" ref="act_cancel"/>-->
<!-- <field name="signal">invoice_cancel</field>-->
<!-- </record>-->
<record id="t12" model="workflow.transition">
<field name="act_from" ref="act_open"/>
<field name="act_to" ref="act_cancel"/>

1072
addons/account/i18n/bg.po
View File

File diff suppressed because it is too large Load Diff

1096
addons/account/i18n/pl.po
View File

File diff suppressed because it is too large Load Diff

2
addons/account/i18n/zh_CN.po
View File

@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-07-16 03:39+0000\n"
"X-Launchpad-Export-Date: 2010-07-17 03:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account

2
addons/account/invoice.py
View File

@ -300,7 +300,7 @@ class account_invoice(osv.osv):
'account.move.reconcile': (_get_invoice_from_reconcile, None, 50),
}, help="The Ledger Postings of the invoice have been reconciled with Ledger Postings of the payment(s)."),
'partner_bank': fields.many2one('res.partner.bank', 'Bank Account',
help='The bank account to pay to or to be paid from', readonly=True, states={'draft':[('readonly',False)]}),
help='Bank Account Number, Company bank account if Invoice is customer or supplier refund, otherwise Parner bank account number.', readonly=True, states={'draft':[('readonly',False)]}),
'move_lines':fields.function(_get_lines , method=True, type='many2many', relation='account.move.line', string='Entry Lines'),
'residual': fields.function(_amount_residual, method=True, digits_compute=dp.get_precision('Account'), string='Residual',
store={

8
addons/account/process/customer_invoice_process.xml
View File

@ -125,9 +125,9 @@
<field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
</record>
<record id="account.t5" model="workflow.transition">
<field name="role_id" ref="res_roles_invoice0"/>
</record>
<!-- <record id="account.t5" model="workflow.transition">-->
<!-- <field name="role_id" ref="res_roles_invoice0"/>-->
<!-- </record>-->
<record id="process_transition_confirmstatementfromdraft0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
@ -154,7 +154,7 @@
<field eval="&quot;&quot;&quot;Draft invoices are checked, validated and printed.&quot;&quot;&quot;" 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 eval="[(6,0,[ref('account.t5')])]" name="transition_ids"/>
<field eval="[(6,0,[ref('account.pro2_to_open')])]" name="transition_ids"/>
</record>
<record id="process_transition_validentries0" model="process.transition">

2
addons/account/process/supplier_invoice_process.xml
View File

@ -124,7 +124,7 @@
<field eval="&quot;&quot;&quot;Draft invoices are validated. &quot;&quot;&quot;" 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 eval="[(6,0,[ref('account.t5')])]" name="transition_ids"/>
<field eval="[(6,0,[ref('account.pro2_to_open')])]" name="transition_ids"/>
</record>
<record id="process_transition_suppliervalidentries0" model="process.transition">

36
addons/account/wizard/account_invoice_refund_view.xml
View File

@ -2,31 +2,37 @@
<openerp>
<data>
<record id="view_account_invoice_refund" model="ir.ui.view">
<record id="view_account_invoice_refund" model="ir.ui.view">
<field name="name">account.invoice.refund.form</field>
<field name="model">account.invoice.refund</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Credit Note">
<separator string="This wizard is used to refund the invoice" colspan="4"/>
<group colspan="4" >
<label string="Are you sure you want to refund this invoice ?" colspan="2"/>
<newline/>
<field name="date"/>
<field name="period"/>
<field name="description"/>
<separator string="This wizard is used to refund the invoice" colspan="4"/>
<group colspan="4" >
<label string="Are you sure you want to refund this invoice ?" colspan="2"/>
<newline/>
<field name="date"/>
<field name="period"/>
<field name="description"/>
</group>
<separator colspan="4"/>
<separator colspan="4"/>
<group col="4" colspan="4" fill="1">
<label align="0.0" width="300" string="Refund Invoice: creates a refund invoice"/>
<label align="0.0" width="500" colspan="4" string="Cancel Invoice: creates a reverse accounting entries to cancel the invoice"/>
<label align="0.0" width="550" colspan="4" string="Modify Invoice: creates a refund invoice, and new copy of the same invoice ready for editing"/>
</group>
<separator colspan="4"/>
<group colspan="4" col="6">
<label string ="" colspan="2"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-redo" string="Refund Invoice" name="invoice_refund" type="object"/>
<button icon="gtk-ok" string="Cancel Invoice" name="invoice_cancel" type="object"/>
<button icon="gtk-undo" string="Modify Invoice" name="invoice_modify" type="object"/>
<label string ="" colspan="2"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-redo" string="Refund Invoice" name="invoice_refund" type="object"/>
<button icon="gtk-ok" string="Cancel Invoice" name="invoice_cancel" type="object"/>
<button icon="gtk-undo" string="Modify Invoice" name="invoice_modify" type="object"/>
</group>
</form>
</field>
</record>
</record>
<record id="action_account_invoice_refund" model="ir.actions.act_window">
<field name="name">Credit Note</field>

66
addons/account_anglo_saxon/i18n/nl.po Normal file
View File

@ -0,0 +1,66 @@
# Dutch translation for openobject-addons
# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-11-24 12:50+0000\n"
"PO-Revision-Date: 2010-07-16 15:49+0000\n"
"Last-Translator: Jan Verlaan (Veritos) <Unknown>\n"
"Language-Team: Dutch <nl@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-07-17 03:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_anglo_saxon
#: view:product.category:0
msgid " Accounting Property"
msgstr ""
#. module: account_anglo_saxon
#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
msgid ""
"This module will support the Anglo-Saxons accounting methodology by \n"
" changing the accounting logic with stock transactions. The difference "
"between the Anglo-Saxon accounting countries \n"
" and the Rhine or also called Continental accounting countries is the "
"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
" Anglo-Saxons accounting does take the cost when sales invoice is "
"created, Continental accounting will take the cost at he moment the goods "
"are shipped.\n"
" This module will add this functionality by using a interim account, to "
"store the value of shipped goods and will contra book this interim account \n"
" when the invoice is created to transfer this amount to the debtor or "
"creditor account."
msgstr ""
#. module: account_anglo_saxon
#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
msgid "Stock Account"
msgstr "Voorraadrekening"
#. module: account_anglo_saxon
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "Ongeldige XML, kan overzicht niet weergeven!"
#. module: account_anglo_saxon
#: field:product.category,property_account_creditor_price_difference_categ:0
#: field:product.template,property_account_creditor_price_difference:0
msgid "Price Difference Account"
msgstr "Prijsverschillen rekening"
#. module: account_anglo_saxon
#: help:product.category,property_account_creditor_price_difference_categ:0
#: help:product.template,property_account_creditor_price_difference:0
msgid ""
"This account will be used to value price difference between purchase price "
"and cost price."
msgstr ""
"Deze rekening wordt gebruikt om de prijsverschillen tussen inkoop- en "
"kostprijs te boeken."

2
addons/auction/auction.py
View File

@ -695,7 +695,7 @@ class auction_lots(osv.osv):
# wf_service = netsvc.LocalService('workflow')
# wf_service.trg_validate(uid, 'account.invoice', inv_id, 'invoice_open', cr)
inv_ref.button_compute(cr, uid, invoice.values())
wf_service.trg_validate(uid, 'account.invoice', inv_id, 'invoice_proforma', cr)
wf_service.trg_validate(uid, 'account.invoice', inv_id, 'invoice_proforma2', cr)
return invoices.values()

36
addons/base_contact/i18n/zh_CN.po
View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-03-29 00:51+0000\n"
"Last-Translator: digitalsatori <Unknown>\n"
"PO-Revision-Date: 2010-07-17 09:25+0000\n"
"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-06-22 04:01+0000\n"
"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_contact
@ -30,7 +30,7 @@ msgstr ""
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr "对象名必须是以x_开头并且不能含有特殊字符"
msgstr "对象名必须以x_开头并且不能包含特殊字符"
#. module: base_contact
#: field:res.partner.job,function_id:0
@ -45,7 +45,7 @@ msgstr "业务伙伴职能"
#: view:res.partner.address:0
#: field:res.partner.address,job_ids:0
msgid "Contacts"
msgstr "联系人列表"
msgstr "联系"
#. module: base_contact
#: field:res.partner.job,sequence_partner:0
@ -60,7 +60,7 @@ msgstr "当前"
#. module: base_contact
#: field:res.partner.contact,first_name:0
msgid "First Name"
msgstr "名"
msgstr "名字"
#. module: base_contact
#: model:ir.model,name:base_contact.model_res_partner_job
@ -80,7 +80,7 @@ msgstr "联系人到职能"
#. module: base_contact
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr "操作定义中使用了无效的模式名称。"
msgstr "在动作定义中使用了无效的模快名。"
#. module: base_contact
#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
@ -90,7 +90,7 @@ msgstr "业务伙伴到地址"
#. module: base_contact
#: view:res.partner.address:0
msgid "# of Contacts"
msgstr "个联系人"
msgstr "# 联系人"
#. module: base_contact
#: help:res.partner.job,other:0
@ -142,7 +142,7 @@ msgstr "基本联系人管理模块"
msgid ""
"Order of importance of this job title in the list of job title of the linked "
"partner"
msgstr ""
msgstr "链接业务伙伴按职称按重要性排序的列表"
#. module: base_contact
#: field:res.partner.contact,email:0
@ -153,19 +153,19 @@ msgstr "电子邮件"
#. module: base_contact
#: field:res.partner.job,date_stop:0
msgid "Date Stop"
msgstr "停止时间"
msgstr "停止日期"
#. module: base_contact
#: view:res.partner:0
#: field:res.partner.job,address_id:0
msgid "Address"
msgstr "地址:"
msgstr "地址"
#. module: base_contact
#: model:ir.actions.act_window,name:base_contact.action_res_partner_job
#: model:ir.ui.menu,name:base_contact.menu_action_res_partner_job
msgid "Contact's Jobs"
msgstr "联系人工作"
msgstr "联系人职务"
#. module: base_contact
#: field:res.partner.contact,country_id:0
@ -177,7 +177,7 @@ msgstr "国籍"
msgid ""
"Order of importance of this address in the list of addresses of the linked "
"contact"
msgstr ""
msgstr "链接联系人按地址重要性排序的地址列表"
#. module: base_contact
#: field:res.partner.address,job_id:0
@ -203,7 +203,7 @@ msgstr "定义业务伙伴和地址"
#. module: base_contact
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "无效的 XML 视图结构"
msgstr "无效的视图结构xml文件!"
#. module: base_contact
#: model:process.process,name:base_contact.process_process_basecontactprocess0
@ -218,7 +218,7 @@ msgstr "序号"
#. module: base_contact
#: field:res.partner.job,extension:0
msgid "Extension"
msgstr ""
msgstr "扩展"
#. module: base_contact
#: field:res.partner.contact,mobile:0
@ -311,7 +311,7 @@ msgstr "省/ 州"
#: view:res.partner.contact:0
#: view:res.partner.job:0
msgid "General"
msgstr "常规"
msgstr "一般"
#. module: base_contact
#: selection:res.partner.job,state:0
@ -321,7 +321,7 @@ msgstr "过去"
#. module: base_contact
#: view:res.partner.contact:0
msgid "General Information"
msgstr "通用信息"
msgstr "一般信息"
#. module: base_contact
#: model:process.node,note:base_contact.process_node_function0
@ -336,7 +336,7 @@ msgstr "业务伙伴"
#. module: base_contact
#: field:res.partner.job,date_start:0
msgid "Date Start"
msgstr "开始时间"
msgstr "开始日期"
#. module: base_contact
#: model:process.transition,note:base_contact.process_transition_functiontoaddress0

8
addons/base_iban/i18n/zh_CN.po
View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.6\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-03-20 07:35+0000\n"
"PO-Revision-Date: 2010-07-17 09:28+0000\n"
"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-06-22 03:55+0000\n"
"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_iban
@ -34,7 +34,7 @@ msgstr "银行帐号"
#. module: base_iban
#: model:res.partner.bank.type.field,name:base_iban.bank_country_field
msgid "country_id"
msgstr "国家 - ID"
msgstr "country_id"
#. module: base_iban
#: model:res.partner.bank.type.field,name:base_iban.bank_swift_field
@ -60,7 +60,7 @@ msgstr "IBAN帐号"
#. module: base_iban
#: model:res.partner.bank.type.field,name:base_iban.bank_acc_number_field
msgid "acc_number"
msgstr "账号"
msgstr "acc_number"
#~ msgid ""
#~ "\n"

18
addons/base_module_quality/i18n/zh_CN.po
View File

@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-06-09 16:41+0000\n"
"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
"PO-Revision-Date: 2010-07-17 09:42+0000\n"
"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
"Language-Team: Simplified Chinese <zh_CN@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-06-22 04:19+0000\n"
"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_module_quality
@ -61,14 +61,14 @@ msgstr "详细信息"
#. module: base_module_quality
#: field:module.quality.detail,ponderation:0
msgid "Ponderation"
msgstr ""
msgstr "考虑"
#. module: base_module_quality
#: help:module.quality.detail,ponderation:0
msgid ""
"Some tests are more critical than others, so they have a bigger weight in "
"the computation of final rating"
msgstr ""
msgstr "一些测试比其他更重要, 所以它们在计算最终等级时占更大分量."
#. module: base_module_quality
#: view:module.quality.check:0
@ -86,12 +86,12 @@ msgstr "已跳过"
msgid ""
"The test will be completed only if the module is installed or if the test "
"may be processed on uninstalled module."
msgstr "只有模块已经安装或测试能在已卸载的模块上运行的情况下测试才能完成。"
msgstr "只有模块已安装或如果测试能在已卸载的模块上运行, 测试才能完成."
#. module: base_module_quality
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "无效的 XML 视图结构"
msgstr "无效的视图结构xml文件!"
#. module: base_module_quality
#: model:ir.model,name:base_module_quality.model_module_quality_check
@ -116,7 +116,7 @@ msgstr "文件名"
#. module: base_module_quality
#: field:module.quality.detail,score:0
msgid "Score (%)"
msgstr ""
msgstr "评分(%)"
#. module: base_module_quality
#: help:quality_detail_save,init,name:0
@ -137,7 +137,7 @@ msgstr "保存报告"
#. module: base_module_quality
#: wizard_view:quality_detail_save,init:0
msgid "Standard entries"
msgstr ""
msgstr "普通记录"
#. module: base_module_quality
#: view:module.quality.detail:0

18
addons/base_module_record/i18n/zh_CN.po
View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.6\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-03-20 07:36+0000\n"
"PO-Revision-Date: 2010-07-17 09:51+0000\n"
"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-06-22 04:01+0000\n"
"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_module_record
@ -66,7 +66,7 @@ msgstr "只记录"
#: selection:base_module_record.module_record_objects,intro,data_kind:0
#: selection:base_module_record.module_save,info,data_kind:0
msgid "Demo Data"
msgstr "示范数据"
msgstr "演示数据"
#. module: base_module_record
#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
@ -173,7 +173,7 @@ msgstr "记录信息"
#: wizard_view:base_module_record.module_record_objects,save:0
#: wizard_view:base_module_record.module_save,save:0
msgid "Module successfully created !"
msgstr "模块创建完成！"
msgstr "模块已成功创建！"
#. module: base_module_record
#: wizard_view:base_module_record.module_record,start:0
@ -183,7 +183,7 @@ msgstr "停止记录"
#. module: base_module_record
#: selection:base_module_record.module_record_objects,init,filter_cond:0
msgid "Created"
msgstr "创建"
msgstr "已创建"
#. module: base_module_record
#: wizard_view:base_module_record.module_record_objects,end:0
@ -210,7 +210,7 @@ msgstr "修改"
#. module: base_module_record
#: selection:base_module_record.module_save,init,info_status:0
msgid "Recording"
msgstr "记录"
msgstr "记录中"
#. module: base_module_record
#: wizard_button:base_module_record.module_record_objects,init,record:0
@ -275,7 +275,7 @@ msgstr "模块创建"
msgid ""
"You can continue the recording session by relauching the 'start recording' "
"wizard."
msgstr "你可以继续记录这会话.开始记录向导"
msgstr "你可以继续记录这会话. '开始记录' 向导"
#. module: base_module_record
#: wizard_field:base_module_record.module_record_objects,intro,data_kind:0
@ -293,7 +293,7 @@ msgstr "模块信息"
#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_save
#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_save
msgid "Save Recorded Module"
msgstr "保存记录"
msgstr "保存记录模块"
#. module: base_module_record
#: wizard_view:base_module_record.module_record,stop:0
@ -314,7 +314,7 @@ msgstr "取消"
#: wizard_button:base_module_record.module_record_objects,save,end:0
#: wizard_button:base_module_record.module_save,save,end:0
msgid "Close"
msgstr "结束"
msgstr "关闭"
#. module: base_module_record
#: selection:base_module_record.module_record_objects,init,filter_cond:0

30
addons/base_report_creator/i18n/zh_CN.po
View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.6\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-03-20 07:37+0000\n"
"PO-Revision-Date: 2010-07-17 10:17+0000\n"
"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-06-22 04:15+0000\n"
"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_report_creator
@ -22,7 +22,7 @@ msgid ""
"Provide an expression for the field based on which you want to filter the "
"records.\n"
" e.g. res_partner.id=3"
msgstr "提供一个基于字段的表达式必须过滤记录 .例如res_partner.id=3"
msgstr "提供一个基于字段过滤记录的表达式. 例如: res_partner.id=3"
#. module: base_report_creator
#: field:base_report_creator.report,view_graph_type:0
@ -47,7 +47,7 @@ msgstr "图形模式"
#. module: base_report_creator
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr "在这动作定义中有无效的模块名"
msgstr "在动作定义中使用了无效的模快名。"
#. module: base_report_creator
#: view:base_report_creator.report:0
@ -182,7 +182,7 @@ msgstr "开始日期"
#. module: base_report_creator
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "无效XML视图结构!"
msgstr "无效的视图结构xml文件!"
#. module: base_report_creator
#: selection:base_report_creator.report,view_type1:0
@ -209,7 +209,7 @@ msgstr "授权组(留空为所有)"
#. module: base_report_creator
#: view:base_report_creator.report:0
msgid "Security"
msgstr "安全"
msgstr "安全设定"
#. module: base_report_creator
#: wizard_field:base_report_creator.report.menu.create,init,menu_name:0
@ -242,7 +242,7 @@ msgstr "y轴"
#: selection:base_report_creator.report,view_type2:0
#: selection:base_report_creator.report,view_type3:0
msgid "Calendar"
msgstr "日程表"
msgstr "日历"
#. module: base_report_creator
#: selection:base_report_creator.report,view_type1:0
@ -274,7 +274,7 @@ msgstr "状态"
#. module: base_report_creator
#: selection:base_report_creator.report,view_graph_orientation:0
msgid "Vertical"
msgstr "垂直线"
msgstr "纵向"
#. module: base_report_creator
#: selection:base_report_creator.report,type:0
@ -299,12 +299,12 @@ msgstr "有效"
#. module: base_report_creator
#: selection:base_report_creator.report,view_graph_orientation:0
msgid "Horizontal"
msgstr "水平线"
msgstr "横向"
#. module: base_report_creator
#: field:base_report_creator.report.fields,group_method:0
msgid "Grouping Method"
msgstr "图形模板"
msgstr "分组方式"
#. module: base_report_creator
#: field:base_report_creator.report.filter,condition:0
@ -345,7 +345,7 @@ msgstr "打开报表"
#. module: base_report_creator
#: selection:base_report_creator.report.fields,group_method:0
msgid "Grouped"
msgstr "图形"
msgstr "已分组"
#. module: base_report_creator
#: view:base_report_creator.report:0
@ -407,11 +407,9 @@ msgid ""
"the \"Dashboard\" menu.\n"
msgstr ""
"这模块允许你创建任何统计\n"
"报告几个对象,它是一SQL查询生成器和浏览器\n"
"和用户\n"
"报告几个对象, 它是一SQL查询生成器和浏览器\n"
"\n"
"安装模块后,它在控制台菜单增加一个自定义的报表菜单在\n"
"控制台 的 菜单\n"
"安装模块后, 它在控制台菜单增加一个自定义的报表菜单\n"
#. module: base_report_creator
#: selection:base_report_creator.report.fields,calendar_mode:0
@ -456,7 +454,7 @@ msgstr "值"
#. module: base_report_creator
#: selection:base_report_creator.report,view_graph_type:0
msgid "Bar Chart"
msgstr "条线图"
msgstr "柱状图表"
#. module: base_report_creator
#: field:base_report_creator.report,view_type2:0

8
addons/base_report_designer/i18n/zh_CN.po
View File

@ -7,19 +7,19 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.6\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-03-20 07:37+0000\n"
"PO-Revision-Date: 2010-07-17 10:22+0000\n"
"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-06-22 04:12+0000\n"
"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_report_designer
#: wizard_field:base_report_designer.modify,init,text:0
msgid "Introduction"
msgstr "介绍"
msgstr "简介"
#. module: base_report_designer
#: wizard_view:base_report_designer.modify,send_form:0
@ -98,7 +98,7 @@ msgid ""
"open it with OpenOffice. Don't forget to install the Tiny OpenOffice package "
"to modify it. Once it is modified, re-upload it in Open ERP using this "
"wizard."
msgstr "这是你要求报表的模板.保存为一个.SXW文件和用openoffice打开和修改.修改后使用这个向导重新上传"
msgstr "这是你要求报表的模板. 保存为一个.SXW文件和用openoffice打开和修改. 修改后使用这个向导重新上传"
#. module: base_report_designer
#: wizard_button:base_report_designer.modify,send_form,send_form_result:0

8
addons/base_setup/i18n/zh_CN.po
View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.6\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-03-20 07:37+0000\n"
"PO-Revision-Date: 2010-07-17 10:27+0000\n"
"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-06-22 04:03+0000\n"
"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_setup
@ -84,12 +84,12 @@ msgstr "电子邮件"
#: wizard_field:base_setup.base_setup,init,state_id:0
#: wizard_field:base_setup.base_setup,update,state_id:0
msgid "State"
msgstr "省市"
msgstr "省/州"
#. module: base_setup
#: wizard_view:base_setup.base_setup,finish:0
msgid "Your new database is now fully installed."
msgstr "新账套已安装完毕."
msgstr "新帐套已安装完毕."
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,profile:0

36
addons/board/i18n/zh_CN.po
View File

@ -7,20 +7,20 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.6\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-03-20 07:37+0000\n"
"PO-Revision-Date: 2010-07-17 14:45+0000\n"
"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-06-22 04:14+0000\n"
"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: board
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
#. module: board
#: model:ir.model,name:board.model_board_board
@ -30,12 +30,12 @@ msgstr "控制台"
#. module: board
#: field:board.note,user_id:0
msgid "Author"
msgstr "建立者"
msgstr "作者"
#. module: board
#: model:ir.module.module,shortdesc:board.module_meta_information
msgid "Dashboard main module"
msgstr "控制台主要模块"
msgstr "控制面板主要模块"
#. module: board
#: view:board.note:0
@ -51,7 +51,7 @@ msgstr "宽度"
#. module: board
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr "在动作定义中使用了无效的模快名。"
msgstr "在这动作定义中有无效的模块名"
#. module: board
#: field:board.board.line,name:0
@ -62,7 +62,7 @@ msgstr "标题"
#: model:ir.actions.act_window,name:board.action_view_board_list_form
#: model:ir.ui.menu,name:board.menu_view_board_form
msgid "Dashboard Definition"
msgstr "控制台定义"
msgstr "控制面板定义"
#. module: board
#: model:ir.actions.act_window,name:board.action_view_board_note_form
@ -103,12 +103,12 @@ msgstr "备注类型"
#. module: board
#: wizard_view:board.board.menu.create,init:0
msgid "Create Menu For Dashboard"
msgstr "创建控制台菜单"
msgstr "创建控制面板菜单"
#. module: board
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "无效XML视图结构!"
msgstr "无效的视图结构xml文件!"
#. module: board
#: wizard_field:board.board.menu.create,init,menu_parent_id:0
@ -130,12 +130,12 @@ msgstr "备注类型"
#: field:board.board,name:0
#: field:board.board.line,board_id:0
msgid "Dashboard"
msgstr "控制台"
msgstr "控制面板"
#. module: board
#: model:ir.module.module,description:board.module_meta_information
msgid "Base module for all dashboards."
msgstr "所有控制台的基础模块"
msgstr "所有控制面板的基础模块"
#. module: board
#: field:board.board.line,position:0
@ -145,7 +145,7 @@ msgstr "位置"
#. module: board
#: model:ir.actions.act_window,name:board.dashboard_open
msgid "Open Dashboard"
msgstr "打开控制台"
msgstr "打开控制面板"
#. module: board
#: wizard_field:board.board.menu.create,init,menu_name:0
@ -186,7 +186,7 @@ msgstr "创建菜单"
#. module: board
#: model:ir.ui.menu,name:board.dashboard_menu
msgid "Dashboards"
msgstr "控制台"
msgstr "控制面板"
#. module: board
#: field:board.board.line,height:0
@ -206,7 +206,7 @@ msgstr "取消"
#. module: board
#: view:board.board:0
msgid "Dashboard View"
msgstr "控制台视图"
msgstr "控制面板视图"
#. module: board
#: model:ir.model,name:board.model_board_board_line
@ -218,5 +218,13 @@ msgstr "控制台明细"
msgid "Subject"
msgstr "主题"
#, python-format
#~ msgid "User Error!"
#~ msgstr "用户错误！"
#, python-format
#~ msgid "Please Insert Dashboard View(s) !"
#~ msgstr "请插入看板视图！"
#~ msgid "Action"
#~ msgstr "动作"

250
addons/crm/i18n/es.po
View File

@ -7,13 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-01-05 05:59+0000\n"
"PO-Revision-Date: 2010-06-28 22:26+0000\n"
"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\n"
"PO-Revision-Date: 2010-07-18 17:30+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"<jesteve@zikzakmedia.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-06-30 03:34+0000\n"
"X-Launchpad-Export-Date: 2010-07-19 03:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
@ -94,9 +95,7 @@ msgstr "Nombre de fase"
#. module: crm
#: view:crm.case:0
#: view:crm.case.history:0
#: model:ir.actions.act_window,name:crm.crm_case_categ0-act
#: model:ir.actions.act_window,name:crm.crm_case_section_open_act
#: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act
#: model:ir.ui.menu,name:crm.next_id_51
msgid "Cases"
msgstr "Casos"
@ -147,9 +146,6 @@ msgstr "Reparado"
#. module: crm
#: code:addons/crm/crm.py:0
#: code:addons/crm/wizard/crm_job_wizard.py:0
#: code:addons/crm/wizard/crm_lead_wizard.py:0
#: code:addons/crm/wizard/crm_phonecall_wizard.py:0
#, python-format
msgid "Warning !"
msgstr "Advertencia !"
@ -206,30 +202,16 @@ msgstr ""
"correo para correo de salida."
#. module: crm
#: view:crm.case:0
#: field:crm.case,partner_id:0
#: model:crm.case.categ,name:crm.categ_lead4
#: model:crm.case.categ,name:crm.categ_oppor4
#: wizard_field:crm.case.opportunity.partner_opportunity,init,partner_id:0
#: field:crm.case.rule,trg_partner_id:0
#: selection:crm.email.add.cc,name:0
#: field:crm.email.add.cc,partner_id:0
#: wizard_field:crm.lead.opportunity_set,create_partner,partner_id:0
#: wizard_field:crm.lead.opportunity_set,opportunity,partner_id:0
#: view:crm.opportunity:0
#: view:crm.phonecall:0
#: wizard_field:crm.phonecall.opportunity_set,create_partner,partner_id:0
#: wizard_field:crm.phonecall.opportunity_set,opportunity,partner_id:0
#: model:process.node,name:crm.process_node_partner0
msgid "Partner"
msgstr "Empresa"
#. module: crm
#: field:crm.case.categ,section_id:0
#: field:crm.case.category2,section_id:0
#: view:crm.case.section:0
#: field:crm.case.section,name:0
#: field:crm.case.stage,section_id:0
#: wizard_field:crm.case.section.menu,init,section_id:0
#: model:ir.model,name:crm.model_crm_case_section
msgid "Case Section"
msgstr "Sección del caso"
@ -284,7 +266,8 @@ msgid "Send New Email"
msgstr "Enviar nuevo correo eléctronico"
#. module: crm
#: view:crm.case.history:0
#: model:ir.actions.act_window,name:crm.crm_case_history_my-act
#: model:ir.ui.menu,name:crm.menu_crm_case_history_my-act
msgid "My Histories"
msgstr "Mis historias"
@ -340,15 +323,10 @@ msgstr "Categorías"
#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
#, python-format
msgid "Warning!"
msgstr "Advertencia!"
msgstr "¡Aviso!"
#. module: crm
#: view:crm.case:0
#: view:crm.claim:0
#: view:crm.fundraising:0
#: view:crm.job:0
#: view:crm.lead:0
#: view:crm.opportunity:0
msgid "Dates"
msgstr "Fechas"
@ -430,7 +408,6 @@ msgid "Exception Rules"
msgstr "Reglas de Excepción"
#. module: crm
#: field:crm.menu.config_wizard,opportunity:0
#: model:ir.actions.report.xml,name:crm.crm_business_opportunities_report
msgid "Business Opportunities"
msgstr "Oportunidades de negocio"
@ -484,12 +461,6 @@ msgstr "Particular"
#. module: crm
#: field:crm.case,categ_id:0
#: field:crm.case.rule,trg_categ_id:0
#: wizard_field:crm.job.reschedule_phone_call,init,category_id:0
#: view:crm.opportunity:0
#: wizard_field:crm.opportunity.reschedule_phone_call,init,category_id:0
#: field:report.crm.case.section.categ.categ2,categ_id:0
#: field:report.crm.case.section.categ.stage,categ_id:0
#: field:report.crm.case.section.stage,categ_id:0
msgid "Category"
msgstr "Categoría"
@ -521,11 +492,6 @@ msgstr "%(partner)s = Nombre empresa"
#. module: crm
#: view:crm.case:0
#: view:crm.claim:0
#: view:crm.fundraising:0
#: view:crm.job:0
#: view:crm.lead:0
#: view:crm.opportunity:0
msgid "Action Information"
msgstr "Información de la acción"
@ -554,15 +520,14 @@ msgstr "Condiciones"
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_case_categ0-act_open
#: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act_open
msgid "Open Cases"
msgstr "Casos abiertos"
#. module: crm
#: field:crm.case.log,name:0
#: view:crm.claim:0
#: view:crm.job:0
#: field:crm.case,state:0
msgid "Status"
msgstr "Posición"
msgstr "Estado"
#. module: crm
#: wizard_view:crm.case.opportunity.partner_opportunity,init:0
@ -592,9 +557,6 @@ msgstr "Árbol de reuniones"
#: view:crm.case:0
#: selection:crm.case.rule,trg_state_from:0
#: selection:crm.case.rule,trg_state_to:0
#: view:crm.fundraising:0
#: view:crm.lead:0
#: view:crm.opportunity:0
#, python-format
msgid "Escalate"
msgstr "Escalado"
@ -712,8 +674,6 @@ msgstr "Política de reclamaciones"
#. module: crm
#: code:addons/crm/crm.py:0
#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
#: code:addons/crm/wizard/wizard_crm_send_email.py:0
#, python-format
msgid ""
"You must define a responsible user for this case in order to use this action!"
@ -759,11 +719,6 @@ msgstr "Setiembre"
#. module: crm
#: view:crm.case:0
#: view:crm.claim:0
#: view:crm.fundraising:0
#: view:crm.job:0
#: view:crm.lead:0
#: view:crm.opportunity:0
msgid "Communication history"
msgstr "Historial de comunicación"
@ -1191,10 +1146,8 @@ msgid "Next Action"
msgstr "Próxima acción"
#. module: crm
#: view:crm.case:0
#: field:crm.case,date_deadline:0
#: selection:crm.case.rule,trg_date_type:0
#: view:crm.opportunity:0
msgid "Deadline"
msgstr "Fecha límite"
@ -1371,12 +1324,6 @@ msgstr "%(partner_email)s = Email empresa"
#. module: crm
#: view:crm.case:0
#: view:crm.claim:0
#: view:crm.fundraising:0
#: view:crm.job:0
#: view:crm.lead:0
#: view:crm.opportunity:0
#: view:crm.phonecall:0
msgid "Reset to Draft"
msgstr "Cambiar a borrador"
@ -1589,8 +1536,6 @@ msgstr "Esperando respuesta"
#: field:crm.case,date:0
#: field:crm.case.log,date:0
#: selection:crm.case.rule,trg_date_type:0
#: view:crm.claim:0
#: view:crm.phonecall:0
msgid "Date"
msgstr "Fecha"
@ -1637,11 +1582,6 @@ msgstr "Dando la ubicacion de la reunion"
#. module: crm
#: view:crm.case:0
#: view:crm.claim:0
#: view:crm.fundraising:0
#: view:crm.job:0
#: view:crm.lead:0
#: view:crm.opportunity:0
msgid "History"
msgstr "Historial"
@ -1676,40 +1616,18 @@ msgstr "Enviar recordatorio"
#. module: crm
#: view:crm.case:0
#: view:crm.fundraising:0
#: view:crm.job:0
#: view:crm.lead:0
#: view:crm.opportunity:0
msgid "References"
msgstr "Referencias"
#. module: crm
#: code:addons/crm/crm.py:0
#: view:crm.case:0
#: wizard_button:crm.case.opportunity.partner_opportunity,init,end:0
#: view:crm.claim:0
#: view:crm.claim.assign_wizard:0
#: view:crm.fundraising:0
#: view:crm.helpdesk.assign_wizard:0
#: wizard_button:crm.job.meeting_set,init,end:0
#: wizard_button:crm.job.partner_create,init,end:0
#: wizard_button:crm.job.reschedule_phone_call,init,end:0
#: view:crm.lead:0
#: wizard_button:crm.lead.opportunity_set,create_partner,end:0
#: wizard_button:crm.lead.opportunity_set,opportunity,end:0
#: wizard_button:crm.lead.partner_create,init,end:0
#: view:crm.meeting.generic_wizard:0
#: wizard_button:crm.new.send.mail,init,end:0
#: view:crm.opportunity:0
#: view:crm.opportunity.assign_wizard:0
#: wizard_button:crm.opportunity.reschedule_phone_call,init,end:0
#: view:crm.phonecall:0
#: view:crm.phonecall.assign_wizard:0
#: wizard_button:crm.phonecall.meeting_set,init,end:0
#: wizard_button:crm.phonecall.opportunity_set,create_partner,end:0
#: wizard_button:crm.phonecall.opportunity_set,opportunity,end:0
#: wizard_button:crm.phonecall.partner_create,init,end:0
#: wizard_button:crm.send.mail,init,end:0
#: selection:crm.case,state:0
#: selection:crm.case.rule,act_state:0
#: selection:crm.case.rule,trg_state_from:0
#: selection:crm.case.rule,trg_state_to:0
#: wizard_button:crm.case.section.menu,design_menu,end:0
#: wizard_button:crm.case.section.menu,init,end:0
#, python-format
msgid "Cancel"
msgstr "Cancelar"
@ -1824,9 +1742,6 @@ msgid "="
msgstr "="
#. module: crm
#: view:crm.fundraising:0
#: view:crm.job:0
#: field:crm.menu.config_wizard,name:0
#: field:crm.segmentation,name:0
msgid "Name"
msgstr "Nombre"
@ -1880,11 +1795,6 @@ msgstr "Seguimiento de errores"
#. module: crm
#: view:crm.case:0
#: view:crm.case.rule:0
#: view:crm.claim:0
#: view:crm.fundraising:0
#: view:crm.job:0
#: view:crm.lead:0
#: view:crm.opportunity:0
msgid "Actions"
msgstr "Acciones"
@ -2151,17 +2061,12 @@ msgstr "Estado del caso"
#. module: crm
#: code:addons/crm/crm.py:0
#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
#: code:addons/crm/wizard/wizard_crm_send_email.py:0
#, python-format
msgid "Send"
msgstr "Enviar"
#. module: crm
#: field:crm.case,priority:0
#: view:crm.fundraising:0
#: view:crm.lead:0
#: view:crm.opportunity:0
msgid "Priority"
msgstr "Prioridad"
@ -2207,11 +2112,6 @@ msgstr "Programar una reunión normal o telefónica"
#. module: crm
#: code:addons/crm/crm.py:0
#: code:addons/crm/crm_claim.py:0
#: code:addons/crm/crm_helpdesk.py:0
#: code:addons/crm/crm_meeting.py:0
#: code:addons/crm/crm_opportunity.py:0
#: code:addons/crm/crm_phonecall.py:0
#, python-format
msgid "Error !"
msgstr "¡Error!"
@ -2461,14 +2361,6 @@ msgstr "Bajo"
#. module: crm
#: field:crm.case,date_closed:0
#: selection:crm.case,state:0
#: selection:crm.case.rule,act_state:0
#: selection:crm.case.rule,trg_state_from:0
#: selection:crm.case.rule,trg_state_to:0
#: selection:report.crm.case.section.categ.categ2,state:0
#: selection:report.crm.case.section.categ.stage,state:0
#: selection:report.crm.case.section.categ2,state:0
#: selection:report.crm.case.section.stage,state:0
msgid "Closed"
msgstr "Cerrado"
@ -2655,8 +2547,7 @@ msgstr ""
"Está seguro de que desea crear una empresa basada en esta solicitud laboral ?"
#. module: crm
#: wizard_field:crm.lead.opportunity_set,create_partner,action:0
#: wizard_field:crm.phonecall.opportunity_set,create_partner,action:0
#: field:crm.case.log,name:0
msgid "Action"
msgstr "Acción"
@ -2704,7 +2595,6 @@ msgstr "Ventas"
#. module: crm
#: view:crm.case:0
#: view:crm.phonecall:0
msgid "General"
msgstr "General"
@ -2751,16 +2641,6 @@ msgstr "Todas las oportunidades"
#: selection:crm.case.rule,act_state:0
#: selection:crm.case.rule,trg_state_from:0
#: selection:crm.case.rule,trg_state_to:0
#: view:crm.claim:0
#: view:crm.fundraising:0
#: view:crm.job:0
#: view:crm.lead:0
#: view:crm.opportunity:0
#: view:crm.phonecall:0
#: selection:report.crm.case.section.categ.categ2,state:0
#: selection:report.crm.case.section.categ.stage,state:0
#: selection:report.crm.case.section.categ2,state:0
#: selection:report.crm.case.section.stage,state:0
#, python-format
msgid "Open"
msgstr "Abierto"
@ -2798,16 +2678,6 @@ msgstr "Asistencia/Ayuda"
#. module: crm
#: field:crm.case,user_id:0
#: field:crm.case.rule,trg_user_id:0
#: view:crm.claim:0
#: field:crm.claim.assign_wizard,user_id:0
#: view:crm.fundraising:0
#: field:crm.helpdesk.assign_wizard,user_id:0
#: view:crm.job:0
#: view:crm.meeting:0
#: field:crm.meeting.generic_wizard,user_id:0
#: view:crm.opportunity:0
#: field:crm.opportunity.assign_wizard,user_id:0
#: field:crm.phonecall.assign_wizard,user_id:0
msgid "Responsible"
msgstr "Responsable"
@ -3050,6 +2920,8 @@ msgid "Jobs Hiring Process"
msgstr "Proceso de selección de personal"
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_case_categ0-act
#: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act
#: model:ir.ui.menu,name:crm.next_id_52
msgid "All Cases"
msgstr "Todos los casos"
@ -3171,7 +3043,6 @@ msgstr ""
#. module: crm
#: code:addons/crm/crm.py:0
#: code:addons/crm/wizard/wizard_cal_subscribe.py:0
#, python-format
msgid "Error!"
msgstr "¡Error!"
@ -3262,17 +3133,6 @@ msgstr "%(case_subject)s = Asunto del caso"
#: field:crm.case,section_id:0
#: field:crm.case.log,section_id:0
#: field:crm.case.rule,trg_section_id:0
#: field:crm.claim.assign_wizard,section_id:0
#: field:crm.helpdesk.assign_wizard,section_id:0
#: wizard_field:crm.job.reschedule_phone_call,init,section_id:0
#: field:crm.meeting.generic_wizard,section_id:0
#: field:crm.opportunity.assign_wizard,section_id:0
#: wizard_field:crm.opportunity.reschedule_phone_call,init,section_id:0
#: field:crm.phonecall.assign_wizard,section_id:0
#: field:report.crm.case.section.categ.categ2,section_id:0
#: field:report.crm.case.section.categ.stage,section_id:0
#: field:report.crm.case.section.categ2,section_id:0
#: field:report.crm.case.section.stage,section_id:0
msgid "Section"
msgstr "Sección"
@ -3303,10 +3163,7 @@ msgid "Your action"
msgstr "Su acción"
#. module: crm
#: model:crm.case.category2,name:crm.category_lead3
#: field:crm.case.history,email:0
#: field:crm.email.add.cc,email:0
#: view:crm.job:0
msgid "Email"
msgstr "Email"
@ -3363,16 +3220,6 @@ msgstr "Informes"
#: selection:crm.case.rule,act_state:0
#: selection:crm.case.rule,trg_state_from:0
#: selection:crm.case.rule,trg_state_to:0
#: view:crm.claim:0
#: view:crm.fundraising:0
#: view:crm.job:0
#: view:crm.lead:0
#: selection:crm.new.send.mail,init,state:0
#: view:crm.opportunity:0
#: selection:report.crm.case.section.categ.categ2,state:0
#: selection:report.crm.case.section.categ.stage,state:0
#: selection:report.crm.case.section.categ2,state:0
#: selection:report.crm.case.section.stage,state:0
#, python-format
msgid "Pending"
msgstr "Pendiente"
@ -3519,9 +3366,23 @@ msgid "All Funds"
msgstr "Todos los fondos"
#. module: crm
#: field:crm.case.section,calendar:0
#: view:crm.meeting:0
#: model:ir.ui.menu,name:crm.menu_crm_case_category_act_meetings
#: selection:crm.case.section.menu,design_menu,menu10_option:0
#: selection:crm.case.section.menu,design_menu,menu11_option:0
#: selection:crm.case.section.menu,design_menu,menu12_option:0
#: selection:crm.case.section.menu,design_menu,menu13_option:0
#: selection:crm.case.section.menu,design_menu,menu14_option:0
#: selection:crm.case.section.menu,design_menu,menu15_option:0
#: selection:crm.case.section.menu,design_menu,menu16_option:0
#: selection:crm.case.section.menu,design_menu,menu17_option:0
#: selection:crm.case.section.menu,design_menu,menu1_option:0
#: selection:crm.case.section.menu,design_menu,menu2_option:0
#: selection:crm.case.section.menu,design_menu,menu3_option:0
#: selection:crm.case.section.menu,design_menu,menu4_option:0
#: selection:crm.case.section.menu,design_menu,menu5_option:0
#: selection:crm.case.section.menu,design_menu,menu6_option:0
#: selection:crm.case.section.menu,design_menu,menu7_option:0
#: selection:crm.case.section.menu,design_menu,menu8_option:0
#: selection:crm.case.section.menu,design_menu,menu9_option:0
msgid "Calendar"
msgstr "Calendario"
@ -3567,6 +3428,7 @@ msgstr "Saliente"
#. module: crm
#: code:addons/crm/crm.py:0
#: view:crm.case:0
#, python-format
msgid "Historize"
msgstr "Añadir al historial"
@ -3594,11 +3456,6 @@ msgstr "Probabilidad de éxito"
#: selection:crm.case.rule,act_state:0
#: selection:crm.case.rule,trg_state_from:0
#: selection:crm.case.rule,trg_state_to:0
#: view:crm.meeting:0
#: selection:report.crm.case.section.categ.categ2,state:0
#: selection:report.crm.case.section.categ.stage,state:0
#: selection:report.crm.case.section.categ2,state:0
#: selection:report.crm.case.section.stage,state:0
#, python-format
msgid "Draft"
msgstr "Borrador"
@ -3628,8 +3485,6 @@ msgstr "Normal"
#. module: crm
#: code:addons/crm/crm.py:0
#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
#: code:addons/crm/wizard/wizard_crm_send_email.py:0
#, python-format
msgid "You must put a Partner eMail to use this action!"
msgstr "¡Debe indicar un Email de empresa para usar esta acción!"
@ -3772,8 +3627,6 @@ msgstr "Fase del caso"
#. module: crm
#: view:crm.case:0
#: view:crm.fundraising:0
#: view:crm.opportunity:0
msgid "Estimates"
msgstr "Estimaciones"
@ -3785,6 +3638,10 @@ msgstr "Usuario responsable"
#. module: crm
#: code:addons/crm/crm.py:0
#: view:crm.case:0
#: selection:crm.case,state:0
#: selection:crm.case.rule,act_state:0
#: selection:crm.case.rule,trg_state_from:0
#: selection:crm.case.rule,trg_state_to:0
#, python-format
msgid "Close"
msgstr "Cerrado"
@ -3842,14 +3699,9 @@ msgid "% = The '%' Character"
msgstr "% = EL '%' caracter"
#. module: crm
#: view:crm.case:0
#: field:crm.case,name:0
#: field:crm.case.history,description:0
#: field:crm.case.history,note:0
#: view:crm.job:0
#: view:crm.meeting:0
#: view:crm.opportunity:0
#: view:crm.phonecall:0
#: field:crm.segmentation,description:0
msgid "Description"
msgstr "Descripción"
@ -3900,14 +3752,6 @@ msgstr "_Importar"
#. module: crm
#: code:addons/crm/crm.py:0
#: field:crm.case.log,case_id:0
#: field:crm.claim,inherit_case_id:0
#: field:crm.fundraising,inherit_case_id:0
#: field:crm.helpdesk,inherit_case_id:0
#: field:crm.job,inherit_case_id:0
#: field:crm.lead,inherit_case_id:0
#: field:crm.meeting,inherit_case_id:0
#: field:crm.opportunity,inherit_case_id:0
#: field:crm.phonecall,inherit_case_id:0
#: model:ir.model,name:crm.model_crm_case
#: model:res.request.link,name:crm.req_link_case
#, python-format
@ -4031,7 +3875,6 @@ msgstr "Exportar archivo ICS"
#. module: crm
#: field:crm.case.rule,sequence:0
#: field:crm.case.section,sequence:0
#: field:crm.case.stage,sequence:0
msgid "Sequence"
msgstr "Secuencia"
@ -4202,9 +4045,6 @@ msgstr "Boletín de noticias"
#~ msgid "List"
#~ msgstr "Lista"
#~ msgid "Send Partner & Historize"
#~ msgstr "Enviar empresa & Añadir historial"
#~ msgid "All Histories"
#~ msgstr "Todos los historiales"
@ -4217,9 +4057,6 @@ msgstr "Boletín de noticias"
#~ msgid "Mail to watchers (Cc)"
#~ msgstr "Enviar correo a observadores (CC)"
#~ msgid "crm.case.section.open"
#~ msgstr "crm.case.section.open"
#~ msgid "Deadline Date is automatically computed from Start Date + Duration"
#~ msgstr ""
#~ "La fecha límite se calcula automáticamente a partir de Fecha de inicio + "
@ -4233,3 +4070,6 @@ msgstr "Boletín de noticias"
#~ msgstr ""
#~ "Es posible que desee crear un nuevo menú padre para poner todos los menús "
#~ "creados en él."
#~ msgid "Send Partner & Historize"
#~ msgstr "Enviar a empresa y añadir al historial"

472
addons/crm/i18n/zh_CN.po
View File

File diff suppressed because it is too large Load Diff

4
addons/delivery/delivery_view.xml
View File

@ -141,6 +141,8 @@
<field name="arch" type="xml">
<field name="address_id" position="after">
<field name="carrier_id"/>
<field name="carrier_tracking_ref" groups="base.group_extended"/>
<field name="number_of_packages" groups="base.group_extended"/>
<field name="weight"/>
</field>
</field>
@ -178,6 +180,8 @@
<field name="arch" type="xml">
<field name="address_id" position="after">
<field name="carrier_id"/>
<field name="carrier_tracking_ref" groups="base.group_extended"/>
<field name="number_of_packages" groups="base.group_extended"/>
<field name="weight"/>
</field>
</field>

2
addons/delivery/report/shipping.rml
View File

@ -114,7 +114,7 @@
<blockTable colWidths="287.0,254.0" repeatRows="1" style="Tableau1">
<tr>
<td>
<para style="terp_default_Bold_9">Invoiced to</para>
<para style="terp_default_Bold_9">[[ o.sale_id and o.sale_id.partner_invoice_id and 'Invoiced to' or '' ]]</para>
<para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.partner_id.name or '']]</para>
<para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.name or '']]</para>
<para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.street or '']]</para>

2
addons/delivery/stock.py
View File

@ -55,6 +55,8 @@ class stock_picking(osv.osv):
'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['move_lines'], 20),
'stock.move': (_get_picking_line, ['product_id','product_qty','product_uom','product_uos_qty'], 20),
}),
'carrier_tracking_ref': fields.char('Carrier Tracking Ref', size=32),
'number_of_packages': fields.integer('Number of Packages'),
}
def action_invoice_create(self, cursor, user, ids, journal_id=False,

15
addons/event/event.py
View File

@ -100,6 +100,9 @@ class event_event(osv.osv):
@param context: A standard dictionary for contextual values
@return: True
"""
if not context:
context = {}
res = False
if type(ids) in (int, long,):
ids = [ids]
data_pool = self.pool.get('ir.model.data')
@ -107,7 +110,7 @@ class event_event(osv.osv):
for event in self.browse(cr, uid, ids, context=context):
total_confirmed = event.register_current
if total_confirmed >= event.register_min or event.register_max == 0:
self.do_confirm(cr, uid, [event.id], context=context)
res = self.do_confirm(cr, uid, [event.id], context=context)
else:
unconfirmed_ids.append(event.id)
if unconfirmed_ids:
@ -126,8 +129,8 @@ class event_event(osv.osv):
'target': 'new',
'context': context,
'nodestroy': True
}
return True
}
return res
def _get_register(self, cr, uid, ids, fields, args, context=None):
@ -219,10 +222,10 @@ class event_event(osv.osv):
'mail_auto_confirm': fields.boolean('Mail Auto Confirm', readonly=False, states={'done': [('readonly', True)]}, help='Check this box if you want ot use the automatic confirmation emailing or the reminder'),
'mail_registr': fields.text('Registration Email', readonly=False, states={'done': [('readonly', True)]}, help='This email will be sent when someone subscribes to the event.'),
'mail_confirm': fields.text('Confirmation Email', readonly=False, states={'done': [('readonly', True)]}, help="This email will be sent when the event gets confimed or when someone subscribes to a confirmed event. This is also the email sent to remind someone about the event."),
'product_id': fields.many2one('product.product', 'Product', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="Product which is provided cost of event. Invoice of event will be created with this Product."),
'product_id': fields.many2one('product.product', 'Product', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="The invoices of this event registration will be created with this Product. Thus it allows you to set the default label and the accounting info you want by default on these invoices."),
'note': fields.text('Notes', help="Description or Summary of Event", readonly=False, states={'done': [('readonly', True)]}),
'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', readonly=True, states={'draft': [('readonly', False)]}, help="Pricelist version for current event."),
'unit_price': fields.related('product_id', 'list_price', type='float', string='Registration Cost', readonly=True, states={'draft':[('readonly',False)]}),
'unit_price': fields.related('product_id', 'list_price', type='float', string='Registration Cost', readonly=True, states={'draft':[('readonly',False)]}, help="This will be the default price used as registration cost when invoicing this event. Note that you can specify for each registration a specific amount if you want to"),
'main_speaker_id': fields.many2one('res.partner','Main Speaker', readonly=False, states={'done': [('readonly', True)]}),
'speaker_ids':fields.many2many('res.partner', 'event_speaker_rel', 'speaker_id', 'partner_id', 'Other Speakers', readonly=False, states={'done': [('readonly', True)]}),
'address_id': fields.many2one('res.partner.address','Location Address', readonly=False, states={'done': [('readonly', True)]}),
@ -442,6 +445,8 @@ class event_registration(osv.osv):
@param context: A standard dictionary for contextual values
@return: True
"""
if not context:
context = {}
data_pool = self.pool.get('ir.model.data')
unconfirmed_ids = []
for registration in self.browse(cr, uid, ids, context=context):

282
addons/event/test/test_event.yml
View File

@ -1,34 +1,55 @@
- |
In order to test the 'event' module in OpenERP, we create a new event.
In order to test the "Event Organisation" in Association system.
- |
Given that I have product "Ticket for Concert".
I want to organize one conference event on "OpenERP Business".
- |
I'm creating new product "Ticket for Conference" to specify registration Cost of conference.
-
!record {model: product.product, id: product_product_ticketforconcert0}:
categ_id: product.cat1
cost_method: standard
list_price: 68.0
mes_type: fixed
name: Ticket for Concert
procure_method: make_to_stock
standard_price: 15.0
supply_method: buy
type: product
uom_id: product.product_uom_unit
uom_po_id: product.product_uom_unit
volume: 0.0
warranty: 0.0
weight: 0.0
weight_net: 0.0
name: Ticket for Conference
- |
Given that I have also Event type "Conference".
I'm creating Event type "Conference".
-
!record {model: event.type, id: event_type_conference0}:
name: Conference
name: Conferences
- |
I create partner "Mark Johnson" and and I provide an address to this
new customer, as well as an email "info@mycustomer.com".
I'm creating one Event "Conference on OpenERP Business" which will be started beetween 1 and 10 in this month.
-
!record {model: event.event, id: event_event_conference0}:
date_begin: 2010-08-01
date_end: 2010-08-10
name: Conference on OpenERP Business.
product_id: 'product_product_ticketforconcert0'
type: 'event_type_conference0'
reply_to: 'info@customer.com'
- |
Check that the new conference event is "Draft" or not.
-
!assert {model: event.event, id: event_event_conference0}:
- state == 'draft', "Event should be in draft by default when first time created"
- |
Need Minimun 10 Registrations to confirm/start this Conference Event and does not allowed more than 100 Registrations.
- |
So I set Minimun and Maximun Registrations limit.
-
!python {model: event.event}: |
self.write(cr, uid, [ref('event_event_conference0')], {'register_max': 100, 'register_min': 10})
- |
I'm doing to confirm that conference event.
-
!python {model: event.event}: |
self.button_confirm(cr, uid, [ref("event_event_conference0")])
- |
But this conference event need minimum 10 Confirmed Registrations. so Check that Event is not "confirmed".
-
!assert {model: event.event, id: event_event_conference0}:
- state != 'confirm', "Event should not confirmed if minimum registrations does not reached"
- |
"Mark Johnson" want to subscribe/join into "Conference on OpenERP Business" with 10 tickets.
- |
I'm creating new partner "Mark Johnson" with him email "info@mycustomer.com".
-
!record {model: res.partner, id: res_partner_markjohnson0}:
address:
@ -44,155 +65,108 @@
type: default
zip: '1000'
email: 'info@mycustomer.com'
credit_limit: 0.0
lang: en_US
name: Mark Johnson
property_account_payable: account.a_pay
property_account_receivable: account.a_recv
- |
we create it with a "Conference on OpenERP Offshore Business" event and provide "Beginning date", "Ending Date" and "Product" as Concert Ticket.
-
!record {model: event.event, id: event_event_conference0}:
date_begin: '2010-06-07 13:39:00'
date_end: '2010-06-10 13:39:00'
name: Conference on OpenERP Offshore Business.
product_id: 'product_product_ticketforconcert0'
register_max: 0.0
register_min: 0.0
state: draft
type: 'event_type_conference0'
reply_to: 'info@customer.com'
- |
we set the limit of registrations to this event using "Minimum Registrations" 2 and "Maximum Registrations" 10.
-
!python {model: event.event}: |
self.write(cr, uid, [ref('event_event_conference0')], {'register_max': 10, 'register_min': 2})
- |
We Check that the event is in "Draft" state.
-
!assert {model: event.event, id: event_event_conference0}:
- state == 'draft'
- |
Then we confirm it press on "Confirm Event" button.
-
!python {model: event.event}: |
self.button_confirm(cr, uid, [ref("event_event_conference0")], {"active_ids": [ref("event.menu_event_event")]})
- |
Check that Event is "confirmed" or not.
-
!assert {model: event.event, id: event_event_conference0}:
- state == 'confirm'
- |
person "Mark Johnson" want to confirm their registrations. for that
I create New Registration for "Conference on OpenERP Offshore Business.
I'm creating Registration for "Mark Johnson" on "Conference on OpenERP Business" with 10 tickets.
-
!record {model: event.registration, id: event_registration_registrationjacot0}:
contact_id: base_contact.res_partner_contact_jacot0
date_deadline: '2010-06-07 13:39:00'
event_id: event.event_event_conference0
event_product: Ticket for Concert
name: 'Registration: Jacot'
partner_id: 'res_partner_markjohnson0'
partner_invoice_id: 'res_partner_markjohnson0'
partner_id: event.res_partner_markjohnson0
partner_invoice_id: event.res_partner_markjohnson0
event_product: Ticket for Conference
unit_price: 68.0
nb_register: 10
- |
I check that "Number of registration" is less than "Maximum registration" defined in "Conference on OpenERP Offshore Business" event.
if not then confirmation will fail because its greater then the Maximum registration.
-
!python {model: event.event}: |
from tools.translate import _
obj_register = self.pool.get('event.registration')
event_id1 = self.browse(cr, uid, ref('event_event_conference0'))
register_ids = obj_register.search(cr, uid, [('event_id', '=', event_id1.id)])
register_id = obj_register.browse(cr, uid, register_ids)[0]
assert register_id.nb_register <= event_id1.register_max, _('NO. of Registration for this event is More than Maximum Registration Defined !')
- |
And Confirm that Registration by click on "Confirm Registration" button of Registraion form.
I'm doing to Open that Registration.
-
!python {model: event.registration}: |
self.check_confirm(cr, uid, [ref("event_registration_registrationjacot0")], {"active_ids": [ref("event.menu_action_registration")]})
self.check_confirm(cr, uid, [ref("event_registration_registrationjacot0")])
- |
one other Person "Zen" also want to confirm their Registraions. so
They create New registraion for This event.
-
!record {model: event.registration, id: event_registration_registrationzen0}:
contact_id: base_contact.res_partner_contact_zen0
date_deadline: '2010-06-07 13:39:00'
event_id: event.event_event_conference0
event_product: Ticket for Concert
name: 'Registration: Zen'
partner_id: base.res_partner_3
partner_invoice_id: base.res_partner_3
unit_price: 68.0
- |
And Confirm that Registration by click on "Confirm Registration" button of Registraion form.
-
!python {model: event.registration}: |
self.check_confirm(cr, uid, [ref("event_registration_registrationzen0")], {"active_ids": [ref("event.menu_action_registration")]})
- |
Third person create New Registration for "Conference on OpenERP Offshore Business" event.
-
!record {model: event.registration, id: event_registration_registrationpassot0}:
contact_id: base_contact.res_partner_contact_passot0
date_deadline: '2010-06-07 13:39:00'
email_from: info@mediapole.net
event_id: 'event_event_conference0'
event_product: Ticket for Concert
name: 'Registration: Passot'
partner_id: base.res_partner_8
partner_invoice_id: base.res_partner_8
unit_price: 68.0
- |
This person cannot Confirm their registration.so I check that state is "Unconfirmed".
-
!assert {model: event.registration, id: event_registration_registrationpassot0}:
- state == 'draft'
- |
I Check that the total number of confirmed is 2 and unconfirmed registrations 1.
-
!python {model: event.event}: |
from tools.translate import _
obj_event = self.browse(cr, uid, ref('event_event_conference0'))
assert obj_event.register_current == 2, "Number of Confirmed Registration for this event is %s"%(obj_event.register_current)
assert obj_event.register_prospect == 1, "Number of Unconfirmed Registration for this event is %s" %(obj_event.register_prospect)
- |
This event is finished by click on "Event Done" button of this event form.
-
!python {model: event.event}: |
self.button_done(cr, uid, [ref("event.event_event_conference0")], {"active_ids": [ref("event.menu_event_event")] })
- |
We can create invoice if the registration is in "Open" state otherwise it gives the warning to the user.
so I check that Registration is in "Open" state before click on "Make Invoices."
Check that Registration is in "Open" or not."
-
!assert {model: event.registration, id: event_registration_registrationjacot0}:
- state == 'open'
- |
Now, I will invoice the participant who have address using "Make Invoices".Create invoice will be linked to Invoice Field available on Payments tab of registrations.
- state == 'open', "Registration should be open here."
-
!record {model: event.make.invoice, id: event_make_invoice_0}:
{}
- |
I click on "Done" button of this "Make Invoices" wizard.
-
!python {model: event.make.invoice}: |
self.make_invoice(cr, uid, [ref("event_make_invoice_0")], {"active_ids": [ref("event_registration_registrationzen0")]})
I'm again try to confirm that conference event.
-
!python {model: event.event}: |
self.button_confirm(cr, uid, [ref("event_event_conference0")])
- |
I check that Invoice for this partner is created or not.
Now Minimun requirement of Registration is fullfil. so Check that Event is "confirmed" or not.
-
!assert {model: event.event, id: event_event_conference0}:
- state == 'confirm', "Event should be confirmed here."
- |
I'm creating invoice of Registration of "Mark Johnson" on "Conference on OpenERP Business".
-
!python {model: event.registration}: |
from tools.translate import _
data_event_reg = self.browse(cr, uid, ref('event_registration_registrationzen0'), context=context)
assert data_event_reg.invoice_id, _("Invoices has not been generated for this partner")
self.action_invoice_create(cr, uid, [ref("event_registration_registrationjacot0")])
- |
Check Invoice of Registration of "Mark Johnson" is created or not.
-
!assert {model: event.registration, id: event_registration_registrationjacot0}:
- invoice_id != False, "Invoice should be generated"
- |
Check Registration of "Mark Johnson" is closed or not after invoice generated.
-
!assert {model: event.registration, id: event_registration_registrationjacot0}:
- state != 'done', "Registration should be closed after invoice generated"
- |
Now "Mark Johnson" want to another registration on "Conference on OpenERP Business" with 120 tickets.
- |
I'm creating new registration for "Mark Johnson" with 100 tickets.
-
!record {model: event.registration, id: event_registration_registrationzen0}:
event_id: event.event_event_conference0
partner_id: event.res_partner_markjohnson0
partner_invoice_id: event.res_partner_markjohnson0
event_product: Ticket for Conference
unit_price: 68.0
nb_register: 100
- |
I'm doing to open "Mark Johnson" registration.
-
!python {model: event.registration}: |
self.check_confirm(cr, uid, [ref("event_registration_registrationzen0")])
- |
But conference event do not allowed more than 100 Registrations. so Check that registration is not "open".
-
!assert {model: event.registration, id: event_registration_registrationzen0}:
- state == 'draft', "Registration should be in draft by default."
- |
Now I'm modify number of tickets of "Mark Johnson"'s registration with 90 tickets.
-
!python {model: event.registration}: |
self.write(cr, uid, [ref("event_registration_registrationzen0")], {'nb_register': 90})
- |
I'm again try to open "Mark Johnson" registration.
-
!python {model: event.registration}: |
self.check_confirm(cr, uid, [ref("event_registration_registrationzen0")])
- |
Check that registration "open" or not.
-
!assert {model: event.registration, id: event_registration_registrationzen0}:
- state == 'open', "Registration should be open here."
- |
I'm closing "Conference on OpenERP Business" Conference event
-
!python {model: event.event}: |
self.button_done(cr, uid, [ref("event_event_conference0")])
- |
Check that conference "close" or not.
-
!assert {model: event.event, id: event_event_conference0}:
- state == 'done', "Registration should be Closed here."

2
addons/event/wizard/event_confirm.py
View File

@ -33,7 +33,7 @@ class event_confirm(osv.osv_memory):
'msg': fields.text('Message', readonly=True),
}
_defaults = {
'msg': _('Total Registrations of this Event could not reached Minimum Registration Limit. What do you want to do?')
'msg': _('Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?')
}
def confirm(self, cr, uid, ids, context):

3
addons/event/wizard/event_confirm_registration.py
View File

@ -50,11 +50,10 @@ class event_confirm_registration(osv.osv_memory):
register_max = registration.event_id.register_max
if registration.event_id.id not in overlimit_event_ids:
overlimit_event_ids.append(registration.event_id.id)
msg += _("The Event '%s' is reached Maximum Limit(%s).") \
msg += _("Warning: The Event '%s' has reached its Maximum Limit (%s).") \
%(registration.event_id.name, register_max)
if 'msg' in fields:
res.update({'msg': msg})
return res
def confirm(self, cr, uid, ids, context):

2
addons/marketing_campaign/marketing_campaign.py
View File

@ -678,6 +678,8 @@ class marketing_campaign_workitem(osv.osv):
'datas' : datas,
'nodestroy': True,
}
else:
raise osv.except_osv(_('No preview'),_('The current step for this item has no email or report to preview.'))
return res
marketing_campaign_workitem()

12
addons/marketing_campaign/marketing_campaign_view.xml
View File

@ -306,8 +306,8 @@
<field name="partner_id"/>
<field name="date"/>
<field name="state"/>
<button string="Preview" states="todo" name="preview" icon="gtk-apply" type="object"/>
<button string="Process" states="todo" name="process" type="object" icon="gtk-ok"/>
<button string="Preview" states="todo" name="preview" icon="gtk-zoom-fit" type="object"/>
<button string="Process" states="todo" name="process" type="object" icon="terp-gtk-go-back-rtl"/>
<button string="Cancel" states="todo" name="button_cancel" type="object" icon="gtk-cancel"/>
</tree>
</field>
@ -335,7 +335,7 @@
<separator string="Date" colspan="2"/>
<field name="date"/>
<label string="" colspan="1"/>
<button string="Preview" states="todo" name="preview" icon="gtk-apply" type="object"/>
<button string="Preview" states="todo" name="preview" icon="gtk-zoom-fit" type="object"/>
</group>
</group>
<group colspan="4" col="4" attrs="{'invisible':[('state','!=','exception')]}">
@ -345,8 +345,8 @@
<separator string="Status" colspan="4"/>
<group colspan="4" col="11">
<field name="state" nolabel="1" readonly="True" select="1"/>
<button string="Reset" states="exception,cancelled" name="button_draft" type="object" icon="gtk-ok"/>
<button string="Process" states="todo" name="process" type="object" icon="gtk-ok"/>
<button string="Reset" states="exception,cancelled" name="button_draft" type="object" icon="gtk-undo"/>
<button string="Process" states="todo" name="process" type="object" icon="terp-gtk-go-back-rtl"/>
<button string="Cancel" states="todo,exception" name="button_cancel" type="object" icon="gtk-cancel"/>
</group>
</form>
@ -379,7 +379,7 @@
</record>
<record model="ir.actions.act_window" id="action_marketing_campaign_workitem">
<field name="name">Campaign Activities (Workitems)</field>
<field name="name">Campaign Followup</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">marketing.campaign.workitem</field>
<field name="view_type">form</field>

195
addons/mrp/i18n/pl.po
View File

@ -1,19 +1,19 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * mrp
# * mrp
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-05-21 08:19+0000\n"
"PO-Revision-Date: 2010-07-18 15:01+0000\n"
"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-06-22 03:56+0000\n"
"X-Launchpad-Export-Date: 2010-07-19 03:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp
@ -45,7 +45,7 @@ msgstr "Planowanie zasobów produkcyjnych (MRP)"
#. module: mrp
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr ""
msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
#. module: mrp
#: field:mrp.bom.revision,indice:0
@ -91,12 +91,14 @@ msgid "Stockable Stock"
msgstr "Zapas rejestrowany"
#. module: mrp
#: field:mrp.procurement,origin:0 field:mrp.production,origin:0
#: field:mrp.procurement,origin:0
#: field:mrp.production,origin:0
msgid "Origin"
msgstr "Pochodzenie"
#. module: mrp
#: model:ir.ui.menu,name:mrp.menu_mrp_configuration view:res.company:0
#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
#: view:res.company:0
msgid "Configuration"
msgstr "Konfiguracja"
@ -175,7 +177,8 @@ msgstr "Automatyczne nabycia"
#. module: mrp
#: wizard_field:change_production_qty,confirm,product_qty:0
#: field:mrp.bom,product_qty:0 field:mrp.production,product_qty:0
#: field:mrp.bom,product_qty:0
#: field:mrp.production,product_qty:0
#: field:mrp.production.product.line,product_qty:0
msgid "Product Qty"
msgstr "Ilość produktu"
@ -203,7 +206,7 @@ msgstr "Wyjątek przesunięcia"
#. module: mrp
#: model:process.node,note:mrp.process_node_orderrfq0
msgid "A purchase order is created for a sub-contracting demand."
msgstr ""
msgstr "Zamówienie zakupu zostało utworzone dla podwykonawcy."
#. module: mrp
#: rml:mrp.production.order:0
@ -262,7 +265,8 @@ msgid "Internal Ref."
msgstr "Wewn. odnośnik"
#. module: mrp
#: view:mrp.procurement:0 field:mrp.procurement,state:0
#: view:mrp.procurement:0
#: field:mrp.procurement,state:0
#: field:mrp.production,state:0
msgid "Status"
msgstr "Stan"
@ -304,26 +308,29 @@ msgstr ""
#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_production_action
#: model:ir.ui.menu,name:mrp.menu_mrp_production_action view:mrp.production:0
#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
#: view:mrp.production:0
msgid "Production Orders"
msgstr "Zamówienia produkcji"
#. module: mrp
#: rml:bom.structure:0 field:mrp.procurement,product_qty:0
#: rml:bom.structure:0
#: field:mrp.procurement,product_qty:0
#: rml:mrp.production.order:0
#: wizard_field:product.product.procurement,init,qty:0
msgid "Quantity"
msgstr "Ilość"
#. module: mrp
#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
#: selection:mrp.procurement,priority:0
#: selection:mrp.production,priority:0
msgid "Not urgent"
msgstr "Nie pilne"
#. module: mrp
#: model:process.transition,name:mrp.process_transition_procureserviceproduct0
msgid "Procure Service Product"
msgstr ""
msgstr "Nabycie usługi"
#. module: mrp
#: view:mrp.production:0
@ -359,10 +366,11 @@ msgstr "Proces nabycia"
#. module: mrp
#: field:mrp.production,date_planned_date:0
msgid "Scheduled Date"
msgstr ""
msgstr "Zaplanowana data"
#. module: mrp
#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
#: selection:mrp.procurement,priority:0
#: selection:mrp.production,priority:0
msgid "Urgent"
msgstr "Pilne"
@ -478,19 +486,20 @@ msgid "Stockable Product Stock"
msgstr ""
#. module: mrp
#: field:mrp.bom,product_uos:0 field:mrp.production.product.line,product_uos:0
#: field:mrp.bom,product_uos:0
#: field:mrp.production.product.line,product_uos:0
msgid "Product UOS"
msgstr "JS produktu"
#. module: mrp
#: model:process.transition,name:mrp.process_transition_productionprocureproducts0
msgid "Production Procure Products"
msgstr ""
msgstr "Nabycie z produkcji"
#. module: mrp
#: model:process.process,name:mrp.process_process_serviceproductprocess0
msgid "Service Product Process"
msgstr ""
msgstr "Proces usługi"
#. module: mrp
#: model:process.transition,note:mrp.process_transition_purchaseprocure0
@ -544,7 +553,7 @@ msgstr "Czas produkcji"
#: model:ir.actions.act_window,name:mrp.mrp_procurement_action4
#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action4
msgid "Exceptions Procurements to Fix"
msgstr ""
msgstr "Wyjątki nabycia do poprawienia"
#. module: mrp
#: selection:mrp.procurement,state:0
@ -602,8 +611,10 @@ msgid "Waiting"
msgstr "Oczekiwanie"
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_routing field:mrp.bom,routing_id:0
#: field:mrp.production,routing_id:0 view:mrp.routing:0
#: model:ir.model,name:mrp.model_mrp_routing
#: field:mrp.bom,routing_id:0
#: field:mrp.production,routing_id:0
#: view:mrp.routing:0
#: model:process.node,name:mrp.process_node_routing0
msgid "Routing"
msgstr "Marszruta"
@ -676,7 +687,8 @@ msgid "Production orders"
msgstr "Zamówienia produkcji"
#. module: mrp
#: field:mrp.bom,child_complete_ids:0 field:mrp.bom,child_ids:0
#: field:mrp.bom,child_complete_ids:0
#: field:mrp.bom,child_ids:0
msgid "BoM Hyerarchy"
msgstr "Hierarchia Zest. Mat."
@ -702,7 +714,8 @@ msgid "Security Days"
msgstr "Dni na wszelki wypadek"
#. module: mrp
#: view:mrp.production:0 field:mrp.production,cycle_total:0
#: view:mrp.production:0
#: field:mrp.production,cycle_total:0
msgid "Total Cycles"
msgstr "Suma cykli"
@ -762,7 +775,9 @@ msgid "Production done"
msgstr "Produkcja wykonana"
#. module: mrp
#: rml:bom.structure:0 field:mrp.bom,code:0 field:mrp.routing,code:0
#: rml:bom.structure:0
#: field:mrp.bom,code:0
#: field:mrp.routing,code:0
#: field:mrp.workcenter,code:0
msgid "Code"
msgstr "Kod"
@ -774,7 +789,8 @@ msgstr "Liczba godzin"
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_property_group
#: field:mrp.property,group_id:0 field:mrp.property.group,name:0
#: field:mrp.property,group_id:0
#: field:mrp.property.group,name:0
msgid "Property Group"
msgstr "Grupa właściwości"
@ -789,12 +805,14 @@ msgid "References"
msgstr "Odnośniki"
#. module: mrp
#: wizard_button:change_production_qty,confirm,end:0 view:mrp.procurement:0
#: wizard_button:change_production_qty,confirm,end:0
#: view:mrp.procurement:0
#: selection:mrp.procurement,state:0
#: wizard_button:mrp.procurement.compute,init,end:0
#: wizard_button:mrp.procurement.compute.all,init,end:0
#: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
#: view:mrp.production:0 wizard_button:mrp.workcenter.load,init,end:0
#: view:mrp.production:0
#: wizard_button:mrp.workcenter.load,init,end:0
#: wizard_button:product.product.procurement,init,end:0
#: wizard_button:product_price,init,end:0
msgid "Cancel"
@ -876,10 +894,14 @@ msgid "Nbr of cycle"
msgstr "Liczba cykli"
#. module: mrp
#: field:mrp.bom,name:0 field:mrp.procurement,name:0
#: rml:mrp.production.order:0 field:mrp.production.product.line,name:0
#: field:mrp.property,name:0 field:mrp.routing,name:0
#: field:mrp.routing.workcenter,name:0 field:stock.warehouse.orderpoint,name:0
#: field:mrp.bom,name:0
#: field:mrp.procurement,name:0
#: rml:mrp.production.order:0
#: field:mrp.production.product.line,name:0
#: field:mrp.property,name:0
#: field:mrp.routing,name:0
#: field:mrp.routing.workcenter,name:0
#: field:stock.warehouse.orderpoint,name:0
msgid "Name"
msgstr "Nazwa"
@ -992,7 +1014,8 @@ msgid "Notes"
msgstr "Uwagi"
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_bom view:mrp.bom:0
#: model:ir.model,name:mrp.model_mrp_bom
#: view:mrp.bom:0
#: field:mrp.production,bom_id:0
msgid "Bill of Material"
msgstr "Zestawienie materiałowe"
@ -1053,7 +1076,8 @@ msgid "Sale Ref"
msgstr "Odnośnik sprzedaży"
#. module: mrp
#: field:mrp.procurement,priority:0 field:mrp.production,priority:0
#: field:mrp.procurement,priority:0
#: field:mrp.production,priority:0
#: rml:mrp.production.order:0
msgid "Priority"
msgstr "Priorytet"
@ -1082,7 +1106,8 @@ msgstr "Narzędzie"
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for products used in raw materials."
msgid ""
"Location where the system will look for products used in raw materials."
msgstr ""
"Strefa, w której system oczekuje produktów jako materiałów do produkcji."
@ -1118,7 +1143,8 @@ msgid "Max Quantity"
msgstr "Ilość maks."
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_procurement view:mrp.procurement:0
#: model:ir.model,name:mrp.model_mrp_procurement
#: view:mrp.procurement:0
msgid "Procurement"
msgstr "Nabycie"
@ -1168,7 +1194,8 @@ msgid "Procurement for raw materials."
msgstr "Nabycie dla materiałów do produkcji."
#. module: mrp
#: view:mrp.procurement:0 field:mrp.procurement,note:0
#: view:mrp.procurement:0
#: field:mrp.procurement,note:0
#: rml:mrp.production.order:0
msgid "Note"
msgstr "Uwaga"
@ -1194,8 +1221,10 @@ msgid "Define a routing to describe the manufacturing steps."
msgstr "Zdefiniuj marszrutę, aby opisać kroki produkcyjne."
#. module: mrp
#: field:mrp.bom,active:0 field:mrp.routing,active:0
#: field:mrp.workcenter,active:0 field:stock.warehouse.orderpoint,active:0
#: field:mrp.bom,active:0
#: field:mrp.routing,active:0
#: field:mrp.workcenter,active:0
#: field:stock.warehouse.orderpoint,active:0
msgid "Active"
msgstr "Aktywne"
@ -1208,18 +1237,23 @@ msgstr "Nabądź produkty"
#: model:ir.actions.act_window,name:mrp.mrp_property_action
#: model:ir.ui.menu,name:mrp.menu_mrp_property_action
#: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
#: view:mrp.bom:0 field:mrp.bom,property_ids:0 view:mrp.procurement:0
#: field:mrp.procurement,property_ids:0 view:mrp.property:0
#: view:mrp.bom:0
#: field:mrp.bom,property_ids:0
#: view:mrp.procurement:0
#: field:mrp.procurement,property_ids:0
#: view:mrp.property:0
msgid "Properties"
msgstr "Właściwości"
#. module: mrp
#: field:mrp.procurement,date_planned:0 field:mrp.production,date_planned:0
#: field:mrp.procurement,date_planned:0
#: field:mrp.production,date_planned:0
msgid "Scheduled date"
msgstr "Planowana data"
#. module: mrp
#: view:mrp.procurement:0 view:mrp.production:0
#: view:mrp.procurement:0
#: view:mrp.production:0
msgid "Extra Information"
msgstr "Dodatkowe informacje"
@ -1267,7 +1301,8 @@ msgid "Change Product Qty."
msgstr "Zmień ilość produktu"
#. module: mrp
#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
#: selection:mrp.procurement,state:0
#: selection:mrp.production,state:0
msgid "Done"
msgstr "Wykonano"
@ -1315,15 +1350,18 @@ msgid "Capacity per Cycle"
msgstr "Ilość na cykl"
#. module: mrp
#: field:mrp.bom,product_id:0 field:mrp.procurement,product_id:0
#: field:mrp.production,product_id:0 rml:mrp.production.order:0
#: field:mrp.bom,product_id:0
#: field:mrp.procurement,product_id:0
#: field:mrp.production,product_id:0
#: rml:mrp.production.order:0
#: field:mrp.production.product.line,product_id:0
#: field:stock.warehouse.orderpoint,product_id:0
msgid "Product"
msgstr "Produkt"
#. module: mrp
#: view:mrp.production:0 field:mrp.production,hour_total:0
#: view:mrp.production:0
#: field:mrp.production,hour_total:0
msgid "Total Hours"
msgstr "Suma godzin"
@ -1338,7 +1376,8 @@ msgid "Product BoM Structure"
msgstr "Struktura Zest. Mat. produktu"
#. module: mrp
#: field:mrp.bom,product_uom:0 field:mrp.production,product_uom:0
#: field:mrp.bom,product_uom:0
#: field:mrp.production,product_uom:0
#: field:mrp.production.product.line,product_uom:0
#: field:stock.warehouse.orderpoint,product_uom:0
msgid "Product UOM"
@ -1364,14 +1403,16 @@ msgid "Product type is Stockable and procure method is make to stock"
msgstr "Typ produktu jest Rejestrowany i metoda nabycia jest Na zapas."
#. module: mrp
#: help:mrp.bom,date_start:0 help:mrp.bom,date_stop:0
#: help:mrp.bom,date_start:0
#: help:mrp.bom,date_stop:0
msgid "Validity of this BoM or component. Keep empty if it's always valid."
msgstr ""
"Ważność tego Zestawienia materiałowego lub komponentu. Pozostaw puste, jeśli "
"ma być zawsze ważny."
#. module: mrp
#: field:mrp.procurement,product_uos:0 field:mrp.production,product_uos:0
#: field:mrp.procurement,product_uos:0
#: field:mrp.production,product_uos:0
msgid "Product UoS"
msgstr "JS produktu"
@ -1383,12 +1424,14 @@ msgstr "JM produktu"
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_workcenter
#: field:mrp.production.workcenter.line,workcenter_id:0
#: field:mrp.routing.workcenter,workcenter_id:0 view:mrp.workcenter:0
#: field:mrp.routing.workcenter,workcenter_id:0
#: view:mrp.workcenter:0
msgid "Workcenter"
msgstr "Centrum robocze"
#. module: mrp
#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
#: selection:mrp.procurement,priority:0
#: selection:mrp.production,priority:0
msgid "Very Urgent"
msgstr "Bardzo pilne"
@ -1428,7 +1471,8 @@ msgid "Stockable Order Request"
msgstr ""
#. module: mrp
#: view:mrp.production:0 view:mrp.production.product.line:0
#: view:mrp.production:0
#: view:mrp.production.product.line:0
msgid "Scheduled Products"
msgstr "Zaplanowane produkty"
@ -1455,7 +1499,8 @@ msgstr "Jeśli w zamówieniu nabycia produkt jest typu Rejestrowany."
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_production_workcenter_line
#: view:mrp.production:0 rml:mrp.production.order:0
#: view:mrp.production:0
#: rml:mrp.production.order:0
msgid "Work Orders"
msgstr "Centra robocze"
@ -1603,7 +1648,8 @@ msgstr "Wykorzystanie centrów roboczych"
msgid ""
"Efficiency on the production. A factor of 0.9 means a loss of 10% in the "
"production."
msgstr "Efektywność produkcji. Współczynnik 0,9 oznacza stratę 10% produkcji."
msgstr ""
"Efektywność produkcji. Współczynnik 0,9 oznacza stratę 10% produkcji."
#. module: mrp
#: field:mrp.bom,product_rounding:0
@ -1693,7 +1739,8 @@ msgid "plus"
msgstr "plus"
#. module: mrp
#: field:mrp.bom.revision,bom_id:0 field:mrp.procurement,bom_id:0
#: field:mrp.bom.revision,bom_id:0
#: field:mrp.procurement,bom_id:0
msgid "BoM"
msgstr "Zest. Mat."
@ -1737,7 +1784,8 @@ msgid "last indice"
msgstr ""
#. module: mrp
#: field:mrp.bom,revision_ids:0 view:mrp.bom.revision:0
#: field:mrp.bom,revision_ids:0
#: view:mrp.bom.revision:0
msgid "BoM Revisions"
msgstr "Wersje Zest. Mat."
@ -1747,12 +1795,14 @@ msgid "Retry"
msgstr "Powtórz"
#. module: mrp
#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
#: selection:mrp.procurement,state:0
#: selection:mrp.production,state:0
msgid "Draft"
msgstr "Projekt"
#. module: mrp
#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
#: selection:mrp.procurement,priority:0
#: selection:mrp.production,priority:0
msgid "Normal"
msgstr "Normalne"
@ -1806,8 +1856,11 @@ msgid "from stock"
msgstr "z zapasu"
#. module: mrp
#: view:mrp.bom:0 view:mrp.property:0 view:mrp.property.group:0
#: view:mrp.routing:0 view:mrp.routing.workcenter:0
#: view:mrp.bom:0
#: view:mrp.property:0
#: view:mrp.property.group:0
#: view:mrp.routing:0
#: view:mrp.routing.workcenter:0
msgid "General Information"
msgstr "Informacje ogólne"
@ -1860,10 +1913,14 @@ msgid "Change Product Qty"
msgstr "Zmień ilość produktu"
#. module: mrp
#: field:mrp.bom.revision,description:0 view:mrp.property:0
#: field:mrp.property,description:0 field:mrp.property.group,description:0
#: view:mrp.routing:0 field:mrp.routing,note:0
#: field:mrp.routing.workcenter,note:0 view:mrp.workcenter:0
#: field:mrp.bom.revision,description:0
#: view:mrp.property:0
#: field:mrp.property,description:0
#: field:mrp.property.group,description:0
#: view:mrp.routing:0
#: field:mrp.routing,note:0
#: field:mrp.routing.workcenter,note:0
#: view:mrp.workcenter:0
#: field:mrp.workcenter,note:0
msgid "Description"
msgstr "Opis"
@ -1923,7 +1980,8 @@ msgid "On Stock"
msgstr "Na zapas"
#. module: mrp
#: field:mrp.bom,sequence:0 rml:mrp.production.order:0
#: field:mrp.bom,sequence:0
#: rml:mrp.production.order:0
#: field:mrp.production.workcenter.line,sequence:0
#: field:mrp.routing.workcenter,sequence:0
msgid "Sequence"
@ -1981,4 +2039,9 @@ msgstr "Tygodniowe odchylenie wartości zapasów"
#: model:ir.model,name:mrp.model_report_mrp_inout
#: view:report.mrp.inout:0
msgid "Stock value variation"
msgstr "Odchylenie wartości zapasów"
msgstr "Zmiany wartości zapasów"
#. module: mrp
#: view:board.board:0
msgid "Next production orders"
msgstr "Następne zamówienie produkcji"

2
addons/procurement/procurement.py
View File

@ -319,7 +319,7 @@ class procurement_order(osv.osv):
move_obj = self.pool.get('stock.move')
for procurement in self.browse(cr, uid, ids):
if procurement.product_qty <= 0.00:
raise osv.except_osv(_('Data Insufficient !'), _('Please check the Quantity of Procurement Order(s), it should not be less than 1!'))
raise osv.except_osv(_('Data Insufficient !'), _('Please check the Quantity in Procurement Order(s), it should not be less than 1!'))
if procurement.product_id.type in ('product', 'consu'):
if not procurement.move_id:
source = procurement.location_id.id

29
addons/product/product.py
View File

@ -48,25 +48,24 @@ class product_uom(osv.osv):
_name = 'product.uom'
_description = 'Product Unit of Measure'
def _compute_factor_inv(self, factor):
return factor and round(1.0 / factor, 6) or 0.0
def _factor_inv(self, cursor, user, ids, name, arg, context):
res = {}
for uom in self.browse(cursor, user, ids, context=context):
if uom.factor:
res[uom.id] = round(1 / uom.factor, 6)
else:
res[uom.id] = 0.0
res[uom.id] = self._compute_factor_inv(uom.factor)
return res
def _factor_inv_write(self, cursor, user, id, name, value, arg, context):
if value:
self.write(cursor, user, id, {
'factor': round(1/value, 6),
}, context=context)
else:
self.write(cursor, user, id, {
'factor': 0.0,
}, context=context)
return True
return self.write(cursor, user, id, {'factor': self._compute_factor_inv(value)}, context=context)
def create(self, cr, uid, data, context={}):
if 'factor_inv' in data:
if data['factor_inv'] <> 1:
data['factor'] = self._compute_factor_inv(data['factor_inv'])
del(data['factor_inv'])
return super(product_uom, self).create(cr, uid, data, context)
_columns = {
'name': fields.char('Name', size=64, required=True, translate=True),
@ -85,13 +84,11 @@ class product_uom(osv.osv):
"Use 1.0 for a UoM that cannot be further split, such as a piece."),
'active': fields.boolean('Active', help="By unchecking the active field you can disable a unit of measure without deleting it."),
'uom_type': fields.selection([('bigger','Bigger than the reference UoM'),
('reference','Reference UoM for this category (ratio=1)'),
('reference','Reference UoM for this category'),
('smaller','Smaller than the reference UoM')],'UoM Type', required=1),
}
_defaults = {
'factor': 1.0,
'factor_inv': 1.0,
'active': 1,
'rounding': 0.01,
'uom_type': 'reference',

1
addons/product/product_view.xml
View File

@ -297,6 +297,7 @@
<tree string="Units of Measure">
<field name="name"/>
<field name="category_id"/>
<field name="uom_type"/>
<field name="factor"/>
<field name="rounding"/>
</tree>

12
addons/project/project.py
View File

@ -337,6 +337,7 @@ class task(osv.osv):
def copy_data(self, cr, uid, id, default={}, context=None):
default = default or {}
default['work_ids'] = []
default['active'] = True
return super(task, self).copy_data(cr, uid, id, default, context)
def _check_dates(self, cr, uid, ids, context=None):
@ -353,8 +354,17 @@ class task(osv.osv):
return False
return True
def _is_template(self, cr, uid, ids, field_name, arg, context=None):
res = {}
for task in self.browse(cr, uid, ids, context=context):
res[task.id] = True
if task.project_id:
if task.project_id.active == False or task.project_id.state == 'template':
res[task.id] = False
return res
_columns = {
'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the task without removing it. This is basically used for the management of templates of projects and tasks."),
'active': fields.function(_is_template, method=True, store=True, string='Not a Template Task', type='boolean', help="This field is computed automatically and have the same behavior than the boolean 'active' field: if the task is linked to a template or unactivated project, it will be hidden unless specifically asked."),
'name': fields.char('Task Summary', size=128, required=True),
'description': fields.text('Description'),
'priority' : fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'), ('0','Very urgent')], 'Importance'),

2
addons/purchase/i18n/pt_BR.po
View File

@ -15,7 +15,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-07-16 03:39+0000\n"
"X-Launchpad-Export-Date: 2010-07-17 03:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: purchase

96
addons/sale/i18n/pl.po
View File

@ -1,19 +1,19 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * sale
# * sale
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-05-24 20:45+0000\n"
"PO-Revision-Date: 2010-07-18 10:05+0000\n"
"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-06-22 04:08+0000\n"
"X-Launchpad-Export-Date: 2010-07-19 03:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale
@ -71,7 +71,8 @@ msgid "Steps To Deliver a Sale Order"
msgstr "Kroki dostawy zamówienia sprzedaży"
#. module: sale
#: wizard_field:sale.advance_payment_inv,init,qtty:0 rml:sale.order:0
#: wizard_field:sale.advance_payment_inv,init,qtty:0
#: rml:sale.order:0
msgid "Quantity"
msgstr "Ilość"
@ -81,7 +82,8 @@ msgid "You invoice has been successfully created !"
msgstr "Twoja faktura została poprawnie utworzona"
#. module: sale
#: view:sale.order:0 view:sale.order.line:0
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Automatic Declaration"
msgstr "Deklaracja automatyczna"
@ -156,10 +158,12 @@ msgstr "Przesunięcia zapasów"
#. module: sale
#: view:sale.order.line:0
msgid "Manual Designation"
msgstr ""
msgstr "Ręczne przypisanie"
#. module: sale
#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
#: view:sale.order:0
#: field:sale.order,note:0
#: view:sale.order.line:0
#: field:sale.order.line,notes:0
msgid "Notes"
msgstr "Notatki"
@ -170,7 +174,8 @@ msgid "Invoice after delivery"
msgstr "Faktura po dostawie"
#. module: sale
#: field:sale.order,amount_tax:0 field:sale.order.line,tax_id:0
#: field:sale.order,amount_tax:0
#: field:sale.order.line,tax_id:0
msgid "Taxes"
msgstr "Podatki"
@ -185,7 +190,8 @@ msgid "Shipping Policy"
msgstr "Zasady wysyłki"
#. module: sale
#: selection:sale.order,state:0 selection:sale.order.line,state:0
#: selection:sale.order,state:0
#: selection:sale.order.line,state:0
msgid "Cancelled"
msgstr "Anulowano"
@ -230,7 +236,8 @@ msgid "Procurement is created after confirmation of sale order."
msgstr "Nabycie jest tworzone po potwierdzeniu zamówienia sprzedaży"
#. module: sale
#: field:sale.order,project_id:0 field:sale.shop,project_id:0
#: field:sale.order,project_id:0
#: field:sale.shop,project_id:0
msgid "Analytic Account"
msgstr "Konto analityczne"
@ -320,7 +327,8 @@ msgid "Invoice Based on Sales Orders"
msgstr "Faktura wg zamówień sprzedaży"
#. module: sale
#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
#: model:ir.model,name:sale.model_sale_shop
#: view:sale.shop:0
msgid "Sale Shop"
msgstr "Sklep sprzedaży"
@ -335,7 +343,8 @@ msgid "Order N°"
msgstr "Nr zamówienia"
#. module: sale
#: field:sale.order,order_line:0 view:sale.order.line:0
#: field:sale.order,order_line:0
#: view:sale.order.line:0
msgid "Order Lines"
msgstr "Pozycje zamówienia"
@ -345,7 +354,8 @@ msgid "Disc.(%)"
msgstr "Up.(%)"
#. module: sale
#: view:sale.order:0 view:sale.order.line:0
#: view:sale.order:0
#: view:sale.order.line:0
#: field:sale.order.line,invoice_lines:0
msgid "Invoice Lines"
msgstr "Pozycje faktury"
@ -443,13 +453,15 @@ msgid "Order Reference"
msgstr "Numer"
#. module: sale
#: selection:sale.order,state:0 view:sale.order.line:0
#: selection:sale.order,state:0
#: view:sale.order.line:0
#: selection:sale.order.line,state:0
msgid "Done"
msgstr "Wykonano"
#. module: sale
#: field:sale.order,pricelist_id:0 field:sale.shop,pricelist_id:0
#: field:sale.order,pricelist_id:0
#: field:sale.shop,pricelist_id:0
msgid "Pricelist"
msgstr "Cennik"
@ -620,7 +632,8 @@ msgid "Taxes :"
msgstr "Podatki :"
#. module: sale
#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
#: field:sale.order,invoiced_rate:0
#: field:sale.order.line,invoiced:0
msgid "Invoiced"
msgstr "Zafakturowano"
@ -773,7 +786,8 @@ msgid "Direct Delivery"
msgstr "Dostawa bezpośrednia"
#. module: sale
#: view:sale.order:0 view:sale.order.line:0
#: view:sale.order:0
#: view:sale.order.line:0
#: field:sale.order.line,property_ids:0
msgid "Properties"
msgstr "Właściwości"
@ -787,7 +801,7 @@ msgstr "Oferta"
#. module: sale
#: model:product.template,name:sale.advance_product_0_product_template
msgid "Advance Product"
msgstr ""
msgstr "Awansuj produkt"
#. module: sale
#: model:process.transition,note:sale.process_transition_invoice0
@ -806,7 +820,8 @@ msgstr "Oblicz"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
msgid "Shop"
msgstr "Sklep"
@ -867,7 +882,8 @@ msgid "Delivery Order Only"
msgstr "Tylko zamówienia dostawy"
#. module: sale
#: view:sale.order:0 view:sale.order.line:0
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales order lines"
msgstr "Pozycje zamówienia sprzedaży"
@ -882,14 +898,15 @@ msgid "Sales"
msgstr "Sprzedaż"
#. module: sale
#: view:sale.order:0 view:sale.order.line:0
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Il."
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
msgid "Packing OUT is created for stockable products."
msgstr ""
msgstr "Wydanie zewnętrzne jest tworzone dla produktów rejestrowanych."
#. module: sale
#: view:sale.order:0
@ -897,7 +914,8 @@ msgid "Other data"
msgstr "Inne dane"
#. module: sale
#: wizard_field:sale.advance_payment_inv,init,amount:0 rml:sale.order:0
#: wizard_field:sale.advance_payment_inv,init,amount:0
#: rml:sale.order:0
#: field:sale.order.line,price_unit:0
msgid "Unit Price"
msgstr "Cena jednostkowa"
@ -923,7 +941,8 @@ msgstr "Faktura"
#: model:process.transition.action,name:sale.process_transition_action_cancel1
#: model:process.transition.action,name:sale.process_transition_action_cancel2
#: wizard_button:sale.advance_payment_inv,init,end:0
#: view:sale.config.picking_policy:0 view:sale.order.line:0
#: view:sale.config.picking_policy:0
#: view:sale.order.line:0
#: wizard_button:sale.order.line.make_invoice,init,end:0
#: wizard_button:sale.order.make_invoice,init,end:0
msgid "Cancel"
@ -945,14 +964,15 @@ msgstr ""
"ale oczekuje na planistę, aby uruchomił akcję dla daty zamówienia."
#. module: sale
#: view:sale.order:0 view:sale.order.line:0
#: view:sale.order:0
#: view:sale.order.line:0
msgid "UoM"
msgstr "JM"
#. module: sale
#: field:sale.order.line,number_packages:0
msgid "Number Packages"
msgstr ""
msgstr "Liczba opakowań"
#. module: sale
#: model:process.transition,note:sale.process_transition_deliver0
@ -1060,7 +1080,8 @@ msgid "Ordering Contact"
msgstr "Kontakt do zamawiającego"
#. module: sale
#: rml:sale.order:0 field:sale.order.line,name:0
#: rml:sale.order:0
#: field:sale.order.line,name:0
msgid "Description"
msgstr "Opis"
@ -1117,7 +1138,8 @@ msgid ""
msgstr "Nazwa i adres kontaktu proszącego o ofertę."
#. module: sale
#: field:sale.order,partner_id:0 field:sale.order.line,order_partner_id:0
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
msgid "Customer"
msgstr "Klient"
@ -1129,7 +1151,8 @@ msgstr "Cennik zakupu"
#. module: sale
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_saleorder0
#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
#: model:res.request.link,name:sale.req_link_sale_order
#: view:sale.order:0
#: field:stock.picking,sale_id:0
msgid "Sale Order"
msgstr "Zamówienie sprzedaży"
@ -1156,7 +1179,8 @@ msgid "Total amount"
msgstr "Suma kwot"
#. module: sale
#: rml:sale.order:0 field:sale.order,date_order:0
#: rml:sale.order:0
#: field:sale.order,date_order:0
msgid "Date Ordered"
msgstr "Data zamówienia"
@ -1166,9 +1190,9 @@ msgid "Product UoS"
msgstr "JS produktu"
#. module: sale
#: selection:report.sale.order.created,state:0
#: selection:sale.order,state:0
msgid "Manual In Progress"
msgstr "Recznie w trakcie przetwarzania"
msgstr "Ręcznie w toku"
#. module: sale
#: field:sale.order.line,product_uom:0
@ -1245,7 +1269,8 @@ msgstr ""
"oddzielnie)"
#. module: sale
#: view:sale.order:0 view:sale.order.line:0
#: view:sale.order:0
#: view:sale.order.line:0
msgid "States"
msgstr "Stany"
@ -1265,7 +1290,8 @@ msgid "Error: Invalid ean code"
msgstr "Błąd: Niedozwolony kod EAN"
#. module: sale
#: field:sale.order,picked_rate:0 field:sale.order,shipped:0
#: field:sale.order,picked_rate:0
#: field:sale.order,shipped:0
msgid "Picked"
msgstr "Wydano"
@ -1442,7 +1468,7 @@ msgstr "Sprzedaż wg produktów"
#. module: sale
#: model:ir.ui.menu,name:sale.next_id_81
msgid "This Month"
msgstr "W tym miesiącu"
msgstr "Bieżący miesiąc"
#. module: sale
#: field:report.sale.order.category,category_id:0

16
addons/sale/sale.py
View File

@ -221,7 +221,7 @@ class sale_order(osv.osv):
('invoice_except', 'Invoice Exception'),
('done', 'Done'),
('cancel', 'Cancelled')
], 'Order State', readonly=True, help="Gives the state of the quotation or sale order. The exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). The 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the date 'Ordered Date'.", select=True),
], 'Order State', readonly=True, help="Gives the state of the quotation or sale order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the date 'Ordered Date'.", select=True),
'date_order': fields.date('Ordered Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
'create_date': fields.date('Creation Date', readonly=True, help="Date on which sale order is created"),
'date_confirm': fields.date('Confirmation Date', readonly=True, help="Date on which sale order is confirmed"),
@ -473,7 +473,9 @@ class sale_order(osv.osv):
for o in self.browse(cr, uid, ids):
lines = []
for line in o.order_line:
if (line.state in states) and not line.invoiced:
if line.invoiced:
raise osv.except_osv(_('Error !'), _('The Sale Order already has some lines invoiced. You should continue the billing process by line.'))
elif (line.state in states):
lines.append(line.id)
created_lines = self.pool.get('sale.order.line').invoice_line_create(cr, uid, lines)
if created_lines:
@ -830,11 +832,11 @@ class sale_order_line(osv.osv):
'notes': fields.text('Notes'),
'th_weight': fields.float('Weight', readonly=True, states={'draft':[('readonly',False)]}),
'state': fields.selection([('draft', 'Draft'),('confirmed', 'Confirmed'),('done', 'Done'),('cancel', 'Cancelled'),('exception', 'Exception')], 'State', required=True, readonly=True,
help=' * The \'Draft\' state is set automatically when sale order in draft state. \
\n* The \'Confirmed\' state is set automatically when sale order in confirm state. \
\n* The \'Exception\' state is set automatically when sale order is set as exception. \
\n* The \'Done\' state is set automatically when sale order is set as done. \
\n* The \'Cancelled\' state is set automatically when user cancel sale order.'),
help='* The \'Draft\' state is set when the related sale order in draft state. \
\n* The \'Confirmed\' state is set when the related sale order is confirmed. \
\n* The \'Exception\' state is set when the related sale order is set as exception. \
\n* The \'Done\' state is set when the sale order line has been picked. \
\n* The \'Cancelled\' state is set when a user cancel the sale order related.'),
'order_partner_id': fields.related('order_id', 'partner_id', type='many2one', relation='res.partner', string='Customer'),
'salesman_id':fields.related('order_id', 'user_id', type='many2one', relation='res.users', string='Salesman'),
'company_id': fields.related('order_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True, states={'draft':[('readonly',False)]}),

46
addons/sale/sale_view.xml
View File

@ -93,7 +93,7 @@
</field>
</record>
<act_window name="Partial Invoice"
<act_window name="Deposit"
res_model="sale.advance.payment.inv"
src_model="sale.order"
view_mode="form"
@ -101,7 +101,6 @@
key2="client_action_multi"
id="action_view_sale_advance_payment_inv"/>
<record id="view_order_form" model="ir.ui.view">
<field name="name">sale.order.form</field>
<field name="model">sale.order</field>
@ -264,14 +263,17 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Sales Order">
<filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]"/>
<filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]" help="Sale Orders that haven't yet be confirmed"/>
<filter icon="terp-check" string="Sales" domain="[('state','in',('manual','progress'))]"/>
<separator orientation="vertical"/>
<filter icon="terp-gtk-go-back-rtl" string="To Invoice" domain="[('state','=','manual')]"/>
<filter icon="terp-dolar_ok!" string="To Invoice" domain="[('state','=','manual')]" help="Sale Orders ready to be invoiced"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="partner_id" select="1"/>
<field name="user_id" select="1"/>
<field name="user_id" select="1">
<filter domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal"/>
</field>
<field name="date_order" select="1" string="Order date" />
<newline/>
<group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
@ -397,23 +399,20 @@
<separator colspan="4" string="States"/>
<field name="state"/>
<group col="3" colspan="2">
<button colspan="1"
name="create_sale_order_line_invoice"
states="confirmed"
string="Create Invoice"
type="object"
icon="terp-document-new"
attrs="{'invisible': [('invoiced', '=', 1)]}"/>
<button name="button_cancel"
states="confirmed,exception"
<button colspan="1"
name="create_sale_order_line_invoice"
string="Create Invoice"
type="object"
icon="terp-document-new"
attrs="{'invisible': ['|',('state', 'in', ('draft','cancel')),('invoiced', '=', 1)]}"/>
<button name="button_cancel"
string="Cancel" type="object"
icon="gtk-cancel"
attrs="{'invisible': [('invoiced', '=', 1)]}" />
attrs="{'invisible': ['|',('state', 'not in', ('confirmed', 'exception')),('invoiced', '=', 1)]}"/>
<button name="button_done"
states="confirmed,exception"
string="Done" type="object"
icon="gtk-jump-to"
attrs="{'invisible': [('invoiced', '=', 0)]}"/>
icon="gtk-jump-to"
attrs="{'invisible': ['|',('state', 'not in', ('confirmed','exception')),('invoiced', '=', 0)]}"/>
</group>
</page>
<!-- <page string="Properties" groups="base.group_extended">-->
@ -436,13 +435,13 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Sales Order">
<filter icon="terp-gtk-go-back-rtl" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]" separator="1"/>
<filter icon="terp-gtk-go-back-rtl" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]" separator="1" help="Sale Order Lines ready to be invoiced"/>
<separator orientation="vertical"/>
<field name="order_id"/>
<field name="order_partner_id"/>
<field name="product_id"/>
<field name="salesman_id">
<filter icon="terp-dolar" domain="[('salesman_id','=',uid)]" help="My Sale Order Lines"/>
<filter icon="terp-personnal" domain="[('salesman_id','=',uid)]" help="Sale Order Lines related to a Sale Order of mine"/>
</field>
<newline/>
<group expand="context.get('report',False)" string="Group By..." colspan="9" col="8">
@ -464,20 +463,23 @@
<filter icon="terp-accessories-archiver" string="Shipped"
domain="[('state','=','done')]"
name="unshipped"
help="Sale Order Lines that are in 'done' state"
/>
<filter icon="terp-dolar_ok!" string="Uninvoiced" name="uninvoiced"
domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"
help="Sale Order Lines that are confirmed, done or in exception state and haven't yet been invoiced"
/>
<filter icon="terp-dolar" string="Sale Order"
<filter icon="terp-check" string="Confirmed"
domain="[('state','=','confirmed')]"
name="sale order"
help="Confirmed Sale Order Lines"
/>
<separator orientation="vertical"/>
<field name="order_id"/>
<field name="order_partner_id"/>
<field name="product_id"/>
<field name="salesman_id">
<filter icon="terp-dolar" domain="[('salesman_id','=',uid)]" help="My Sale Order Lines"/>
<filter icon="terp-personal" domain="[('salesman_id','=',uid)]" help="My Sale Order Lines"/>
</field>
<newline />
<group expand="0" string="Group By..." colspan="9" col="8">

2
addons/sale/wizard/sale_make_invoice_advance.xml
View File

@ -31,7 +31,7 @@
<newline />
<separator string="" colspan="4"/>
<group colspan="4">
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button special="cancel" string="Close" icon="gtk-cancel"/>
<button name="open_invoice" string="Open Invoice" type="object" icon="gtk-open"/>
</group>
</form>

171
addons/sale_crm/wizard/crm_make_sale.py
View File

@ -21,7 +21,6 @@
from osv import fields, osv
from tools.translate import _
from mx.DateTime import now
import time
import decimal_precision as dp
@ -100,7 +99,7 @@ class crm_make_sale(osv.osv_memory):
raise osv.except_osv(_('Data Insufficient!'),_('Customer has no addresses defined!'))
vals = {
'origin': 'Opportunity:%s' % str(case.id),
'origin': 'Opportunity: %s' % str(case.id),
'section_id': case.section_id and case.section_id.id or False,
'shop_id': make.shop_id.id,
'partner_id': partner_id,
@ -108,8 +107,7 @@ class crm_make_sale(osv.osv_memory):
'partner_invoice_id': partner_addr['invoice'],
'partner_order_id': partner_addr['contact'],
'partner_shipping_id': partner_addr['delivery'],
'order_policy': 'manual',
'date_order': now(),
'date_order': time.strftime('%Y-%m-%d'),
'fiscal_position': fpos,
}
@ -121,14 +119,21 @@ class crm_make_sale(osv.osv_memory):
vals['project_id'] = make.analytic_account.id
new_id = sale_obj.create(cr, uid, vals)
for line in make.sale_order_line:
value = sale_line_obj.product_id_change(cr, uid, [], pricelist,
line.product_id.id, qty=1, partner_id=partner_id, fiscal_position=fpos)['value']
value['product_id'] =line.product_id.id
value = {}
value['order_id'] = new_id
value['tax_id'] = [(6,0,line['tax_id'])]
value['name'] = line.name
value['delay'] = line.delay
value['product_id'] =line.product_id and line.product_id.id or False
value['price_unit'] = line.price_unit
value['tax_id'] = line.tax_id and [(6,0,map(lambda x: x.id,line.tax_id))] or False
value['type'] = line.type
value['product_uom_qty']=line.product_uom_qty
value['discount']=line.discount
value['product_uom']=line.product_uom.id
value['product_uos_qty']=line.product_uos_qty
value['product_uos']=line.product_uos and line.product_uos.id or False
value['product_packaging'] = line.product_packaging and line.product_packaging.id or False
value['discount']=line.discount
value['notes']=line.notes
sale_line_obj.create(cr, uid, value)
case_obj.write(cr, uid, [case.id], {'ref': 'sale.order,%s' % new_id})
new_ids.append(new_id)
@ -149,7 +154,6 @@ class crm_make_sale(osv.osv_memory):
'view_id': False,
'type': 'ir.actions.act_window',
'res_id': new_ids and new_ids[0]
}
else:
value = {
@ -165,8 +169,8 @@ class crm_make_sale(osv.osv_memory):
_columns = {
'shop_id': fields.many2one('sale.shop', 'Shop', required=True),
'partner_id': fields.many2one('res.partner', 'Customer', required=True, help='Use this partner if there is no partner on the Opportunity'),
'sale_order_line': fields.one2many('sale.order.make.line', 'order_line', 'Product Line', readonly=True, states={'draft': [('readonly', False)]}),
'partner_id': fields.many2one('res.partner', 'Customer', required=True),
'sale_order_line': fields.one2many('sale.order.make.line', 'opportunity_order_id', 'Product Line'),
'analytic_account': fields.many2one('account.analytic.account', 'Analytic Account'),
'close': fields.boolean('Close Case', help='Check this to close the case after having created the sale order.'),
}
@ -180,140 +184,33 @@ crm_make_sale()
class sale_order_make_line(osv.osv_memory):
def product_id_change(self, cr, uid, ids, pricelist, product, qty=0,
def product_id_change(self, cr, uid, ids, product, qty=0,
uom=False, qty_uos=0, uos=False, name='', partner_id=False,
lang=False, update_tax=True, date_order=False, packaging=False, fiscal_position=False, flag=False):
lang=False, update_tax=True, packaging=False, flag=False):
if not partner_id:
raise osv.except_osv(_('No Customer Defined !'), _('You have to select a customer in the sale form !\nPlease set one customer before choosing a product.'))
warning = {}
product_uom_obj = self.pool.get('product.uom')
partner_obj = self.pool.get('res.partner')
product_obj = self.pool.get('product.product')
if partner_id:
lang = partner_obj.browse(cr, uid, partner_id).lang
context = {'lang': lang, 'partner_id': partner_id}
if not product:
return {'value': {'th_weight': 0, 'product_packaging': False,
'product_uos_qty': qty}, 'domain': {'product_uom': [],
'product_uos': []}}
if not date_order:
date_order = time.strftime('%Y-%m-%d')
result = {}
product_obj = product_obj.browse(cr, uid, product, context=context)
if not packaging and product_obj.packaging:
packaging = product_obj.packaging[0].id
result['product_packaging'] = packaging
if packaging:
default_uom = product_obj.uom_id and product_obj.uom_id.id
pack = self.pool.get('product.packaging').browse(cr, uid, packaging, context=context)
q = product_uom_obj._compute_qty(cr, uid, uom, pack.qty, default_uom)
# qty = qty - qty % q + q
if qty and (q and not (qty % q) == 0):
ean = pack.ean
qty_pack = pack.qty
type_ul = pack.ul
warn_msg = _("You selected a quantity of %d Units.\nBut it's not compatible with the selected packaging.\nHere is a proposition of quantities according to the packaging: ") % (qty)
warn_msg = warn_msg + "\n\n" + _("EAN: ") + str(ean) + _(" Quantity: ") + str(qty_pack) + _(" Type of ul: ") + str(type_ul.name)
warning = {
'title': _('Picking Information !'),
'message': warn_msg
}
result['product_uom_qty'] = qty
uom2 = False
if uom:
uom2 = product_uom_obj.browse(cr, uid, uom)
if product_obj.uom_id.category_id.id != uom2.category_id.id:
uom = False
if uos:
if product_obj.uos_id:
uos2 = product_uom_obj.browse(cr, uid, uos)
if product_obj.uos_id.category_id.id != uos2.category_id.id:
uos = False
else:
uos = False
if product_obj.description_sale:
result['notes'] = product_obj.description_sale
fpos = fiscal_position and self.pool.get('account.fiscal.position').browse(cr, uid, fiscal_position) or False
if update_tax: #The quantity only have changed
result['delay'] = (product_obj.sale_delay or 0.0)
partner = partner_obj.browse(cr, uid, partner_id)
result['tax_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, product_obj.taxes_id)
result.update({'type': product_obj.procure_method})
if not flag:
result['name'] = self.pool.get('product.product').name_get(cr, uid, [product_obj.id], context=context)[0][1]
domain = {}
if (not uom) and (not uos):
result['product_uom'] = product_obj.uom_id.id
if product_obj.uos_id:
result['product_uos'] = product_obj.uos_id.id
result['product_uos_qty'] = qty * product_obj.uos_coeff
uos_category_id = product_obj.uos_id.category_id.id
else:
result['product_uos'] = False
result['product_uos_qty'] = qty
uos_category_id = False
domain = {'product_uom':
[('category_id', '=', product_obj.uom_id.category_id.id)],
'product_uos':
[('category_id', '=', uos_category_id)]}
elif uos and not uom: # only happens if uom is False
result['product_uom'] = product_obj.uom_id and product_obj.uom_id.id
result['product_uom_qty'] = qty_uos / product_obj.uos_coeff
elif uom: # whether uos is set or not
default_uom = product_obj.uom_id and product_obj.uom_id.id
q = product_uom_obj._compute_qty(cr, uid, uom, qty, default_uom)
if product_obj.uos_id:
result['product_uos'] = product_obj.uos_id.id
result['product_uos_qty'] = qty * product_obj.uos_coeff
else:
result['product_uos'] = False
result['product_uos_qty'] = qty
if not uom2:
uom2 = product_obj.uom_id
return {'value': result, 'domain': domain, 'warning': warning}
date_order = time.strftime('%Y-%m-%d')
part = self.pool.get('res.partner').browse(cr, uid, partner_id)
pricelist = part.property_product_pricelist and part.property_product_pricelist.id or False
fiscal_position = part.property_account_position and part.property_account_position.id or False
return self.pool.get('sale.order.line').product_id_change(cr, uid, ids, pricelist, product, qty, uom, qty_uos, uos, name, partner_id, lang, update_tax, date_order, packaging, fiscal_position, flag)
def product_uom_change(self, cursor, user, ids, pricelist, product, qty=0,
uom=False, qty_uos=0, uos=False, name='', partner_id=False,
lang=False, update_tax=True, date_order=False):
res = self.product_id_change(cursor, user, ids, pricelist, product,
qty=qty, uom=uom, qty_uos=qty_uos, uos=uos, name=name,
partner_id=partner_id, lang=lang, update_tax=update_tax,
date_order=date_order)
if 'product_uom' in res['value']:
del res['value']['product_uom']
if not uom:
res['value']['price_unit'] = 0.0
return res
_name = 'sale.order.make.line'
_description = 'Sale Order Line'
_description = 'Opportunity Sale Order Line'
_columns = {
'order_line': fields.many2one('crm.make.sale', 'Order Reference', required=True, ondelete='cascade', select=True, readonly=True, ),
'order_id': fields.many2one('sale.order', 'Order Reference', required=True, ondelete='cascade', select=True, readonly=True, ),
'name': fields.char('Description', size=256, required=True, select=True, readonly=True, ),
'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of sale order lines."),
'delay': fields.float('Delivery Lead Time', required=True, help="Number of days between the order confirmation the the shipping of the products to the customer", readonly=True, ),
'opportunity_order_id': fields.many2one('crm.make.sale', 'Order Reference', required=True, ondelete='cascade', select=True, readonly=True, ),
'name': fields.char('Description', size=256, required=True, select=True, ),
'delay': fields.float('Delivery Lead Time', required=True, help="Number of days between the order confirmation the the shipping of the products to the customer"),
'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], change_default=True),
'procurement_id': fields.many2one('procurement.order', 'Procurement'),
'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, ),
'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes', readonly=True, states={'draft':[('readonly',False)]}),
'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True, readonly=True, states={'draft':[('readonly',False)]}),
'product_uom_qty': fields.float('Quantity (UoM)', digits=(16, 2), required=True, readonly=True, states={'draft':[('readonly',False)]}),
'product_uom': fields.many2one('product.uom', 'Unit of Measure ', required=True, readonly=True, states={'draft':[('readonly',False)]}),
'product_uos_qty': fields.float('Quantity (UoS)', readonly=True, states={'draft':[('readonly',False)]}),
'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price')),
'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes'),
'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True),
'product_uom_qty': fields.float('Quantity (UoM)', digits=(16, 2), required=True, ),
'product_uom': fields.many2one('product.uom', 'Unit of Measure ', required=True, ),
'product_uos_qty': fields.float('Quantity (UoS)'),
'product_uos': fields.many2one('product.uom', 'Product UoS'),
'product_packaging': fields.many2one('product.packaging', 'Packaging'),
'discount': fields.float('Discount (%)', digits=(16, 2), readonly=True, states={'draft':[('readonly',False)]}),
'discount': fields.float('Discount (%)', digits=(16, 2)),
'notes': fields.text('Notes'),
}
_order = 'sequence, id'

25
addons/sale_crm/wizard/crm_make_sale_view.xml
View File

@ -21,25 +21,21 @@
<notebook>
<page string="Order Line">
<field colspan="4"
context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
context="partner_id=parent.partner_id,shop=parent.shop_id"
name="product_id"
on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], True, parent.date_order, product_packaging, parent.fiscal_position, False)"
on_change="product_id_change(product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], True, product_packaging, False)"
/>
<field
context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
name="product_uom_qty"
on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging, parent.fiscal_position, True)"
/>
<field groups="product.group_uos" name="product_uos_qty"/>
<field name="product_uom"
on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order)"/>
<group colspan="2">
<field name="product_uom_qty"/>
<field name="product_uom" nolabel="1"/>
</group>
<group colspan="2" groups="product.group_uos">
<field name="product_uos_qty"/>
<field name="product_uos" nolabel="1"/></group>
<field
name="product_packaging"
context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging, parent.fiscal_position, False)"
domain="[('product_id','=',product_id)]"
groups="base.group_extended"/>
<field colspan="4" name="name"/>
<field name="price_unit"/>
<field name="discount"/>
@ -49,6 +45,9 @@
<separator colspan="5" string="Taxes"/>
<field colspan="4" name="tax_id" nolabel="1" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
</page>
<page string="Notes">
<field colspan="4" name="notes" nolabel="1"/>
</page>
</notebook>
</form>
<tree string="Sales order lines">

10
addons/sale_journal/sale_journal_view.xml
View File

@ -1,6 +1,9 @@
<openerp>
<data>
<menuitem id="menu_sale_journal_config" name="Sale Journals"
parent="base.menu_base_config" sequence="5"/>
<!-- sale journal invoice Type's Form view -->
<record model="ir.ui.view" id="view_sale_journal_invoice_type_form">
@ -40,7 +43,7 @@
<field name="view_mode">tree,form</field>
</record>
<!-- <menuitem name="Invoicing Methods" id="menu_definition_journal_invoice_type" parent="sale.menu_shop_configuration" action="action_definition_journal_invoice_type"/> -->
<menuitem name="Invoicing Methods" id="menu_definition_journal_invoice_type" parent="menu_sale_journal_config" action="action_definition_journal_invoice_type"/>
<!-- sale journal Form view -->
@ -138,7 +141,8 @@
<field name="search_view_id" ref="view_sale_journal_search"/>
</record>
<menuitem id="menu_definition_journal" name="Sales Journals" parent="product.prod_config_main" action="action_definition_journal" sequence="70" />
<menuitem id="menu_definition_journal" name="Sales Journals" parent="menu_sale_journal_config" action="action_definition_journal" sequence="70" />
<!-- Inherit sales order form view -->
@ -151,7 +155,7 @@
<field name="origin" position="after">
<group colspan="2" col="2">
<separator string="Journal" colspan="4"/>
<field name="journal_id" select="1" widget="selection"/>
<field name="journal_id" select="1"/>
<field name="invoice_type_id" select="1" widget="selection"/>
</group>
</field>

93
addons/sale_layout/report/report_sale_layout.rml
View File

@ -31,6 +31,27 @@
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
</blockTableStyle>
<blockTableStyle id="Table_final">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
<lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,2" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="1,2" stop="1,2"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="2,2" stop="2,2"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="3,2" stop="3,2"/>
</blockTableStyle>
<blockTableStyle id="Table_note">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table6">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
@ -233,7 +254,7 @@
<blockTable colWidths="132.0,134.0,135.0,135.0" style="Table6">
<tr>
<td>
<para style="terp_default_Centre_8">[[ o.name ]]</para>
<para style="terp_default_Centre_8">[[ o.client_order_ref ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ o.date_order ]]</para>
@ -345,8 +366,72 @@
<para style="P31">Price</para>
</td>
</tr>
</blockTable>
</section>
</blockTable>
</section>
<blockTable colWidths="387.0,56.0,73.0,21.0" style="Table_final">
<tr>
<td>
<para style="terp_default_9">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_9">Net Total :</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed ) ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name ]]</para>
</td>
</tr>
<tr>
<td>
<para style="terp_default_9">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_9">Taxes :</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(o.amount_tax ) ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name ]]</para>
</td>
</tr>
<tr>
<td>
<para style="terp_default_9">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_Bold_9">Total :</para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total ) ]] </para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ o.pricelist_id.currency_id.name ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_8">
<font color="white"> </font>
</para>
<blockTable colWidths="533.0" style="Table_note">
<tr>
<td>
<para style="terp_default_9">[[ format(o.note or '') ]]</para>
</td>
</tr>
<tr>
<td>
<para style="terp_default_9">[[ format((o.partner_id.property_payment_term and o.partner_id.property_payment_term.note) or '') ]]</para>
</td>
</tr>
</blockTable>
</story>
</document>

20
addons/sale_layout/sale_layout_view.xml
View File

@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<data>
<record id="sale.action_order_line_tree2" model="ir.actions.act_window">
<field name="domain">[('layout_type','=', 'article')]</field>
</record>
<record model="ir.ui.view" id="view_order_line_form2_inherit_1">
<field name="name">sale.order.line.form2.inherit_1</field>
<field name="model">sale.order.line</field>
@ -15,20 +17,6 @@
</field>
</record>
<record model="ir.ui.view" id="view_order_line_tree_inherit_1">
<field name="name">sale.order.line.tree.inherit_1</field>
<field name="model">sale.order.line</field>
<field name="inherit_id" ref="sale.view_order_line_tree"/>
<field name="type">tree</field>
<field name="arch" type="xml">
<xpath expr="/tree/field[@name='name']" position="before">
<field name="sequence" string="Seq."/>
<field name="layout_type"/>
</xpath>
</field>
</record>
<record model="ir.ui.view" id="view_order_form_inherit_1">
<field name="name">sale.order.form.inherit_1</field>
<field name="model">sale.order</field>

154
addons/stock/i18n/nl.po
View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-06-14 13:39+0000\n"
"Last-Translator: Marcel van der Boom (HS-Development BV) <marcel@hsdev.com>\n"
"PO-Revision-Date: 2010-07-16 15:56+0000\n"
"Last-Translator: Jan Verlaan (Veritos) <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-06-22 03:53+0000\n"
"X-Launchpad-Export-Date: 2010-07-17 03:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock
@ -44,7 +44,7 @@ msgstr "terp-account"
#. module: stock
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr "Ongeldige modelnaam in de definitie van de actie."
msgstr "Ongeldige modelnaam in de actie-definitie."
#. module: stock
#: model:ir.module.module,shortdesc:stock.module_meta_information
@ -592,7 +592,7 @@ msgid "New Reception Packing"
msgstr "Nieuw ontvangstbon aanmaken"
#. module: stock
#: wizard_field:stock.move.track,init,quantity:0
#: wizard_field:mrp.stock.move.track,init,quantity:0
msgid "Quantity per lot"
msgstr "Aantal per batch"
@ -683,7 +683,7 @@ msgstr "Relatie locaties"
#: help:stock.move,tracking_id:0
msgid ""
"Tracking lot is the code that will be put on the logistical unit/pallet"
msgstr ""
msgstr "Lotnummer is de identificatie voor de logistieke eenheid/pallet"
#. module: stock
#: view:stock.tracking:0
@ -840,7 +840,9 @@ msgid "General Informations"
msgstr "Algemene Informatie"
#. module: stock
#: code:addons/stock/wizard/wizard_return.py:0
#: selection:stock.location,chained_location_type:0
#, python-format
msgid "None"
msgstr "Geen"
@ -879,7 +881,7 @@ msgstr "Alle voorraadbewegingen"
#. module: stock
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "Ongeldige XML voor overzicht"
msgstr "Ongeldige XML voor weergave!"
#. module: stock
#: field:res.partner,property_stock_supplier:0
@ -1028,12 +1030,12 @@ msgstr "Concept periodieke voorraadcontroles"
#. module: stock
#: wizard_button:inventory.merge,init,end:0
#: wizard_button:inventory.merge.stock.zero,init,end:0
#: wizard_button:mrp.stock.move.track,init,end:0
#: wizard_button:stock.fill_inventory,init,end:0
#: wizard_button:stock.invoice_onshipping,init,end:0
#: wizard_button:stock.location.products,init,end:0
#: view:stock.move:0
#: wizard_button:stock.move.split,init,end:0
#: wizard_button:stock.move.track,init,end:0
#: wizard_button:stock.partial_picking,init,end:0
#: view:stock.picking:0
#: wizard_button:stock.picking.make,init,end:0
@ -1046,7 +1048,7 @@ msgstr "Annuleer"
#: view:stock.move:0
#: view:stock.picking:0
msgid "Split in production lots"
msgstr "Splits in productie-eenheden"
msgstr "Splits in productie-lots"
#. module: stock
#: model:ir.model,name:stock.model_stock_inventory
@ -1228,9 +1230,9 @@ msgid "STOCK_STOP"
msgstr "STOCK_STOP"
#. module: stock
#: wizard_view:stock.move.track,init:0
#: wizard_view:mrp.stock.move.track,init:0
msgid "Tracking a move"
msgstr "Volg een voorraadbeweging"
msgstr ""
#. module: stock
#: selection:stock.location,icon:0
@ -1274,7 +1276,7 @@ msgstr "Transactieregels"
#: rml:lot.stock.overview:0
#: rml:lot.stock.overview_all:0
msgid "Value"
msgstr ""
msgstr "Waarde"
#. module: stock
#: field:stock.picking,type:0
@ -1415,7 +1417,7 @@ msgstr "Vaste locatie"
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
"De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !"
#. module: stock
#: field:stock.picking,min_date:0
@ -1503,7 +1505,7 @@ msgstr "STOCK_SORT_DESCENDING"
#: model:ir.actions.act_window,name:stock.action_tracking_form
#: model:ir.ui.menu,name:stock.menu_action_tracking_form
msgid "Tracking Lots"
msgstr "Traceer eenheden"
msgstr "Traceer lots"
#. module: stock
#: wizard_button:inventory.merge,init,merge:0
@ -1585,6 +1587,7 @@ msgid "Make packing"
msgstr "Maak picking"
#. module: stock
#: wizard_field:stock.partial_picking,end2,back_order_notification:0
#: field:stock.picking,backorder_id:0
msgid "Back Order"
msgstr "Nalevering"
@ -1637,9 +1640,9 @@ msgid "STOCK_ZOOM_OUT"
msgstr "STOCK_ZOOM_OUT"
#. module: stock
#: wizard_field:stock.move.track,init,tracking_prefix:0
#: wizard_field:mrp.stock.move.track,init,tracking_prefix:0
msgid "Tracking prefix"
msgstr "Volgkengetal"
msgstr "Traceer voorloper"
#. module: stock
#: selection:stock.location,allocation_method:0
@ -1922,7 +1925,7 @@ msgid "Tracking"
msgstr "Traceren"
#. module: stock
#: wizard_button:stock.move.track,init,track:0
#: wizard_button:mrp.stock.move.track,init,track:0
#: wizard_button:stock.picking.make,init,make:0
msgid "Ok"
msgstr "Akkoord"
@ -2400,6 +2403,58 @@ msgstr "Fysieke locaties"
#~ msgid "Stock Management"
#~ msgstr "Voorraadbeheer"
#, python-format
#~ msgid "You cannot delete any record!"
#~ msgstr "U kunt dit record niet verwijderen!"
#, python-format
#~ msgid "UserError"
#~ msgstr "Gebruikersfout"
#, python-format
#~ msgid "You can only delete draft moves."
#~ msgstr "Er kunnen alleen concept-wijzigingen worden verwijderd."
#, python-format
#~ msgid "Invoice state"
#~ msgstr "Factuur status"
#, python-format
#~ msgid "Delivered Qty"
#~ msgstr "Geleverd aantal"
#, python-format
#~ msgid "Merging is only allowed on draft inventories."
#~ msgstr "Samenvoegen is alleen toegestaan vanaf concept-facturen"
#, python-format
#~ msgid "Please select at least two inventories."
#~ msgstr "Selecteer tenminste twee inventarisaties"
#, python-format
#~ msgid "You can not remove a lot line !"
#~ msgstr "Een eenheidsregel kan niet worden verwijderd!"
#, python-format
#~ msgid "Provide the quantities of the returned products."
#~ msgstr "Geeft de aantallen van de geretourneerde producten."
#, python-format
#~ msgid "Received Qty"
#~ msgstr "Ontvangen aantal"
#, python-format
#~ msgid "Error"
#~ msgstr "Fout"
#, python-format
#~ msgid "Products: "
#~ msgstr "Producten: "
#, python-format
#~ msgid "Error !"
#~ msgstr "Fout!"
#~ msgid ""
#~ "OpenERP Stock Management module can manage multi-warehouses, multi and "
#~ "structured stock locations.\n"
@ -2428,3 +2483,68 @@ msgstr "Fysieke locaties"
#~ "* Rapid detection of mistakes through double entry system\n"
#~ "* Traceability (upstream/downstream, production lots, serial number, ...)\n"
#~ " "
#, python-format
#~ msgid "No production sequence defined"
#~ msgstr "Geen productievolgorde gedefinieerd"
#, python-format
#~ msgid "Error, no partner !"
#~ msgstr "Fout, geen relatie!"
#, python-format
#~ msgid ""
#~ "Please put a partner on the picking list if you want to generate invoice."
#~ msgstr "Selecteer een relatie op een factuur aan te maken."
#, python-format
#~ msgid "Return lines"
#~ msgstr "Retour regels"
#, python-format
#~ msgid "Error!"
#~ msgstr "Fout!"
#, python-format
#~ msgid "Unplanned Qty"
#~ msgstr "Niet geplande aantal"
#, python-format
#~ msgid "to be invoiced"
#~ msgstr "te factureren"
#, python-format
#~ msgid "Produced Qty"
#~ msgstr "Geproduceerd aantal"
#, python-format
#~ msgid "No product in this location."
#~ msgstr "Geen producten op deze locatie"
#, python-format
#~ msgid "Invoice is not created"
#~ msgstr "Factuur is niet gegenereerd"
#, python-format
#~ msgid "Warning"
#~ msgstr "Waarschuwing"
#, python-format
#~ msgid "Message !"
#~ msgstr "Bericht !"
#, python-format
#~ msgid "Invoice is already created."
#~ msgstr "Factuur is reeds gegenereerd"
#, python-format
#~ msgid "Please select one and only one inventory !"
#~ msgstr "Selecteer één voorraad locatie"
#, python-format
#~ msgid "P&L Qty"
#~ msgstr "Winst&Verlies hoeveelheid"
#, python-format
#~ msgid "Invoice cannot be created from Packing."
#~ msgstr "Factuur kan niet worden gegenereerd vanuit Pick-order"

132
addons/stock/i18n/pl.po
View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-06-14 14:56+0000\n"
"PO-Revision-Date: 2010-07-18 10:18+0000\n"
"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-06-22 03:54+0000\n"
"X-Launchpad-Export-Date: 2010-07-19 03:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock
@ -595,7 +595,7 @@ msgid "New Reception Packing"
msgstr "Nowe przyjęcia zewnętrzne"
#. module: stock
#: wizard_field:stock.move.track,init,quantity:0
#: wizard_field:mrp.stock.move.track,init,quantity:0
msgid "Quantity per lot"
msgstr "Ilość wg partii"
@ -728,7 +728,7 @@ msgstr "Od"
#. module: stock
#: rml:stock.picking.list:0
msgid "weight"
msgstr ""
msgstr "waga"
#. module: stock
#: rml:stock.picking.list:0
@ -845,7 +845,9 @@ msgid "General Informations"
msgstr "Ogólne informacje"
#. module: stock
#: code:addons/stock/wizard/wizard_return.py:0
#: selection:stock.location,chained_location_type:0
#, python-format
msgid "None"
msgstr "Brak"
@ -854,7 +856,7 @@ msgstr "Brak"
#: model:ir.actions.wizard,name:stock.action2
#: model:ir.actions.wizard,name:stock.action_lot4
msgid "Downstream traceability"
msgstr ""
msgstr "Śledzenie wsteczne"
#. module: stock
#: model:stock.location,name:stock.stock_location_14
@ -1032,12 +1034,12 @@ msgstr "Projekty okresowych inwentaryzacji"
#. module: stock
#: wizard_button:inventory.merge,init,end:0
#: wizard_button:inventory.merge.stock.zero,init,end:0
#: wizard_button:mrp.stock.move.track,init,end:0
#: wizard_button:stock.fill_inventory,init,end:0
#: wizard_button:stock.invoice_onshipping,init,end:0
#: wizard_button:stock.location.products,init,end:0
#: view:stock.move:0
#: wizard_button:stock.move.split,init,end:0
#: wizard_button:stock.move.track,init,end:0
#: wizard_button:stock.partial_picking,init,end:0
#: view:stock.picking:0
#: wizard_button:stock.picking.make,init,end:0
@ -1233,7 +1235,7 @@ msgid "STOCK_STOP"
msgstr ""
#. module: stock
#: wizard_view:stock.move.track,init:0
#: wizard_view:mrp.stock.move.track,init:0
msgid "Tracking a move"
msgstr "Śledzenie przesunięcia"
@ -1591,6 +1593,7 @@ msgid "Make packing"
msgstr "Wykonaj pobranie"
#. module: stock
#: wizard_field:stock.partial_picking,end2,back_order_notification:0
#: field:stock.picking,backorder_id:0
msgid "Back Order"
msgstr "Pobranie częściowe"
@ -1643,7 +1646,7 @@ msgid "STOCK_ZOOM_OUT"
msgstr ""
#. module: stock
#: wizard_field:stock.move.track,init,tracking_prefix:0
#: wizard_field:mrp.stock.move.track,init,tracking_prefix:0
msgid "Tracking prefix"
msgstr "Prefiks śledzenia"
@ -1934,7 +1937,7 @@ msgid "Tracking"
msgstr "Śledzenie"
#. module: stock
#: wizard_button:stock.move.track,init,track:0
#: wizard_button:mrp.stock.move.track,init,track:0
#: wizard_button:stock.picking.make,init,make:0
msgid "Ok"
msgstr "Ok"
@ -2352,7 +2355,7 @@ msgstr "Wydanie zewnętrzne"
#: model:ir.actions.wizard,name:stock.action4
#: model:ir.actions.wizard,name:stock.action_lot2
msgid "Upstream traceability"
msgstr ""
msgstr "Śledzenie wprzód"
#. module: stock
#: field:product.category,property_stock_account_input_categ:0
@ -2412,9 +2415,93 @@ msgstr "Stan przesunięcia"
msgid "Physical Locations"
msgstr "Strefy fizyczne"
#, python-format
#~ msgid "You cannot delete any record!"
#~ msgstr "Nie możesz usunąć żadnego rekordu!"
#, python-format
#~ msgid "Error, no partner !"
#~ msgstr "Błąd, brak partnera !"
#, python-format
#~ msgid "Invoice is not created"
#~ msgstr "Faktura nie została utworzona"
#, python-format
#~ msgid "Provide the quantities of the returned products."
#~ msgstr "Podaj ilości zwróconych produktów"
#, python-format
#~ msgid "Error"
#~ msgstr "Błąd"
#, python-format
#~ msgid "Invoice is already created."
#~ msgstr "Faktura już została utworzona."
#, python-format
#~ msgid "Products: "
#~ msgstr "Produkty: "
#, python-format
#~ msgid "Error!"
#~ msgstr "Błąd!"
#, python-format
#~ msgid "Warning"
#~ msgstr "Ostrzeżenie"
#, python-format
#~ msgid "Error !"
#~ msgstr "Błąd !"
#, python-format
#~ msgid "to be invoiced"
#~ msgstr "do zafakturowania"
#~ msgid "Stock Management"
#~ msgstr "Zapasy"
#, python-format
#~ msgid "No product in this location."
#~ msgstr "Brak produktów w tej strefie"
#, python-format
#~ msgid "Invoice state"
#~ msgstr "Stan faktury"
#, python-format
#~ msgid "Delivered Qty"
#~ msgstr "Ilość dostarczona"
#, python-format
#~ msgid "Please select at least two inventories."
#~ msgstr "Wybierz co najmniej dwie inwentaryzacje"
#, python-format
#~ msgid "You can not remove a lot line !"
#~ msgstr "Nie możesz usuwać pozycji partii !"
#, python-format
#~ msgid "Received Qty"
#~ msgstr "Otrzymana ilość"
#, python-format
#~ msgid "No production sequence defined"
#~ msgstr "Nie zdefiniowano numeracji produkcji"
#, python-format
#~ msgid "Message !"
#~ msgstr "Wiadomość !"
#, python-format
#~ msgid "Please select one and only one inventory !"
#~ msgstr "Wybierz tylko jedną inwentaryzację !"
#, python-format
#~ msgid "Produced Qty"
#~ msgstr "Ilość wyprodukowana"
#~ msgid ""
#~ "OpenERP Stock Management module can manage multi-warehouses, multi and "
#~ "structured stock locations.\n"
@ -2443,3 +2530,28 @@ msgstr "Strefy fizyczne"
#~ "* Śledzenie partii (Od dostawcy/Od nabywcy, partie produkcyjne, numery "
#~ "seryjne, ...)\n"
#~ " "
#, python-format
#~ msgid "You can only delete draft moves."
#~ msgstr "Możesz usuwać tylko projekty przesunięć"
#, python-format
#~ msgid "Merging is only allowed on draft inventories."
#~ msgstr "Łączenie jest dozwolone tylko na projektach inwentaryzacji"
#, python-format
#~ msgid "Unplanned Qty"
#~ msgstr "Ilość nieplanowana"
#, python-format
#~ msgid ""
#~ "Please put a partner on the picking list if you want to generate invoice."
#~ msgstr "Podaj partnera do listy pobrań, jeśli chcesz wygenerować fakturę."
#, python-format
#~ msgid "Invoice cannot be created from Packing."
#~ msgstr "Nie można utworzyć faktury z listy przesunięć"
#, python-format
#~ msgid "Return lines"
#~ msgstr "Pozycje zwrotu"

326
addons/stock/i18n/zh_CN.po
View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.6\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-05-06 03:59+0000\n"
"Last-Translator: digitalsatori <Unknown>\n"
"PO-Revision-Date: 2010-07-17 05:42+0000\n"
"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-06-22 03:54+0000\n"
"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock
@ -44,7 +44,7 @@ msgstr "terp-account"
#. module: stock
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr "在动作定义使用了无效的模型名称。"
msgstr "在动作定义中使用了无效的模快名。"
#. module: stock
#: model:ir.module.module,shortdesc:stock.module_meta_information
@ -91,19 +91,19 @@ msgstr "退货"
#. module: stock
#: field:product.category,property_stock_journal:0
msgid "Stock journal"
msgstr "库存分类帐"
msgstr "库存记录集合"
#. module: stock
#: wizard_view:stock.fill_inventory,init:0
msgid "Fill Inventory for specific location"
msgstr "填写具体库位盘存"
msgstr "填写库存的具体库位"
#. module: stock
#: model:ir.actions.report.xml,name:stock.report_picking_list
#: view:stock.picking:0
#: field:stock.picking.move.wizard,picking_id:0
msgid "Packing list"
msgstr "分拣单"
msgstr "装箱单"
#. module: stock
#: rml:lot.stock.overview:0
@ -114,13 +114,13 @@ msgstr "金额"
#. module: stock
#: view:stock.picking:0
msgid "Products Received"
msgstr "已收到的货品"
msgstr "已收到的产品"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_picking_tree4
#: model:ir.ui.menu,name:stock.menu_action_picking_tree4
msgid "Incoming Products"
msgstr "入库货品"
msgstr "接收的产品"
#. module: stock
#: field:stock.picking,name:0
@ -131,7 +131,7 @@ msgstr "参照"
#. module: stock
#: wizard_field:stock.invoice_onshipping,init,group:0
msgid "Group by partner"
msgstr "按业务伙伴分类"
msgstr "按业务伙伴分组"
#. module: stock
#: field:stock.picking,address_id:0
@ -184,7 +184,7 @@ msgstr "状态"
#. module: stock
#: field:stock.location,stock_real_value:0
msgid "Real Stock Value"
msgstr "实际库存额"
msgstr "实际库存值"
#. module: stock
#: view:stock.move:0
@ -201,12 +201,12 @@ msgstr "可用"
#. module: stock
#: view:stock.move:0
msgid "Make Parcel"
msgstr "装箱"
msgstr "打包"
#. module: stock
#: wizard_view:stock.partial_picking,end2:0
msgid "Packing result"
msgstr "包装结果"
msgstr "装箱单结果"
#. module: stock
#: selection:stock.location,icon:0
@ -272,7 +272,7 @@ msgstr "内部调拨"
#. module: stock
#: field:stock.move,product_packaging:0
msgid "Packaging"
msgstr "装箱"
msgstr "装箱单"
#. module: stock
#: rml:stock.picking.list:0
@ -295,7 +295,7 @@ msgstr "附加信息"
#. module: stock
#: selection:stock.invoice_onshipping,init,type:0
msgid "Customer Refund"
msgstr "客户退货"
msgstr "客户退还"
#. module: stock
#: selection:stock.location,icon:0
@ -305,7 +305,7 @@ msgstr "STOCK_FLOPPY"
#. module: stock
#: view:stock.production.lot.revision:0
msgid "Production Lot Revisions"
msgstr ""
msgstr "生产批次修订"
#. module: stock
#: view:stock.location:0
@ -332,7 +332,7 @@ msgstr "调拨信息"
#. module: stock
#: view:stock.picking:0
msgid "Unreceived Products"
msgstr "未接收产品"
msgstr "未接收的产品"
#. module: stock
#: field:stock.inventory,state:0
@ -354,12 +354,12 @@ msgstr "STOCK_UNDERLINE"
#. module: stock
#: view:stock.picking.move.wizard:0
msgid "Move Lines"
msgstr "凭证明细"
msgstr "调拨明细"
#. module: stock
#: wizard_field:stock.fill_inventory,init,recursive:0
msgid "Include all childs for the location"
msgstr "包括所有库位子项"
msgstr "包括所有该库位的子库位"
#. module: stock
#: field:product.template,property_stock_procurement:0
@ -414,7 +414,7 @@ msgstr "数量"
#. module: stock
#: view:stock.picking:0
msgid "Process Now"
msgstr "现在处理"
msgstr "立即处理"
#. module: stock
#: field:stock.location,address_id:0
@ -449,7 +449,7 @@ msgstr "库存属性"
#. module: stock
#: wizard_button:stock.partial_picking,init,split:0
msgid "Make Picking"
msgstr "建立领料/提货"
msgstr "建立装箱单"
#. module: stock
#: model:stock.location,name:stock.location_procurement
@ -475,7 +475,7 @@ msgstr "产品ID"
#. module: stock
#: view:res.partner:0
msgid "Sales & Purchases"
msgstr "销售与采购"
msgstr "销售&采购"
#. module: stock
#: selection:stock.invoice_onshipping,init,type:0
@ -485,7 +485,7 @@ msgstr "客户发票"
#. module: stock
#: field:product.template,property_stock_inventory:0
msgid "Inventory Location"
msgstr "盘存库位"
msgstr "库存库位"
#. module: stock
#: help:product.product,track_production:0
@ -503,12 +503,12 @@ msgid ""
"For the current product (template), this stock location will be used, "
"instead of the default one, as the source location for stock moves generated "
"when you do an inventory"
msgstr "对于当前产品(模板)该库存库位默认作为库存盘点时库存调拨的源库位."
msgstr "对于当前产品(模板), 这库存库位将作为默认值, 库存盘点时作为库存调拨的源库位."
#. module: stock
#: help:product.category,property_stock_account_output_categ:0
msgid "This account will be used to value the output stock"
msgstr "用于记录出库价值科目"
msgstr "这科目用于记录出库值"
#. module: stock
#: selection:stock.location,icon:0
@ -519,7 +519,7 @@ msgstr "STOCK_ZOOM_FIT"
#: help:product.category,property_stock_journal:0
msgid ""
"This journal will be used for the accounting move generated by stock move"
msgstr "用于记录库存调拨产生的会计变动."
msgstr "这记录集合用于库存调拨产生的会计凭证."
#. module: stock
#: model:ir.actions.act_window,name:stock.action_picking_calendar_delivery
@ -545,7 +545,7 @@ msgstr "STOCK_SAVE_AS"
#. module: stock
#: model:ir.model,name:stock.model_stock_report_prodlots
msgid "Stock report by production lots"
msgstr "库存生产批次报表"
msgstr "生产批次库存报表"
#. module: stock
#: field:stock.location,stock_virtual:0
@ -586,10 +586,10 @@ msgstr "STOCK_GOTO_BOTTOM"
#: model:ir.actions.act_window,name:stock.action_picking_form
#: model:ir.ui.menu,name:stock.menu_action_picking_form
msgid "New Reception Packing"
msgstr "新接收的包装"
msgstr "新接收的装箱单"
#. module: stock
#: wizard_field:stock.move.track,init,quantity:0
#: wizard_field:mrp.stock.move.track,init,quantity:0
msgid "Quantity per lot"
msgstr "每批次数量"
@ -700,7 +700,7 @@ msgstr "terp-stock"
#. module: stock
#: rml:stock.picking.list:0
msgid "Packing List:"
msgstr "包装单:"
msgstr "装箱单:"
#. module: stock
#: selection:stock.location,icon:0
@ -730,7 +730,7 @@ msgstr "未分派的产品"
#. module: stock
#: view:stock.picking:0
msgid "Invoice Control"
msgstr "发票控制"
msgstr "发票管理"
#. module: stock
#: model:ir.model,name:stock.model_stock_production_lot_revision
@ -754,7 +754,7 @@ msgstr "等待中"
#: model:ir.ui.menu,name:stock.menu_action_picking_tree7
#: model:ir.ui.menu,name:stock.menu_picking_waiting
msgid "Available Packing"
msgstr ""
msgstr "有效的装箱单"
#. module: stock
#: model:ir.model,name:stock.model_stock_warehouse
@ -780,7 +780,7 @@ msgstr "一般IT供应商"
#. module: stock
#: model:ir.actions.report.xml,name:stock.report_location_overview_all
msgid "Location Content (With children)"
msgstr "库存地点（包括子项）"
msgstr "库位内容(包括子项)"
#. module: stock
#: selection:stock.location,icon:0
@ -807,7 +807,7 @@ msgstr "STOCK_CONNECT"
#: model:ir.ui.menu,name:stock.menu_action_picking_all
#: wizard_field:stock.picking.make,init,pickings:0
msgid "Packing"
msgstr "装箱"
msgstr "装箱单"
#. module: stock
#: selection:stock.location,icon:0
@ -818,7 +818,7 @@ msgstr "STOCK_GO_DOWN"
#: field:res.partner,property_stock_customer:0
#: selection:stock.location,usage:0
msgid "Customer Location"
msgstr "客户存货地点"
msgstr "客户库位"
#. module: stock
#: selection:stock.location,icon:0
@ -829,7 +829,7 @@ msgstr "STOCK_OK"
#: model:ir.actions.act_window,name:stock.action_picking_tree9
#: model:ir.ui.menu,name:stock.menu_action_picking_tree9
msgid "New Internal Packing"
msgstr "新的内部包装"
msgstr "新的内部装箱单"
#. module: stock
#: view:stock.inventory:0
@ -837,7 +837,9 @@ msgid "General Informations"
msgstr "一般信息"
#. module: stock
#: code:addons/stock/wizard/wizard_return.py:0
#: selection:stock.location,chained_location_type:0
#, python-format
msgid "None"
msgstr "空"
@ -876,7 +878,7 @@ msgstr "所有库存调拨"
#. module: stock
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "描述视图结构的XML文件无效"
msgstr "无效的视图结构xml文件!"
#. module: stock
#: field:res.partner,property_stock_supplier:0
@ -897,7 +899,7 @@ msgstr "紧急"
#. module: stock
#: help:product.category,property_stock_account_input_categ:0
msgid "This account will be used to value the input stock"
msgstr "此科目用于记录入库库存金额"
msgstr "这科目用于记录入库值"
#. module: stock
#: selection:stock.location,icon:0
@ -980,7 +982,7 @@ msgstr "STOCK_APPLY"
#. module: stock
#: wizard_view:stock.partial_picking,end2:0
msgid "The packing has been successfully made !"
msgstr "装箱已完成！"
msgstr "这装箱单已完成!"
#. module: stock
#: field:stock.move,address_id:0
@ -1024,12 +1026,12 @@ msgstr "定期盘存草稿"
#. module: stock
#: wizard_button:inventory.merge,init,end:0
#: wizard_button:inventory.merge.stock.zero,init,end:0
#: wizard_button:mrp.stock.move.track,init,end:0
#: wizard_button:stock.fill_inventory,init,end:0
#: wizard_button:stock.invoice_onshipping,init,end:0
#: wizard_button:stock.location.products,init,end:0
#: view:stock.move:0
#: wizard_button:stock.move.split,init,end:0
#: wizard_button:stock.move.track,init,end:0
#: wizard_button:stock.partial_picking,init,end:0
#: view:stock.picking:0
#: wizard_button:stock.picking.make,init,end:0
@ -1089,7 +1091,7 @@ msgstr "稍候处理"
msgid ""
"This stock location will be used, instead of the default one, as the source "
"location for goods you receive from the current partner"
msgstr "默认作为你接收业务伙伴产品的来源库位"
msgstr "默认作为你接收当前业务伙伴产品的来源库位"
#. module: stock
#: field:stock.warehouse,partner_address_id:0
@ -1120,7 +1122,7 @@ msgstr "STOCK_HARDDISK"
#. module: stock
#: model:ir.actions.act_window,name:stock.act_relate_picking
msgid "Related Picking"
msgstr "相关领料/提货"
msgstr "相关的装箱单"
#. module: stock
#: field:stock.incoterms,name:0
@ -1148,13 +1150,13 @@ msgstr "]"
#. module: stock
#: view:stock.picking:0
msgid "Input Packing List"
msgstr "接收包装单"
msgstr "接收的装箱单"
#. module: stock
#: model:ir.model,name:stock.model_stock_picking
#: field:stock.move,picking_id:0
msgid "Packing List"
msgstr "包装单"
msgstr "装箱单"
#. module: stock
#: selection:stock.location,icon:0
@ -1164,7 +1166,7 @@ msgstr "STOCK_COPY"
#. module: stock
#: selection:stock.invoice_onshipping,init,type:0
msgid "Supplier Refund"
msgstr "供应商退货"
msgstr "供应商退还"
#. module: stock
#: model:ir.model,name:stock.model_stock_move
@ -1195,7 +1197,7 @@ msgstr "STOCK_CDROM"
#. module: stock
#: selection:stock.picking,invoice_state:0
msgid "Not from Packing"
msgstr "不是来自包装"
msgstr "不是来自装箱单"
#. module: stock
#: view:stock.location:0
@ -1223,7 +1225,7 @@ msgid "STOCK_STOP"
msgstr "STOCK_STOP"
#. module: stock
#: wizard_view:stock.move.track,init:0
#: wizard_view:mrp.stock.move.track,init:0
msgid "Tracking a move"
msgstr "跟踪调拨"
@ -1235,7 +1237,7 @@ msgstr "STOCK_FIND_AND_REPLACE"
#. module: stock
#: view:stock.picking:0
msgid "Validate"
msgstr "审核"
msgstr "确认"
#. module: stock
#: selection:stock.location,icon:0
@ -1284,7 +1286,7 @@ msgstr "产品"
#. module: stock
#: field:stock.picking,move_type:0
msgid "Delivery Method"
msgstr "运输方式"
msgstr "送货方式"
#. module: stock
#: model:ir.actions.wizard,name:stock.partial_picking
@ -1399,14 +1401,14 @@ msgid ""
"* Traceability (upstream/downstream, production lots, serial number, ...)\n"
" "
msgstr ""
"\"OpenERP库存管理模块可以管理多仓库，多样化结构的仓储地点.\\n\"\n"
"\"感谢复式记帐管理，存货管理很强大并且灵活:\\n\"\n"
"\"* 移动历史和规划,\\n\"\n"
"\"* 不同的库存管理法 (FIFO, LIFO, ...)\\n\"\n"
"\"库存管理模块可以管理多仓库, 多样化结构的仓储地点.\\n\"\n"
"\"感谢复式记帐管理, 存货管理很强大并且灵活:\\n\"\n"
"\"* 调拨历史和计划\\n\"\n"
"\"* 不同的库存管理法 (先进先出, 先进后出, ...)\\n\"\n"
"\"* 库存估价 (标准或平均价格, ...)\\n\"\n"
"\"* 稳健面临盘存差错\\n\"\n"
"\"* 自动重新订货规则 (库存水平, JIT, ...)\\n\"\n"
"\"* 支持条形码\\n\"\n"
"\"* 支持条码\\n\"\n"
"\"* 通过复式记帐系统快速检测错误\\n\"\n"
"\"* 可追溯性(向上追溯/向下追溯,产品批次,序列号, ...)\\n\"\n"
" "
@ -1451,7 +1453,7 @@ msgstr "STOCK_DELETE"
#. module: stock
#: model:account.journal,name:stock.stock_journal
msgid "Stock Journal"
msgstr "库存分类帐"
msgstr "库存记录集合"
#. module: stock
#: selection:stock.location,icon:0
@ -1481,7 +1483,7 @@ msgstr "强制可用"
#. module: stock
#: wizard_view:stock.location.products,init:0
msgid "View Stock of Products"
msgstr "产品库存视图"
msgstr "查看库存产品"
#. module: stock
#: selection:stock.location,icon:0
@ -1571,7 +1573,7 @@ msgstr "数量(销售单位)"
#: model:ir.actions.act_window,name:stock.action_picking_tree5
#: model:ir.ui.menu,name:stock.menu_action_picking_tree5
msgid "Packing to Process"
msgstr "包装处理"
msgstr "装箱单处理"
#. module: stock
#: selection:stock.location,icon:0
@ -1587,12 +1589,13 @@ msgstr "设为可用"
#: model:ir.actions.wizard,name:stock.make_picking
#: wizard_view:stock.picking.make,init:0
msgid "Make packing"
msgstr "装箱"
msgstr "建立装箱单"
#. module: stock
#: wizard_field:stock.partial_picking,end2,back_order_notification:0
#: field:stock.picking,backorder_id:0
msgid "Back Order"
msgstr "拖欠订单"
msgstr "订单"
#. module: stock
#: selection:stock.location,icon:0
@ -1642,7 +1645,7 @@ msgid "STOCK_ZOOM_OUT"
msgstr "STOCK_ZOOM_OUT"
#. module: stock
#: wizard_field:stock.move.track,init,tracking_prefix:0
#: wizard_field:mrp.stock.move.track,init,tracking_prefix:0
msgid "Tracking prefix"
msgstr "跟踪前缀"
@ -1732,7 +1735,7 @@ msgstr "仓库"
#. module: stock
#: help:product.product,track_outgoing:0
msgid "Force to use a Production Lot during deliveries"
msgstr "出库时指定批次"
msgstr "送货时指定批次"
#. module: stock
#: view:stock.picking:0
@ -1742,7 +1745,7 @@ msgstr "把调拨明细线分为两部分"
#. module: stock
#: wizard_field:stock.invoice_onshipping,init,journal_id:0
msgid "Destination Journal"
msgstr "目标分类帐"
msgstr "目的地记录集合"
#. module: stock
#: model:ir.actions.act_window,name:stock.act_stock_production_lot_2_stock_report_prodlots
@ -1769,7 +1772,7 @@ msgstr "退回"
#. module: stock
#: field:stock.picking,auto_picking:0
msgid "Auto-Packing"
msgstr "自动创建分拣单"
msgstr "自动装箱单"
#. module: stock
#: field:stock.move,product_uos:0
@ -1915,7 +1918,8 @@ msgid ""
"move has to be validated by a worker. With 'Automatic No Step Added', the "
"location is replaced in the original move."
msgstr ""
"如果你选择链式库位这是唯一的.'自动调拨'将创建一个库存调拨后当前这个将自动确认.'手动操作'库存调拨需要人手确认.'自动不增加'库位式取代调拨来源."
"如果你只选择链式库位类型.\n"
"'自动调拨' 将创建一个库存调拨后将自动确认. '手动操作' 库存调拨需要人手确认. '自动不增加'步骤' 库位将取代调拨源库位."
#. module: stock
#: field:stock.location,icon:0
@ -1928,7 +1932,7 @@ msgid "Tracking"
msgstr "跟踪"
#. module: stock
#: wizard_button:stock.move.track,init,track:0
#: wizard_button:mrp.stock.move.track,init,track:0
#: wizard_button:stock.picking.make,init,make:0
msgid "Ok"
msgstr "确定"
@ -1937,7 +1941,7 @@ msgstr "确定"
#: help:product.template,property_stock_account_input:0
msgid ""
"This account will be used, instead of the default one, to value input stock"
msgstr "默认作为记录入库值科目"
msgstr "这科目默认作为记录入库值"
#. module: stock
#: model:stock.location,name:stock.stock_location_8
@ -1967,7 +1971,7 @@ msgstr "已登入库存"
#. module: stock
#: selection:stock.picking,type:0
msgid "Getting Goods"
msgstr "收货"
msgstr "获得的货物"
#. module: stock
#: view:stock.location:0
@ -1977,7 +1981,7 @@ msgstr "库存库位"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_MEDIA_PLAY"
msgstr "播放"
msgstr "STOCK_MEDIA_PLAY"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_picking_tree_delivery
@ -1988,7 +1992,7 @@ msgstr "送货单"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_OPEN"
msgstr "打开"
msgstr "STOCK_OPEN"
#. module: stock
#: help:res.partner,property_stock_customer:0
@ -2006,7 +2010,7 @@ msgstr "确定"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_MEDIA_PREVIOUS"
msgstr "前一个"
msgstr "STOCK_MEDIA_PREVIOUS"
#. module: stock
#: view:stock.move:0
@ -2033,7 +2037,7 @@ msgstr "库存库位结构"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_DISCONNECT"
msgstr "分拆"
msgstr "STOCK_DISCONNECT"
#. module: stock
#: help:product.template,property_stock_account_output:0
@ -2044,7 +2048,7 @@ msgstr "默认作为记录出库值科目"
#. module: stock
#: view:stock.picking:0
msgid "Confirm (Do Not Process Now)"
msgstr "确认(现在没处理进程)"
msgstr "确认(现在不处理)"
#. module: stock
#: field:stock.tracking,move_ids:0
@ -2054,7 +2058,7 @@ msgstr "调拨跟踪"
#. module: stock
#: model:ir.ui.menu,name:stock.next_id_61
msgid "Reporting"
msgstr "内部报表"
msgstr "报表"
#. module: stock
#: model:ir.actions.wizard,name:stock.wizard_invoice_onshipping
@ -2065,7 +2069,7 @@ msgstr "创建发票"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_NETWORK"
msgstr "网络"
msgstr "STOCK_NETWORK"
#. module: stock
#: model:ir.ui.menu,name:stock.menu_stock_configuration
@ -2075,7 +2079,7 @@ msgstr "设置"
#. module: stock
#: selection:stock.location,icon:0
msgid "terp-project"
msgstr "项目"
msgstr "terp-project"
#. module: stock
#: model:ir.actions.act_window,name:stock.act_product_product_2_stock_report_prodlots
@ -2089,7 +2093,7 @@ msgstr "库存批次"
#. module: stock
#: field:stock.move,auto_validate:0
msgid "Auto Validate"
msgstr "自动验证"
msgstr "自动确认"
#. module: stock
#: field:stock.location,chained_auto_packing:0
@ -2106,12 +2110,12 @@ msgstr "虚拟库存值"
#: selection:stock.move,state:0
#: selection:stock.picking,state:0
msgid "Canceled"
msgstr "取消"
msgstr "已取消"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_GOTO_LAST"
msgstr "最后"
msgstr "STOCK_GOTO_LAST"
#. module: stock
#: selection:stock.picking,invoice_state:0
@ -2121,7 +2125,7 @@ msgstr "已开票"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_DIRECTORY"
msgstr "目录"
msgstr "STOCK_DIRECTORY"
#. module: stock
#: help:product.template,property_stock_production:0
@ -2151,7 +2155,7 @@ msgstr "草稿"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_JUSTIFY_CENTER"
msgstr "居中"
msgstr "STOCK_JUSTIFY_CENTER"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_picking_tree3
@ -2159,12 +2163,12 @@ msgstr "居中"
#: model:ir.ui.menu,name:stock.menu_action_picking_tree3
#: model:ir.ui.menu,name:stock.menu_action_picking_tree8
msgid "Confirmed Packing Waiting Availability"
msgstr "确认包装等待可用"
msgstr "确认装箱单等待可用"
#. module: stock
#: field:stock.location,posy:0
msgid "Shelves (Y)"
msgstr "架子（Y）"
msgstr "货架(Y)"
#. module: stock
#: model:ir.actions.wizard,name:stock.wizard_merge_inventory_zero
@ -2189,7 +2193,7 @@ msgstr "直接送货"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_REVERT_TO_SAVED"
msgstr "恢复到保存"
msgstr "STOCK_REVERT_TO_SAVED"
#. module: stock
#: field:product.product,track_production:0
@ -2217,7 +2221,7 @@ msgstr "对于当前产品(模板)该库存库位默认作为产品需求的库
#. module: stock
#: model:ir.model,name:stock.model_stock_picking_move_wizard
msgid "stock.picking.move.wizard"
msgstr "库存.领料/提货.调拨.向导"
msgstr "库存.装箱单.调拨.向导"
#. module: stock
#: model:res.request.link,name:stock.req_link_tracking
@ -2253,7 +2257,7 @@ msgstr "库位"
msgid ""
"Scheduled date for the movement of the products or real date if the move is "
"done."
msgstr "如果调拨完成.产品调拨的预定日期或实际日期"
msgstr "如果调拨完成. 产品调拨的预定日期或实际日期"
#. module: stock
#: view:stock.picking:0
@ -2263,7 +2267,7 @@ msgstr "一般信息"
#. module: stock
#: selection:stock.location,icon:0
msgid "terp-product"
msgstr "产品"
msgstr "terp-product"
#. module: stock
#: wizard_button:stock.partial_picking,end2,end:0
@ -2321,7 +2325,7 @@ msgstr "说明"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_INDENT"
msgstr "缩进"
msgstr "STOCK_INDENT"
#. module: stock
#: selection:stock.picking,type:0
@ -2365,7 +2369,7 @@ msgstr "发出"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_JUSTIFY_RIGHT"
msgstr "右对齐"
msgstr "STOCK_JUSTIFY_RIGHT"
#. module: stock
#: model:ir.model,name:stock.model_stock_inventory_line
@ -2380,7 +2384,7 @@ msgstr "其它信息"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_MEDIA_NEXT"
msgstr "下一个"
msgstr "STOCK_MEDIA_NEXT"
#. module: stock
#: view:stock.move:0
@ -2393,5 +2397,149 @@ msgstr "调拨状态"
msgid "Physical Locations"
msgstr "物理库位"
#, python-format
#~ msgid "You cannot delete any record!"
#~ msgstr "您不能删除任何记录！"
#~ msgid "Stock Management"
#~ msgstr "库存管理"
#, python-format
#~ msgid "No product in this location."
#~ msgstr "该货位没有产品"
#, python-format
#~ msgid "Invoice cannot be created from Packing."
#~ msgstr "不可从装箱单创建发票"
#, python-format
#~ msgid "You can only delete draft moves."
#~ msgstr "您只可删除草稿调拨"
#, python-format
#~ msgid "UserError"
#~ msgstr "用户错误"
#, python-format
#~ msgid "Invoice state"
#~ msgstr "发票状态"
#, python-format
#~ msgid "Delivered Qty"
#~ msgstr "已交货数量"
#, python-format
#~ msgid "Invoice is not created"
#~ msgstr "没有创建发票"
#, python-format
#~ msgid "Please select at least two inventories."
#~ msgstr "请选择至少2个盘存"
#, python-format
#~ msgid "Merging is only allowed on draft inventories."
#~ msgstr "只允许合并草搞盘存"
#, python-format
#~ msgid "Provide the quantities of the returned products."
#~ msgstr "输入退货的数量"
#, python-format
#~ msgid "You can not remove a lot line !"
#~ msgstr "您不能删除批次线!"
#, python-format
#~ msgid "Received Qty"
#~ msgstr "已接收数量"
#, python-format
#~ msgid "Error"
#~ msgstr "错误"
#, python-format
#~ msgid "Invoice is already created."
#~ msgstr "发票已创建"
#, python-format
#~ msgid "Products: "
#~ msgstr "产品： "
#, python-format
#~ msgid "P&L Qty"
#~ msgstr "益损数量"
#, python-format
#~ msgid "No production sequence defined"
#~ msgstr "无生产序列定义"
#, python-format
#~ msgid "Error !"
#~ msgstr "错误！"
#, python-format
#~ msgid "Error, no partner !"
#~ msgstr "错误，无业务伙伴！"
#, python-format
#~ msgid "Return lines"
#~ msgstr "退回明细"
#, python-format
#~ msgid "Message !"
#~ msgstr "消息！"
#, python-format
#~ msgid ""
#~ "Please put a partner on the picking list if you want to generate invoice."
#~ msgstr "如果想生成发票，请在挑选列表上填写一家业务伙伴。"
#, python-format
#~ msgid "Error!"
#~ msgstr "错误！"
#, python-format
#~ msgid "Warning"
#~ msgstr "警告"
#, python-format
#~ msgid "Please select one and only one inventory !"
#~ msgstr "请选定唯一的盘存"
#, python-format
#~ msgid "Unplanned Qty"
#~ msgstr "计划外数量"
#, python-format
#~ msgid "to be invoiced"
#~ msgstr "需开发票"
#, python-format
#~ msgid "Produced Qty"
#~ msgstr "产品数量"
#~ msgid ""
#~ "OpenERP Stock Management module can manage multi-warehouses, multi and "
#~ "structured stock locations.\n"
#~ "Thanks to the double entry management, the inventory controlling is powerful "
#~ "and flexible:\n"
#~ "* Moves history and planning,\n"
#~ "* Different inventory methods (FIFO, LIFO, ...)\n"
#~ "* Stock valuation (standard or average price, ...)\n"
#~ "* Robustness faced with Inventory differences\n"
#~ "* Automatic reordering rules (stock level, JIT, ...)\n"
#~ "* Bar code supported\n"
#~ "* Rapid detection of mistakes through double entry system\n"
#~ "* Traceability (upstream/downstream, production lots, serial number, ...)\n"
#~ " "
#~ msgstr ""
#~ "系统库存管理模块能管理多仓库多和结构化仓库库位\n"
#~ "使用复式记录管理提供灵活和强大库存控制:\n"
#~ "* 调拨历史和计划\n"
#~ "* 不同的库存管理方法(FIFO, LIFO, ...)\n"
#~ "* 存货估计(标准和平均估价)\n"
#~ "* 自动重开单规则(库存级别,jit)\n"
#~ "* 存货清单不同的鲁棒性\n"
#~ "* 条码支持\n"
#~ "* 通过复式录入系统实现快速检测错误\n"
#~ "* 跟踪能力(上游,下游,产品批号,序列号)\n"
#~ " "

6
addons/stock_invoice_directly/i18n/zh_CN.po
View File

@ -7,16 +7,16 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-03-20 10:29+0000\n"
"PO-Revision-Date: 2010-07-17 05:33+0000\n"
"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-06-22 04:19+0000\n"
"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock_invoice_directly
#: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
msgid "Invoice Picking Directly"
msgstr "发票直接分包"
msgstr "直接发票装箱单"

15
addons/stock_location/i18n/zh_CN.po
View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.6\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-03-20 10:30+0000\n"
"PO-Revision-Date: 2010-07-17 05:40+0000\n"
"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-06-22 04:18+0000\n"
"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock_location
@ -24,7 +24,7 @@ msgstr "转换要的天数"
#. module: stock_location
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "无效XML视图结构!"
msgstr "无效的视图结构xml文件!"
#. module: stock_location
#: model:ir.module.module,shortdesc:stock_location.module_meta_information
@ -35,18 +35,18 @@ msgstr "库存库位路径"
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
#. module: stock_location
#: selection:stock.location.path,auto:0
msgid "Automatic No Step Added"
msgstr "自动没步骤增加"
msgstr "自动，不加入步骤"
#. module: stock_location
#: help:product.product,path_ids:0
msgid ""
"These rules set the right path of the product in the whole location tree."
msgstr "这些规则确定了库位树正确的产品路径"
msgstr "这些规则确定了产品在整个库位树的正确路径"
#. module: stock_location
#: field:stock.location.path,location_from_id:0
@ -89,7 +89,8 @@ msgid ""
"move has to be validated by a worker. With 'Automatic No Step Added', the "
"location is replaced in the original move."
msgstr ""
"这些规则确定了库位树正确的产品路径.‘自动调拨’将创建库存调拨后当前将自动验证.‘手动操作’这库存调拨要工人验证.‘自动没增加步骤’库位是取代原来的"
"这些规则确定了产品在库位树中的正确移动路径.\n"
"‘自动调拨’ 将创建库存调拨后自动确认. ‘手动操作’ 库存调拨需要人工确认. ‘自动不加入步骤’ 库位是取代调拨源库位."
#. module: stock_location
#: field:stock.location.path,name:0

10
addons/stock_no_autopicking/i18n/zh_CN.po
View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-03-20 10:30+0000\n"
"PO-Revision-Date: 2010-07-17 05:44+0000\n"
"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-06-22 04:16+0000\n"
"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock_no_autopicking
@ -24,14 +24,14 @@ msgstr "无效的视图结构xml文件"
#. module: stock_no_autopicking
#: field:product.product,auto_pick:0
msgid "Auto Picking"
msgstr "自动分包"
msgstr "自动装箱单"
#. module: stock_no_autopicking
#: help:product.product,auto_pick:0
msgid "Auto picking for raw materials of production orders."
msgstr "为生产原料单自动分包"
msgstr "生产单原料的自动装箱单"
#. module: stock_no_autopicking
#: model:ir.module.module,shortdesc:stock_no_autopicking.module_meta_information
msgid "Stock No Auto-Picking"
msgstr "库存没自动分包"
msgstr "库存没自动装箱单"

BIN
addons/thunderbird/plugin/tiny_plugin-2.0.xpi
View File

Binary file not shown.