[MERGE]merge with trunk addosn
bzr revid: sgo@tinyerp.com-20120705093637-gduzr141b3ech762
This commit is contained in:
Sanjay Gohel (Open ERP)
commit
3c94320597
|
|
@ -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': [
|
||||
|
|
|
|||
|
|
@ -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">
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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',
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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')
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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">-->
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ 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-07-04 02:25+0000\n"
|
||||
"PO-Revision-Date: 2012-07-04 23:38+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-04 04:38+0000\n"
|
||||
"X-Launchpad-Export-Date: 2012-07-05 04:49+0000\n"
|
||||
"X-Generator: Launchpad (build 15544)\n"
|
||||
|
||||
#. module: stock_planning
|
||||
|
|
@ -453,7 +453,7 @@ msgstr "調達履歴"
|
|||
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 "在庫計算の数量を表示するため使用する単位。デフォルト分類から、または第2分類（単位分類）から単位を使うことができます。"
|
||||
msgstr "在庫計算の数量を表示するため使用する単位。デフォルト分類から、または第2分類（販売単位分類）から単位を使うことができます。"
|
||||
|
||||
#. module: stock_planning
|
||||
#: view:stock.period.createlines:0
|
||||
|
|
@ -541,7 +541,7 @@ msgstr "この会社の期間5"
|
|||
#. module: stock_planning
|
||||
#: field:stock.sale.forecast,product_uom:0
|
||||
msgid "Product UoM"
|
||||
msgstr ""
|
||||
msgstr "製品単位"
|
||||
|
||||
#. module: stock_planning
|
||||
#: field:stock.sale.forecast,analyzed_period1_per_company:0
|
||||
|
|
@ -619,7 +619,7 @@ msgstr "倉庫 "
|
|||
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 "在庫計算の数量を示すために使用される単位。デフォルト分類から、または第2分類（単位の分類）から単位を使用することができます。"
|
||||
msgstr "在庫計算の数量を示すために使用される単位。デフォルト分類から、または第2分類（販売単位分類）から単位を使用することができます。"
|
||||
|
||||
#. module: stock_planning
|
||||
#: view:stock.planning:0
|
||||
|
|
@ -709,7 +709,7 @@ msgstr "在庫計画行の作成"
|
|||
#. module: stock_planning
|
||||
#: view:stock.planning:0
|
||||
msgid "General Info"
|
||||
msgstr ""
|
||||
msgstr "一般情報"
|
||||
|
||||
#. module: stock_planning
|
||||
#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
|
||||
|
|
@ -744,14 +744,14 @@ msgstr "在庫供給場所"
|
|||
#. module: stock_planning
|
||||
#: help:stock.period.createlines,date_stop:0
|
||||
msgid "Ending date for planning period."
|
||||
msgstr ""
|
||||
msgstr "計画期間の終了日"
|
||||
|
||||
#. module: stock_planning
|
||||
#: help:stock.planning.createlines,forecasted_products:0
|
||||
msgid ""
|
||||
"Check this box to create planning for all products having any forecast for "
|
||||
"selected Warehouse and Period. Product Category field will be ignored."
|
||||
msgstr ""
|
||||
msgstr "選択した倉庫と期間の全ての製品が任意の予測を持つための計画を作成するにはこのボックスをチェックします。製品分類項目は無視されます。"
|
||||
|
||||
#. module: stock_planning
|
||||
#: code:addons/stock_planning/stock_planning.py:632
|
||||
|
|
@ -759,19 +759,19 @@ msgstr ""
|
|||
#: code:addons/stock_planning/stock_planning.py:702
|
||||
#, python-format
|
||||
msgid "MPS(%s) %s"
|
||||
msgstr ""
|
||||
msgstr "MPS（%s）%s"
|
||||
|
||||
#. module: stock_planning
|
||||
#: field:stock.planning,already_in:0
|
||||
msgid "Already In"
|
||||
msgstr ""
|
||||
msgstr "既入庫"
|
||||
|
||||
#. module: stock_planning
|
||||
#: field:stock.planning,product_uom_categ:0
|
||||
#: field:stock.planning,product_uos_categ:0
|
||||
#: field:stock.sale.forecast,product_uom_categ:0
|
||||
msgid "Product UoM Category"
|
||||
msgstr ""
|
||||
msgstr "製品単位分類"
|
||||
|
||||
#. module: stock_planning
|
||||
#: model:ir.actions.act_window,help:stock_planning.action_view_stock_sale_forecast_form
|
||||
|
|
@ -798,6 +798,10 @@ msgid ""
|
|||
"can trigger the procurement of what is missing to reach your desired "
|
||||
"quantities"
|
||||
msgstr ""
|
||||
"マスタ調達スケジュールは倉庫の補充のための主な操縦者になることができ、または自動MRPスケジューリング（最小在庫ルール他）を補完します。\n"
|
||||
"各MPS行は現在と未来の在庫レベルを基本として、計画された在庫移動と同様、与えられた倉庫の中の与えられた在庫期間のために、与えられた製品の入庫と出庫の前も"
|
||||
"って計算された概観を与えます。予測数量は手動で変更することができます。そしてシミュレート結果の在庫数量に満足したなら、希望の数量に到達しないものの調達のき"
|
||||
"っかけとすることができます。"
|
||||
|
||||
#. module: stock_planning
|
||||
#: code:addons/stock_planning/stock_planning.py:685
|
||||
|
|
@ -834,48 +838,48 @@ msgstr ""
|
|||
#: field:stock.sale.forecast,period_id:0
|
||||
#: field:stock.sale.forecast.createlines,period_id:0
|
||||
msgid "Period"
|
||||
msgstr ""
|
||||
msgstr "期間"
|
||||
|
||||
#. module: stock_planning
|
||||
#: field:stock.sale.forecast,product_uos_categ:0
|
||||
msgid "Product UoS Category"
|
||||
msgstr ""
|
||||
msgstr "製品販売単位分類"
|
||||
|
||||
#. module: stock_planning
|
||||
#: field:stock.planning,active_uom:0
|
||||
#: field:stock.sale.forecast,active_uom:0
|
||||
msgid "Active UoM"
|
||||
msgstr ""
|
||||
msgstr "アクティブな単位"
|
||||
|
||||
#. module: stock_planning
|
||||
#: view:stock.planning:0
|
||||
msgid "Search Stock Planning"
|
||||
msgstr ""
|
||||
msgstr "在庫計画の検索"
|
||||
|
||||
#. module: stock_planning
|
||||
#: field:stock.sale.forecast.createlines,copy_forecast:0
|
||||
msgid "Copy Last Forecast"
|
||||
msgstr ""
|
||||
msgstr "最終予測のコピー"
|
||||
|
||||
#. module: stock_planning
|
||||
#: help:stock.sale.forecast,product_id:0
|
||||
msgid "Shows which product this forecast concerns."
|
||||
msgstr ""
|
||||
msgstr "この予測に関連する製品の表示"
|
||||
|
||||
#. module: stock_planning
|
||||
#: selection:stock.planning,state:0
|
||||
msgid "Done"
|
||||
msgstr ""
|
||||
msgstr "完了"
|
||||
|
||||
#. module: stock_planning
|
||||
#: field:stock.period.createlines,period_ids:0
|
||||
msgid "Periods"
|
||||
msgstr ""
|
||||
msgstr "期間"
|
||||
|
||||
#. module: stock_planning
|
||||
#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
|
||||
msgid "Create Stock Periods"
|
||||
msgstr ""
|
||||
msgstr "在庫期間の作成"
|
||||
|
||||
#. module: stock_planning
|
||||
#: view:stock.period:0
|
||||
|
|
@ -883,7 +887,7 @@ msgstr ""
|
|||
#: view:stock.planning.createlines:0
|
||||
#: view:stock.sale.forecast.createlines:0
|
||||
msgid "Close"
|
||||
msgstr ""
|
||||
msgstr "閉じる"
|
||||
|
||||
#. module: stock_planning
|
||||
#: view:stock.sale.forecast:0
|
||||
|
|
@ -895,47 +899,47 @@ msgstr "検証済"
|
|||
#: view:stock.period:0
|
||||
#: selection:stock.period,state:0
|
||||
msgid "Open"
|
||||
msgstr ""
|
||||
msgstr "開く"
|
||||
|
||||
#. module: stock_planning
|
||||
#: help:stock.sale.forecast.createlines,copy_forecast:0
|
||||
msgid "Copy quantities from last Stock and Sale Forecast."
|
||||
msgstr ""
|
||||
msgstr "最終在庫と受注予測から数量をコピー"
|
||||
|
||||
#. module: stock_planning
|
||||
#: field:stock.sale.forecast,analyzed_period1_per_dept:0
|
||||
msgid "This Dept Period1"
|
||||
msgstr ""
|
||||
msgstr "この部門の期間1"
|
||||
|
||||
#. module: stock_planning
|
||||
#: field:stock.sale.forecast,analyzed_period3_per_dept:0
|
||||
msgid "This Dept Period3"
|
||||
msgstr ""
|
||||
msgstr "この部門の期間3"
|
||||
|
||||
#. module: stock_planning
|
||||
#: field:stock.sale.forecast,analyzed_period2_per_dept:0
|
||||
msgid "This Dept Period2"
|
||||
msgstr ""
|
||||
msgstr "この部門の期間2"
|
||||
|
||||
#. module: stock_planning
|
||||
#: field:stock.sale.forecast,analyzed_period5_per_dept:0
|
||||
msgid "This Dept Period5"
|
||||
msgstr ""
|
||||
msgstr "この部門の期間5"
|
||||
|
||||
#. module: stock_planning
|
||||
#: field:stock.sale.forecast,analyzed_period4_per_dept:0
|
||||
msgid "This Dept Period4"
|
||||
msgstr ""
|
||||
msgstr "この部門の期間4"
|
||||
|
||||
#. module: stock_planning
|
||||
#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
|
||||
msgid "This Warehouse Period2"
|
||||
msgstr ""
|
||||
msgstr "この倉庫の期間2"
|
||||
|
||||
#. module: stock_planning
|
||||
#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
|
||||
msgid "This Warehouse Period3"
|
||||
msgstr ""
|
||||
msgstr "この倉庫の期間3"
|
||||
|
||||
#. module: stock_planning
|
||||
#: help:stock.planning,stock_supply_location:0
|
||||
|
|
@ -944,38 +948,39 @@ msgid ""
|
|||
"supply will be made from Output location of Supply Warehouse. Used in "
|
||||
"'Supply from Another Warehouse' with Supply Warehouse."
|
||||
msgstr ""
|
||||
"供給倉庫の在庫場所から供給する場合はチェックします。チェックしない場合は供給倉庫の出力場所から供給されます。供給倉庫の他の倉庫場所から供給で使用されます。"
|
||||
|
||||
#. module: stock_planning
|
||||
#: field:stock.sale.forecast,create_uid:0
|
||||
msgid "Responsible"
|
||||
msgstr ""
|
||||
msgstr "担当"
|
||||
|
||||
#. module: stock_planning
|
||||
#: view:stock.sale.forecast:0
|
||||
msgid "Default UOM"
|
||||
msgstr ""
|
||||
msgstr "デフォルト単位"
|
||||
|
||||
#. module: stock_planning
|
||||
#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
|
||||
msgid "This Warehouse Period4"
|
||||
msgstr ""
|
||||
msgstr "この倉庫の期間4"
|
||||
|
||||
#. module: stock_planning
|
||||
#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
|
||||
msgid "This Warehouse Period5"
|
||||
msgstr ""
|
||||
msgstr "この倉庫の期間5"
|
||||
|
||||
#. module: stock_planning
|
||||
#: view:stock.period:0
|
||||
msgid "Current"
|
||||
msgstr ""
|
||||
msgstr "現在"
|
||||
|
||||
#. module: stock_planning
|
||||
#: help:stock.planning,supply_warehouse_id:0
|
||||
msgid ""
|
||||
"Warehouse used as source in supply pick move created by 'Supply from Another "
|
||||
"Warehouse'."
|
||||
msgstr ""
|
||||
msgstr "倉庫は、他の倉庫からの供給によって作成された、供給集荷移動の元として使用されます。"
|
||||
|
||||
#. module: stock_planning
|
||||
#: model:ir.model,name:stock_planning.model_stock_planning
|
||||
|
|
@ -993,12 +998,12 @@ msgstr "この予測がどの倉庫に関連するかを表示します。在庫
|
|||
#: code:addons/stock_planning/stock_planning.py:661
|
||||
#, python-format
|
||||
msgid "%s Procurement (%s, %s) %s %s \n"
|
||||
msgstr ""
|
||||
msgstr "%s 調達 (%s, %s) %s %s \n"
|
||||
|
||||
#. module: stock_planning
|
||||
#: field:stock.sale.forecast,analyze_company:0
|
||||
msgid "Per Company"
|
||||
msgstr ""
|
||||
msgstr "会社毎"
|
||||
|
||||
#. module: stock_planning
|
||||
#: help:stock.planning,to_procure:0
|
||||
|
|
@ -1006,42 +1011,42 @@ msgid ""
|
|||
"Enter quantity which (by your plan) should come in. Change this value and "
|
||||
"observe Stock simulation. This value should be equal or greater than "
|
||||
"Confirmed In."
|
||||
msgstr ""
|
||||
msgstr "入庫すべき（計画による）数量を入力します。この値を変更し、在庫シミュレーションを観察します。この値は確認済入庫以上である必要があります。"
|
||||
|
||||
#. module: stock_planning
|
||||
#: field:stock.sale.forecast,analyzed_period4_per_company:0
|
||||
msgid "This Company Period4"
|
||||
msgstr ""
|
||||
msgstr "この会社の期間4"
|
||||
|
||||
#. module: stock_planning
|
||||
#: help:stock.planning.createlines,period_id:0
|
||||
msgid "Period which planning will concern."
|
||||
msgstr ""
|
||||
msgstr "計画が関連する期間"
|
||||
|
||||
#. module: stock_planning
|
||||
#: field:stock.planning,already_out:0
|
||||
msgid "Already Out"
|
||||
msgstr ""
|
||||
msgstr "既出庫"
|
||||
|
||||
#. module: stock_planning
|
||||
#: help:stock.planning,product_id:0
|
||||
msgid "Product which this planning is created for."
|
||||
msgstr ""
|
||||
msgstr "この計画が作成される対象の製品"
|
||||
|
||||
#. module: stock_planning
|
||||
#: view:stock.sale.forecast:0
|
||||
msgid "Per Warehouse :"
|
||||
msgstr ""
|
||||
msgstr "倉庫毎："
|
||||
|
||||
#. module: stock_planning
|
||||
#: field:stock.planning,history:0
|
||||
msgid "Procurement History"
|
||||
msgstr ""
|
||||
msgstr "調達履歴"
|
||||
|
||||
#. module: stock_planning
|
||||
#: help:stock.period.createlines,date_start:0
|
||||
msgid "Starting date for planning period."
|
||||
msgstr ""
|
||||
msgstr "開始期間の開始日"
|
||||
|
||||
#. module: stock_planning
|
||||
#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
|
||||
|
|
@ -1051,48 +1056,48 @@ msgstr ""
|
|||
#: view:stock.period:0
|
||||
#: view:stock.period.createlines:0
|
||||
msgid "Stock Periods"
|
||||
msgstr ""
|
||||
msgstr "在庫期間"
|
||||
|
||||
#. module: stock_planning
|
||||
#: view:stock.planning:0
|
||||
msgid "Stock"
|
||||
msgstr ""
|
||||
msgstr "在庫"
|
||||
|
||||
#. module: stock_planning
|
||||
#: help:stock.planning,incoming:0
|
||||
msgid "Quantity of all confirmed incoming moves in calculated Period."
|
||||
msgstr ""
|
||||
msgstr "計算された期間の全ての確認済入庫移動の数量"
|
||||
|
||||
#. module: stock_planning
|
||||
#: field:stock.period,date_stop:0
|
||||
#: field:stock.period.createlines,date_stop:0
|
||||
msgid "End Date"
|
||||
msgstr ""
|
||||
msgstr "終了日"
|
||||
|
||||
#. module: stock_planning
|
||||
#: view:stock.planning:0
|
||||
msgid "No Requisition"
|
||||
msgstr ""
|
||||
msgstr "命令書なし"
|
||||
|
||||
#. module: stock_planning
|
||||
#: field:stock.sale.forecast,name:0
|
||||
msgid "Name"
|
||||
msgstr ""
|
||||
msgstr "名称"
|
||||
|
||||
#. module: stock_planning
|
||||
#: help:stock.sale.forecast,period_id:0
|
||||
msgid "Shows which period this forecast concerns."
|
||||
msgstr ""
|
||||
msgstr "この予測が関連する期間を表示"
|
||||
|
||||
#. module: stock_planning
|
||||
#: field:stock.planning,product_uom:0
|
||||
msgid "UoM"
|
||||
msgstr ""
|
||||
msgstr "単位"
|
||||
|
||||
#. module: stock_planning
|
||||
#: view:stock.period:0
|
||||
msgid "Closed Periods"
|
||||
msgstr ""
|
||||
msgstr "閉鎖済期間"
|
||||
|
||||
#. module: stock_planning
|
||||
#: view:stock.planning:0
|
||||
|
|
@ -1100,7 +1105,7 @@ msgstr ""
|
|||
#: view:stock.sale.forecast:0
|
||||
#: field:stock.sale.forecast,product_id:0
|
||||
msgid "Product"
|
||||
msgstr ""
|
||||
msgstr "製品"
|
||||
|
||||
#. module: stock_planning
|
||||
#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
|
||||
|
|
@ -1113,13 +1118,13 @@ msgstr "受注予測"
|
|||
#: field:stock.planning.createlines,product_categ_id:0
|
||||
#: field:stock.sale.forecast.createlines,product_categ_id:0
|
||||
msgid "Product Category"
|
||||
msgstr ""
|
||||
msgstr "製品分類"
|
||||
|
||||
#. module: stock_planning
|
||||
#: code:addons/stock_planning/stock_planning.py:672
|
||||
#, python-format
|
||||
msgid "You must specify a Source Warehouse !"
|
||||
msgstr ""
|
||||
msgstr "元の倉庫を指定する必要があります。"
|
||||
|
||||
#. module: stock_planning
|
||||
#: field:stock.planning,procure_to_stock:0
|
||||
|
|
@ -1136,7 +1141,7 @@ msgstr "承認"
|
|||
msgid ""
|
||||
"Period for this planning. Requisition will be created for beginning of the "
|
||||
"period."
|
||||
msgstr "この計画の期間。申請は期間の開始時に作成されます。"
|
||||
msgstr "この計画の期間。命令書は期間の開始時に作成されます。"
|
||||
|
||||
#. module: stock_planning
|
||||
#: code:addons/stock_planning/stock_planning.py:631
|
||||
|
|
@ -1188,6 +1193,8 @@ msgid ""
|
|||
"between Planned In and Confirmed In. For current period Already In is also "
|
||||
"calculated. This value is used to create procurement for lacking quantity."
|
||||
msgstr ""
|
||||
"計画された入庫数量のために残された数量。これは計画入庫と確認済入庫の間の計算された差です。現在の期間のために、既入庫も計算されます。この値は不足数量のため"
|
||||
"に調達を生成するのに使用されます。"
|
||||
|
||||
#. module: stock_planning
|
||||
#: help:stock.planning,outgoing_left:0
|
||||
|
|
@ -1195,7 +1202,7 @@ msgid ""
|
|||
"Quantity expected to go out in selected period besides Confirmed Out. As a "
|
||||
"difference between Planned Out and Confirmed Out. For current period Already "
|
||||
"Out is also calculated"
|
||||
msgstr ""
|
||||
msgstr "確認済出庫とは別に選択された期間に出庫すると期待される数量。計画出庫と確認済出庫の差です。現在期間の既出庫もまた計算されます。"
|
||||
|
||||
#. module: stock_planning
|
||||
#: view:stock.sale.forecast:0
|
||||
|
|
@ -1209,3 +1216,5 @@ msgid ""
|
|||
"you only have to fill in the forecast quantities. The wizard doesn't "
|
||||
"duplicate the line when another one exist for the same selection."
|
||||
msgstr ""
|
||||
"このウィザードは一度に複数の予測行を作成するのを手助けします。それが作成された後、あなたは予測数量を埋める必要があります。同じ選択に対して同じものが存在す"
|
||||
"る場合、ウィザードは行を重複させません。"
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue