[MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20121026080034-1h0et5pzcl322r4i
This commit is contained in:
Thibault Delavallée
commit
46158e3c2e
File diff suppressed because it is too large
Load Diff
|
|
@ -7,14 +7,14 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
|
||||
"PO-Revision-Date: 2011-04-15 19:38+0000\n"
|
||||
"PO-Revision-Date: 2012-10-25 12:32+0000\n"
|
||||
"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2012-10-19 05:15+0000\n"
|
||||
"X-Generator: Launchpad (build 16165)\n"
|
||||
"X-Launchpad-Export-Date: 2012-10-26 04:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16194)\n"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: view:analytic.plan.create.model:0
|
||||
|
|
@ -136,7 +136,7 @@ msgstr "Определить аналитический план счетов"
|
|||
#. module: account_analytic_plans
|
||||
#: constraint:account.invoice:0
|
||||
msgid "Invalid BBA Structured Communication !"
|
||||
msgstr ""
|
||||
msgstr "Неверна структурная связь BBA!"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: constraint:account.bank.statement:0
|
||||
|
|
@ -149,6 +149,8 @@ msgid ""
|
|||
"The date of your Journal Entry is not in the defined period! You should "
|
||||
"change the date or remove this constraint from the journal."
|
||||
msgstr ""
|
||||
"Дата проводки в журнале не в определённом периоде! Вы должны сменить дату "
|
||||
"или удалить это ограничение из журнала."
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: sql_constraint:account.journal:0
|
||||
|
|
@ -251,6 +253,8 @@ msgid ""
|
|||
"currency. You should remove the secondary currency on the account or select "
|
||||
"a multi-currency view on the journal."
|
||||
msgstr ""
|
||||
"Выбранный счёт проводки в журнале нуждается во вторичной валюте. Вы должны "
|
||||
"удалить вторичную валюту по счёту или выбрать мульти-валютный вид по журналу."
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: report:account.analytic.account.crossovered.analytic:0
|
||||
|
|
@ -429,7 +433,7 @@ msgstr "Счет 4 уровня"
|
|||
#. module: account_analytic_plans
|
||||
#: constraint:account.move.line:0
|
||||
msgid "Company must be the same for its related account and period."
|
||||
msgstr ""
|
||||
msgstr "Для счета и периода должна быть одна компания."
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: view:account.analytic.plan.instance.line:0
|
||||
|
|
@ -515,11 +519,14 @@ msgid ""
|
|||
"analytic accounts for each plan set. Then, you must attach a plan set to "
|
||||
"your account journals."
|
||||
msgstr ""
|
||||
"Для настройки нескольких планов счетов аналитики, вы должны определить "
|
||||
"корневые счета аналитики для каждого набора плана. Затем вы можете "
|
||||
"прикрепить набор плана к вашим учётным журналам."
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: constraint:account.move.line:0
|
||||
msgid "You can not create journal items on closed account."
|
||||
msgstr ""
|
||||
msgstr "Нельзя создать элемент журнала по закрытому счету ."
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: report:account.analytic.account.crossovered.analytic:0
|
||||
|
|
|
|||
|
|
@ -0,0 +1,199 @@
|
|||
# Polish translation for openobject-addons
|
||||
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
|
||||
# This file is distributed under the same license as the openobject-addons package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
|
||||
"PO-Revision-Date: 2012-10-25 16:56+0000\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: Polish <pl@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2012-10-26 04:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16194)\n"
|
||||
|
||||
#. module: account_check_writing
|
||||
#: selection:res.company,check_layout:0
|
||||
msgid "Check on Top"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_check_writing
|
||||
#: model:ir.actions.act_window,help:account_check_writing.action_write_check
|
||||
msgid ""
|
||||
"The check payment form allows you to track the payment you do to your "
|
||||
"suppliers specially by check. When you select a supplier, the payment method "
|
||||
"and an amount for the payment, OpenERP will propose to reconcile your "
|
||||
"payment with the open supplier invoices or bills.You can print the check"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_check_writing
|
||||
#: view:account.voucher:0
|
||||
#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
|
||||
#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle
|
||||
#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_top
|
||||
msgid "Print Check"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_check_writing
|
||||
#: selection:res.company,check_layout:0
|
||||
msgid "Check in middle"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_check_writing
|
||||
#: help:res.company,check_layout:0
|
||||
msgid ""
|
||||
"Check on top is compatible with Quicken, QuickBooks and Microsoft Money. "
|
||||
"Check in middle is compatible with Peachtree, ACCPAC and DacEasy. Check on "
|
||||
"bottom is compatible with Peachtree, ACCPAC and DacEasy only"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_check_writing
|
||||
#: selection:res.company,check_layout:0
|
||||
msgid "Check on bottom"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_check_writing
|
||||
#: constraint:res.company:0
|
||||
msgid "Error! You can not create recursive companies."
|
||||
msgstr ""
|
||||
|
||||
#. module: account_check_writing
|
||||
#: help:account.journal,allow_check_writing:0
|
||||
msgid "Check this if the journal is to be used for writing checks."
|
||||
msgstr ""
|
||||
|
||||
#. module: account_check_writing
|
||||
#: field:account.journal,allow_check_writing:0
|
||||
msgid "Allow Check writing"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_check_writing
|
||||
#: report:account.print.check.bottom:0
|
||||
#: report:account.print.check.middle:0
|
||||
#: report:account.print.check.top:0
|
||||
msgid "Description"
|
||||
msgstr "Opis"
|
||||
|
||||
#. module: account_check_writing
|
||||
#: model:ir.model,name:account_check_writing.model_account_journal
|
||||
msgid "Journal"
|
||||
msgstr "Dziennik"
|
||||
|
||||
#. module: account_check_writing
|
||||
#: model:ir.actions.act_window,name:account_check_writing.action_write_check
|
||||
#: model:ir.ui.menu,name:account_check_writing.menu_action_write_check
|
||||
msgid "Write Checks"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_check_writing
|
||||
#: report:account.print.check.bottom:0
|
||||
#: report:account.print.check.middle:0
|
||||
#: report:account.print.check.top:0
|
||||
msgid "Discount"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_check_writing
|
||||
#: report:account.print.check.bottom:0
|
||||
#: report:account.print.check.middle:0
|
||||
#: report:account.print.check.top:0
|
||||
msgid "Original Amount"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_check_writing
|
||||
#: view:res.company:0
|
||||
msgid "Configuration"
|
||||
msgstr "Konfiguracja"
|
||||
|
||||
#. module: account_check_writing
|
||||
#: field:account.voucher,allow_check:0
|
||||
msgid "Allow Check Writing"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_check_writing
|
||||
#: report:account.print.check.bottom:0
|
||||
#: report:account.print.check.middle:0
|
||||
#: report:account.print.check.top:0
|
||||
msgid "Payment"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_check_writing
|
||||
#: field:account.journal,use_preprint_check:0
|
||||
msgid "Use Preprinted Check"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_check_writing
|
||||
#: sql_constraint:res.company:0
|
||||
msgid "The company name must be unique !"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_check_writing
|
||||
#: report:account.print.check.bottom:0
|
||||
#: report:account.print.check.middle:0
|
||||
#: report:account.print.check.top:0
|
||||
msgid "Due Date"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_check_writing
|
||||
#: model:ir.model,name:account_check_writing.model_res_company
|
||||
msgid "Companies"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_check_writing
|
||||
#: view:res.company:0
|
||||
msgid "Default Check Layout"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_check_writing
|
||||
#: constraint:account.journal:0
|
||||
msgid ""
|
||||
"Configuration error! The currency chosen should be shared by the default "
|
||||
"accounts too."
|
||||
msgstr ""
|
||||
|
||||
#. module: account_check_writing
|
||||
#: report:account.print.check.bottom:0
|
||||
#: report:account.print.check.middle:0
|
||||
msgid "Balance Due"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_check_writing
|
||||
#: report:account.print.check.bottom:0
|
||||
#: report:account.print.check.middle:0
|
||||
#: report:account.print.check.top:0
|
||||
msgid "Check Amount"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_check_writing
|
||||
#: model:ir.model,name:account_check_writing.model_account_voucher
|
||||
msgid "Accounting Voucher"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_check_writing
|
||||
#: sql_constraint:account.journal:0
|
||||
msgid "The name of the journal must be unique per company !"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_check_writing
|
||||
#: sql_constraint:account.journal:0
|
||||
msgid "The code of the journal must be unique per company !"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_check_writing
|
||||
#: field:account.voucher,amount_in_word:0
|
||||
msgid "Amount in Word"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_check_writing
|
||||
#: report:account.print.check.top:0
|
||||
msgid "Open Balance"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_check_writing
|
||||
#: field:res.company,check_layout:0
|
||||
msgid "Choose Check layout"
|
||||
msgstr ""
|
||||
|
|
@ -19,11 +19,14 @@
|
|||
#
|
||||
##############################################################################
|
||||
|
||||
import logging
|
||||
import time
|
||||
|
||||
from osv import osv, fields
|
||||
import netsvc
|
||||
|
||||
_logger = logging.getLogger(__name__)
|
||||
|
||||
class payment_mode(osv.osv):
|
||||
_name= 'payment.mode'
|
||||
_description= 'Payment Mode'
|
||||
|
|
@ -70,9 +73,7 @@ class payment_order(osv.osv):
|
|||
|
||||
#dead code
|
||||
def get_wizard(self, type):
|
||||
logger = netsvc.Logger()
|
||||
logger.notifyChannel("Warning!", netsvc.LOG_WARNING,
|
||||
"No wizard is found for the payment type '%s'." % type)
|
||||
_logger.warning("No wizard found for the payment type '%s'.", type)
|
||||
return None
|
||||
|
||||
def _total(self, cursor, user, ids, name, args, context=None):
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@
|
|||
<button name="proforma_voucher" string="Validate" states="draft" class="oe_highlight"/>
|
||||
<button name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}" class="oe_highlight"/>
|
||||
<button name="cancel_voucher" string="Cancel" states="draft,proforma" />
|
||||
<button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to confirm this record ?"/>
|
||||
<button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure you want to cancel this receipt?"/>
|
||||
<button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
|
||||
<field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
|
||||
</header>
|
||||
|
|
@ -209,7 +209,7 @@
|
|||
<button name="proforma_voucher" string="Validate" states="draft" class="oe_highlight"/>
|
||||
<button name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}" class="oe_highlight"/>
|
||||
<button name="cancel_voucher" string="Cancel" states="draft,proforma" />
|
||||
<button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to confirm this record ?"/>
|
||||
<button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure you want to cancel this receipt?"/>
|
||||
<button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
|
||||
<field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
|
||||
</header>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,112 @@
|
|||
# Polish translation for openobject-addons
|
||||
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
|
||||
# This file is distributed under the same license as the openobject-addons package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
|
||||
"PO-Revision-Date: 2012-10-25 17:11+0000\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: Polish <pl@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2012-10-26 04:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16194)\n"
|
||||
|
||||
#. #-#-#-#-# auth_openid.pot (OpenERP Server 6.1rc1) #-#-#-#-#
|
||||
#. module: auth_openid
|
||||
#. #-#-#-#-# auth_openid.pot.web (PROJECT VERSION) #-#-#-#-#
|
||||
#. openerp-web
|
||||
#: view:res.users:0
|
||||
#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:12
|
||||
msgid "OpenID"
|
||||
msgstr ""
|
||||
|
||||
#. #-#-#-#-# auth_openid.pot (OpenERP Server 6.1rc1) #-#-#-#-#
|
||||
#. module: auth_openid
|
||||
#. #-#-#-#-# auth_openid.pot.web (PROJECT VERSION) #-#-#-#-#
|
||||
#. openerp-web
|
||||
#: field:res.users,openid_url:0
|
||||
#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:47
|
||||
msgid "OpenID URL"
|
||||
msgstr ""
|
||||
|
||||
#. module: auth_openid
|
||||
#: help:res.users,openid_email:0
|
||||
msgid "Used for disambiguation in case of a shared OpenID URL"
|
||||
msgstr ""
|
||||
|
||||
#. module: auth_openid
|
||||
#: sql_constraint:res.users:0
|
||||
msgid "You can not have two users with the same login !"
|
||||
msgstr ""
|
||||
|
||||
#. module: auth_openid
|
||||
#: field:res.users,openid_email:0
|
||||
msgid "OpenID Email"
|
||||
msgstr ""
|
||||
|
||||
#. module: auth_openid
|
||||
#: constraint:res.users:0
|
||||
msgid "The chosen company is not in the allowed companies for this user"
|
||||
msgstr ""
|
||||
|
||||
#. module: auth_openid
|
||||
#: field:res.users,openid_key:0
|
||||
msgid "OpenID Key"
|
||||
msgstr ""
|
||||
|
||||
#. module: auth_openid
|
||||
#: model:ir.model,name:auth_openid.model_res_users
|
||||
msgid "res.users"
|
||||
msgstr ""
|
||||
|
||||
#. openerp-web
|
||||
#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:8
|
||||
msgid "Password"
|
||||
msgstr "Hasło"
|
||||
|
||||
#. openerp-web
|
||||
#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:9
|
||||
#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:10
|
||||
msgid "Google"
|
||||
msgstr "Google"
|
||||
|
||||
#. openerp-web
|
||||
#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:10
|
||||
msgid "Google Apps"
|
||||
msgstr ""
|
||||
|
||||
#. openerp-web
|
||||
#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:11
|
||||
msgid "Launchpad"
|
||||
msgstr "Launchpad"
|
||||
|
||||
#. openerp-web
|
||||
#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:20
|
||||
msgid "Google Apps Domain:"
|
||||
msgstr ""
|
||||
|
||||
#. openerp-web
|
||||
#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:24
|
||||
msgid "Username:"
|
||||
msgstr ""
|
||||
|
||||
#. openerp-web
|
||||
#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:28
|
||||
msgid "OpenID URL:"
|
||||
msgstr ""
|
||||
|
||||
#. openerp-web
|
||||
#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:35
|
||||
msgid "Google Apps Domain"
|
||||
msgstr ""
|
||||
|
||||
#. openerp-web
|
||||
#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:41
|
||||
msgid "Username"
|
||||
msgstr ""
|
||||
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
|
||||
"PO-Revision-Date: 2012-05-10 17:50+0000\n"
|
||||
"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
|
||||
"PO-Revision-Date: 2012-10-25 16:32+0000\n"
|
||||
"Last-Translator: ccdos <Unknown>\n"
|
||||
"Language-Team: Chinese (Simplified) <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: 2012-10-19 05:35+0000\n"
|
||||
"X-Generator: Launchpad (build 16165)\n"
|
||||
"X-Launchpad-Export-Date: 2012-10-26 04:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16194)\n"
|
||||
|
||||
#. module: base_action_rule
|
||||
#: help:base.action.rule,act_mail_to_user:0
|
||||
|
|
@ -315,7 +315,7 @@ msgstr "激活"
|
|||
#: code:addons/base_action_rule/base_action_rule.py:329
|
||||
#, python-format
|
||||
msgid "No Email ID Found for your Company address!"
|
||||
msgstr ""
|
||||
msgstr "公司地址中没有设置Email !"
|
||||
|
||||
#. module: base_action_rule
|
||||
#: field:base.action.rule,act_remind_user:0
|
||||
|
|
|
|||
|
|
@ -170,12 +170,7 @@
|
|||
</group>
|
||||
</group>
|
||||
</page>
|
||||
<!--
|
||||
Temporarily removing invitation feature as the implementation
|
||||
was not clean. Invitation should be trigerred automatically
|
||||
based on partner_ids.
|
||||
-->
|
||||
<page string="Invitations">
|
||||
<page string="Invitations" groups="base.group_no_one">
|
||||
<field name="attendee_ids" widget="one2many" mode="tree">
|
||||
<tree string="Invitation details" editable="top">
|
||||
<field name="partner_id"/>
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@
|
|||
</div>
|
||||
<div class="oe_title">
|
||||
<div class="oe_edit_only">
|
||||
<label for="name" string="Title"/>
|
||||
<label for="name"/>
|
||||
</div>
|
||||
<h1><field name="name" required="1"/></h1>
|
||||
<div class="oe_edit_only">
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
|
||||
"PO-Revision-Date: 2012-03-22 16:17+0000\n"
|
||||
"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
|
||||
"PO-Revision-Date: 2012-10-25 16:22+0000\n"
|
||||
"Last-Translator: fenshuajiang <openerp@126.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: 2012-08-28 06:06+0000\n"
|
||||
"X-Generator: Launchpad (build 15864)\n"
|
||||
"X-Launchpad-Export-Date: 2012-10-26 04:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16194)\n"
|
||||
|
||||
#. module: crm
|
||||
#: view:crm.lead.report:0
|
||||
|
|
@ -172,7 +172,7 @@ msgstr "预计结束月份"
|
|||
#. module: crm
|
||||
#: view:crm.lead2opportunity.partner.mass:0
|
||||
msgid "Assigned Opportunities to"
|
||||
msgstr ""
|
||||
msgstr "分配商机给"
|
||||
|
||||
#. module: crm
|
||||
#: view:crm.lead:0 field:crm.lead,partner_id:0 view:crm.lead.report:0
|
||||
|
|
@ -583,7 +583,7 @@ msgstr "结束日期"
|
|||
#. module: crm
|
||||
#: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
|
||||
msgid "Schedule/Log a Call"
|
||||
msgstr ""
|
||||
msgstr "计划/记录一个电话"
|
||||
|
||||
#. module: crm
|
||||
#: constraint:base.action.rule:0
|
||||
|
|
@ -763,7 +763,7 @@ msgstr "继续"
|
|||
#. module: crm
|
||||
#: field:crm.segmentation,som_interval:0
|
||||
msgid "Days per Period"
|
||||
msgstr ""
|
||||
msgstr "每阶段的天数"
|
||||
|
||||
#. module: crm
|
||||
#: field:crm.meeting,byday:0
|
||||
|
|
@ -926,7 +926,7 @@ msgstr "开启天数"
|
|||
#. module: crm
|
||||
#: view:crm.meeting:0
|
||||
msgid "Show Time as"
|
||||
msgstr ""
|
||||
msgstr "显示时间为"
|
||||
|
||||
#. module: crm
|
||||
#: view:crm.phonecall2partner:0
|
||||
|
|
@ -1299,7 +1299,7 @@ msgstr "写日期"
|
|||
#. module: crm
|
||||
#: view:crm.meeting:0
|
||||
msgid "End of Recurrency"
|
||||
msgstr ""
|
||||
msgstr "结束循环"
|
||||
|
||||
#. module: crm
|
||||
#: view:crm.meeting:0
|
||||
|
|
@ -1835,7 +1835,7 @@ msgstr "回复到"
|
|||
#. module: crm
|
||||
#: view:crm.case.section:0
|
||||
msgid "Select Stages for this Sales Team"
|
||||
msgstr ""
|
||||
msgstr "为这个销售团队选择阶段"
|
||||
|
||||
#. module: crm
|
||||
#: view:board.board:0
|
||||
|
|
@ -2683,7 +2683,7 @@ msgstr "这联系的邮件地址"
|
|||
#. module: crm
|
||||
#: field:crm.lead,referred:0
|
||||
msgid "Referred by"
|
||||
msgstr ""
|
||||
msgstr "推荐人"
|
||||
|
||||
#. module: crm
|
||||
#: view:crm.lead:0 model:ir.model,name:crm.model_crm_add_note
|
||||
|
|
|
|||
|
|
@ -0,0 +1,49 @@
|
|||
# Polish translation for openobject-addons
|
||||
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
|
||||
# This file is distributed under the same license as the openobject-addons package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
|
||||
"PO-Revision-Date: 2012-10-25 16:50+0000\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: Polish <pl@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2012-10-26 04:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16194)\n"
|
||||
|
||||
#. module: decimal_precision
|
||||
#: field:decimal.precision,digits:0
|
||||
msgid "Digits"
|
||||
msgstr "Cyfry"
|
||||
|
||||
#. module: decimal_precision
|
||||
#: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form
|
||||
#: model:ir.ui.menu,name:decimal_precision.menu_decimal_precision_form
|
||||
msgid "Decimal Accuracy"
|
||||
msgstr ""
|
||||
|
||||
#. module: decimal_precision
|
||||
#: field:decimal.precision,name:0
|
||||
msgid "Usage"
|
||||
msgstr "Użycie"
|
||||
|
||||
#. module: decimal_precision
|
||||
#: sql_constraint:decimal.precision:0
|
||||
msgid "Only one value can be defined for each given usage!"
|
||||
msgstr ""
|
||||
|
||||
#. module: decimal_precision
|
||||
#: view:decimal.precision:0
|
||||
msgid "Decimal Precision"
|
||||
msgstr ""
|
||||
|
||||
#. module: decimal_precision
|
||||
#: model:ir.model,name:decimal_precision.model_decimal_precision
|
||||
msgid "decimal.precision"
|
||||
msgstr ""
|
||||
|
|
@ -103,7 +103,7 @@ class DocIndex(indexer):
|
|||
return _to_unicode(data)
|
||||
except OSError:
|
||||
|
||||
_logger.warn("Failed attempt to execute antiword (MS Word reader). Antiword is necessary to index the file %s of MIME type %s. Detailed error available at DEBUG level.", fname, self._getMimeTypes()[0])
|
||||
_logger.warning("Failed attempt to execute antiword (MS Word reader). Antiword is necessary to index the file %s of MIME type %s. Detailed error available at DEBUG level.", fname, self._getMimeTypes()[0])
|
||||
_logger.debug("Trace of the failed file indexing attempt.", exc_info=True)
|
||||
return False
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ _logger = logging.getLogger(__name__)
|
|||
try:
|
||||
import controllers
|
||||
except ImportError:
|
||||
_logger.warn(
|
||||
_logger.warning(
|
||||
"""Could not load openerp-web section of EDI, EDI will not behave correctly
|
||||
|
||||
To fix, launch openerp-web in embedded mode""")
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ class hr_job(osv.osv):
|
|||
'requirements': fields.text('Requirements'),
|
||||
'department_id': fields.many2one('hr.department', 'Department'),
|
||||
'company_id': fields.many2one('res.company', 'Company'),
|
||||
'state': fields.selection([('open', 'In Position'), ('recruit', 'In Recruitement')], 'Status', readonly=True, required=True,
|
||||
'state': fields.selection([('open', 'No Recruitment'), ('recruit', 'Recruitement in Progress')], 'Status', readonly=True, required=True,
|
||||
help="By default 'In position', set it to 'In Recruitment' if recruitment process is going on for this job position."),
|
||||
}
|
||||
_defaults = {
|
||||
|
|
|
|||
|
|
@ -330,8 +330,8 @@
|
|||
<field name="arch" type="xml">
|
||||
<form string="Job" version="7.0">
|
||||
<header>
|
||||
<button name="job_recruitement" string="In Recruitement" states="open" type="object" class="oe_highlight" groups="base.group_user"/>
|
||||
<button name="job_open" string="Recruitment Done" states="recruit" type="object" class="oe_highlight" groups="base.group_user"/>
|
||||
<button name="job_recruitement" string="Launch Recruitement" states="open" type="object" class="oe_highlight" groups="base.group_user"/>
|
||||
<button name="job_open" string="Stop Recruitment" states="recruit" type="object" class="oe_highlight" groups="base.group_user"/>
|
||||
<field name="state" widget="statusbar" statusbar_visible="recruit,open"/>
|
||||
</header>
|
||||
<sheet>
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
|
||||
"PO-Revision-Date: 2012-08-18 17:32+0000\n"
|
||||
"Last-Translator: Heling Yao <Unknown>\n"
|
||||
"PO-Revision-Date: 2012-10-25 16:29+0000\n"
|
||||
"Last-Translator: fenshuajiang <openerp@126.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: 2012-10-19 05:21+0000\n"
|
||||
"X-Generator: Launchpad (build 16165)\n"
|
||||
"X-Launchpad-Export-Date: 2012-10-26 04:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16194)\n"
|
||||
|
||||
#. module: hr
|
||||
#: model:process.node,name:hr.process_node_openerpuser0
|
||||
|
|
@ -181,7 +181,7 @@ msgstr "女性"
|
|||
#: help:hr.job,expected_employees:0
|
||||
msgid ""
|
||||
"Expected number of employees for this job position after new recruitment."
|
||||
msgstr ""
|
||||
msgstr "新的招聘后这个工作岗位上期望的员工人数"
|
||||
|
||||
#. module: hr
|
||||
#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
|
||||
|
|
@ -685,7 +685,7 @@ msgstr "下属"
|
|||
#. module: hr
|
||||
#: field:hr.job,no_of_employee:0
|
||||
msgid "Number of employees currently occupying this job position."
|
||||
msgstr ""
|
||||
msgstr "这个工作岗位上现有的员工人数"
|
||||
|
||||
#. module: hr
|
||||
#: field:hr.job,no_of_recruitment:0
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
|
||||
"PO-Revision-Date: 2012-05-10 17:47+0000\n"
|
||||
"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
|
||||
"PO-Revision-Date: 2012-10-25 17:16+0000\n"
|
||||
"Last-Translator: ccdos <Unknown>\n"
|
||||
"Language-Team: Chinese (Simplified) <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: 2012-10-19 05:27+0000\n"
|
||||
"X-Generator: Launchpad (build 16165)\n"
|
||||
"X-Launchpad-Export-Date: 2012-10-26 04:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16194)\n"
|
||||
|
||||
#. module: hr_evaluation
|
||||
#: help:hr_evaluation.plan.phase,send_anonymous_manager:0
|
||||
|
|
@ -304,7 +304,7 @@ msgstr "上个月完成的评估"
|
|||
#. module: hr_evaluation
|
||||
#: model:ir.model,name:hr_evaluation.model_mail_compose_message
|
||||
msgid "Email composition wizard"
|
||||
msgstr ""
|
||||
msgstr "电子邮件撰写向导"
|
||||
|
||||
#. module: hr_evaluation
|
||||
#: view:hr.evaluation.report:0
|
||||
|
|
|
|||
|
|
@ -64,15 +64,15 @@ class hr_expense_expense(osv.osv):
|
|||
_description = "Expense"
|
||||
_order = "id desc"
|
||||
_columns = {
|
||||
'name': fields.char('Description', size=128, required=True),
|
||||
'name': fields.char('Description', size=128),
|
||||
'id': fields.integer('Sheet ID', readonly=True),
|
||||
'date': fields.date('Date', select=True),
|
||||
'journal_id': fields.many2one('account.journal', 'Force Journal', help = "The journal used when the expense is done."),
|
||||
'employee_id': fields.many2one('hr.employee', "Employee", required=True),
|
||||
'user_id': fields.many2one('res.users', 'User', required=True),
|
||||
'date_confirm': fields.date('Confirmation Date', select=True, help = "Date of the confirmation of the sheet expense. It's filled when the button Confirm is pressed."),
|
||||
'date_valid': fields.date('Validation Date', select=True, help = "Date of the acceptation of the sheet expense. It's filled when the button Accept is pressed."),
|
||||
'user_valid': fields.many2one('res.users', 'Validation User'),
|
||||
'date_confirm': fields.date('Confirmation Date', select=True, help="Date of the confirmation of the sheet expense. It's filled when the button Confirm is pressed."),
|
||||
'date_valid': fields.date('Validation Date', select=True, help="Date of the acceptation of the sheet expense. It's filled when the button Accept is pressed."),
|
||||
'user_valid': fields.many2one('res.users', 'Validation By'),
|
||||
'account_move_id': fields.many2one('account.move', 'Ledger Posting'),
|
||||
'line_ids': fields.one2many('hr.expense.line', 'expense_id', 'Expense Lines', readonly=True, states={'draft':[('readonly',False)]} ),
|
||||
'note': fields.text('Note'),
|
||||
|
|
@ -189,7 +189,7 @@ class hr_expense_expense(osv.osv):
|
|||
raise osv.except_osv(_('Error!'), _('The employee must have a home address.'))
|
||||
acc = exp.employee_id.address_home_id.property_account_payable.id
|
||||
voucher = {
|
||||
'name': exp.name,
|
||||
'name': exp.name or '/',
|
||||
'reference': sequence_obj.get(cr, uid, 'hr.expense.invoice'),
|
||||
'account_id': acc,
|
||||
'type': 'purchase',
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@
|
|||
</group>
|
||||
<group>
|
||||
<field name="name"/>
|
||||
<field name="user_valid"/>
|
||||
<field name="user_valid" attrs="{'invisible': [('state','=','draft')]}"/>
|
||||
<field name="currency_id" groups="base.group_multi_currency" on_change="onchange_currency_id(currency_id, company_id)"/>
|
||||
</group>
|
||||
</group>
|
||||
|
|
@ -128,9 +128,9 @@
|
|||
</group>
|
||||
</group>
|
||||
</page>
|
||||
<page string="Other Info">
|
||||
<page string="Accounting" groups="account.group_account_user">
|
||||
<group>
|
||||
<group string="Accounting Data" groups="account.group_account_user">
|
||||
<group string="Accounting Data">
|
||||
<field name="journal_id" widget="selection" domain="[('type', '=', 'purchase')]"/>
|
||||
<field name="voucher_id" context="{'form_view_ref': 'account_voucher.view_purchase_receipt_form'}"/>
|
||||
</group>
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@
|
|||
<form string="Jobs - Recruitment Form" version="7.0">
|
||||
<header>
|
||||
<button name="case_close_with_emp" string="Hire" type="object"
|
||||
states="draft,open,pending" class="oe_highlight"/>
|
||||
states="draft,open,pending,done" class="oe_highlight"/>
|
||||
<button name="case_cancel" string="Refuse" type="object"
|
||||
states="draft,open,pending" class="oe_highlight"/>
|
||||
<field name="stage_id" widget="statusbar" clickable="True"/>
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
|
||||
"PO-Revision-Date: 2012-05-10 18:19+0000\n"
|
||||
"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
|
||||
"PO-Revision-Date: 2012-10-25 17:20+0000\n"
|
||||
"Last-Translator: ccdos <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: 2012-10-19 05:15+0000\n"
|
||||
"X-Generator: Launchpad (build 16165)\n"
|
||||
"X-Launchpad-Export-Date: 2012-10-26 04:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16194)\n"
|
||||
|
||||
#. module: hr_timesheet
|
||||
#: code:addons/hr_timesheet/report/user_timesheet.py:43
|
||||
|
|
@ -468,7 +468,7 @@ msgstr "一般信息"
|
|||
#. module: hr_timesheet
|
||||
#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
|
||||
msgid "My Current Timesheet"
|
||||
msgstr ""
|
||||
msgstr "我当前的时间表"
|
||||
|
||||
#. module: hr_timesheet
|
||||
#: code:addons/hr_timesheet/report/user_timesheet.py:40
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2012-02-08 00:49+0000\n"
|
||||
"PO-Revision-Date: 2012-02-13 09:52+0000\n"
|
||||
"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
|
||||
"PO-Revision-Date: 2012-10-25 17:08+0000\n"
|
||||
"Last-Translator: ccdos <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: 2012-10-19 05:06+0000\n"
|
||||
"X-Generator: Launchpad (build 16165)\n"
|
||||
"X-Launchpad-Export-Date: 2012-10-26 04:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16194)\n"
|
||||
|
||||
#. module: mrp
|
||||
#: view:mrp.routing.workcenter:0
|
||||
|
|
@ -89,7 +89,7 @@ msgstr "单位成本"
|
|||
#. module: mrp
|
||||
#: view:mrp.production:0
|
||||
msgid "Scrap Products"
|
||||
msgstr "原料消耗"
|
||||
msgstr "报废原料"
|
||||
|
||||
#. module: mrp
|
||||
#: model:ir.actions.act_window,name:mrp.mrp_routing_action
|
||||
|
|
@ -135,7 +135,7 @@ msgstr "生产订单编号"
|
|||
#. module: mrp
|
||||
#: view:mrp.production:0
|
||||
msgid "Finished Products"
|
||||
msgstr "已完工数量"
|
||||
msgstr "产成品"
|
||||
|
||||
#. module: mrp
|
||||
#: view:mrp.production:0
|
||||
|
|
@ -209,7 +209,7 @@ msgstr "输入一个费用产品用于跟踪辅助核算会计中的成本"
|
|||
#. module: mrp
|
||||
#: model:process.node,note:mrp.process_node_purchaseprocure0
|
||||
msgid "For purchased material"
|
||||
msgstr "用于采购原料"
|
||||
msgstr "用于外购的物料"
|
||||
|
||||
#. module: mrp
|
||||
#: model:ir.actions.act_window,help:mrp.product_form_config_action
|
||||
|
|
@ -1288,7 +1288,7 @@ msgstr "如果产品的供应方法是外购，系统创建采购订单。"
|
|||
#. module: mrp
|
||||
#: model:ir.model,name:mrp.model_procurement_order
|
||||
msgid "Procurement"
|
||||
msgstr "需求单"
|
||||
msgstr "需求"
|
||||
|
||||
#. module: mrp
|
||||
#: model:ir.actions.act_window,name:mrp.action_view_mrp_product_price_wizard
|
||||
|
|
|
|||
|
|
@ -620,10 +620,10 @@
|
|||
<form string="Manufacturing Orders" version="7.0">
|
||||
<header>
|
||||
<button name="button_confirm" states="draft" string="Confirm Production" class="oe_highlight"/>
|
||||
<button name="button_produce" states="ready" string="Start Production" class="oe_highlight"/>
|
||||
<button name="%(act_mrp_product_produce)d" states="in_production" string="Produce" type="action" class="oe_highlight"/>
|
||||
<button name="force_production" states="confirmed" string="Force Reservation" type="object" class="oe_highlight"/>
|
||||
<button name="%(act_mrp_product_produce)d" states="confirmed,ready,in_production" string="Produce" type="action" class="oe_highlight"/>
|
||||
<button name="force_production" states="confirmed" string="Force Reservation" type="object"/>
|
||||
<button name="force_production" states="picking_except" string="Force Reservation" type="object"/>
|
||||
<button name="button_produce" states="confirmed,ready" string="Mark as Started"/>
|
||||
<button name="button_recreate" states="picking_except" string="Recreate Picking"/>
|
||||
<button name="button_cancel" states="draft,ready,in_production,picking_except" string="Cancel"/>
|
||||
<button name="action_cancel" type="object" states="confirmed" string="Cancel"/>
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
|
||||
"PO-Revision-Date: 2012-05-10 17:43+0000\n"
|
||||
"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
|
||||
"PO-Revision-Date: 2012-10-25 16:34+0000\n"
|
||||
"Last-Translator: ccdos <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: 2012-10-19 05:25+0000\n"
|
||||
"X-Generator: Launchpad (build 16165)\n"
|
||||
"X-Launchpad-Export-Date: 2012-10-26 04:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16194)\n"
|
||||
|
||||
#. module: mrp_repair
|
||||
#: view:mrp.repair:0
|
||||
|
|
@ -178,7 +178,7 @@ msgstr "警告！"
|
|||
#. module: mrp_repair
|
||||
#: report:repair.order:0
|
||||
msgid "Tax"
|
||||
msgstr ""
|
||||
msgstr "税"
|
||||
|
||||
#. module: mrp_repair
|
||||
#: view:mrp.repair:0
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ class pad_common(osv.osv_memory):
|
|||
def copy(self, cr, uid, id, default=None, context=None):
|
||||
if not default:
|
||||
default = {}
|
||||
for k,v in self._all_columns:
|
||||
for k, v in self._all_columns.iteritems():
|
||||
field = v.column
|
||||
if hasattr(field,'pad_content_field'):
|
||||
pad = self.pad_generate_url(cr, uid, context)
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ class project_work(osv.osv):
|
|||
if not context.get('no_analytic_entry',False):
|
||||
task_obj = task_obj.browse(cr, uid, vals['task_id'])
|
||||
result = self.get_user_related_details(cr, uid, vals.get('user_id', uid))
|
||||
vals_line['name'] = '%s: %s' % (tools.ustr(task_obj.name), tools.ustr(vals['name']) or '/')
|
||||
vals_line['name'] = '%s: %s' % (tools.ustr(task_obj.name), tools.ustr(vals['name'] or '/'))
|
||||
vals_line['user_id'] = vals['user_id']
|
||||
vals_line['product_id'] = result['product_id']
|
||||
vals_line['date'] = vals['date'][:10]
|
||||
|
|
@ -172,7 +172,7 @@ class project_work(osv.osv):
|
|||
|
||||
vals_line = {}
|
||||
if 'name' in vals:
|
||||
vals_line['name'] = '%s: %s' % (tools.ustr(task.task_id.name), tools.ustr(vals['name']) or '/')
|
||||
vals_line['name'] = '%s: %s' % (tools.ustr(task.task_id.name), tools.ustr(vals['name'] or '/'))
|
||||
if 'user_id' in vals:
|
||||
vals_line['user_id'] = vals['user_id']
|
||||
if 'date' in vals:
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
|
||||
"PO-Revision-Date: 2012-08-27 16:58+0000\n"
|
||||
"PO-Revision-Date: 2012-10-25 17:44+0000\n"
|
||||
"Last-Translator: ccdos <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: 2012-10-19 05:08+0000\n"
|
||||
"X-Generator: Launchpad (build 16165)\n"
|
||||
"X-Launchpad-Export-Date: 2012-10-26 04:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16194)\n"
|
||||
|
||||
#. module: purchase
|
||||
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
|
||||
|
|
@ -746,7 +746,7 @@ msgstr "询价单"
|
|||
#: code:addons/purchase/edi/purchase_order.py:139
|
||||
#, python-format
|
||||
msgid "EDI Pricelist (%s)"
|
||||
msgstr ""
|
||||
msgstr "EDI 价格表 (%s)"
|
||||
|
||||
#. module: purchase
|
||||
#: selection:purchase.order,state:0
|
||||
|
|
@ -1141,7 +1141,7 @@ msgstr "计算"
|
|||
#. module: purchase
|
||||
#: view:stock.picking:0
|
||||
msgid "Incoming Shipments Available"
|
||||
msgstr ""
|
||||
msgstr "可用的入库"
|
||||
|
||||
#. module: purchase
|
||||
#: model:ir.ui.menu,name:purchase.menu_purchase_partner_cat
|
||||
|
|
|
|||
|
|
@ -152,9 +152,10 @@ class purchase_order(osv.osv):
|
|||
_columns = {
|
||||
'name': fields.char('Order Reference', size=64, required=True, select=True, help="Unique number of the purchase order, computed automatically when the purchase order is created."),
|
||||
'origin': fields.char('Source Document', size=64,
|
||||
help="Reference of the document that generated this purchase order request."
|
||||
help="Reference of the document that generated this purchase order request; a sale order or an internal procurement request."
|
||||
),
|
||||
'partner_ref': fields.char('Supplier Reference', states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, size=64),
|
||||
'partner_ref': fields.char('Supplier Reference', states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, size=64,
|
||||
help="Reference of the sale order or quotation sent by your supplier. It's mainly used to do the matching when you receive the products as this reference is usually written on the delivery order sent by your supplier."),
|
||||
'date_order':fields.date('Order Date', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, select=True, help="Date on which this document has been created."),
|
||||
'date_approve':fields.date('Date Approved', readonly=1, select=True, help="Date on which purchase order has been approved"),
|
||||
'partner_id':fields.many2one('res.partner', 'Supplier', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, change_default=True),
|
||||
|
|
@ -889,10 +890,10 @@ class purchase_order_line(osv.osv):
|
|||
account_tax = self.pool.get('account.tax')
|
||||
|
||||
# - check for the presence of partner_id and pricelist_id
|
||||
if not pricelist_id:
|
||||
raise osv.except_osv(_('No Pricelist !'), _('Select a price list for a supplier in the purchase form to choose a product.'))
|
||||
if not partner_id:
|
||||
raise osv.except_osv(_('No Partner!'), _('Select a partner in purchase order to choose a product.'))
|
||||
if not pricelist_id:
|
||||
raise osv.except_osv(_('No Pricelist !'), _('Select a price list in the purchase order form before choosing a product.'))
|
||||
|
||||
# - determine name and notes based on product in partner lang.
|
||||
lang = res_partner.browse(cr, uid, partner_id).lang
|
||||
|
|
|
|||
|
|
@ -198,7 +198,7 @@
|
|||
<field name="arch" type="xml">
|
||||
<form string="Purchase Order" version="7.0">
|
||||
<header>
|
||||
<button name="wkf_send_rfq" states="draft" string="Send RFQ" type="object" context="{'send_rfq':True}" class="oe_highlight"/>
|
||||
<button name="wkf_send_rfq" states="draft" string="Send Request for Quotation" type="object" context="{'send_rfq':True}" class="oe_highlight"/>
|
||||
<button name="purchase_confirm" states="draft" string="Confirm Order"/>
|
||||
<button name="purchase_confirm" states="sent" string="Confirm Order" class="oe_highlight"/>
|
||||
<button name="wkf_send_rfq" states="confirmed" string="Resend Purchase Order" type="object" class="oe_highlight"/>
|
||||
|
|
@ -262,7 +262,7 @@
|
|||
</group>
|
||||
<div class="oe_clear"/>
|
||||
<label for="notes"/>
|
||||
<field name="notes"/>
|
||||
<field name="notes" class="oe_inline"/>
|
||||
</page>
|
||||
<page string="Incoming Shipments & Invoices">
|
||||
<group>
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2012-02-08 00:37+0000\n"
|
||||
"PO-Revision-Date: 2011-07-12 17:47+0000\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"PO-Revision-Date: 2012-10-25 17:31+0000\n"
|
||||
"Last-Translator: ccdos <Unknown>\n"
|
||||
"Language-Team: Chinese (Simplified) <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: 2012-10-19 05:37+0000\n"
|
||||
"X-Generator: Launchpad (build 16165)\n"
|
||||
"X-Launchpad-Export-Date: 2012-10-26 04:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16194)\n"
|
||||
|
||||
#. module: purchase_double_validation
|
||||
#: view:purchase.double.validation.installer:0
|
||||
|
|
@ -30,7 +30,7 @@ msgstr "定义限定金额后采购需要审核"
|
|||
#. module: purchase_double_validation
|
||||
#: view:purchase.double.validation.installer:0
|
||||
msgid "title"
|
||||
msgstr "标题"
|
||||
msgstr "职位"
|
||||
|
||||
#. module: purchase_double_validation
|
||||
#: field:purchase.double.validation.installer,config_logo:0
|
||||
|
|
@ -47,7 +47,7 @@ msgstr "设置采购的限定金额"
|
|||
#: view:board.board:0
|
||||
#: model:ir.actions.act_window,name:purchase_double_validation.purchase_waiting
|
||||
msgid "Purchase Order Waiting Approval"
|
||||
msgstr ""
|
||||
msgstr "等待审批的采购订单"
|
||||
|
||||
#. module: purchase_double_validation
|
||||
#: view:purchase.double.validation.installer:0
|
||||
|
|
@ -67,7 +67,7 @@ msgstr "purchase.double.validation.installer"
|
|||
#. module: purchase_double_validation
|
||||
#: field:purchase.double.validation.installer,limit_amount:0
|
||||
msgid "Maximum Purchase Amount"
|
||||
msgstr "限定的采购金额"
|
||||
msgstr "最大的采购金额"
|
||||
|
||||
#~ msgid "purchase_double_validation"
|
||||
#~ msgstr "purchase_double_validation"
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2012-02-08 00:37+0000\n"
|
||||
"PO-Revision-Date: 2012-02-15 13:20+0000\n"
|
||||
"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
|
||||
"PO-Revision-Date: 2012-10-25 17:29+0000\n"
|
||||
"Last-Translator: ccdos <Unknown>\n"
|
||||
"Language-Team: Chinese (Simplified) <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: 2012-10-19 05:36+0000\n"
|
||||
"X-Generator: Launchpad (build 16165)\n"
|
||||
"X-Launchpad-Export-Date: 2012-10-26 04:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16194)\n"
|
||||
|
||||
#. module: purchase_requisition
|
||||
#: sql_constraint:purchase.order:0
|
||||
|
|
@ -139,7 +139,7 @@ msgstr "勾选选项，请购生成采购申请而不是直接生成询价单"
|
|||
#: code:addons/purchase_requisition/purchase_requisition.py:136
|
||||
#, python-format
|
||||
msgid "Warning"
|
||||
msgstr ""
|
||||
msgstr "警告"
|
||||
|
||||
#. module: purchase_requisition
|
||||
#: report:purchase.requisition:0
|
||||
|
|
@ -181,7 +181,7 @@ msgstr "重置为草稿"
|
|||
#. module: purchase_requisition
|
||||
#: view:purchase.requisition:0
|
||||
msgid "Current Purchase Requisition"
|
||||
msgstr ""
|
||||
msgstr "当前的采购请求"
|
||||
|
||||
#. module: purchase_requisition
|
||||
#: model:res.groups,name:purchase_requisition.group_purchase_requisition_user
|
||||
|
|
@ -218,7 +218,7 @@ msgstr "数量"
|
|||
#. module: purchase_requisition
|
||||
#: view:purchase.requisition:0
|
||||
msgid "Unassigned Requisition"
|
||||
msgstr ""
|
||||
msgstr "未指派的请购单"
|
||||
|
||||
#. module: purchase_requisition
|
||||
#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
|
||||
|
|
@ -307,7 +307,7 @@ msgstr "请购类型"
|
|||
#. module: purchase_requisition
|
||||
#: view:purchase.requisition:0
|
||||
msgid "New Purchase Requisition"
|
||||
msgstr ""
|
||||
msgstr "新的采购申请"
|
||||
|
||||
#. module: purchase_requisition
|
||||
#: view:purchase.requisition:0
|
||||
|
|
@ -399,7 +399,7 @@ msgstr "采购申请(排它的)"
|
|||
#. module: purchase_requisition
|
||||
#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
|
||||
msgid "Manager"
|
||||
msgstr ""
|
||||
msgstr "主管"
|
||||
|
||||
#. module: purchase_requisition
|
||||
#: constraint:product.product:0
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2012-09-20 07:29+0000\n"
|
||||
"PO-Revision-Date: 2012-06-11 07:32+0000\n"
|
||||
"Last-Translator: openerp-china.black-jack <onetimespeed@gmail.com>\n"
|
||||
"PO-Revision-Date: 2012-10-25 17:36+0000\n"
|
||||
"Last-Translator: ccdos <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: 2012-10-19 05:13+0000\n"
|
||||
"X-Generator: Launchpad (build 16165)\n"
|
||||
"X-Launchpad-Export-Date: 2012-10-26 04:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16194)\n"
|
||||
|
||||
#. module: sale
|
||||
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
|
||||
|
|
@ -203,7 +203,7 @@ msgstr ""
|
|||
#. module: sale
|
||||
#: view:sale.config.settings:0
|
||||
msgid "Contract Feature"
|
||||
msgstr ""
|
||||
msgstr "合同特性"
|
||||
|
||||
#. module: sale
|
||||
#: field:sale.report,state:0
|
||||
|
|
@ -233,7 +233,7 @@ msgstr "待开票"
|
|||
#: view:sale.order.line:0
|
||||
#: field:sale.report,product_uom:0
|
||||
msgid "Unit of Measure"
|
||||
msgstr ""
|
||||
msgstr "计量单位"
|
||||
|
||||
#. module: sale
|
||||
#: help:sale.order,date_confirm:0
|
||||
|
|
@ -257,12 +257,12 @@ msgstr "3月"
|
|||
#: code:addons/sale/sale.py:558
|
||||
#, python-format
|
||||
msgid "First cancel all invoices attached to this sales order."
|
||||
msgstr ""
|
||||
msgstr "首先取消所有关联这个销售订单的发票。"
|
||||
|
||||
#. module: sale
|
||||
#: selection:sale.advance.payment.inv,advance_payment_method:0
|
||||
msgid "Invoice the whole sale order"
|
||||
msgstr ""
|
||||
msgstr "为整个销售单开票"
|
||||
|
||||
#. module: sale
|
||||
#: field:sale.order,project_id:0
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2012-09-20 07:32+0000\n"
|
||||
"PO-Revision-Date: 2012-09-21 14:19+0000\n"
|
||||
"Last-Translator: openerp-china.black-jack <onetimespeed@gmail.com>\n"
|
||||
"PO-Revision-Date: 2012-10-25 17:47+0000\n"
|
||||
"Last-Translator: ccdos <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: 2012-10-19 05:39+0000\n"
|
||||
"X-Generator: Launchpad (build 16165)\n"
|
||||
"X-Launchpad-Export-Date: 2012-10-26 04:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16194)\n"
|
||||
|
||||
#. module: sale_stock
|
||||
#: help:sale.config.settings,group_invoice_deli_orders:0
|
||||
|
|
@ -118,7 +118,7 @@ msgstr "对每个销售订单明细，将会创建对应的采购订单来供应
|
|||
#: code:addons/sale_stock/sale_stock.py:678
|
||||
#, python-format
|
||||
msgid "Error!"
|
||||
msgstr ""
|
||||
msgstr "错误！"
|
||||
|
||||
#. module: sale_stock
|
||||
#: field:sale.order,picking_policy:0
|
||||
|
|
@ -146,12 +146,12 @@ msgstr "库存调拨"
|
|||
#: code:addons/sale_stock/sale_stock.py:164
|
||||
#, python-format
|
||||
msgid "Invalid Action!"
|
||||
msgstr ""
|
||||
msgstr "非法的动作"
|
||||
|
||||
#. module: sale_stock
|
||||
#: field:sale.config.settings,module_project_timesheet:0
|
||||
msgid "Project Timesheet"
|
||||
msgstr ""
|
||||
msgstr "项目时间表"
|
||||
|
||||
#. module: sale_stock
|
||||
#: help:sale.config.settings,module_delivery:0
|
||||
|
|
@ -166,7 +166,7 @@ msgstr ""
|
|||
#: code:addons/sale_stock/sale_stock.py:647
|
||||
#, python-format
|
||||
msgid "Configuration Error!"
|
||||
msgstr ""
|
||||
msgstr "设置错误!"
|
||||
|
||||
#. module: sale_stock
|
||||
#: model:process.node,name:sale_stock.process_node_saleprocurement0
|
||||
|
|
@ -188,7 +188,7 @@ msgstr "销售订单"
|
|||
#: model:ir.model,name:sale_stock.model_stock_picking_out
|
||||
#: view:sale.order:0
|
||||
msgid "Delivery Orders"
|
||||
msgstr ""
|
||||
msgstr "送货单"
|
||||
|
||||
#. module: sale_stock
|
||||
#: model:ir.model,name:sale_stock.model_sale_order_line
|
||||
|
|
@ -218,7 +218,7 @@ msgstr "错误！您不能创建递归公司."
|
|||
#. module: sale_stock
|
||||
#: field:sale.config.settings,group_invoice_so_lines:0
|
||||
msgid "Generate invoices based on the sale order"
|
||||
msgstr ""
|
||||
msgstr "基于销售单生成发票"
|
||||
|
||||
#. module: sale_stock
|
||||
#: help:res.company,security_lead:0
|
||||
|
|
@ -244,7 +244,7 @@ msgstr "强制指定"
|
|||
#. module: sale_stock
|
||||
#: field:sale.config.settings,default_order_policy:0
|
||||
msgid "The default invoicing method is"
|
||||
msgstr ""
|
||||
msgstr "默认的开票方法"
|
||||
|
||||
#. module: sale_stock
|
||||
#: code:addons/sale_stock/sale_stock.py:233
|
||||
|
|
@ -265,7 +265,7 @@ msgstr "转移给客户的单据"
|
|||
#. module: sale_stock
|
||||
#: view:sale.order:0
|
||||
msgid "View Delivery Order"
|
||||
msgstr ""
|
||||
msgstr "发运单视图"
|
||||
|
||||
#. module: sale_stock
|
||||
#: field:sale.order.line,move_ids:0
|
||||
|
|
@ -275,7 +275,7 @@ msgstr "库存调拨"
|
|||
#. module: sale_stock
|
||||
#: view:sale.config.settings:0
|
||||
msgid "Default Options"
|
||||
msgstr ""
|
||||
msgstr "默认选项"
|
||||
|
||||
#. module: sale_stock
|
||||
#: field:sale.config.settings,module_project_mrp:0
|
||||
|
|
@ -334,7 +334,7 @@ msgstr "需求会在销售订单确认或发票付款后自动生成。它是采
|
|||
#. module: sale_stock
|
||||
#: field:sale.config.settings,group_invoice_deli_orders:0
|
||||
msgid "Generate invoices after and based on delivery orders"
|
||||
msgstr ""
|
||||
msgstr "基于发运单生产发票"
|
||||
|
||||
#. module: sale_stock
|
||||
#: code:addons/sale_stock/sale_stock.py:499
|
||||
|
|
@ -345,7 +345,7 @@ msgstr ""
|
|||
#. module: sale_stock
|
||||
#: field:sale.config.settings,module_delivery:0
|
||||
msgid "Allow adding shipping costs"
|
||||
msgstr ""
|
||||
msgstr "允许追加运输成本"
|
||||
|
||||
#. module: sale_stock
|
||||
#: view:sale.order:0
|
||||
|
|
@ -360,12 +360,12 @@ msgstr "打包装"
|
|||
#. module: sale_stock
|
||||
#: field:sale.config.settings,default_picking_policy:0
|
||||
msgid "Deliver all at once when all products are available."
|
||||
msgstr ""
|
||||
msgstr "当所有商品可用后一次性发运"
|
||||
|
||||
#. module: sale_stock
|
||||
#: model:res.groups,name:sale_stock.group_invoice_deli_orders
|
||||
msgid "Enable Invoicing Delivery orders"
|
||||
msgstr ""
|
||||
msgstr "允许开发运单"
|
||||
|
||||
#. module: sale_stock
|
||||
#: code:addons/sale_stock/sale_stock.py:689
|
||||
|
|
@ -409,12 +409,12 @@ msgstr "属性"
|
|||
#. module: sale_stock
|
||||
#: constraint:stock.move:0
|
||||
msgid "You must assign a serial number for this product."
|
||||
msgstr ""
|
||||
msgstr "你必须为这个产品指定序列号"
|
||||
|
||||
#. module: sale_stock
|
||||
#: field:sale.config.settings,group_mrp_properties:0
|
||||
msgid "Product properties on order lines"
|
||||
msgstr ""
|
||||
msgstr "订单行上面的产品属性"
|
||||
|
||||
#. module: sale_stock
|
||||
#: help:sale.config.settings,default_order_policy:0
|
||||
|
|
@ -425,7 +425,7 @@ msgstr "你可以根据销售订单或送货单生成发票。"
|
|||
#. module: sale_stock
|
||||
#: constraint:stock.move:0
|
||||
msgid "You cannot move products from or to a location of the type view."
|
||||
msgstr ""
|
||||
msgstr "你能移动从（到）这种类型视图的库位"
|
||||
|
||||
#. module: sale_stock
|
||||
#: model:ir.model,name:sale_stock.model_sale_report
|
||||
|
|
@ -452,7 +452,7 @@ msgstr ""
|
|||
#. module: sale_stock
|
||||
#: view:sale.order:0
|
||||
msgid "View Invoice"
|
||||
msgstr ""
|
||||
msgstr "查看发票"
|
||||
|
||||
#. module: sale_stock
|
||||
#: sql_constraint:stock.picking:0
|
||||
|
|
@ -508,7 +508,7 @@ msgstr ""
|
|||
#. module: sale_stock
|
||||
#: selection:sale.config.settings,default_order_policy:0
|
||||
msgid "Invoice based on sales orders"
|
||||
msgstr ""
|
||||
msgstr "基于销售单的发票"
|
||||
|
||||
#. module: sale_stock
|
||||
#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@
|
|||
<field name="product_id"
|
||||
context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
|
||||
groups="base.group_user"
|
||||
on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/>
|
||||
on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/>
|
||||
</field>
|
||||
<field name="product_uom_qty" position="replace">
|
||||
<field context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
|
||||
|
|
|
|||
|
|
@ -425,7 +425,7 @@ class stock_location(osv.osv):
|
|||
# so we ROLLBACK to the SAVEPOINT to restore the transaction to its earlier
|
||||
# state, we return False as if the products were not available, and log it:
|
||||
cr.execute("ROLLBACK TO stock_location_product_reserve")
|
||||
_logger.warn("Failed attempt to reserve %s x product %s, likely due to another transaction already in progress. Next attempt is likely to work. Detailed error available at DEBUG level.", product_qty, product_id)
|
||||
_logger.warning("Failed attempt to reserve %s x product %s, likely due to another transaction already in progress. Next attempt is likely to work. Detailed error available at DEBUG level.", product_qty, product_id)
|
||||
_logger.debug("Trace of the failed product reservation attempt: ", exc_info=True)
|
||||
return False
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue