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

[MERGE] technical no-op merge to restore history 

bzr revid: odo@openerp.com-20111026085631-qyrwgaocx0k531bl
This commit is contained in:
Olivier Dony 2011-10-26 10:56:31 +02:00
parent 692293d31b c9fdaa9e4d
commit 37d3fbaab6
8 changed files with 624 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
addons/association/i18n/fi.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: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2011-06-27 10:43+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"PO-Revision-Date: 2011-10-25 11:10+0000\n"
"Last-Translator: Jussi Mikkola <Unknown>\n"
"Language-Team: Finnish <fi@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: 2011-10-19 05:47+0000\n"
"X-Generator: Launchpad (build 14157)\n"
"X-Launchpad-Export-Date: 2011-10-26 05:13+0000\n"
"X-Generator: Launchpad (build 14189)\n"
#. module: association
#: field:profile.association.config.install_modules_wizard,wiki:0
@ -72,8 +72,8 @@ msgid ""
"Tracks and manages employee expenses, and can automatically re-invoice "
"clients if the expenses are project-related."
msgstr ""
"Seuraa ja hallitsee työntekijäkuluja ja voi automaattisesti laskuttaa "
"asiakasta, jos kulut liittyvät projektiin."
"Seuraa ja hallinnoi työntekijöiden matkalaskuja ja osaa myös automaattisesti "
"(kautta)laskuttaa projekteihin liittyvät kulut asiakkaalta."
#. module: association
#: help:profile.association.config.install_modules_wizard,project_gtd:0
@ -81,11 +81,14 @@ msgid ""
"GTD is a methodology to efficiently organise yourself and your tasks. This "
"module fully integrates GTD principle with OpenERP's project management."
msgstr ""
"Kerralla valmista (Getting things Done, GTD) on menetelmä tehokkaaseen "
"ajanhallintaan. Moduuli integroi saumattomasti GTD:n periaatteet OpenERPin "
"projektihallintaan."
#. module: association
#: view:profile.association.config.install_modules_wizard:0
msgid "Resources Management"
msgstr "Resurssienhallinta"
msgstr "Resurssien hallinta"
#. module: association
#: model:ir.module.module,shortdesc:association.module_meta_information
@ -95,7 +98,7 @@ msgstr "Yhdistysprofiili"
#. module: association
#: field:profile.association.config.install_modules_wizard,hr_expense:0
msgid "Expenses Tracking"
msgstr "Kulujenseuranta"
msgstr "Kulujen seuranta"
#. module: association
#: model:ir.actions.act_window,name:association.action_config_install_module
@ -109,6 +112,8 @@ msgid ""
"Lets you create wiki pages and page groups in order to keep track of "
"business knowledge and share it with and between your employees."
msgstr ""
"Mahdollistaa Wiki-sivujen luonnin ja sivujen kokoamisen ryhmiksi, mikä "
"tehostaa työntekijöiden välistä liiketoiminnan tietämyksen hallintaa."
#. module: association
#: help:profile.association.config.install_modules_wizard,project:0

584
addons/hr_attendance/i18n/es_CL.po Normal file
View File

@ -0,0 +1,584 @@
# Spanish (Chile) translation for openobject-addons
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
"PO-Revision-Date: 2011-10-25 14:27+0000\n"
"Last-Translator: Juano <Unknown>\n"
"Language-Team: Spanish (Chile) <es_CL@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: 2011-10-26 05:13+0000\n"
"X-Generator: Launchpad (build 14189)\n"
#. module: hr_attendance
#: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
msgid "Time Tracking"
msgstr "Control de Tiempo"
#. module: hr_attendance
#: view:hr.attendance:0
msgid "Group By..."
msgstr "Agrupar por..."
#. module: hr_attendance
#: view:hr.attendance:0
msgid "Today"
msgstr "Hoy"
#. module: hr_attendance
#: selection:hr.attendance.month,month:0
msgid "March"
msgstr "Marzo"
#. module: hr_attendance
#: view:hr.sign.in.out.ask:0
msgid ""
"You did not sign out the last time. Please enter the date and time you "
"signed out."
msgstr ""
"No registró la salida la última vez. Por favor, introduzca la fecha y hora "
"de la salida."
#. module: hr_attendance
#: report:report.hr.timesheet.attendance.error:0
msgid "Total period:"
msgstr "Total periodo:"
#. module: hr_attendance
#: field:hr.action.reason,name:0
msgid "Reason"
msgstr "Motivo"
#. module: hr_attendance
#: view:hr.attendance.error:0
msgid "Print Attendance Report Error"
msgstr "Imprimir informe errores asistenciales"
#. module: hr_attendance
#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:156
#, python-format
msgid "The sign-out date must be in the past"
msgstr ""
"La fecha del registro de salida debe ser en el pasado o en tiempo pasado."
#. module: hr_attendance
#: report:report.hr.timesheet.attendance.error:0
msgid "Date Signed"
msgstr "Fecha registro"
#. module: hr_attendance
#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
msgid ""
"The Time Tracking functionality aims to manage employee attendances from "
"Sign in/Sign out actions. You can also link this feature to an attendance "
"device using OpenERP's web service features."
msgstr ""
#. module: hr_attendance
#: view:hr.action.reason:0
msgid "Attendance reasons"
msgstr ""
#. module: hr_attendance
#: view:hr.attendance:0
#: field:hr.attendance,day:0
msgid "Day"
msgstr ""
#. module: hr_attendance
#: selection:hr.employee,state:0
msgid "Present"
msgstr "Presente"
#. module: hr_attendance
#: model:ir.model,name:hr_attendance.model_hr_sign_in_out_ask
msgid "Ask for Sign In Out"
msgstr "Preguntar para registrar entrada / salida"
#. module: hr_attendance
#: field:hr.attendance,action_desc:0
#: model:ir.model,name:hr_attendance.model_hr_action_reason
msgid "Action Reason"
msgstr "Razón de la acción"
#. module: hr_attendance
#: view:hr.sign.in.out:0
msgid "Ok"
msgstr "Ok"
#. module: hr_attendance
#: view:hr.action.reason:0
msgid "Define attendance reason"
msgstr "Defina el motivo de la ausencia"
#. module: hr_attendance
#: constraint:hr.employee:0
msgid ""
"Error ! You cannot select a department for which the employee is the manager."
msgstr ""
"¡Error! No puede seleccionar un departamento para el cual el empleado sea el "
"responsable o director."
#. module: hr_attendance
#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
msgid "Attendances By Month"
msgstr "Asistencia por mes"
#. module: hr_attendance
#: field:hr.sign.in.out,name:0
#: field:hr.sign.in.out.ask,name:0
msgid "Employees name"
msgstr "Nombre empleados"
#. module: hr_attendance
#: model:ir.actions.act_window,name:hr_attendance.open_view_attendance_reason
#: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance_reason
msgid "Attendance Reasons"
msgstr "Causas de asistencia/ausencia"
#. module: hr_attendance
#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:156
#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:162
#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:169
#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:174
#, python-format
msgid "UserError"
msgstr "Error del usuario"
#. module: hr_attendance
#: field:hr.attendance.error,end_date:0
#: field:hr.attendance.week,end_date:0
msgid "Ending Date"
msgstr "Fecha final"
#. module: hr_attendance
#: view:hr.attendance:0
msgid "Employee attendance"
msgstr "Asistencia del empleado"
#. module: hr_attendance
#: code:addons/hr_attendance/hr_attendance.py:136
#, python-format
msgid "Warning"
msgstr "Alerta"
#. module: hr_attendance
#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:169
#, python-format
msgid "The Sign-in date must be in the past"
msgstr "La fecha del registro de entrada debe ser anterior o en el pasado"
#. module: hr_attendance
#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:162
#, python-format
msgid "A sign-in must be right after a sign-out !"
msgstr "¡Un registro de entrada debe estar después de un registro de salida!"
#. module: hr_attendance
#: field:hr.employee,state:0
#: model:ir.model,name:hr_attendance.model_hr_attendance
msgid "Attendance"
msgstr "Asistencia"
#. module: hr_attendance
#: field:hr.attendance.error,max_delay:0
msgid "Max. Delay (Min)"
msgstr "Máx. retraso (minutos)"
#. module: hr_attendance
#: view:hr.attendance.error:0
#: view:hr.attendance.month:0
msgid "Print"
msgstr "Imprimir"
#. module: hr_attendance
#: view:hr.attendance:0
msgid "Hr Attendance Search"
msgstr "Buscar Asistencia RH"
#. module: hr_attendance
#: model:ir.module.module,description:hr_attendance.module_meta_information
msgid ""
"\n"
" This module aims to manage employee's attendances.\n"
" Keeps account of the attendances of the employees on the basis of the\n"
" actions(Sign in/Sign out) performed by them.\n"
" "
msgstr ""
"\n"
" Este módulo sirve para gestionar la asistencia de los empleados.\n"
" Controla la asistencia de los empleados mediante las acciones\n"
" (Registrar entrada/Registrar salida) realizadas por ellos.\n"
" "
#. module: hr_attendance
#: constraint:hr.attendance:0
msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
msgstr ""
"Error: Registro de entrada (resp. Registro de salida) debe seguir al "
"Registro de salida (resp. Registro de entrada)"
#. module: hr_attendance
#: selection:hr.attendance.month,month:0
msgid "July"
msgstr "julio"
#. module: hr_attendance
#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_error
#: model:ir.actions.report.xml,name:hr_attendance.attendance_error_report
msgid "Attendance Error Report"
msgstr "Reporte/Informe errores de asistencia"
#. module: hr_attendance
#: field:hr.attendance.error,init_date:0
#: field:hr.attendance.week,init_date:0
msgid "Starting Date"
msgstr "Fecha inicial"
#. module: hr_attendance
#: report:report.hr.timesheet.attendance.error:0
msgid "Min Delay"
msgstr "Mín. retraso"
#. module: hr_attendance
#: selection:hr.attendance,action:0
#: view:hr.employee:0
msgid "Sign In"
msgstr "Entrar"
#. module: hr_attendance
#: report:report.hr.timesheet.attendance.error:0
msgid "Operation"
msgstr "Operación"
#. module: hr_attendance
#: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
#, python-format
msgid "No Data Available"
msgstr ""
#. module: hr_attendance
#: selection:hr.attendance.month,month:0
msgid "September"
msgstr "septiembre"
#. module: hr_attendance
#: selection:hr.attendance.month,month:0
msgid "December"
msgstr "diciembre"
#. module: hr_attendance
#: field:hr.attendance.month,month:0
msgid "Month"
msgstr "Mes"
#. module: hr_attendance
#: report:report.hr.timesheet.attendance.error:0
msgid ""
"(*) A negative delay means that the employee worked more than encoded."
msgstr ""
"(*) Un retraso negativo significa que el empleado trabajó más horas de las "
"codificadas."
#. module: hr_attendance
#: help:hr.attendance,action_desc:0
msgid ""
"Specifies the reason for Signing In/Signing Out in case of extra hours."
msgstr "Especifique la razón de entrada y salida en el caso de horas extras."
#. module: hr_attendance
#: model:ir.model,name:hr_attendance.model_hr_attendance_month
msgid "Print Monthly Attendance Report"
msgstr "Imprimir informe mensual de asistencias"
#. module: hr_attendance
#: model:ir.model,name:hr_attendance.model_hr_sign_in_out
msgid "Sign In Sign Out"
msgstr "Entrada Salida"
#. module: hr_attendance
#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:103
#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:125
#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:141
#: view:hr.sign.in.out:0
#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_sigh_in_out
#: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance_sigh_in_out
#, python-format
msgid "Sign in / Sign out"
msgstr "Registrar entrada/salida"
#. module: hr_attendance
#: view:hr.sign.in.out.ask:0
msgid "hr.sign.out.ask"
msgstr ""
#. module: hr_attendance
#: selection:hr.attendance.month,month:0
msgid "August"
msgstr "agosto"
#. module: hr_attendance
#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:174
#, python-format
msgid "A sign-out must be right after a sign-in !"
msgstr "¡Un registro de salida debe estar después de un registro de entrada!"
#. module: hr_attendance
#: selection:hr.attendance.month,month:0
msgid "June"
msgstr "junio"
#. module: hr_attendance
#: model:ir.model,name:hr_attendance.model_hr_attendance_error
msgid "Print Error Attendance Report"
msgstr "Error en la impresión del informe de asistencia"
#. module: hr_attendance
#: model:ir.module.module,shortdesc:hr_attendance.module_meta_information
msgid "Attendances Of Employees"
msgstr ""
#. module: hr_attendance
#: field:hr.attendance,name:0
msgid "Date"
msgstr ""
#. module: hr_attendance
#: selection:hr.attendance.month,month:0
msgid "November"
msgstr ""
#. module: hr_attendance
#: constraint:hr.employee:0
msgid "Error ! You cannot create recursive Hierarchy of Employees."
msgstr ""
#. module: hr_attendance
#: selection:hr.attendance.month,month:0
msgid "October"
msgstr ""
#. module: hr_attendance
#: view:hr.attendance:0
msgid "My Attendances"
msgstr ""
#. module: hr_attendance
#: selection:hr.attendance.month,month:0
msgid "January"
msgstr ""
#. module: hr_attendance
#: selection:hr.action.reason,action_type:0
#: view:hr.sign.in.out:0
#: view:hr.sign.in.out.ask:0
msgid "Sign in"
msgstr ""
#. module: hr_attendance
#: view:hr.attendance.error:0
msgid "Analysis Information"
msgstr ""
#. module: hr_attendance
#: view:hr.sign.in.out:0
msgid "Sign-Out Entry must follow Sign-In."
msgstr ""
#. module: hr_attendance
#: report:report.hr.timesheet.attendance.error:0
msgid "Attendance Errors"
msgstr ""
#. module: hr_attendance
#: field:hr.attendance,action:0
#: selection:hr.attendance,action:0
msgid "Action"
msgstr ""
#. module: hr_attendance
#: view:hr.sign.in.out:0
msgid ""
"If you need your staff to sign in when they arrive at work and sign out "
"again at the end of the day, OpenERP allows you to manage this with this "
"tool. If each employee has been linked to a system user, then they can "
"encode their time with this action button."
msgstr ""
#. module: hr_attendance
#: field:hr.sign.in.out,emp_id:0
msgid "Employee ID"
msgstr ""
#. module: hr_attendance
#: model:ir.model,name:hr_attendance.model_hr_attendance_week
msgid "Print Week Attendance Report"
msgstr ""
#. module: hr_attendance
#: field:hr.sign.in.out.ask,emp_id:0
msgid "Empoyee ID"
msgstr ""
#. module: hr_attendance
#: view:hr.attendance.error:0
#: view:hr.attendance.month:0
#: view:hr.sign.in.out:0
#: view:hr.sign.in.out.ask:0
msgid "Cancel"
msgstr ""
#. module: hr_attendance
#: help:hr.action.reason,name:0
msgid "Specifies the reason for Signing In/Signing Out."
msgstr ""
#. module: hr_attendance
#: report:report.hr.timesheet.attendance.error:0
msgid ""
"(*) A positive delay means that the employee worked less than recorded."
msgstr ""
#. module: hr_attendance
#: view:hr.attendance.month:0
msgid "Print Attendance Report Monthly"
msgstr ""
#. module: hr_attendance
#: selection:hr.action.reason,action_type:0
#: view:hr.sign.in.out:0
#: view:hr.sign.in.out.ask:0
msgid "Sign out"
msgstr ""
#. module: hr_attendance
#: report:report.hr.timesheet.attendance.error:0
msgid "Delay"
msgstr ""
#. module: hr_attendance
#: view:hr.attendance:0
#: model:ir.model,name:hr_attendance.model_hr_employee
msgid "Employee"
msgstr ""
#. module: hr_attendance
#: code:addons/hr_attendance/hr_attendance.py:136
#, python-format
msgid ""
"You tried to %s with a date anterior to another event !\n"
"Try to contact the administrator to correct attendances."
msgstr ""
#. module: hr_attendance
#: view:hr.sign.in.out.ask:0
#: field:hr.sign.in.out.ask,last_time:0
msgid "Your last sign out"
msgstr ""
#. module: hr_attendance
#: report:report.hr.timesheet.attendance.error:0
msgid "Date Recorded"
msgstr ""
#. module: hr_attendance
#: model:ir.actions.act_window,name:hr_attendance.open_view_attendance
#: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance
#: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance
msgid "Attendances"
msgstr ""
#. module: hr_attendance
#: selection:hr.attendance.month,month:0
msgid "May"
msgstr ""
#. module: hr_attendance
#: view:hr.sign.in.out.ask:0
msgid "Your last sign in"
msgstr ""
#. module: hr_attendance
#: selection:hr.attendance,action:0
#: view:hr.employee:0
msgid "Sign Out"
msgstr ""
#. module: hr_attendance
#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
msgid ""
"Sign in / Sign out. In some companies, staff have to sign in when they "
"arrive at work and sign out again at the end of the day. If each employee "
"has been linked to a system user, then they can encode their time with this "
"action button."
msgstr ""
#. module: hr_attendance
#: field:hr.attendance,employee_id:0
msgid "Employee's Name"
msgstr ""
#. module: hr_attendance
#: selection:hr.employee,state:0
msgid "Absent"
msgstr ""
#. module: hr_attendance
#: selection:hr.attendance.month,month:0
msgid "February"
msgstr ""
#. module: hr_attendance
#: field:hr.action.reason,action_type:0
msgid "Action's type"
msgstr ""
#. module: hr_attendance
#: view:hr.attendance:0
msgid "Employee attendances"
msgstr ""
#. module: hr_attendance
#: field:hr.sign.in.out,state:0
msgid "Current state"
msgstr ""
#. module: hr_attendance
#: selection:hr.attendance.month,month:0
msgid "April"
msgstr ""
#. module: hr_attendance
#: view:hr.attendance.error:0
msgid "Bellow this delay, the error is considered to be voluntary"
msgstr ""
#. module: hr_attendance
#: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
#, python-format
msgid "No records found for your selection!"
msgstr ""
#. module: hr_attendance
#: view:hr.sign.in.out.ask:0
msgid ""
"You did not sign in the last time. Please enter the date and time you signed "
"in."
msgstr ""
#. module: hr_attendance
#: field:hr.attendance.month,year:0
msgid "Year"
msgstr ""
#. module: hr_attendance
#: view:hr.sign.in.out.ask:0
msgid "hr.sign.in.out.ask"
msgstr ""

2
addons/project/project_view.xml
View File

@ -175,7 +175,7 @@
<field name="context">{'search_default_Current':1}</field>
<field name="help">A project contains a set of tasks or issues that will be performed by your resources assigned to it. A project can be hierarchically structured, as a child of a Parent Project. This allows you to design large project structures with different phases spread over the project duration cycle. Each user can set his default project in his own preferences to automatically filter the tasks or issues he usually works on. If you choose to invoice the time spent on a project task, you can find project tasks to be invoiced in the billing section.</field>
</record>
<menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_project_management" sequence="1"/>
<menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_definitions" sequence="1"/>
<record id="open_view_template_project" model="ir.actions.act_window">
<field name="name">Templates of Projects</field>

12
addons/project_long_term/project_long_term.py
View File

@ -184,8 +184,7 @@ class project_phase(osv.osv):
duration = str(phase.duration) + duration_uom
result += '''
def Phase_%s():
title = \"%s\"
effort = \"%s\"''' % (phase.id, phase.name, duration)
effort = \"%s\"''' % (phase.id, duration)
start = []
if phase.constraint_date_start:
start.append('datetime.datetime.strptime("'+str(phase.constraint_date_start)+'", "%Y-%m-%d %H:%M:%S")')
@ -252,9 +251,8 @@ class project(osv.osv):
for key, vals in resource_objs.items():
result +='''
class User_%s(Resource):
title = \"%s\"
efficiency = %s
''' % (key, vals.get('name',False), vals.get('efficiency', False))
''' % (key, vals.get('efficiency', False))
result += '''
def Project():
@ -268,12 +266,11 @@ def Project():
# TODO: check if we need working_..., default values are ok.
result = """
def Project_%d():
title = \"%s\"
start = \'%s\'
working_days = %s
resource = %s
""" % (
project.id, project.name,
project.id,
project.date_start, working_days,
'|'.join(['User_'+str(x.id) for x in project.members])
)
@ -379,9 +376,8 @@ class project_task(osv.osv):
continue
result += '''
%sdef Task_%s():
%s title = \"%s\"
%s todo = \"%.2fH\"
%s effort = \"%.2fH\"''' % (ident,task.id, ident,task.name, ident,task.remaining_hours, ident,task.total_hours)
%s effort = \"%.2fH\"''' % (ident,task.id, ident,task.remaining_hours, ident,task.total_hours)
start = []
for t2 in task.parent_ids:
start.append("up.Task_%s.end" % (t2.id,))

14
addons/project_long_term/project_long_term_view.xml
View File

@ -2,7 +2,7 @@
<openerp>
<data>
<menuitem id="base.menu_project_long_term" name="Long Term Planning" parent="base.menu_main_pm" sequence="1"/>
<menuitem id="base.menu_project_long_term" name="Planning" parent="base.menu_main_pm" sequence="1"/>
# ------------------------------------------------------
# Project User Allocation
@ -71,7 +71,7 @@
<field name="model">project.user.allocation</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Users Allocation">
<search string="Planning of Users">
<group>
<field name="user_id"/>
<field name="phase_id"/>
@ -88,7 +88,7 @@
</field>
</record>
<record id="act_resouce_allocation" model="ir.actions.act_window">
<field name="name">Users Allocation</field>
<field name="name">Planning of Users</field>
<field name="res_model">project.user.allocation</field>
<field name="view_type">form</field>
<field name="view_mode">gantt,tree,form,calendar</field>
@ -118,14 +118,14 @@
</group>
</group>
<notebook colspan="4">
<page string="Users Allocation">
<page string="Planning of Users">
<field colspan="4" name="user_ids" nolabel="1">
<tree editable="bottom" string="Project User Allocation">
<tree editable="bottom" string="Project Users">
<field name="user_id"/>
<field name="date_start"/>
<field name="date_end"/>
</tree>
<form string="Project Users Allocation">
<form string="Project Users">
<field name="user_id"/>
<field name="date_start" />
<field name="date_end"/>
@ -377,7 +377,7 @@
<menuitem id="menu_resouce_allocation" action="act_resouce_allocation"
icon="STOCK_INDENT"
name="Users Allocations" parent="base.menu_project_long_term" sequence="2"/>
parent="base.menu_project_long_term" sequence="2"/>
<menuitem id="menu_pm_users_project1"
groups="base.group_extended"

10
addons/project_long_term/wizard/project_compute_phases_view.xml
View File

@ -3,13 +3,13 @@
<data>
<record id="view_project_compute_phases_select" model="ir.ui.view">
<field name="name">Compute Scheduling of Phases</field>
<field name="name">Schedule Phases</field>
<field name="model">project.compute.phases</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Compute Scheduling of Phases">
<form string="Schedule Phases">
<group colspan="4" col="4">
<separator colspan="4" string="Compute Scheduling of phases for all or specified project" />
<separator colspan="4" string="Schedule Phases" />
<field name="target_project" colspan="4"/>
<field name="project_id" colspan="4" attrs="{'invisible':[('target_project','=','all')], 'required':[('target_project','!=','all')]}"/>
<separator colspan="4"/>
@ -25,7 +25,7 @@
</record>
<record id="action_project_compute_phases" model="ir.actions.act_window">
<field name="name">Compute Phase Scheduling</field>
<field name="name">Schedule Phases</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">project.compute.phases</field>
<field name="view_type">form</field>
@ -36,7 +36,7 @@
</field>
</record>
<menuitem id="menu_compute_phase" name="Compute Phase Scheduling"
<menuitem id="menu_compute_phase"
parent="menu_phase_schedule" action="action_project_compute_phases"/>
</data>

