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

[MERGE]: Merge with latest trunk-addons 

bzr revid: rpa@tinyerp.com-20120704113856-vytxzu1zf6x6mnip
This commit is contained in:
Rucha (Open ERP) 2012-07-04 17:08:56 +05:30
parent cdaecbdf95 7caadacccc
commit 4217b46c0d
61 changed files with 14853 additions and 423 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/account/account_invoice_view.xml
View File

@ -270,7 +270,7 @@
</notebook>
</sheet>
<footer>
<field name="message_ids" widget="ThreadView"/>
<field name="message_ids" widget="mail_thread"/>
</footer>
</form>
</field>
@ -405,7 +405,7 @@
</notebook>
</sheet>
<footer>
<field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
</footer>
</form>
</field>

10387
addons/account/i18n/es_DO.po Normal file
View File

File diff suppressed because it is too large Load Diff

2
addons/account_analytic_analysis/account_analytic_analysis_menu.xml
View File

@ -77,7 +77,7 @@
<menuitem id="base.menu_sales" name="Sales"
parent="base.menu_base_partner"
sequence="1"/>
<menuitem action="action_account_analytic_overdue_all" id="menu_action_account_analytic_overdue_all" sequence="6" parent="base.menu_sales"/>
<menuitem action="action_account_analytic_overdue_all" id="menu_action_account_analytic_overdue_all" sequence="7" parent="base.menu_sales"/>
</data>

81
addons/account_bank_statement_extensions/i18n/sv.po
View File

@ -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:35+0000\n"
"PO-Revision-Date: 2012-04-25 10:49+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"PO-Revision-Date: 2012-07-03 09:17+0000\n"
"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
"Language-Team: Swedish <sv@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-04-26 04:41+0000\n"
"X-Generator: Launchpad (build 15149)\n"
"X-Launchpad-Export-Date: 2012-07-04 04:39+0000\n"
"X-Generator: Launchpad (build 15544)\n"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
@ -42,7 +42,7 @@ msgstr "CODA"
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,parent_id:0
msgid "Parent Code"
msgstr "Förälderns kod"
msgstr "Överliggande kod"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
@ -54,7 +54,7 @@ msgstr "Debet"
#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_cancel_statement_line
#: model:ir.model,name:account_bank_statement_extensions.model_cancel_statement_line
msgid "Cancel selected statement lines"
msgstr ""
msgstr "Avbryt valda utdragsrader"
#. module: account_bank_statement_extensions
#: constraint:res.partner.bank:0
@ -118,6 +118,8 @@ msgid ""
"Delete operation not allowed ! Please go to the associated bank "
"statement in order to delete and/or modify this bank statement line"
msgstr ""
"Radering inte tillåten ! Vänligen använd associerat bankuttdrag för att "
"radera och/eller ändra utdragsrader"
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,type:0
@ -134,27 +136,27 @@ msgstr "Journal"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Confirmed Statement Lines."
msgstr ""
msgstr "Bekräfta utdragsrader"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Credit Transactions."
msgstr ""
msgstr "Kredittransaktioner"
#. module: account_bank_statement_extensions
#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line
msgid "cancel selected statement lines."
msgstr ""
msgstr "avbryt valda utdragsrader."
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line,counterparty_number:0
msgid "Counterparty Number"
msgstr ""
msgstr "Motpartens nummer"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line.global:0
msgid "Transactions"
msgstr ""
msgstr "Transaktioner"
#. module: account_bank_statement_extensions
#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
@ -200,6 +202,9 @@ msgid ""
"Please define BIC/Swift code on bank for bank type IBAN Account to make "
"valid payments"
msgstr ""
"\n"
"Vänligen ange BIC/Swift-kod på bank för banktyp IBAN-konto för korrekta "
"utbetalningar"
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line,val_date:0
@ -214,7 +219,7 @@ msgstr "Bekräfta valda rader från kontoutdraget."
#. module: account_bank_statement_extensions
#: view:cancel.statement.line:0
msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
msgstr ""
msgstr "Är du säker på att du vill avbryta valda bankutdragsrader ?"
#. module: account_bank_statement_extensions
#: report:bank.statement.balance.report:0
@ -234,42 +239,42 @@ msgstr "Anteckningar"
#. module: account_bank_statement_extensions
#: selection:account.bank.statement.line.global,type:0
msgid "Manual"
msgstr ""
msgstr "Manuell"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Credit"
msgstr ""
msgstr "Kredit"
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,amount:0
msgid "Amount"
msgstr ""
msgstr "Belopp"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Fin.Account"
msgstr ""
msgstr "Fin.konto"
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line,counterparty_currency:0
msgid "Counterparty Currency"
msgstr ""
msgstr "Motpartsvaluta"
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line,counterparty_bic:0
msgid "Counterparty BIC"
msgstr ""
msgstr "Motpartens BIC"
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,child_ids:0
msgid "Child Codes"
msgstr ""
msgstr "Barnkoder"
#. module: account_bank_statement_extensions
#: view:confirm.statement.line:0
msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
msgstr ""
msgstr "Är du säker på att du vill bekräfta valda bankutdragsrader?"
#. module: account_bank_statement_extensions
#: constraint:account.bank.statement.line:0
@ -277,6 +282,7 @@ msgid ""
"The amount of the voucher must be the same amount as the one on the "
"statement line"
msgstr ""
"Beloppet på bokföringsordern måste överenstämma med beloppet på kontoutdraget"
#. module: account_bank_statement_extensions
#: help:account.bank.statement.line,globalisation_id:0
@ -284,91 +290,92 @@ msgid ""
"Code to identify transactions belonging to the same globalisation level "
"within a batch payment"
msgstr ""
"Kod för att identifiera transaktioner som tillhör samma batchbetalning"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Draft Statement Lines."
msgstr ""
msgstr "Preleminära utdragsrader."
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Glob. Am."
msgstr ""
msgstr "Glob. Am."
#. module: account_bank_statement_extensions
#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
msgid "Bank Statement Line"
msgstr ""
msgstr "Kontoutdragsrad"
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,code:0
msgid "Code"
msgstr ""
msgstr "Kod"
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line,counterparty_name:0
msgid "Counterparty Name"
msgstr ""
msgstr "Motpartsnamn"
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,name:0
msgid "Communication"
msgstr ""
msgstr "Kommunikation"
#. module: account_bank_statement_extensions
#: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
msgid "Bank Accounts"
msgstr ""
msgstr "Bankkonton"
#. module: account_bank_statement_extensions
#: constraint:account.bank.statement:0
msgid "The journal and period chosen have to belong to the same company."
msgstr ""
msgstr "Journalen och perioden måste tillhöra samma bolag."
#. module: account_bank_statement_extensions
#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
msgid "Bank Statement"
msgstr ""
msgstr "Bankkontoutdrag"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Statement Line"
msgstr ""
msgstr "Utdragsrad"
#. module: account_bank_statement_extensions
#: sql_constraint:account.bank.statement.line.global:0
msgid "The code must be unique !"
msgstr ""
msgstr "Koden måste vara unik !"
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,bank_statement_line_ids:0
#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line
#: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line
msgid "Bank Statement Lines"
msgstr ""
msgstr "Bankutdragsrad"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line.global:0
msgid "Child Batch Payments"
msgstr ""
msgstr "Barnbatchbetalningar"
#. module: account_bank_statement_extensions
#: view:cancel.statement.line:0
#: view:confirm.statement.line:0
msgid "Cancel"
msgstr ""
msgstr "Avbryt"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Statement Lines"
msgstr ""
msgstr "Utdragsrader"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Total Amount"
msgstr ""
msgstr "Totalsumma"
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line,globalisation_id:0
msgid "Globalisation ID"
msgstr ""
msgstr "Globalt ID"

2
addons/account_voucher/account_voucher_view.xml
View File

@ -112,7 +112,7 @@
</notebook>
</sheet>
<footer>
<field name="message_ids" widget="ThreadView"/>
<field name="message_ids" widget="mail_thread"/>
</footer>
</form>
</field>

4
addons/account_voucher/voucher_payment_receipt_view.xml
View File

@ -258,7 +258,7 @@
</notebook>
</sheet>
<footer>
<field name="message_ids" widget="ThreadView"/>
<field name="message_ids" widget="mail_thread"/>
</footer>
</form>
</field>
@ -431,7 +431,7 @@
</notebook>
</sheet>
<footer>
<field name="message_ids" widget="ThreadView"/>
<field name="message_ids" widget="mail_thread"/>
</footer>
</form>
</field>

4
addons/account_voucher/voucher_sales_purchase_view.xml
View File

@ -168,7 +168,7 @@
</notebook>
</sheet>
<footer>
<field name="message_ids" widget="ThreadView"/>
<field name="message_ids" widget="mail_thread"/>
</footer>
</form>
</field>
@ -321,7 +321,7 @@
</notebook>
</sheet>
<footer>
<field name="message_ids" widget="ThreadView"/>
<field name="message_ids" widget="mail_thread"/>
</footer>
</form>
</field>

2
addons/analytic/analytic_view.xml
View File

@ -44,7 +44,7 @@
</notebook>
</sheet>
<footer>
<field name="message_ids" widget="ThreadView"/>
<field name="message_ids" widget="mail_thread"/>
</footer>
</form>
</field>

10
addons/base_action_rule/i18n/nl.po
View File

@ -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 18:05+0000\n"
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
"PO-Revision-Date: 2012-07-02 15:02+0000\n"
"Last-Translator: Erwin <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: 2012-06-28 04:39+0000\n"
"X-Generator: Launchpad (build 15505)\n"
"X-Launchpad-Export-Date: 2012-07-03 05:36+0000\n"
"X-Generator: Launchpad (build 15531)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@ -337,7 +337,7 @@ msgstr "Actief"
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
msgid "No Email ID Found for your Company address!"
msgstr ""
msgstr "Geen e-mail id gevonden voor uw bedrijfsadres!"
#. module: base_action_rule
#: field:base.action.rule,act_remind_user:0

18
addons/crm/crm_lead_view.xml
View File

@ -171,10 +171,13 @@
</div>
</group>
<group>
<field name="contact_name" />
<label for="contact_name" />
<div>
<field name="contact_name" class="oe_inline"/>,
<field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" class="oe_inline"/>
</div>
<field name="email_from" widget="email"/>
<field name="function" />
<field domain="[('domain', '=', 'contact')]" name="title"/>
<field name="phone"/>
<field name="mobile"/>
<field name="fax"/>
@ -210,7 +213,7 @@
</notebook>
</sheet>
<footer>
<field name="message_ids" widget="ThreadView"/>
<field name="message_ids" widget="mail_thread"/>
</footer>
</form>
</field>
@ -531,9 +534,12 @@
</group>
<group>
<field name="contact_name" />
<label for="contact_name" />
<div>
<field name="contact_name" class="oe_inline"/>,
<field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" class="oe_inline"/>
</div>
<field name="function" />
<field domain="[('domain', '=', 'contact')]" name="title"/>
<field name="mobile"/>
<field name="fax"/>
</group>
@ -563,7 +569,7 @@
</notebook>
</sheet>
<footer>
<field name="message_ids" widget="ThreadView"/>
<field name="message_ids" widget="mail_thread"/>
</footer>
</form>
</field>

2
addons/crm/crm_meeting_menu.xml
View File

@ -83,7 +83,7 @@
<menuitem name="Meetings" id="menu_crm_case_categ_meet"
action="crm_case_categ_meet" parent="base.menu_sales"
sequence="7" />
sequence="8" />
<record id="action_view_attendee_form" model="ir.actions.act_window">
<field name="name">Meeting Invitations</field>

2
addons/crm/crm_meeting_view.xml
View File

@ -258,7 +258,7 @@
</notebook>
</sheet>
<footer>
<field name="message_ids" widget="ThreadView"/>
<field name="message_ids" widget="mail_thread"/>
</footer>
</form>
</field>

2
addons/crm/crm_phonecall_view.xml
View File

@ -146,7 +146,7 @@
<field name="description" placeholder="Description..." />
</sheet>
<footer>
<field name="message_ids" widget="ThreadView"/>
<field name="message_ids" widget="mail_thread"/>
</footer>
</form>
</field>

88
addons/crm/res_partner_view.xml
View File

@ -45,25 +45,57 @@
</field>
</record>
<act_window
id="crm_meeting_partner"
name="Meetings"
res_model="crm.meeting"
src_model="res.partner"
view_mode="calendar,tree,form,gantt"
context="{'search_default_partner_id': [active_id],'default_partner_id': active_id}"
/>
<act_window
id="act_res_partner_2_opportunity"
name="Opportunities"
res_model="crm.lead"
src_model="res.partner"
view_mode="kanban,tree,form,graph,calendar"
domain="[('type','=','opportunity')]"
context="{'search_default_partner_id': [active_id],'default_partner_id': active_id}"
/>
<!-- open meetings related to given partner -->
<record id="crm_meeting_partner" model="ir.actions.act_window">
<field name="name">Meetings</field>
<field name="src_model">res.partner</field>
<field name="res_model">crm.meeting</field>
<field name="view_mode">calendar,tree,form,gantt</field>
<field name="context">{'search_default_partner_id': active_id}</field>
</record>
<!-- Partner kanban view inherte -->
<!-- open opportunities related to given partner -->
<record model="ir.actions.act_window" id="relate_partner_opportunities">
<field name="name">Opportunities</field>
<field name="res_model">crm.lead</field>
<field name="view_mode">kanban,tree,form,graph,calendar</field>
<field name="domain">[('type','=','opportunity')]</field>
<field name="context">{'search_default_partner_id': active_id,
'stage_type': 'opportunity', 'default_type': 'opportunity'}</field>
<field name="view_id" eval="False"/>
<field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
<field name="help">
With opportunities you can manage and keep track of your sales pipeline by creating specific customer- or prospect-related sales documents to follow up potential sales. Information such as expected revenue, opportunity stage, expected closing date, communication history and much more can be stored. Opportunities can be connected to the email gateway: new emails may create opportunities, each of them automatically gets the history of the conversation with the customer.
You and your team(s) will be able to plan meetings and phone calls from opportunities, convert them into quotations, manage related documents, track all customer related activities, and much more.
</field>
</record>
<record model="ir.actions.act_window.view" id="relate_partner_opportunities_kanban">
<field name="sequence" eval="0"/>
<field name="view_mode">kanban</field>
<field name="view_id" ref="crm_case_kanban_view_leads"/>
<field name="act_window_id" ref="relate_partner_opportunities"/>
</record>
<record model="ir.actions.act_window.view" id="relate_partner_opportunities_tree">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="crm_case_tree_view_oppor"/>
<field name="act_window_id" ref="relate_partner_opportunities"/>
</record>
<record model="ir.actions.act_window.view" id="relate_partner_opportunities_form">
<field name="sequence" eval="2"/>
<field name="view_mode">form</field>
<field name="view_id" ref="crm_case_form_view_oppor"/>
<field name="act_window_id" ref="relate_partner_opportunities"/>
</record>
<record model="ir.actions.act_window.view" id="relate_partner_opportunities_graph">
<field name="sequence" eval="4"/>
<field name="view_mode">graph</field>
<field name="view_id" ref="crm_case_graph_view_opportunity"/>
<field name="act_window_id" ref="relate_partner_opportunities"/>
</record>
<!-- Partner kanban view inherte -->
<record model="ir.ui.view" id="crm_lead_partner_kanban_view">
<field name="name">res.partner.kanban.inherit</field>
<field name="model">res.partner</field>
@ -74,13 +106,13 @@
<field name="opportunity_count"/>
<field name="meeting_count"/>
</field>
<xpath expr="//h4[@class='oe_partner_heading']" position="after">
<a name="%(act_res_partner_2_opportunity)d" type="action">
<t t-if="record.opportunity_count.value"><t t-esc="record.opportunity_count.value"/> Opportunities</t>
</a>
<a name="%(crm_meeting_partner)d" type="action">
<t t-if="record.meeting_count.value"><t t-esc="record.meeting_count.value"/> Meetings</t>
</a>
<xpath expr="//h4[@class='oe_partner_heading']" position="after">
<a name="%(relate_partner_opportunities)d" type="action">
<t t-if="record.opportunity_count.value"><t t-esc="record.opportunity_count.value"/> Opportunities</t>
</a>
<a name="%(crm_meeting_partner)d" type="action">
<t t-if="record.meeting_count.value"><t t-esc="record.meeting_count.value"/> Meetings</t>
</a>
</xpath>
</field>
</record>
@ -96,12 +128,12 @@
<button type="action"
string="Schedule a Meeting"
name="%(crm.crm_case_categ_meet_create_partner)d"
context="{'default_partner_id': [active_id], 'default_duration': 4.0}"/>
context="{'search_default_partner_id': active_id, 'default_duration': 4.0}"/>
<button type="action" string="Schedule a Call"
name="%(crm.crm_case_categ_phone_create_partner)d"
context="{'search_default_partner_id': [active_id], 'default_duration': 1.0, 'default_partner_id': active_id}" />
context="{'search_default_partner_id': active_id, 'default_duration': 1.0}" />
<button type="action" string="Opportunities"
name="%(crm.crm_case_category_act_oppor11)d" context="{'search_default_partner_id': [active_id]}"/>
name="%(crm.crm_case_category_act_oppor11)d" context="{'search_default_partner_id': active_id}"/>
</xpath>
</field>
</record>

6
addons/crm_claim/crm_claim_view.xml
View File

@ -168,9 +168,9 @@
</notebook>
</group>
</sheet>
<div class="oe_sheet_width">
<field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
</div>
<footer>
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
</footer>
</form>
</field>
</record>

2
addons/crm_fundraising/crm_fundraising_view.xml
View File

@ -129,7 +129,7 @@
</notebook>
</sheet>
<footer>
<field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
</footer>
</form>
</field>

2
addons/crm_helpdesk/crm_helpdesk_view.xml
View File

@ -100,7 +100,7 @@
</notebook>
</sheet>
<footer>
<field name="message_ids" widget="ThreadView"/>
<field name="message_ids" widget="mail_thread"/>
</footer>
</form>
</field>

2
addons/crm_todo/crm_todo_view.xml
View File

@ -58,7 +58,7 @@
id="menu_crm_todo"
parent="base.menu_sales"
action="crm_todo_action"
sequence="5"/>
sequence="6"/>
</data>

10
addons/email_template/i18n/nl.po
View File

@ -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 18:29+0000\n"
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
"PO-Revision-Date: 2012-07-02 15:02+0000\n"
"Last-Translator: Erwin <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: 2012-06-28 04:39+0000\n"
"X-Generator: Launchpad (build 15505)\n"
"X-Launchpad-Export-Date: 2012-07-03 05:36+0000\n"
"X-Generator: Launchpad (build 15531)\n"
#. module: email_template
#: field:email.template,subtype:0
@ -192,7 +192,7 @@ msgstr ""
#. module: email_template
#: model:ir.model,name:email_template.model_mail_compose_message
msgid "Email composition wizard"
msgstr ""
msgstr "E-mail samenstellen wizard"
#. module: email_template
#: view:email.template:0

25
addons/event/event_view.xml
View File

@ -167,9 +167,9 @@
</page>
</notebook>
</sheet>
<div class="oe_sheet_width">
<field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
</div>
<footer>
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
</footer>
</form>
</field>
</record>
@ -468,19 +468,6 @@
</group>
</page>
<page string="Emails">
<!--
<field name="message_ids" colspan="4" nolabel="1" mode="tree">
<tree string="History">
<field name="display_text" string="History Information"/>
<field name="reply_to" invisible="1"/>
<button
string="Reply" attrs="{'invisible': [('reply_to', '=', False)]}"
name="%(mail.action_email_compose_message_wizard)d"
context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
icon="terp-mail-replied" type="action" />
</tree>
</field>
-->
<button string="Send New Email"
name="%(mail.action_email_compose_message_wizard)d"
icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action"/>
@ -488,9 +475,9 @@
</notebook>
</sheet>
<div class="oe_sheet_width">
<field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
</div>
<footer>
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
</footer>
</form>
</field>
</record>

2
addons/hr/__openerp__.py
View File

@ -43,12 +43,12 @@ You can manage:
'update_xml': [
'security/hr_security.xml',
'security/ir.model.access.csv',
'board_hr_view.xml',
'hr_view.xml',
'hr_department_view.xml',
'process/hr_process.xml',
'hr_installer.xml',
'hr_data.xml',
'board_hr_view.xml',
'res_config_view.xml',
],
'demo_xml': [

2
addons/hr/hr_view.xml
View File

@ -9,6 +9,8 @@
<menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
<menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/>
<menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="25"/>
<menuitem id="menu_hr_reporting_timesheet" name="Reports"
parent="menu_hr_reporting" sequence="6" />
<!--Employee form view -->
<record id="view_employee_form" model="ir.ui.view">

2
addons/hr_evaluation/report/hr_evaluation_report_view.xml
View File

@ -90,7 +90,7 @@
<field name="search_view_id" ref="view_evaluation_report_search"/>
</record>
<menuitem action="action_evaluation_report_all" id="menu_evaluation_report_all" parent="hr.menu_hr_reporting" sequence="3" groups="base.group_hr_manager"/>
<menuitem action="action_evaluation_report_all" id="menu_evaluation_report_all" parent="hr.menu_hr_reporting" sequence="2" groups="base.group_hr_manager"/>
</data>
</openerp>

3
addons/hr_expense/report/hr_expense_report_view.xml
View File

@ -8,7 +8,6 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<tree colors="blue:state == 'draft';black:state in ('confirm','accepted','invoiced','paid');gray:state == 'cancelled'" string="Expenses Analysis">
<field name="date" invisible="1"/>
<field name="employee_id" invisible="1"/>
<field name="user_id" invisible="1"/>
<field name="year" invisible="1"/>
@ -105,7 +104,7 @@
<field name="search_view_id" ref="view_hr_expense_report_search"/>
</record>
<menuitem action="action_hr_expense_report_all" id="menu_hr_expense_report_all" parent="hr.menu_hr_reporting" sequence="2"/>
<menuitem action="action_hr_expense_report_all" id="menu_hr_expense_report_all" parent="hr.menu_hr_reporting" sequence="1"/>
</data>
</openerp>

1
addons/hr_holidays/__openerp__.py
View File

@ -58,7 +58,6 @@ Note that:
'hr_holidays_workflow.xml',
'hr_holidays_view.xml',
'hr_holidays_data.xml',
'hr_holidays_wizard.xml',
'hr_holidays_report.xml',
'report/hr_holidays_report_view.xml',
'report/available_holidays_view.xml',

16
addons/hr_holidays/hr_holidays_view.xml
View File

@ -136,9 +136,9 @@
</page>
</notebook>
</sheet>
<div class="oe_sheet_width">
<field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
</div>
<footer>
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
</footer>
</form>
</field>
</record>
@ -179,11 +179,11 @@
<field name="notes"/>
</page>
</notebook>
</sheet>
<div class="oe_sheet_width">
<field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
</div>
</form>
</sheet>
<footer>
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
</footer>
</form>
</field>
</record>

10
addons/hr_holidays/hr_holidays_wizard.xml
View File

@ -1,10 +0,0 @@
<?xml version="1.0" ?>
<openerp>
<data>
<menuitem
id="menu_hr_reporting_holidays"
name="Leaves"
parent="hr.menu_hr_reporting"
sequence="6"/>
</data>
</openerp>

2
addons/hr_holidays/report/available_holidays_view.xml
View File

@ -17,7 +17,7 @@
name="Leaves Analysis"
id="menu_hr_available_holidays_report_tree"
action="action_hr_available_holidays_report"
parent="menu_hr_reporting_holidays"/>
parent="hr.menu_hr_reporting" sequence="5" />
</data>

7
addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
View File

@ -9,9 +9,8 @@
<field name="arch" type="xml">
<form string="Leaves by Department" version="7.0">
<header>
<button name="print_report" string="Print" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
<button name="print_report" string="Print" type="object" class="oe_highlight"/> or
<button string="Cancel" special="cancel" class="oe_link"/>
</header>
<group>
<field name="date_from" />
@ -33,7 +32,7 @@
<menuitem
name="Leaves by Department"
parent="menu_hr_reporting_holidays"
parent="hr.menu_hr_reporting_timesheet"
action="action_hr_holidays_summary_dept"
id="menu_account_central_journal"
icon="STOCK_PRINT"/>

2
addons/hr_recruitment/hr_recruitment_view.xml
View File

@ -204,7 +204,7 @@
</notebook>
</sheet>
<footer>
<field name="message_ids" widget="ThreadView"/>
<field name="message_ids" widget="mail_thread"/>
</footer>
</form>
</field>

2
addons/hr_recruitment/report/hr_recruitment_report_view.xml
View File

@ -114,7 +114,7 @@
<field name="context">{'search_default_year':1,'search_default_month':1,'search_default_department':1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="search_view_id" ref="view_hr_recruitment_report_search"/>
</record>
<menuitem action="action_hr_recruitment_report_all" id="menu_hr_recruitment_report_all" parent="hr.menu_hr_reporting" sequence="1"/>
<menuitem action="action_hr_recruitment_report_all" id="menu_hr_recruitment_report_all" parent="hr.menu_hr_reporting" sequence="0"/>
</data>
</openerp>

5
addons/hr_timesheet/hr_timesheet_report.xml
View File

@ -1,11 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<menuitem
id="menu_hr_reporting_timesheet"
name="Timesheet"
parent="hr.menu_hr_reporting"
sequence="5" />
<report auto="False" id="report_user_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee timesheet" xsl="hr_timesheet/report/user_timesheet.xsl"/>
<report auto="False" id="report_users_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet_users" string="Employees Timesheet" xsl="hr_timesheet/report/users_timesheet.xsl"/>

4
addons/hr_timesheet/test/hr_timesheet_report.yml
View File

@ -7,7 +7,7 @@
ctx.update({'model': 'hr.employee','active_ids': []})
data_dict = {'month': time.gmtime()[1], 'year': time.gmtime()[0], 'employee_id' : ref('hr.employee_fp')}
from tools import test_reports
test_reports.try_report_action(cr, uid, 'action_hr_timesheet_my',wiz_data=data_dict, context=ctx, our_module='hr_timesheet')
test_reports.try_report_action(cr, uid, 'action_hr_timesheet_employee',wiz_data=data_dict, context=ctx, our_module='hr_timesheet')
-
Print the HR Timesheet By Employee report through the wizard
@ -18,4 +18,4 @@
ctx.update({'model': 'hr.employee','active_ids': []})
data_dict = {'month': time.gmtime()[1], 'year': time.gmtime()[0], 'employee_ids' : [(6,0,[ref('hr.employee_fp'),ref('hr.employee_qdp'),ref('hr.employee_al')])]}
from tools import test_reports
test_reports.try_report_action(cr, uid, 'action_hr_timesheet_users',wiz_data=data_dict, context=ctx, our_module='hr_timesheet')
test_reports.try_report_action(cr, uid, 'action_hr_timesheet_users',wiz_data=data_dict, context=ctx, our_module='hr_timesheet')

33
addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
View File

@ -34,39 +34,8 @@
<menuitem action="action_hr_timesheet_employee"
id="menu_hr_timesheet_employee"
parent="menu_hr_reporting_timesheet"
parent="hr.menu_hr_reporting"
sequence="2" icon="STOCK_PRINT"/>
<!-- Print My Timesheet -->
<record id="view_hr_timesheet_my" model="ir.ui.view">
<field name="name">hr.analytical.timesheet.my.form</field>
<field name="model">hr.analytical.timesheet.employee</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Print My Timesheet" version="7.0">
<header>
<button string="Print" name="print_report" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group colspan="4">
<separator string="This wizard will print monthly timesheet" colspan="4"/>
<field name="month"/>
<field name="year"/>
</group>
</form>
</field>
</record>
<record id="action_hr_timesheet_my" model="ir.actions.act_window">
<field name="name">My Timesheet</field>
<field name="res_model">hr.analytical.timesheet.employee</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_hr_timesheet_my"/>
<field name="target">new</field>
</record>
</data>
</openerp>

28
addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
View File

@ -10,18 +10,21 @@
<field name="arch" type="xml">
<form string="Monthly Employees Timesheet" version="7.0">
<header>
<button string="Print" name="print_report" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
<button string="Print" name="print_report" type="object" class="oe_highlight"/> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group height="260" width="460">
<group colspan="4">
<field name="month"/>
<field name="year"/>
<separator string="Employees" colspan="4"/>
<field name="employee_ids" colspan="4" nolabel="1"/>
<sheet>
<group>
<label for="month" string="Period"/>
<div>
<field name="month" class="oe_inline"/>
<field name="year" class="oe_inline"/>
</div>
</group>
</group>
<group string="Employees">
<field name="employee_ids" nolabel="1"/>
</group>
</sheet>
</form>
</field>
</record>
@ -37,9 +40,8 @@
<menuitem action="action_hr_timesheet_users"
id="menu_hr_timesheet_users"
parent="menu_hr_reporting_timesheet"
groups="base.group_hr_manager" sequence="3" icon="STOCK_PRINT"/>
parent="hr.menu_hr_reporting_timesheet"
groups="base.group_hr_manager" sequence="2" icon="STOCK_PRINT"/>
</data>
</openerp>

40
addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
View File

@ -7,23 +7,27 @@
<field name="model">hr.timesheet.analytic.profit</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Timesheet Profit" version="7.0">
<header>
<button name="print_report" string="Print" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group height="420" width="370">
<group col="4" colspan="4">
<field name="date_from"/>
<field name="date_to"/>
<separator string="Journals" colspan="4"/>
<field name="journal_ids" colspan="4" nolabel="1"/>
<separator string="Users" colspan="4"/>
<field name="employee_ids" colspan="4" nolabel="1"/>
</group>
</group>
</form>
<form string="Timesheet Profit" version="7.0">
<header>
<button name="print_report" string="Print" colspan="1" type="object" class="oe_highlight"/> or
<button special="cancel" string="Cancel" class="oe_link"/>
</header>
<sheet>
<group>
<label for="date_from" string="Duration" />
<div>
<field name="date_from" nolabel="1" class="oe_inline" />
- <field name="date_to" nolabel="1" class="oe_inline"/>
</div>
</group>
<group>
<separator string="Journals" colspan="4"/>
<field name="journal_ids" colspan="4" nolabel="1"/>
<separator string="Users" colspan="4"/>
<field name="employee_ids" colspan="4" nolabel="1"/>
</group>
</sheet>
</form>
</field>
</record>
@ -38,7 +42,7 @@
<menuitem action="action_hr_timesheet_analytic_profit"
id="menu_hr_timesheet_analytic_profit"
parent="hr_timesheet.menu_hr_reporting_timesheet" icon="STOCK_PRINT"/>
parent="hr.menu_hr_reporting_timesheet" sequence="3" icon="STOCK_PRINT"/>
</data>
</openerp>

2
addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
View File

@ -82,6 +82,6 @@
<menuitem
action="action_hr_timesheet_report_stat_all"
id="menu_hr_timesheet_report_all"
parent="hr_timesheet.menu_hr_reporting_timesheet" sequence="0"/>
parent="hr.menu_hr_reporting" sequence="3"/>
</data>
</openerp>

2
addons/hr_timesheet_sheet/report/timesheet_report_view.xml
View File

@ -110,6 +110,6 @@
<field name="search_view_id" ref="view_timesheet_report_search"/>
</record>
<menuitem action="action_timesheet_report_stat_all" id="menu_timesheet_report_all"
parent="hr_timesheet.menu_hr_reporting_timesheet" sequence="1" groups="base.group_hr_manager"/>
parent="hr.menu_hr_reporting" sequence="4" groups="base.group_hr_manager"/>
</data>
</openerp>

2
addons/idea/idea_view.xml
View File

@ -78,7 +78,7 @@
<h2><field name="category_ids"/></h2>
<field name="description"/>
<footer>
<field name="message_ids" widget="ThreadView"/>
<field name="message_ids" widget="mail_thread"/>
</footer>
</form>
</field>

6
addons/mail/doc/mail_openchatter_howto.rst
View File

@ -38,7 +38,7 @@ Make your module inheriting from the ``mail.thread`` class.
# inherit from mail.thread allows the use of OpenChatter
_inherit = ['mail.thread']
Use the thread viewer widget inside your form view by using the ThreadView widget on the message_ids field inherited from mail.thread.
Use the thread viewer widget inside your form view by using the mail_thread widget on the message_ids field inherited from mail.thread.
::
@ -50,7 +50,7 @@ Use the thread viewer widget inside your form view by using the ThreadView widge
<field name="arch" type="xml">
<form>
[...]
<field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
</form>
</field>
</record>
@ -131,7 +131,7 @@ The drawback of this method is that it is no longer possible to those subscriber
Messages display management
++++++++++++++++++++++++++++
By default, the ThreadView widget shows all messages related to the current document beside the document, in the History and comments section. However, you may want to display other messages in the widget. For example, the OpenChatter on res.users model shows
By default, the mail_thread widget shows all messages related to the current document beside the document, in the History and comments section. However, you may want to display other messages in the widget. For example, the OpenChatter on res.users model shows
- messages related to the user, as usual (messages with ``model = res.users, res_id = current_document_id``)
- messages directly pushed to this user (containing @login)

2
addons/mail/mail_group_view.xml
View File

@ -73,7 +73,7 @@
</group>
</sheet>
<footer class="openerp_mail_group_footer">
<field name="message_ids" widget="ThreadView"
<field name="message_ids" widget="mail_thread"
options='{"thread_level": 1}'/>
</footer>
</form>

2
addons/mail/res_partner_view.xml
View File

@ -10,7 +10,7 @@
<field name="arch" type="xml">
<xpath expr="//sheet" position="after">
<footer>
<field name="message_ids" widget="ThreadView"
<field name="message_ids" widget="mail_thread"
options='{"thread_level": 1}'/>
</footer>
</xpath>

2
addons/mail/res_users_view.xml
View File

@ -28,7 +28,7 @@
</field>
<xpath expr="/form/sheet" position="after">
<div class="oe_bottom">
<field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
</div>
</xpath>
</data>

4
addons/mail/static/src/js/mail.js
View File

@ -497,7 +497,7 @@ openerp.mail = function(session) {
});
session.web.form.widgets.add( 'Thread', 'openerp.mail.Thread');
/** ThreadView widget: thread of comments */
/** mail_thread widget: thread of comments */
mail.RecordThread = session.web.form.AbstractField.extend({
template: 'mail.RecordThread',
@ -598,7 +598,7 @@ openerp.mail = function(session) {
return this.session.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
},
});
session.web.form.widgets.add( 'ThreadView', 'openerp.mail.RecordThread');
session.web.form.widgets.add( 'mail_thread', 'openerp.mail.RecordThread');
/** WallView widget: a wall of messages */
mail.WallView = session.web.Widget.extend({

2
addons/mrp/mrp_view.xml
View File

@ -796,7 +796,7 @@
</notebook>
</sheet>
<footer>
<field name="message_ids" widget="ThreadView"/>
<field name="message_ids" widget="mail_thread"/>
</footer>
</form>
</field>

2
addons/mrp_operations/mrp_operations_view.xml
View File

@ -112,7 +112,7 @@
</notebook>
</sheet>
<footer>
<field name="message_ids" widget="ThreadView"/>
<field name="message_ids" widget="mail_thread"/>
</footer>
</form>
</field>

144
addons/point_of_sale/i18n/nl.po
View File

@ -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-02-09 11:20+0000\n"
"PO-Revision-Date: 2012-07-02 15:03+0000\n"
"Last-Translator: Erwin <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-05-11 04:42+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-07-03 05:35+0000\n"
"X-Generator: Launchpad (build 15531)\n"
#. module: point_of_sale
#: field:report.transaction.pos,product_nb:0
@ -37,6 +37,12 @@ msgid ""
"new payment methods directly from menu \"PoS Backend > Configuration > "
"Payment Methods\"."
msgstr ""
"U dient te definiëren welke betaalmethode beschikbaar dienen te zijn bij de "
"kassa. Dit kunt u doen door gebruik te maken van de bestaande bank en kas. "
"Ga naar Financieel > Instellingen > Financiële administratie > Dagboeken. "
"Selecteer een dagboek en vink te optie \"Kassa betaalmethode\" aan op het "
"kassa tabblad. Het is ook mogelijk een neiuwe betaalmethode aan te maken, "
"direct vanuit het menu Kassa achterkant >> Instellingen >> Betaalmethodes."
#. module: point_of_sale
#: view:pos.order:0 view:report.pos.order:0
@ -51,7 +57,7 @@ msgstr "Water"
#. module: point_of_sale
#: view:report.cash.register:0
msgid "Year from Creation date of cash register"
msgstr ""
msgstr "Jaar van aanmaakdatum kasregister"
#. module: point_of_sale
#: view:pos.confirm:0
@ -66,7 +72,7 @@ msgstr "Spa Reine 2L"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_pos_box_out
msgid "Pos Box Out"
msgstr ""
msgstr "Kassa uit"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_report_cash_register_all
@ -105,7 +111,7 @@ msgstr "Productnaam"
#. module: point_of_sale
#: view:report.cash.register:0
msgid "Month from Creation date of cash register"
msgstr ""
msgstr "Maand van aanmaakdatum kasregister"
#. module: point_of_sale
#: report:account.statement:0 field:pos.box.entries,amount:0
@ -308,12 +314,12 @@ msgstr "Maandelijkse verkopen per gebruiker"
#. module: point_of_sale
#: report:all.closed.cashbox.of.the.day:0
msgid "Today's Closed Cashbox"
msgstr ""
msgstr "Vandaag gesloten kassa"
#. module: point_of_sale
#: view:report.cash.register:0
msgid "Day from Creation date of cash register"
msgstr ""
msgstr "Dag van aanmaakdatum kasregister"
#. module: point_of_sale
#: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale
@ -382,6 +388,8 @@ msgid ""
"If you want to sell this product through the point of sale, select the "
"category it belongs to."
msgstr ""
"Indien u dit product wilt verkopen bij de kassa, dan dient u de categorie te "
"selecteren waartoe het product hoort."
#. module: point_of_sale
#: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
@ -460,7 +468,7 @@ msgstr "Verkoopfactuur"
#. module: point_of_sale
#: view:pos.box.out:0
msgid "Output Operation"
msgstr ""
msgstr "Uitgaande verwerking"
#. module: point_of_sale
#: view:report.pos.order:0 field:report.pos.order,total_discount:0
@ -482,7 +490,7 @@ msgstr "Dr. Oetker Ristorante Bolognese"
#: code:addons/point_of_sale/wizard/pos_box_entries.py:105
#, python-format
msgid "Please check that income account is set to %s"
msgstr ""
msgstr "Controleer of de opbrengsten rekening is ingesteld op %s"
#. module: point_of_sale
#: model:pos.category,name:point_of_sale.pizza
@ -530,7 +538,7 @@ msgstr "Betaling"
#. module: point_of_sale
#: view:report.cash.register:0
msgid "Cash Analysis created in current month"
msgstr ""
msgstr "Kasanalyse gemaakt in de huidige maand"
#. module: point_of_sale
#: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
@ -587,7 +595,7 @@ msgstr "Einddatum"
#. module: point_of_sale
#: view:report.pos.order:0
msgid "POS ordered created during current year"
msgstr ""
msgstr "Kassaorders aangemaakt in huidige jaar"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
@ -691,7 +699,7 @@ msgstr "Eindsaldo"
#: model:ir.actions.act_window,name:point_of_sale.act_pos_open_statement
#: model:ir.model,name:point_of_sale.model_pos_close_statement
msgid "Close Statements"
msgstr ""
msgstr "Afsluit overzichten"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.croky_naturel_45g_product_template
@ -701,7 +709,7 @@ msgstr "Croky Naturel 45g"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.product_product_putmoneyforchange1_product_template
msgid "Cash Out"
msgstr ""
msgstr "Kas uit"
#. module: point_of_sale
#: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
@ -735,6 +743,7 @@ msgid ""
"This field authorize Validation of Cashbox without controlling the closing "
"balance."
msgstr ""
"Met dit veld kunt u de kassa inhoud valideren zonder de afsluitbalans"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_details
@ -750,7 +759,7 @@ msgstr "Pils"
#. module: point_of_sale
#: report:all.closed.cashbox.of.the.day:0
msgid "St.Name"
msgstr ""
msgstr "St.Naam"
#. module: point_of_sale
#: report:pos.details_summary:0
@ -845,7 +854,7 @@ msgstr "Stella Artois 33cl"
#. module: point_of_sale
#: view:report.cash.register:0
msgid "Cash Analysis created during this year"
msgstr ""
msgstr "Kasanalyse aangemaakt in huidig jaar"
#. module: point_of_sale
#: report:pos.invoice:0
@ -975,7 +984,7 @@ msgstr "Totaal korting"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_pos_box_entries
msgid "Pos Box Entries"
msgstr ""
msgstr "Kassa boekingen"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.boon_framboise_37,5cl_product_template
@ -1038,7 +1047,7 @@ msgstr "Timmermans Kriek 37.5cl"
#. module: point_of_sale
#: field:account.journal,check_dtls:0
msgid "Control Balance Before Closing"
msgstr ""
msgstr "Controleer de balans voor het sluiten"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_pos_order_line
@ -1091,6 +1100,8 @@ msgid ""
"This is a product you can use to take cash from a statement for the point of "
"sale backend, exemple: money lost, transfer to bank, etc."
msgstr ""
"Dit is een product welke u kunt gebruiken om ontbrekend kasgeld te "
"verklaren, bijvoorbeeld: Geld verloren, geld overgemaakt aan bank, etc."
#. module: point_of_sale
#: field:report.cash.register,date:0
@ -1137,6 +1148,8 @@ msgid ""
"There is no receivable account defined to make payment for the partner: "
"\"%s\" (id:%d)"
msgstr ""
"Er is geen debiteurenrekening gedefinieerd om deze betaling te doen foor "
"klant: \"%s\" (id:%d)"
#. module: point_of_sale
#: view:pos.confirm:0
@ -1144,6 +1157,8 @@ msgid ""
"Generate all sale journal entries for non invoiced orders linked to a closed "
"cash register or statement."
msgstr ""
"Genereer alle verkoop journaalpsoten van alle niet gefactureerde orders "
"welke zijn gekoppeld aan een gesloten kasregister of kasverklaring."
#. module: point_of_sale
#: code:addons/point_of_sale/point_of_sale.py:293
@ -1192,11 +1207,12 @@ msgstr "Print datum"
#, python-format
msgid "There is no receivable account defined to make payment"
msgstr ""
"Er is geen debiteurenrekening gedefinieerd om deze betaling op te doen"
#. module: point_of_sale
#: view:pos.open.statement:0
msgid "Do you want to open cash registers?"
msgstr ""
msgstr "Wilt u de kasregisters openen?"
#. module: point_of_sale
#: help:pos.category,sequence:0
@ -1208,7 +1224,7 @@ msgstr ""
#. module: point_of_sale
#: field:product.product,expense_pdt:0
msgid "PoS Cash Output"
msgstr ""
msgstr "Kas uit"
#. module: point_of_sale
#: model:pos.category,name:point_of_sale.soda
@ -1229,7 +1245,7 @@ msgstr "Kassa Orders"
#. module: point_of_sale
#: model:ir.actions.report.xml,name:point_of_sale.all_closed_cashbox_of_the_day
msgid "All Closed CashBox"
msgstr ""
msgstr "Alle gesloten kassa's"
#. module: point_of_sale
#: code:addons/point_of_sale/point_of_sale.py:640
@ -1333,7 +1349,7 @@ msgstr "Kassa"
#: model:ir.actions.act_window,name:point_of_sale.action_product_output
#: model:ir.ui.menu,name:point_of_sale.products_for_output_operations
msgid "Products 'Put Money In'"
msgstr ""
msgstr "Producten 'Stop geld erin'"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.croky_bolognaise_250g_product_template
@ -1367,11 +1383,12 @@ msgid ""
"This is a product you can use to put cash into a statement for the point of "
"sale backend."
msgstr ""
"Dit si een product welke u kunt gebruiken om extra kasgeld te verklaren."
#. module: point_of_sale
#: view:pos.receipt:0
msgid "Print the Receipt of the Sale"
msgstr ""
msgstr "Kassabon afdrukken"
#. module: point_of_sale
#: field:pos.make.payment,journal:0
@ -1415,7 +1432,7 @@ msgstr "Evian 1L"
#. module: point_of_sale
#: model:ir.ui.menu,name:point_of_sale.menu_open_statement
msgid "Open Cash Registers"
msgstr ""
msgstr "Open kassa"
#. module: point_of_sale
#: model:pos.category,name:point_of_sale.water
@ -1450,7 +1467,7 @@ msgstr "Chimay Rouge 33cl"
#. module: point_of_sale
#: field:report.pos.order,delay_validation:0
msgid "Delay Validation"
msgstr ""
msgstr "Vertraging validatie"
#. module: point_of_sale
#: field:pos.order,nb_print:0
@ -1522,7 +1539,7 @@ msgstr "Jaar van orderdatum"
#: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_tree
#: field:pos.box.entries,journal_id:0 field:pos.box.out,journal_id:0
msgid "Cash Register"
msgstr ""
msgstr "Kasregister"
#. module: point_of_sale
#: view:pos.close.statement:0
@ -1542,7 +1559,7 @@ msgstr "Verkoop per gebruiker per dag"
#. module: point_of_sale
#: view:pos.open.statement:0
msgid "Open Registers"
msgstr ""
msgstr "Open registers"
#. module: point_of_sale
#: field:report.transaction.pos,journal_id:0
@ -1567,7 +1584,7 @@ msgstr "Dr. Oetker Ristorante Vegetale"
#. module: point_of_sale
#: view:report.pos.order:0
msgid "POS ordered created by today"
msgstr ""
msgstr "Kassaorders aangemaakt vandaag"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.coca_zero_2l_product_template
@ -1592,7 +1609,7 @@ msgstr "Korting"
#. module: point_of_sale
#: view:report.cash.register:0
msgid "Cash Analysis created in last month"
msgstr ""
msgstr "Kasanalyse gemaakt in laatste maand"
#. module: point_of_sale
#: model:pos.category,name:point_of_sale.beers
@ -1606,11 +1623,14 @@ msgid ""
"validation. He will also open all cash registers for which you have to "
"control the ending belance before closing manually."
msgstr ""
"OpenERP sluit alle kasregisters, welke gesloten kunnen worden zonder een "
"kascontrole. Tevens worden alle kasregisters geopend waarvoor u de endbelans "
"handmatig dient te controleren."
#. module: point_of_sale
#: view:report.cash.register:0
msgid "Cash Analysis created by today"
msgstr ""
msgstr "Kasanalyse gemaakt in vandaag"
#. module: point_of_sale
#: selection:report.cash.register,state:0
@ -1620,7 +1640,7 @@ msgstr "Offerte"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.product_product_putmoneyforchange0_product_template
msgid "Cash In"
msgstr ""
msgstr "Kas in"
#. #-#-#-#-# point_of_sale.pot (OpenERP Server 6.1rc1) #-#-#-#-#
#. module: point_of_sale
@ -1642,7 +1662,7 @@ msgstr "Verkopen per marge"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_pos_config_journal
msgid "Journal Configuration"
msgstr ""
msgstr "Dagboek instellingen"
#. module: point_of_sale
#: view:pos.order:0
@ -1664,7 +1684,7 @@ msgstr "Opnieuw afdrukken"
msgid ""
"Person who uses the the cash register. It could be a reliever, a student or "
"an interim employee."
msgstr ""
msgstr "Personen welke het kasregister hebben gebruikt."
#. module: point_of_sale
#: field:report.transaction.pos,invoice_id:0
@ -1687,6 +1707,9 @@ msgid ""
"payments. We suggest you to control the opening balance of each register, "
"using their CashBox tab."
msgstr ""
"Het systeem zal alle kassa's openen, zodat u de betalingen kunt gaan "
"registreren. We adviseren u om de kasinhoud bij openen te controleren van "
"iedere kassa, door gebruik te maken van het kassa tabblad."
#. module: point_of_sale
#: report:pos.invoice:0 report:pos.lines:0 field:pos.order.line,price_unit:0
@ -1838,7 +1861,7 @@ msgstr "Pepsi 2L"
#. module: point_of_sale
#: report:pos.details:0
msgid "Order"
msgstr ""
msgstr "Order"
#. module: point_of_sale
#: code:addons/point_of_sale/point_of_sale.py:472
@ -1861,7 +1884,7 @@ msgstr "Verkoper"
#: model:ir.model,name:point_of_sale.model_report_cash_register
#: view:report.cash.register:0
msgid "Point of Sale Cash Register Analysis"
msgstr ""
msgstr "Kassa kasregisteranalyse"
#. module: point_of_sale
#: report:pos.lines:0
@ -1897,7 +1920,7 @@ msgstr "Verkopen per gebruiker"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_pos_open_statement
msgid "Open Cash Register"
msgstr ""
msgstr "Open kasregister"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.lindemans_pecheresse_37,5cl_product_template
@ -1961,7 +1984,7 @@ msgstr "Orangina 33cl"
#: model:ir.actions.act_window,name:point_of_sale.action_product_input
#: model:ir.ui.menu,name:point_of_sale.products_for_input_operations
msgid "Products 'Take Money Out'"
msgstr ""
msgstr "Producten 'Haal geld eruit'"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.chimay_bleu_33cl_product_template
@ -1990,7 +2013,7 @@ msgstr "Dr. Oetker Ristorante Spinaci"
#: code:addons/point_of_sale/wizard/pos_box_out.py:88
#, python-format
msgid "You have to open at least one cashbox"
msgstr ""
msgstr "U moet tenminste één kassa openen"
#. module: point_of_sale
#: model:ir.actions.report.xml,name:point_of_sale.pos_payment_report_user
@ -2001,7 +2024,7 @@ msgstr "Betalingen van vandaag per gebruiker"
#: model:ir.actions.act_window,name:point_of_sale.action_box_entries
#: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl
msgid "Put Money In"
msgstr ""
msgstr "Stop geld erin"
#. module: point_of_sale
#: code:addons/point_of_sale/point_of_sale.py:238
@ -2079,13 +2102,14 @@ msgstr "Chaudfontaine 1.5l"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_pos_close_statement
msgid "Close Cash Register"
msgstr ""
msgstr "Kasregister afsluiten"
#. module: point_of_sale
#: code:addons/point_of_sale/point_of_sale.py:65
#, python-format
msgid "In order to delete a sale, it must be new or cancelled."
msgstr ""
"Om een verkoop te kunnen verwijderen moet deze nieuw zijn of geannuleerd."
#. module: point_of_sale
#: model:product.template,name:point_of_sale.coca_regular_50cl_product_template
@ -2128,6 +2152,8 @@ msgid ""
"This field authorize the automatic creation of the cashbox, without control "
"of the initial balance."
msgstr ""
"Dit veld geeft u de mogelijkheid om automatisch een kassa aan te makien, "
"zonder een eerste controle van de kasinhoud."
#. module: point_of_sale
#: model:product.template,name:point_of_sale.coca_zero_50cl_product_template
@ -2159,7 +2185,7 @@ msgstr "Nieuw"
#: code:addons/point_of_sale/point_of_sale.py:238
#, python-format
msgid "In order to set to draft a sale, it must be cancelled."
msgstr ""
msgstr "Om in concept te zetten, moet de verkoopn worden geannuleerd"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.fanta_zero_orange_33cl_product_template
@ -2184,7 +2210,7 @@ msgstr "Maes 33cl"
#. module: point_of_sale
#: view:pos.box.entries:0
msgid "Put Money"
msgstr ""
msgstr "Stop geld"
#. module: point_of_sale
#: sql_constraint:account.journal:0
@ -2210,17 +2236,17 @@ msgstr "Coca-Cola Normaal 1L"
#: code:addons/point_of_sale/point_of_sale.py:253
#, python-format
msgid "Unable to cancel the picking."
msgstr ""
msgstr "Niet mogelijk om het verzamelen te stoppen."
#. module: point_of_sale
#: view:report.pos.order:0
msgid "POS ordered created during current month"
msgstr ""
msgstr "Kassaorders gemaakt in de huidige maand"
#. module: point_of_sale
#: view:report.pos.order:0
msgid "POS ordered created last month"
msgstr ""
msgstr "Kassaorders gemaakt in de vorige maand"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_pos_invoice
@ -2256,7 +2282,7 @@ msgstr "ijsboerke Chocolat 2.5L"
#. module: point_of_sale
#: view:pos.box.out:0
msgid "Take Money"
msgstr ""
msgstr "Pak geld"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_pos_details
@ -2307,7 +2333,7 @@ msgstr "Speciale bieren"
#. module: point_of_sale
#: field:pos.order.line,notice:0
msgid "Discount Notice"
msgstr ""
msgstr "Korting opmerking"
#. module: point_of_sale
#: view:pos.order:0
@ -2361,6 +2387,8 @@ msgid ""
"Payment methods are defined by accounting journals having the field Payment "
"Method checked."
msgstr ""
"Betaalmethodes worden gedefinieerd door de journaalposten waarbij het veld "
"betaalmethode is aangevinkt."
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
@ -2426,7 +2454,7 @@ msgstr "Lays Paprika XXL 300g"
#. module: point_of_sale
#: view:pos.close.statement:0
msgid "Do you want to close your cash registers?"
msgstr ""
msgstr "Wilt u de kasregisters sluiten?"
#. module: point_of_sale
#: report:pos.invoice:0
@ -2450,7 +2478,7 @@ msgstr "Dr. Oetker Ristorante Mozzarella"
#: view:pos.close.statement:0
#, python-format
msgid "Close Cash Registers"
msgstr ""
msgstr "Kasregisters afsluiten"
#. module: point_of_sale
#: report:pos.details:0 report:pos.payment.report.user:0
@ -2505,7 +2533,7 @@ msgstr "Betalingsrapport"
#. module: point_of_sale
#: field:report.transaction.pos,jl_id:0
msgid "Cash Journals"
msgstr ""
msgstr "Kas dagboeken"
#. module: point_of_sale
#: report:pos.sales.user.today:0
@ -2536,7 +2564,7 @@ msgstr "Mei"
#. module: point_of_sale
#: report:pos.lines:0
msgid "Sales lines"
msgstr ""
msgstr "Verkooporderregels"
#. module: point_of_sale
#: view:pos.order:0
@ -2556,7 +2584,7 @@ msgstr "Coca-Cola Zero zonder cafeïne 33cl"
#. module: point_of_sale
#: view:pos.box.out:0
msgid "Describe why you take money from the cash register:"
msgstr ""
msgstr "Beschrijf wat de reden is waarom u geld uit de kassa haalt:"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_order_all
@ -2611,6 +2639,8 @@ msgid ""
"Check this box if this journal define a payment method that can be used in "
"point of sales."
msgstr ""
"Vink deze optie aan indien dit dagboek een betaalmethode is voor gebruik bij "
"de kassa"
#. module: point_of_sale
#: field:pos.category,sequence:0
@ -2641,7 +2671,7 @@ msgstr "Maand van orderdatum"
#. module: point_of_sale
#: field:product.product,income_pdt:0
msgid "PoS Cash Input"
msgstr ""
msgstr "Kassa geld inkomend"
#. module: point_of_sale
#: view:report.cash.register:0 field:report.cash.register,year:0
@ -2707,6 +2737,8 @@ msgid ""
"There are pending operations that could not be saved into the database, are "
"you sure you want to exit?"
msgstr ""
"Er zijn lopende opdrachten die niet kunnen worden opgeslagen in de database. "
"Weet u zeker dat u wilt afsluiten?"
#. openerp-web
#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:236
@ -3053,3 +3085,9 @@ msgstr "Winkel:"
#~ msgid "Print the receipt of the sale"
#~ msgstr "Verkoopbon afdrukken"
#~ msgid "Do you want to open cash registers ?"
#~ msgstr "Wilt u de kassa openen?"
#~ msgid "Do you want to close your cash registers ?"
#~ msgstr "Wilt u uw kasregister afsluiten?"

2
addons/procurement/procurement_view.xml
View File

@ -94,7 +94,7 @@
</notebook>
</sheet>
<footer>
<field name="message_ids" widget="ThreadView"/>
<field name="message_ids" widget="mail_thread"/>
</footer>
</form>
</field>

2
addons/product/product_view.xml
View File

@ -184,7 +184,7 @@
</notebook>
</sheet>
<footer>
<field name="message_ids" widget="ThreadView"/>
<field name="message_ids" widget="mail_thread"/>
</footer>
</form>
</field>

4
addons/project/project_view.xml
View File

@ -148,7 +148,7 @@
</notebook>
</sheet>
<footer>
<field name="message_ids" widget="ThreadView"/>
<field name="message_ids" widget="mail_thread"/>
</footer>
</form>
</field>
@ -496,7 +496,7 @@
</notebook>
</sheet>
<footer>
<field name="message_ids" widget="ThreadView"/>
<field name="message_ids" widget="mail_thread"/>
</footer>
</form>
</field>

2
addons/project/report/project_cumulative.xml
View File

@ -83,7 +83,7 @@
</record>
<menuitem action="action_view_task_history_cumulative"
id="menu_action_view_task_history_cumulative"
parent="project_report_task" />
parent="base.menu_project_report" />
<!--<record id="action_view_task_history_burndown" model="ir.actions.act_window">-->

1
addons/project/report/project_report.py
View File

@ -54,7 +54,6 @@ class report_project_task_user(osv.osv):
'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')],'Status', readonly=True),
'company_id': fields.many2one('res.company', 'Company', readonly=True, groups="base.group_multi_company"),
'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
'type_id': fields.many2one('project.task.type', 'Stage', readonly=True),
}
_order = 'name desc, project_id'

7
addons/project/report/project_report_view.xml
View File

@ -5,8 +5,6 @@
<menuitem id="base.menu_project_report" name="Project"
groups="project.group_project_manager"
parent="base.menu_reporting" sequence="25"/>
<menuitem id="project_report_task" name="Tasks Analysis"
parent="base.menu_project_report"/>
<record id="view_task_project_user_tree" model="ir.ui.view">
<field name="name">report.project.task.user.tree</field>
@ -23,7 +21,6 @@
<field name="date_end" invisible="1"/>
<field name="company_id" invisible="1" groups="base.group_multi_company"/>
<field name="partner_id" invisible="1"/>
<field name="type_id" invisible="1"/>
<field name="day" invisible="1"/>
<field name="month" invisible="1"/>
<field name="year" invisible="1"/>
@ -101,7 +98,6 @@
<newline/>
<group expand="0" string="Extended Filters...">
<field name="priority"/>
<field name="type_id" widget="selection"/>
<separator orientation="vertical"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
@ -115,7 +111,6 @@
<separator orientation="vertical"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<filter string="Stage" icon="terp-stage" context="{'group_by':'type_id'}" />
<separator orientation="vertical"/>
<filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
<filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Creation Date"/>
@ -135,7 +130,7 @@
<field name="help">This report allows you to analyse the performance of your projects and users. You can analyse the quantities of tasks, the hours spent compared to the planned hours, the average number of days to open or close a task, etc.</field>
</record>
<menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="project_report_task"/>
<menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="base.menu_project_report"/>
</data>
</openerp>

2
addons/project_issue/project_issue_view.xml
View File

@ -157,7 +157,7 @@
</notebook>
</sheet>
<footer>
<field name="message_ids" widget="ThreadView"/>
<field name="message_ids" widget="mail_thread"/>
</footer>
</form>
</field>

2
addons/project_timesheet/report/task_report_view.xml
View File

@ -66,7 +66,7 @@
<field name="view_mode">tree,graph</field>
<field name="context">{'search_default_year':1,'search_default_month':1, 'search_default_group_user_id':1}</field>
</record>
<menuitem id="menu_timesheet_task_user" parent="hr_timesheet.menu_hr_reporting_timesheet"
<menuitem id="menu_timesheet_task_user" parent="hr.menu_hr_reporting_timesheet"
action="action_report_timesheet_task_user" sequence="1"/>
</data>

2
addons/purchase/purchase_view.xml
View File

@ -257,7 +257,7 @@
</notebook>
</sheet>
<footer>
<field name="message_ids" widget="ThreadView"/>
<field name="message_ids" widget="mail_thread"/>
</footer>
</form>
</field>

2
addons/purchase_requisition/purchase_requisition_view.xml
View File

@ -105,7 +105,7 @@
</notebook>
</sheet>
<footer>
<field name="message_ids" widget="ThreadView"/>
<field name="message_ids" widget="mail_thread"/>
</footer>
</form>
</field>

6
addons/sale/sale_view.xml
View File

@ -321,7 +321,7 @@
</notebook>
</sheet>
<footer>
<field name="message_ids" widget="ThreadView"/>
<field name="message_ids" widget="mail_thread"/>
</footer>
</form>
</field>
@ -370,7 +370,7 @@
<field name="context">{"search_default_sales":1}</field>
<field name="help">Sales Orders help you manage quotations and orders from your customers. OpenERP suggests that you start by creating a quotation. Once it is confirmed, the quotation will be converted into a Sales Order. OpenERP can handle several types of products so that a sales order may trigger tasks, delivery orders, manufacturing orders, purchases and so on. Based on the configuration of the sales order, a draft invoice will be generated so that you just have to confirm it when you want to bill your customer.</field>
</record>
<menuitem action="action_order_form" id="menu_sale_order" parent="base.menu_sales" sequence="4" groups="base.group_sale_salesman,base.group_sale_manager"/>
<menuitem action="action_order_form" id="menu_sale_order" parent="base.menu_sales" sequence="5" groups="base.group_sale_salesman,base.group_sale_manager"/>
<record id="action_order_tree2" model="ir.actions.act_window">
<field name="name">Sales in Exception</field>
@ -413,7 +413,7 @@
<menuitem id="menu_sale_quotations"
action="action_order_tree5" parent="base.menu_sales"
sequence="3"/>
sequence="4"/>
<record id="action_order_tree" model="ir.actions.act_window">
<field name="name">Old Quotations</field>

3984
addons/stock/i18n/es_DO.po Normal file
View File

File diff suppressed because it is too large Load Diff

8
addons/stock/stock_view.xml
View File

@ -978,7 +978,7 @@
</xpath>
<xpath expr="/form/sheet" position="after">
<footer>
<field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
</footer>
</xpath>
</data>
@ -1090,9 +1090,9 @@
<field name="partner_id" on_change="onchange_partner_in(partner_id)" colspan="4" string="Supplier"/>
</xpath>
<xpath expr="/form/sheet" position="after">
<div class="oe_bottom">
<field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
</div>
<footer>
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
</footer>
</xpath>
</data>
</field>

268
addons/stock_planning/i18n/ja.po
View File

@ -8,21 +8,21 @@ 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-06-30 06:17+0000\n"
"PO-Revision-Date: 2012-07-04 02:25+0000\n"
"Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@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-07-01 04:40+0000\n"
"X-Generator: Launchpad (build 15520)\n"
"X-Launchpad-Export-Date: 2012-07-04 04:38+0000\n"
"X-Generator: Launchpad (build 15544)\n"
#. module: stock_planning
#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
#, python-format
msgid ""
"No forecasts for selected period or no products in selected category !"
msgstr ""
msgstr "選択した期間の予測がないか、選択された分類の中に製品がありません。"
#. module: stock_planning
#: help:stock.planning,stock_only:0
@ -30,76 +30,76 @@ msgid ""
"Check to calculate stock location of selected warehouse only. If not "
"selected calculation is made for input, stock and output location of "
"warehouse."
msgstr ""
msgstr "選択された倉庫のみの在庫場所を計算するためにチェックします。選択しない場合の計算は倉庫の入力、在庫、出力場所によってなされます。"
#. module: stock_planning
#: field:stock.planning,maximum_op:0
msgid "Maximum Rule"
msgstr ""
msgstr "最大値のルール"
#. module: stock_planning
#: view:stock.planning:0
#: view:stock.sale.forecast:0
msgid "Group By..."
msgstr ""
msgstr "グループ化…"
#. module: stock_planning
#: help:stock.sale.forecast,product_amt:0
msgid ""
"Forecast value which will be converted to Product Quantity according to "
"prices."
msgstr ""
msgstr "予測値は価格により製品数量に変換されます。"
#. module: stock_planning
#: code:addons/stock_planning/stock_planning.py:626
#: code:addons/stock_planning/stock_planning.py:670
#, python-format
msgid "Incoming Left must be greater than 0 !"
msgstr ""
msgstr "入荷の残りは0より大きい必要があります。"
#. module: stock_planning
#: help:stock.planning,outgoing_before:0
msgid ""
"Planned Out in periods before calculated. Between start date of current "
"period and one day before start of calculated period."
msgstr ""
msgstr "計算される前に期間内で計画された出荷です。現在の期間の開始日と計算された期間の開始１日前の間です。"
#. module: stock_planning
#: help:stock.sale.forecast.createlines,warehouse_id:0
msgid ""
"Warehouse which forecasts will concern. If during stock planning you will "
"need sales forecast for all warehouses choose any warehouse now."
msgstr ""
msgstr "予測値が関係する倉庫です。在庫計画の期間に全ての倉庫の受注予測を必要とするなら、今、倉庫を選択して下さい。"
#. module: stock_planning
#: field:stock.planning,outgoing_left:0
msgid "Expected Out"
msgstr ""
msgstr "期待された出荷"
#. module: stock_planning
#: view:stock.sale.forecast:0
msgid " "
msgstr ""
msgstr " "
#. module: stock_planning
#: field:stock.planning,incoming_left:0
msgid "Incoming Left"
msgstr ""
msgstr "入荷残り"
#. module: stock_planning
#: view:stock.sale.forecast.createlines:0
msgid "Create Forecasts Lines"
msgstr ""
msgstr "予測行の作成"
#. module: stock_planning
#: help:stock.planning,outgoing:0
msgid "Quantity of all confirmed outgoing moves in calculated Period."
msgstr ""
msgstr "計算された期間の全ての確認された出荷移動の数量"
#. module: stock_planning
#: view:stock.period.createlines:0
msgid "Create Daily Periods"
msgstr ""
msgstr "1日の期間の作成"
#. module: stock_planning
#: view:stock.planning:0
@ -109,45 +109,45 @@ msgstr ""
#: field:stock.sale.forecast,company_id:0
#: field:stock.sale.forecast.createlines,company_id:0
msgid "Company"
msgstr ""
msgstr "会社"
#. module: stock_planning
#: help:stock.planning,warehouse_forecast:0
msgid ""
"All sales forecasts for selected Warehouse of selected Product during "
"selected Period."
msgstr ""
msgstr "選択した期間中に選択した製品の選択した倉庫のための全ての受注予測です。"
#. module: stock_planning
#: view:stock.planning:0
msgid "Minimum Stock Rule Indicators"
msgstr ""
msgstr "最小在庫ルールの指標"
#. module: stock_planning
#: help:stock.sale.forecast.createlines,period_id:0
msgid "Period which forecasts will concern."
msgstr ""
msgstr "予測が関係する期間"
#. module: stock_planning
#: field:stock.planning,stock_only:0
msgid "Stock Location Only"
msgstr ""
msgstr "在庫場所のみ"
#. module: stock_planning
#: help:stock.planning,already_out:0
msgid ""
"Quantity which is already dispatched out of this warehouse in current period."
msgstr ""
msgstr "現在の期間でこの倉庫の既に割り当てられた数量"
#. module: stock_planning
#: field:stock.planning,incoming:0
msgid "Confirmed In"
msgstr ""
msgstr "入庫確認"
#. module: stock_planning
#: view:stock.planning:0
msgid "Current Period Situation"
msgstr ""
msgstr "現在期間の状況"
#. module: stock_planning
#: model:ir.actions.act_window,help:stock_planning.action_stock_period_createlines_form
@ -156,11 +156,13 @@ msgid ""
"are independent of financial periods. If you need periods other than day-, "
"week- or month-based, you may also add then manually."
msgstr ""
"このウィザードは在庫計画の期間の作成を手助けします。こららの期間は会計上の期間とは独立しています。日、週、月ベースの他の期間を必要とする場合は、手動で追加"
"することができます。"
#. module: stock_planning
#: view:stock.period.createlines:0
msgid "Create Monthly Periods"
msgstr ""
msgstr "月次期間の作成"
#. module: stock_planning
#: model:ir.model,name:stock_planning.model_stock_period_createlines
@ -170,46 +172,46 @@ msgstr ""
#. module: stock_planning
#: field:stock.planning,outgoing_before:0
msgid "Planned Out Before"
msgstr ""
msgstr "先行計画出荷"
#. module: stock_planning
#: field:stock.planning.createlines,forecasted_products:0
msgid "All Products with Forecast"
msgstr ""
msgstr "予想を持つ全製品"
#. module: stock_planning
#: help:stock.planning,maximum_op:0
msgid "Maximum quantity set in Minimum Stock Rules for this Warehouse"
msgstr ""
msgstr "この倉庫のため、最大数量が最小在庫ルールで設定されます。"
#. module: stock_planning
#: view:stock.sale.forecast:0
msgid "Periods :"
msgstr ""
msgstr "期間："
#. module: stock_planning
#: help:stock.planning,procure_to_stock:0
msgid ""
"Check to make procurement to stock location of selected warehouse. If not "
"selected procurement will be made into input location of warehouse."
msgstr ""
msgstr "選択された倉庫の在庫場所で調達を行うためにチェックします。選択しない場合は、倉庫の入力場所の中で調達が行われます。"
#. module: stock_planning
#: help:stock.planning,already_in:0
msgid ""
"Quantity which is already picked up to this warehouse in current period."
msgstr ""
msgstr "現在の期間に既にこの倉庫に集められた数量"
#. module: stock_planning
#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
#, python-format
msgid "No products in selected category !"
msgstr ""
msgstr "選択された分類の中に製品がありません。"
#. module: stock_planning
#: view:stock.sale.forecast:0
msgid "Stock and Sales Forecast"
msgstr ""
msgstr "在庫と受注予測"
#. module: stock_planning
#: model:ir.model,name:stock_planning.model_stock_sale_forecast
@ -219,12 +221,12 @@ msgstr ""
#. module: stock_planning
#: field:stock.planning,to_procure:0
msgid "Planned In"
msgstr ""
msgstr "計画入庫"
#. module: stock_planning
#: field:stock.planning,stock_simulation:0
msgid "Stock Simulation"
msgstr ""
msgstr "在庫シミュレーション"
#. module: stock_planning
#: model:ir.model,name:stock_planning.model_stock_planning_createlines
@ -237,60 +239,60 @@ msgid ""
"Confirmed incoming in periods before calculated (Including Already In). "
"Between start date of current period and one day before start of calculated "
"period."
msgstr ""
msgstr "計算する前に期間内で確認された入庫（既に入庫分を含む）です。現在の期間の開始日と計算された期間の開始１日前の間です。"
#. module: stock_planning
#: view:stock.sale.forecast:0
msgid "Search Sales Forecast"
msgstr ""
msgstr "受注予測の検索"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period5_per_user:0
msgid "This User Period5"
msgstr ""
msgstr "このユーザの期間5"
#. module: stock_planning
#: help:stock.planning,history:0
msgid "History of procurement or internal supply of this planning line."
msgstr ""
msgstr "この計画行の調達、または内部供給の履歴"
#. module: stock_planning
#: help:stock.planning,company_forecast:0
msgid ""
"All sales forecasts for whole company (for all Warehouses) of selected "
"Product during selected Period."
msgstr ""
msgstr "選択した期間中に選択した製品の会社全体（全ての倉庫）ための全ての受注予測です。"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period1_per_user:0
msgid "This User Period1"
msgstr ""
msgstr "このユーザの期間1"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period3_per_user:0
msgid "This User Period3"
msgstr ""
msgstr "このユーザの期間3"
#. module: stock_planning
#: view:stock.planning:0
msgid "Stock Planning"
msgstr ""
msgstr "在庫計画"
#. module: stock_planning
#: field:stock.planning,minimum_op:0
msgid "Minimum Rule"
msgstr ""
msgstr "最小値のルール"
#. module: stock_planning
#: view:stock.planning:0
msgid "Procure Incoming Left"
msgstr ""
msgstr "調達入庫の残り"
#. module: stock_planning
#: view:stock.planning.createlines:0
#: view:stock.sale.forecast.createlines:0
msgid "Create"
msgstr ""
msgstr "作成"
#. module: stock_planning
#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
@ -298,12 +300,12 @@ msgstr ""
#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_manual
#: view:stock.planning:0
msgid "Master Procurement Schedule"
msgstr ""
msgstr "マスター調達スケジュール"
#. module: stock_planning
#: field:stock.planning,line_time:0
msgid "Past/Future"
msgstr ""
msgstr "過去 / 将来"
#. module: stock_planning
#: view:stock.period:0
@ -311,17 +313,17 @@ msgstr ""
#: field:stock.planning,state:0
#: field:stock.sale.forecast,state:0
msgid "State"
msgstr ""
msgstr "状態"
#. module: stock_planning
#: help:stock.sale.forecast.createlines,product_categ_id:0
msgid "Product Category of products which created forecasts will concern."
msgstr ""
msgstr "作成された予測が関係するであろう製品の製品分類です。"
#. module: stock_planning
#: model:ir.model,name:stock_planning.model_stock_period
msgid "stock period"
msgstr ""
msgstr "在庫期間"
#. module: stock_planning
#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
@ -334,7 +336,7 @@ msgstr ""
#: field:stock.sale.forecast,warehouse_id:0
#: field:stock.sale.forecast.createlines,warehouse_id:0
msgid "Warehouse"
msgstr ""
msgstr "倉庫"
#. module: stock_planning
#: help:stock.planning,stock_simulation:0
@ -346,21 +348,26 @@ msgid ""
"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
"In."
msgstr ""
"選択された期間終了時の在庫シミュレーション\n"
"　現在の期間のため：\n"
"初期在庫 - 既出庫 + 既入庫 - 期待出庫 + 入庫残\n"
"　その先の期間のため：\n"
"初期在庫 - 先行計画出庫 + 先行入庫 - 計画出庫 + 計画入庫"
#. module: stock_planning
#: help:stock.sale.forecast,analyze_company:0
msgid "Check this box to see the sales for whole company."
msgstr ""
msgstr "会社の全体のための受注を見るためにこのボックスをチェックして下さい。"
#. module: stock_planning
#: view:stock.sale.forecast:0
msgid "Per Department :"
msgstr ""
msgstr "部署毎："
#. module: stock_planning
#: field:stock.planning,incoming_before:0
msgid "Incoming Before"
msgstr ""
msgstr "先行入庫"
#. module: stock_planning
#: code:addons/stock_planning/stock_planning.py:641
@ -382,6 +389,17 @@ msgid ""
" \n"
" Stock Simulation: %s Minimum stock: %s"
msgstr ""
" MPSによりユーザのために作成された調達：%s　作成日：%s　\n"
" 期間：%s　\n"
" 状態に応じて：　\n"
" 倉庫予測：%s　\n"
" 初期在庫：%s　\n"
" 計画出庫：%s　計画入庫：%s　\n"
" 既出庫：%s　既入庫：%s　\n"
" 確認済出庫：%s　確認済入庫：%s　\n"
" 先行計画出庫：%s　先行確認済入庫：%s　\n"
" 期待出庫：%s　入庫残：%s　\n"
" 在庫シミュレーション：%s　最小在庫：%s"
#. module: stock_planning
#: code:addons/stock_planning/stock_planning.py:626
@ -392,55 +410,55 @@ msgstr ""
#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
#, python-format
msgid "Error !"
msgstr ""
msgstr "エラー"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_user_id:0
msgid "This User"
msgstr ""
msgstr "このユーザ"
#. module: stock_planning
#: view:stock.planning:0
msgid "Forecasts"
msgstr ""
msgstr "予測"
#. module: stock_planning
#: view:stock.planning:0
msgid "Supply from Another Warehouse"
msgstr ""
msgstr "他の倉庫からの供給"
#. module: stock_planning
#: view:stock.planning:0
msgid "Calculate Planning"
msgstr ""
msgstr "計画の計算"
#. module: stock_planning
#: code:addons/stock_planning/stock_planning.py:146
#, python-format
msgid "Invalid action !"
msgstr ""
msgstr "無効なアクションです。"
#. module: stock_planning
#: help:stock.planning,stock_start:0
msgid "Stock quantity one day before current period."
msgstr ""
msgstr "現在の期間前の1日の在庫数量"
#. module: stock_planning
#: view:stock.planning:0
msgid "Procurement history"
msgstr ""
msgstr "調達履歴"
#. module: stock_planning
#: help:stock.planning,product_uom:0
msgid ""
"Unit of Measure used to show the quantities of stock calculation.You can use "
"units from default category or from second category (UoS category)."
msgstr ""
msgstr "在庫計算の数量を表示するため使用する単位。デフォルト分類から、または第2分類（単位分類）から単位を使うことができます。"
#. module: stock_planning
#: view:stock.period.createlines:0
msgid "Create Weekly Periods"
msgstr ""
msgstr "週毎の期間を作成"
#. module: stock_planning
#: model:ir.actions.act_window,help:stock_planning.action_stock_period_form
@ -449,56 +467,57 @@ msgid ""
"account periods. You can use wizard for creating periods and review them "
"here."
msgstr ""
"在庫期間は在庫計画のために使用されます。在庫期間はアカウント期間から独立しています。ここからウィザードを使用して期間の作成やレビューができます。"
#. module: stock_planning
#: view:stock.planning:0
msgid "Calculated Period Simulation"
msgstr ""
msgstr "計算済期間シミュレーション"
#. module: stock_planning
#: view:stock.period.createlines:0
msgid "Cancel"
msgstr ""
msgstr "キャンセル"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period4_per_user:0
msgid "This User Period4"
msgstr ""
msgstr "このユーザの期間4"
#. module: stock_planning
#: view:stock.period:0
msgid "Stock and Sales Period"
msgstr ""
msgstr "在庫と受注の期間"
#. module: stock_planning
#: field:stock.planning,company_forecast:0
msgid "Company Forecast"
msgstr ""
msgstr "会社の予測"
#. module: stock_planning
#: help:stock.planning,minimum_op:0
msgid "Minimum quantity set in Minimum Stock Rules for this Warehouse"
msgstr ""
msgstr "最小数量はこの倉庫のために最小在庫ルールで設定します。"
#. module: stock_planning
#: view:stock.sale.forecast:0
msgid "Per User :"
msgstr ""
msgstr "ユーザ毎："
#. module: stock_planning
#: help:stock.planning.createlines,warehouse_id:0
msgid "Warehouse which planning will concern."
msgstr ""
msgstr "計画が関連する倉庫"
#. module: stock_planning
#: field:stock.sale.forecast,user_id:0
msgid "Created/Validated by"
msgstr ""
msgstr "作成者 / 検証者"
#. module: stock_planning
#: field:stock.planning,warehouse_forecast:0
msgid "Warehouse Forecast"
msgstr ""
msgstr "倉庫予測"
#. module: stock_planning
#: code:addons/stock_planning/stock_planning.py:674
@ -506,18 +525,18 @@ msgstr ""
msgid ""
"You must specify a Source Warehouse different than calculated (destination) "
"Warehouse !"
msgstr ""
msgstr "計算された（到着先）倉庫と異なる、元の倉庫を指定する必要があります。"
#. module: stock_planning
#: code:addons/stock_planning/stock_planning.py:146
#, python-format
msgid "Cannot delete a validated sales forecast!"
msgstr ""
msgstr "検証済受注予測は削除できません。"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period5_per_company:0
msgid "This Company Period5"
msgstr ""
msgstr "この会社の期間5"
#. module: stock_planning
#: field:stock.sale.forecast,product_uom:0
@ -527,85 +546,85 @@ msgstr ""
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period1_per_company:0
msgid "This Company Period1"
msgstr ""
msgstr "この会社の期間1"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period2_per_company:0
msgid "This Company Period2"
msgstr ""
msgstr "この会社の期間2"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period3_per_company:0
msgid "This Company Period3"
msgstr ""
msgstr "この会社の期間3"
#. module: stock_planning
#: field:stock.period,date_start:0
#: field:stock.period.createlines,date_start:0
msgid "Start Date"
msgstr ""
msgstr "開始日"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period2_per_user:0
msgid "This User Period2"
msgstr ""
msgstr "このユーザの期間2"
#. module: stock_planning
#: field:stock.planning,confirmed_forecasts_only:0
msgid "Validated Forecasts"
msgstr ""
msgstr "検証済予測"
#. module: stock_planning
#: help:stock.planning.createlines,product_categ_id:0
msgid ""
"Planning will be created for products from Product Category selected by this "
"field. This field is ignored when you check \"All Forecasted Product\" box."
msgstr ""
msgstr "計画はこの項目により選択した製品分類の製品のために作成されます。全ての製品予測をチェックした場合、この項目は無視されます。"
#. module: stock_planning
#: field:stock.planning,planned_outgoing:0
msgid "Planned Out"
msgstr ""
msgstr "計画出庫"
#. module: stock_planning
#: field:stock.sale.forecast,product_qty:0
msgid "Forecast Quantity"
msgstr ""
msgstr "予測数量"
#. module: stock_planning
#: view:stock.planning:0
msgid "Forecast"
msgstr ""
msgstr "予測"
#. module: stock_planning
#: selection:stock.period,state:0
#: selection:stock.planning,state:0
#: selection:stock.sale.forecast,state:0
msgid "Draft"
msgstr ""
msgstr "ドラフト"
#. module: stock_planning
#: view:stock.period:0
msgid "Closed"
msgstr ""
msgstr "閉じた"
#. module: stock_planning
#: view:stock.planning:0
#: view:stock.sale.forecast:0
msgid "Warehouse "
msgstr ""
msgstr "倉庫 "
#. module: stock_planning
#: help:stock.sale.forecast,product_uom:0
msgid ""
"Unit of Measure used to show the quantities of stock calculation.You can use "
"units form default category or from second category (UoS category)."
msgstr ""
msgstr "在庫計算の数量を示すために使用される単位。デフォルト分類から、または第2分類（単位の分類）から単位を使用することができます。"
#. module: stock_planning
#: view:stock.planning:0
msgid "Planning and Situation for Calculated Period"
msgstr ""
msgstr "計算された期間のための計画と状況"
#. module: stock_planning
#: help:stock.planning,planned_outgoing:0
@ -614,54 +633,56 @@ msgid ""
"Period of selected Product. To plan this value look at Confirmed Out or "
"Sales Forecasts. This value should be equal or greater than Confirmed Out."
msgstr ""
"選択した製品の選択した期間中の選択した倉庫からの計画出荷数量を入力します。出荷確認や受注予測ではこの値を見て計画します。この値は確認出荷以上である必要があ"
"ります。"
#. module: stock_planning
#: view:stock.period:0
msgid "Current Periods"
msgstr ""
msgstr "現在期間"
#. module: stock_planning
#: view:stock.planning:0
msgid "Internal Supply"
msgstr ""
msgstr "内部供給"
#. module: stock_planning
#: code:addons/stock_planning/stock_planning.py:724
#, python-format
msgid "%s Pick List %s (%s, %s) %s %s \n"
msgstr ""
msgstr "%s 集荷リスト %s (%s, %s) %s %s \n"
#. module: stock_planning
#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
msgid "Create Sales Forecasts"
msgstr ""
msgstr "受注予測の作成"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period4_id:0
msgid "Period4"
msgstr ""
msgstr "期間4"
#. module: stock_planning
#: field:stock.period,name:0
#: field:stock.period.createlines,name:0
msgid "Period Name"
msgstr ""
msgstr "期間名"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period2_id:0
msgid "Period2"
msgstr ""
msgstr "期間2"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period3_id:0
msgid "Period3"
msgstr ""
msgstr "期間3"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period1_id:0
msgid "Period1"
msgstr ""
msgstr "期間1"
#. module: stock_planning
#: model:ir.actions.act_window,help:stock_planning.action_stock_planning_createlines_form
@ -670,18 +691,20 @@ msgid ""
"warehouse, so you don't have to create them one by one. The wizard doesn't "
"duplicate lines if they already exist for this selection."
msgstr ""
"このウィザードは所定の選択された期間と倉庫のためにMPS計画行の作成を手助けします。そしてひとつひとつそれを作る必要はありません。それらがこの選択のために"
"既に存在するなら、ウィザードは重複する行を作成しません。"
#. module: stock_planning
#: field:stock.planning,outgoing:0
msgid "Confirmed Out"
msgstr ""
msgstr "確認済出庫"
#. module: stock_planning
#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
#: view:stock.planning.createlines:0
msgid "Create Stock Planning Lines"
msgstr ""
msgstr "在庫計画行の作成"
#. module: stock_planning
#: view:stock.planning:0
@ -691,32 +714,32 @@ msgstr ""
#. module: stock_planning
#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
msgid "Sales Forecast"
msgstr ""
msgstr "受注予測"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
msgid "This Warehouse Period1"
msgstr ""
msgstr "この倉庫の期間1"
#. module: stock_planning
#: view:stock.sale.forecast:0
msgid "Sales History"
msgstr ""
msgstr "受注履歴"
#. module: stock_planning
#: field:stock.planning,supply_warehouse_id:0
msgid "Source Warehouse"
msgstr ""
msgstr "元の倉庫"
#. module: stock_planning
#: help:stock.sale.forecast,product_qty:0
msgid "Forecast Product quantity."
msgstr ""
msgstr "製品数量の予測"
#. module: stock_planning
#: field:stock.planning,stock_supply_location:0
msgid "Stock Supply Location"
msgstr ""
msgstr "在庫供給場所"
#. module: stock_planning
#: help:stock.period.createlines,date_stop:0
@ -758,6 +781,8 @@ msgid ""
"manual procurement with this forecast when some periods are exceptional for "
"usual minimum stock rules."
msgstr ""
"この受注予測数量は在庫計画者が調達を手動で行う、あるいは自動調達を補完するための表示です。幾つかの期間が通常の最小在庫ルールの例外である場合、この予測とと"
"もに手動の調達を使うことができます。"
#. module: stock_planning
#: model:ir.actions.act_window,help:stock_planning.action_view_stock_planning_form
@ -791,6 +816,17 @@ msgid ""
" Expected Out: %s Incoming Left: %s \n"
" Stock Simulation: %s Minimum stock: %s "
msgstr ""
"MPSからユーザにより作成された集荷：%s　作成日：%s　\n"
" 期間：%s　\n"
" 状態に応じて：　\n"
" 倉庫予測：%s　\n"
" 初期在庫：%s　\n"
" 計画出庫：%s　計画入庫：%s　\n"
" 既出庫：%s　既入庫：%s　\n"
" 確認済出庫：%s　確認済入庫：%s　\n"
" 先行計画出庫：%s　先行確認済入庫：%s　\n"
" 期待出庫：%s　入庫残：%s　\n"
" 在庫シミュレーション：%s　最小在庫：%s "
#. module: stock_planning
#: field:stock.planning,period_id:0
@ -853,7 +889,7 @@ msgstr ""
#: view:stock.sale.forecast:0
#: selection:stock.sale.forecast,state:0
msgid "Validated"
msgstr ""
msgstr "検証済"
#. module: stock_planning
#: view:stock.period:0
@ -951,7 +987,7 @@ msgstr ""
msgid ""
"Shows which warehouse this forecast concerns. If during stock planning you "
"will need sales forecast for all warehouses choose any warehouse now."
msgstr ""
msgstr "この予測がどの倉庫に関連するかを表示します。在庫計画の期間に全ての倉庫の受注予測が必要な場合、今、倉庫を選択して下さい。"
#. module: stock_planning
#: code:addons/stock_planning/stock_planning.py:661
@ -1071,7 +1107,7 @@ msgstr ""
#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
#: view:stock.sale.forecast:0
msgid "Sales Forecasts"
msgstr ""
msgstr "受注予測"
#. module: stock_planning
#: field:stock.planning.createlines,product_categ_id:0
@ -1143,7 +1179,7 @@ msgstr "誰がこの予測を作成したのか、検証したのかを示しま
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_team_id:0
msgid "Sales Team"
msgstr ""
msgstr "販売チーム"
#. module: stock_planning
#: help:stock.planning,incoming_left:0
@ -1164,7 +1200,7 @@ msgstr ""
#. module: stock_planning
#: view:stock.sale.forecast:0
msgid "Calculate Sales History"
msgstr ""
msgstr "受注履歴の計算"
#. module: stock_planning
#: model:ir.actions.act_window,help:stock_planning.action_stock_sale_forecast_createlines_form