9
addons/project_long_term/wizard/project_compute_tasks_view.xml
View File

@ -3,13 +3,12 @@
<data>
<record id="view_project_compute_tasks" model="ir.ui.view">
<field name="name">Compute Task Scheduling</field>
<field name="name">Schedule Tasks</field>
<field name="model">project.compute.tasks</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Compute Scheduling of Task">
<form string="Schedule Tasks">
<group colspan="4">
<separator colspan="4" string="Compute Scheduling of Task for specified project." />
<field name="project_id" colspan="4"/>
<separator colspan="4"/>
<group colspan="2" col="2">
@ -24,7 +23,7 @@
</record>
<record id="action_project_compute_tasks" model="ir.actions.act_window">
<field name="name">Compute Task Scheduling</field>
<field name="name">Schedule Tasks</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">project.compute.tasks</field>
<field name="view_type">form</field>
@ -33,7 +32,7 @@
<field name="target">new</field>
</record>
<menuitem id="menu_compute_tasks" name="Compute Task Scheduling"
<menuitem id="menu_compute_tasks"
parent="menu_phase_schedule" action="action_project_compute_tasks"/>
</data>

12
addons/share/i18n/fi.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: 2011-01-11 11:16+0000\n"
"PO-Revision-Date: 2011-06-13 06:18+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"PO-Revision-Date: 2011-10-25 12:21+0000\n"
"Last-Translator: Jussi Mikkola <Unknown>\n"
"Language-Team: Finnish <fi@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: 2011-10-19 05:41+0000\n"
"X-Generator: Launchpad (build 14157)\n"
"X-Launchpad-Export-Date: 2011-10-26 05:13+0000\n"
"X-Generator: Launchpad (build 14189)\n"
#. module: share
#: code:addons/share/web/editors.py:15
@ -149,7 +149,7 @@ msgstr "Jako velho: vaihe 2"
#. module: share
#: view:share.wizard:0
msgid "Share wizard: step 0"
msgstr "JJako velho: vaihe 0"
msgstr ""
#. module: share
#: view:share.wizard:0
@ -183,7 +183,7 @@ msgstr "Valmis"
#: field:share.wizard,user_ids:0
#: field:share.wizard.user,user_id:0
msgid "Users"
msgstr ""
msgstr "Käyttäjät"
#. module: share
#: code:addons/share/wizard/share_wizard.py:103