form
diff --git a/addons/event_moodle/event_view.xml b/addons/event_moodle/event_view.xml
index b009339d564..4324990a1d8 100644
--- a/addons/event_moodle/event_view.xml
+++ b/addons/event_moodle/event_view.xml
@@ -7,14 +7,13 @@
form
-
-
-
-
-
+
+
+
-
+
+
@@ -29,12 +28,12 @@
-
-
+
+
-
-
-
+
+
+
diff --git a/addons/event_project/wizard/event_project_retro_view.xml b/addons/event_project/wizard/event_project_retro_view.xml
index cfac9944d1b..b7ab7a55357 100644
--- a/addons/event_project/wizard/event_project_retro_view.xml
+++ b/addons/event_project/wizard/event_project_retro_view.xml
@@ -8,16 +8,16 @@
form
-
+
diff --git a/addons/google_base_account/wizard/google_login_view.xml b/addons/google_base_account/wizard/google_login_view.xml
index acd9e622b01..ddbd4db7ee2 100644
--- a/addons/google_base_account/wizard/google_login_view.xml
+++ b/addons/google_base_account/wizard/google_login_view.xml
@@ -7,15 +7,15 @@
form
-
+
diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py
index 1135b55034a..71d7d9aa93d 100644
--- a/addons/hr/__openerp__.py
+++ b/addons/hr/__openerp__.py
@@ -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': [
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 44b533fdc52..aac2b0637ce 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -309,6 +309,10 @@ class res_users(osv.osv):
return user_id
+ _columns = {
+ 'employee_ids': fields.one2many('hr.employee', 'user_id', 'Related employees'),
+ }
+
res_users()
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 1935cbbd03d..bbf66f0d4c3 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -13,12 +13,14 @@
form
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 5e6953a29d2..1797f32e9ce 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -9,6 +9,8 @@
+
@@ -18,60 +20,64 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -357,16 +363,21 @@
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
@@ -376,9 +387,6 @@
-
-
-
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index b41ccd0e935..3285f4c32a6 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -20,34 +20,32 @@
or
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index e769f3ff684..448e6401cbd 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -133,12 +133,13 @@
form
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
index 3bf762b0f50..c9daaffbe4c 100644
--- a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
@@ -8,15 +8,15 @@
form
-
+
diff --git a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
index e4f6ec33bcb..554355edbb1 100644
--- a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
@@ -7,15 +7,15 @@
form
-
+
diff --git a/addons/hr_attendance/wizard/hr_attendance_error_view.xml b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
index 0657855c549..4e284cd396c 100644
--- a/addons/hr_attendance/wizard/hr_attendance_error_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
@@ -8,17 +8,17 @@
form
-
+
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
index acc1f5e01b0..96d924f88a7 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
@@ -7,12 +7,6 @@
form
-
@@ -22,6 +16,12 @@
+
diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py
index 4f82d1b3014..1267f13ac04 100644
--- a/addons/hr_contract/hr_contract.py
+++ b/addons/hr_contract/hr_contract.py
@@ -44,7 +44,7 @@ class hr_employee(osv.osv):
'place_of_birth': fields.char('Place of Birth', size=30),
'children': fields.integer('Number of Children'),
'vehicle': fields.char('Company Vehicle', size=64),
- 'vehicle_distance': fields.integer('Home-Work Distance', help="In kilometers"),
+ 'vehicle_distance': fields.integer('Home-Work Dist.', help="In kilometers"),
'contract_ids': fields.one2many('hr.contract', 'employee_id', 'Contracts'),
'contract_id':fields.function(_get_latest_contract, string='Contract', type='many2one', relation="hr.contract", help='Latest contract of the employee'),
}
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 11cdba387ca..ae6789ea234 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -8,30 +8,32 @@
hr.employee
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
hr.contract.view.search
hr.contract
@@ -67,34 +69,44 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+ -
+
+
+
+ -
+
-
-
-
-
-
-
-
-
+
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index e6e3dd69a26..a5efaf42347 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -28,11 +28,15 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -133,10 +137,12 @@
hr.employee
-
+
-
-
+
+
+
+
@@ -157,49 +163,50 @@
+
+ ,
+
+
-
-
-
-
-
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -279,13 +286,17 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index c9d51139fa7..d855e02eea7 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -90,7 +90,7 @@
-
+
diff --git a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
index 5be8871446a..fffdf76f0e9 100644
--- a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
+++ b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
@@ -8,14 +8,14 @@
form
-
+
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 9d7ec10cc28..b1192701dfb 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -56,12 +56,12 @@ class hr_expense_expense(osv.osv):
return self.pool.get('res.currency').search(cr, uid, [('rate','=',1.0)], context=context)[0]
_name = "hr.expense.expense"
+ _inherit = ['mail.thread']
_description = "Expense"
_order = "id desc"
_columns = {
'name': fields.char('Description', size=128, required=True),
'id': fields.integer('Sheet ID', readonly=True),
- 'ref': fields.char('Reference', size=32),
'date': fields.date('Date', select=True),
'journal_id': fields.many2one('account.journal', 'Force Journal', help = "The journal used when the expense is invoiced"),
'employee_id': fields.many2one('hr.employee', "Employee", required=True),
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index dd89a3ab57d..b8868c3319f 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -49,7 +49,6 @@
-
@@ -74,38 +73,44 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -113,17 +118,13 @@
-
-
-
-
-
-
-
+
diff --git a/addons/hr_expense/report/expense.rml b/addons/hr_expense/report/expense.rml
index d0d73aa5ca4..bf456cfc4d6 100644
--- a/addons/hr_expense/report/expense.rml
+++ b/addons/hr_expense/report/expense.rml
@@ -160,7 +160,7 @@
Date
- Reference
+ Description
Validated By
@@ -176,7 +176,7 @@
[[ formatLang(o.date,date=True) ]]
- [[ o.ref ]]
+ [[ o.name ]]
[[ o.user_valid.name ]]
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 1299f4e9ce5..7877edf4b3a 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -8,7 +8,6 @@
tree
-
@@ -105,7 +104,7 @@
-
+
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index 09809e488ba..4509508b2be 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -50,7 +50,7 @@ Note that:
for example, you maybe will do it for the user 'admin'.
""",
'images': ['images/hr_allocation_requests.jpeg', 'images/hr_leave_requests.jpeg', 'images/leaves_analysis.jpeg'],
- 'depends': ['hr', 'crm', 'process', 'resource'],
+ 'depends': ['hr', 'base_calendar', 'process', 'resource'],
'init_xml': [],
'update_xml': [
'security/ir.model.access.csv',
@@ -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',
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index a1ab0ae04f3..2a2648f1beb 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -74,7 +74,8 @@ class hr_holidays_status(osv.osv):
_columns = {
'name': fields.char('Leave Type', size=64, required=True, translate=True),
- 'categ_id': fields.many2one('crm.case.categ', 'Meeting', domain="[('object_id.model', '=', 'crm.meeting')]", help='If you set a meeting type, OpenERP will create a meeting in the calendar once a leave is validated.'),
+ 'categ_id': fields.many2one('crm.meeting.type', 'Meeting Type',
+ help='Once a leave is validated, OpenERP will create a corresponding meeting of this type in the calendar.'),
'color_name': fields.selection([('red', 'Red'),('blue','Blue'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color in Report', required=True, help='This color will be used in the leaves summary located in Reporting\Leaves by Departement'),
'limit': fields.boolean('Allow to Override Limit', help='If you select this checkbox, the system allows the employees to take more leaves than the available ones for this type.'),
'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the leave type without removing it."),
@@ -128,7 +129,7 @@ class hr_holidays(osv.osv):
'notes': fields.text('Reasons',readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
'number_of_days_temp': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
'number_of_days': fields.function(_compute_number_of_days, string='Number of Days', store=True),
- 'case_id': fields.many2one('crm.meeting', 'Meeting'),
+ 'meeting_id': fields.many2one('crm.meeting', 'Meeting'),
'type': fields.selection([('remove','Leave Request'),('add','Allocation Request')], 'Request Type', required=True, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help="Choose 'Leave Request' if someone wants to take an off-day. \nChoose 'Allocation Request' if you want to increase the number of leaves available for someone", select=True),
'parent_id': fields.many2one('hr.holidays', 'Parent'),
'linked_request_ids': fields.one2many('hr.holidays', 'parent_id', 'Linked Requests',),
@@ -217,19 +218,12 @@ class hr_holidays(osv.osv):
}
return result
- def onchange_sec_id(self, cr, uid, ids, status, context=None):
- warning = {}
+ def onchange_status_id(self, cr, uid, ids, status_id, context=None):
double_validation = False
- obj_holiday_status = self.pool.get('hr.holidays.status')
- if status:
- holiday_status = obj_holiday_status.browse(cr, uid, status, context=context)
+ if status_id:
+ holiday_status = self.pool.get('hr.holidays.status').browse(cr, uid, status_id, context=context)
double_validation = holiday_status.double_validation
- if holiday_status.categ_id and holiday_status.categ_id.section_id and not holiday_status.categ_id.section_id.allow_unlink:
- warning = {
- 'title': "Warning for ",
- 'message': "You won\'t be able to cancel this leave request because the CRM Sales Team of the leave type disallows."
- }
- return {'warning': warning, 'value': {'double_validation': double_validation}}
+ return {'value': {'double_validation': double_validation}}
def set_to_draft(self, cr, uid, ids, context=None):
self.write(cr, uid, ids, {
@@ -271,7 +265,7 @@ class hr_holidays(osv.osv):
holiday_ids.append(record.id)
if record.holiday_type == 'employee' and record.type == 'remove':
meeting_obj = self.pool.get('crm.meeting')
- vals = {
+ meeting_vals = {
'name': record.name,
'categ_id': record.holiday_status_id.categ_id.id,
'duration': record.number_of_days_temp * 8,
@@ -280,11 +274,11 @@ class hr_holidays(osv.osv):
'date': record.date_from,
'end_date': record.date_to,
'date_deadline': record.date_to,
- 'leave_id': record.id,
+ 'state': 'done', # to block that meeting date in the calendar
}
- case_id = meeting_obj.create(cr, uid, vals)
+ meeting_id = meeting_obj.create(cr, uid, meeting_vals)
self._create_resource_leave(cr, uid, [record], context=context)
- self.write(cr, uid, ids, {'case_id': case_id})
+ self.write(cr, uid, ids, {'meeting_id': meeting_id})
elif record.holiday_type == 'category':
emp_ids = obj_emp.search(cr, uid, [('category_ids', 'child_of', [record.category_id.id])])
leave_ids = []
@@ -330,11 +324,11 @@ class hr_holidays(osv.osv):
return True
def holidays_cancel(self, cr, uid, ids, context=None):
- obj_crm_meeting = self.pool.get('crm.meeting')
+ meeting_obj = self.pool.get('crm.meeting')
for record in self.browse(cr, uid, ids):
# Delete the meeting
- if record.case_id:
- obj_crm_meeting.unlink(cr, uid, [record.case_id.id])
+ if record.meeting_id:
+ meeting_obj.unlink(cr, uid, [record.meeting_id.id])
# If a category that created several holidays, cancel all related
wf_service = netsvc.LocalService("workflow")
@@ -519,10 +513,4 @@ class hr_employee(osv.osv):
hr_employee()
-class crm_meeting(osv.osv):
- _inherit = 'crm.meeting'
- _columns = {
- 'leave_id': fields.many2one('hr.holidays','Leave'),
- }
-
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 34a61654faa..c22c4add718 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -110,29 +110,39 @@
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
+
@@ -159,26 +169,29 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -342,7 +355,7 @@
form
-
+
@@ -409,8 +422,7 @@
-
-
+
@@ -420,6 +432,7 @@
+
@@ -529,8 +542,13 @@
form
-
-
+
+
+
+
+
+
+
diff --git a/addons/hr_holidays/hr_holidays_wizard.xml b/addons/hr_holidays/hr_holidays_wizard.xml
deleted file mode 100644
index efeb8e29115..00000000000
--- a/addons/hr_holidays/hr_holidays_wizard.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index 082bf198e34..e7441060204 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -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" />
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
index f6f5851c051..c0bbf741277 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
@@ -8,16 +8,15 @@
form
-
+
@@ -33,7 +32,7 @@
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
index 4ef2dcc96c4..976d732ee69 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
@@ -8,11 +8,6 @@
form
-
@@ -20,6 +15,11 @@
+
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index f52c420df8a..bae89ed215b 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -7,36 +7,6 @@
-
-
- hr.hr.employee.view.form2
- hr.employee
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
hr.contract.view.form.inherit
@@ -45,8 +15,7 @@
-
-
+
@@ -105,7 +74,7 @@
hr.payroll.structure
form
-
+
@@ -249,6 +218,12 @@
+
+
hr.payslip.form
@@ -265,13 +240,18 @@
-
-
-
-
- from
- to
-
+
+
+
+
+
+
+
+
+ From
+ to
+
+
@@ -281,6 +261,7 @@
+
@@ -302,6 +283,7 @@
+
@@ -360,14 +342,18 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -413,7 +399,27 @@
+
+
+
+ payroll.hr.employee.view.form
+ hr.employee
+
+
+
+
+
+
+
+
+
hr.salary.rule.category.form
@@ -730,12 +736,20 @@
-
+
+
-
-
+
+
+ Period from
+
+ to
+
+
+
+
diff --git a/addons/hr_payroll_account/hr_payroll_account_view.xml b/addons/hr_payroll_account/hr_payroll_account_view.xml
index 8077ed88152..9e3aab3ecb6 100644
--- a/addons/hr_payroll_account/hr_payroll_account_view.xml
+++ b/addons/hr_payroll_account/hr_payroll_account_view.xml
@@ -2,8 +2,6 @@
-
-
hr.payslip.inherit.form
hr.payslip
@@ -27,10 +25,12 @@
-
-
-
-
+
+
+
+
+
+
@@ -44,14 +44,15 @@
form
-
-
-
-
+
+
+
+
+
-
+
@@ -85,12 +86,11 @@
form
-
-
+
-
+
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index b83a482e1c1..e5df8cf2bf3 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -42,11 +42,10 @@ system to store and search in your CV base.
'decimal_precision',
'hr',
'survey',
- 'crm',
+ 'base_calendar',
'fetchmail',
],
'update_xml': [
- 'wizard/hr_recruitment_phonecall_view.xml',
'wizard/hr_recruitment_employee_hired.xml',
'wizard/hr_recruitment_create_partner_job_view.xml',
'hr_recruitment_view.xml',
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 7b0090d60ea..a3cd2f3a629 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -24,15 +24,10 @@ import time
from datetime import datetime, timedelta
from osv import fields, osv
-from crm import crm
import tools
import collections
import binascii
-import tools
from tools.translate import _
-from crm import wizard
-
-wizard.mail_compose_message.SUPPORTED_MODELS.append('hr.applicant')
AVAILABLE_STATES = [
('draft', 'New'),
@@ -98,6 +93,7 @@ class hr_applicant(base_stage, osv.Model):
_description = "Applicant"
_order = "id desc"
_inherit = ['ir.needaction_mixin', 'mail.thread']
+ _mail_compose_message = True
def _get_default_department_id(self, cr, uid, context=None):
""" Gives default department by checking if present in the context """
@@ -181,7 +177,7 @@ class hr_applicant(base_stage, osv.Model):
return res
_columns = {
- 'name': fields.char('Name', size=128, required=True),
+ 'name': fields.char('Subject', size=128, required=True),
'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the case without removing it."),
'description': fields.text('Description'),
'email_from': fields.char('Email', size=128, help="These people will receive email."),
@@ -213,7 +209,7 @@ class hr_applicant(base_stage, osv.Model):
'salary_expected_extra': fields.char('Expected Salary Extra', size=100, help="Salary Expected by Applicant, extra advantages"),
'salary_proposed': fields.float('Proposed Salary', help="Salary Proposed by the Organisation"),
'salary_expected': fields.float('Expected Salary', help="Salary Expected by Applicant"),
- 'availability': fields.integer('Availability (Days)'),
+ 'availability': fields.integer('Availability'),
'partner_name': fields.char("Applicant's Name", size=64),
'partner_phone': fields.char('Phone', size=32),
'partner_mobile': fields.char('Mobile', size=32),
@@ -239,7 +235,7 @@ class hr_applicant(base_stage, osv.Model):
'stage_id': lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c),
'department_id': lambda s, cr, uid, c: s._get_default_department_id(cr, uid, c),
'priority': lambda *a: '',
- 'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c),
+ 'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'hr.applicant', context=c),
'color': 0,
}
@@ -293,49 +289,22 @@ class hr_applicant(base_stage, osv.Model):
return False
def action_makeMeeting(self, cr, uid, ids, context=None):
+ """ This opens Meeting's calendar view to schedule meeting on current applicant
+ @return: Dictionary value for created Meeting view
"""
- This opens Meeting's calendar view to schedule meeting on current Opportunity
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of Opportunity to Meeting IDs
- @param context: A standard dictionary for contextual values
-
- @return: Dictionary value for created Meeting view
- """
- data_obj = self.pool.get('ir.model.data')
- if context is None:
- context = {}
- value = {}
- for opp in self.browse(cr, uid, ids, context=context):
- # Get meeting views
- search_view = data_obj.get_object(cr, uid, 'crm', 'view_crm_case_meetings_filter', context)
- calendar_view = data_obj.get_object(cr, uid, 'crm', 'crm_case_calendar_view_meet', context)
- form_view = data_obj.get_object(cr, uid, 'crm', 'crm_case_form_view_meet', context)
- tree_view = data_obj.get_object(cr, uid, 'crm', 'crm_case_tree_view_meet', context)
- category = data_obj.get_object(cr, uid, 'hr_recruitment', 'categ_meet_interview', context)
- context.update({
- 'default_applicant_id': opp.id,
- 'default_partner_id': opp.partner_id and opp.partner_id.id or False,
- 'default_email_from': opp.email_from,
- 'default_state': 'open',
- 'default_categ_id': category.id,
- 'default_name': opp.name,
- })
- value = {
- 'name': ('Meetings'),
- 'domain': "[('user_id','=',%s)]" % (uid),
- 'context': context,
- 'view_type': 'form',
- 'view_mode': 'calendar,form,tree',
- 'res_model': 'crm.meeting',
- 'view_id': False,
- 'views': [(calendar_view.id, 'calendar'), (form_view.id, 'form'), (tree_view.id, 'tree')],
- 'type': 'ir.actions.act_window',
- 'search_view_id': search_view.id,
- 'nodestroy': True,
- }
- return value
+ applicant = self.browse(cr, uid, ids[0], context)
+ category = self.pool.get('ir.model.data').get_object(cr, uid, 'hr_recruitment', 'categ_meet_interview', context)
+ res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'base_calendar', 'action_crm_meeting', context)
+ res['context'] = {
+ 'default_applicant_id': applicant.id,
+ 'default_partner_id': applicant.partner_id and applicant.partner_id.id or False,
+ 'default_user_id': uid,
+ 'default_email_from': applicant.email_from,
+ 'default_state': 'open',
+ 'default_name': applicant.name,
+ 'default_categ_id': category.id,
+ }
+ return res
def action_print_survey(self, cr, uid, ids, context=None):
"""
diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index 13436bef45a..fe5d3d9969b 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -5,11 +5,9 @@
-->
-
-
+
+
Interview
-
-
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index b90e8d25658..9118fb05ea1 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -16,18 +16,6 @@
view_mode="tree,form,calendar,graph"
view_type="form"/>
- # ------------------------------------------------------
- # Job Categories
- # ------------------------------------------------------
-
-
- Applicant Categories
- crm.case.categ
- form
-
- [('object_id.model', '=', 'hr.applicant')]
-
-
# ------------------------------------------------------
# Stage
# ------------------------------------------------------
@@ -150,58 +138,58 @@
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
+
+ -
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+ ,
+
+
+
+
+ ,
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -371,15 +359,15 @@
form
-
-
-
-
-
-
+
+
+
+
+
+
@@ -517,21 +505,15 @@
action="hr_recruitment_source_action"
sequence="10" groups="base.group_no_one"/>
-
+
CRM - Meetings Form
crm.meeting
form
-
+
-
- {'invisible': [('categ_id','=',%(hr_recruitment.categ_meet_interview)d)]}
-
-
- {'invisible': [('categ_id','=',%(hr_recruitment.categ_meet_interview)d)]}
-
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 5ddbe5045ab..9d81d39f240 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -114,7 +114,7 @@
{'search_default_year':1,'search_default_month':1,'search_default_department':1,'group_by_no_leaf':1,'group_by':[]}
-
+
diff --git a/addons/hr_recruitment/security/ir.model.access.csv b/addons/hr_recruitment/security/ir.model.access.csv
index 6bbc30b7b41..7d082070be5 100644
--- a/addons/hr_recruitment/security/ir.model.access.csv
+++ b/addons/hr_recruitment/security/ir.model.access.csv
@@ -6,7 +6,6 @@ access_hr_recruitment_degree,hr.recruitment.degree,model_hr_recruitment_degree,b
access_mail_message_user,mail.message.user,mail.model_mail_message,base.group_hr_user,1,1,1,1
access_res_partner_hr_user,res.partner.user,base.model_res_partner,base.group_hr_user,1,1,1,1
access_survey_hr_user,survey.hr.user,survey.model_survey,base.group_hr_user,1,1,1,0
-access_crm_phonecall_hruser,crm.phonecall hruser,crm.model_crm_phonecall,base.group_hr_user,1,1,1,1
-access_crm_meeting_hruser,crm.meeting.hruser,crm.model_crm_meeting,base.group_hr_user,1,1,1,1
+access_crm_meeting_hruser,crm.meeting.hruser,base_calendar.model_crm_meeting,base.group_hr_user,1,1,1,1
access_hr_recruitment_source_hr_officer,hr.recruitment.source,model_hr_recruitment_source,base.group_hr_user,1,1,1,1
access_hr_recruitment_source_all,hr.recruitment.source,model_hr_recruitment_source,,1,0,0,0
diff --git a/addons/hr_recruitment/test/recruitment_process.yml b/addons/hr_recruitment/test/recruitment_process.yml
index 38b84fccab2..841a49dc866 100644
--- a/addons/hr_recruitment/test/recruitment_process.yml
+++ b/addons/hr_recruitment/test/recruitment_process.yml
@@ -50,13 +50,6 @@
-
!python {model: hr.applicant}: |
self.write(cr, uid, [ref('hr_case_programmer')], {'job_id':ref('hr.job_developer')})
--
- I start communication with applicant, first schedule phonecall.
--
- !python {model: hr.recruitment.job2phonecall}: |
- context.update({'active_model': 'hr.applicant', 'active_id': ref("hr_case_programmer"), 'active_ids': [ref("hr_case_programmer")], 'survey_id': ref("survey_job_0")})
- id = self.create(cr, uid, {}, context=context)
- self.make_phonecall(cr, uid, [id], context=context)
-
I schedule meeting with applicant for interview.
-
diff --git a/addons/hr_recruitment/wizard/__init__.py b/addons/hr_recruitment/wizard/__init__.py
index acabd219857..fde7df63456 100644
--- a/addons/hr_recruitment/wizard/__init__.py
+++ b/addons/hr_recruitment/wizard/__init__.py
@@ -20,7 +20,6 @@
##############################################################################
-import hr_recruitment_phonecall
import hr_recruitment_create_partner_job
import hr_recruitment_employee_hired
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
index 985f6b25eec..cf8a30c9847 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
+++ b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
@@ -8,12 +8,12 @@
form
-
-
+
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py b/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
deleted file mode 100644
index 12c294c20bc..00000000000
--- a/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
+++ /dev/null
@@ -1,126 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2009 Tiny SPRL (). All Rights Reserved
-# $Id$
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-import time
-
-from osv import osv, fields
-from tools.translate import _
-
-class job2phonecall(osv.osv_memory):
- _name = 'hr.recruitment.job2phonecall'
- _description = 'Schedule Phone Call'
- _columns = {
- 'user_id': fields.many2one('res.users', 'Assign To'),
- 'deadline': fields.datetime('Planned Date'),
- 'note': fields.text('Goals'),
- 'category_id': fields.many2one('crm.case.categ', 'Category', required=True),
- }
-
- def _date_user(self, cr, uid, context=None):
- case_obj = self.pool.get('hr.applicant')
- if context is None:
- context = {}
- case = case_obj.browse(cr, uid, context.get('active_id', False), context=context)
- return case.user_id and case.user_id.id or False
-
- def _date_category(self, cr, uid, context=None):
- case_obj = self.pool.get('hr.applicant')
- if context is None:
- context = {}
- case = case_obj.browse(cr, uid, context.get('active_id', False), context=context)
- categ_id = self.pool.get('crm.case.categ').search(cr, uid, [('name','=','Outbound')], context=context)
- return categ_id and categ_id[0] or case.categ_id and case.categ_id.id or False
-
- def _get_note(self, cr, uid, context=None):
- mail_message = self.pool.get('mail.message')
- if context is None:
- context = {}
- if context.get('active_id'):
- case = self.pool.get('hr.applicant').browse(cr, uid, context['active_id'], context=context)
- if case.description:
- return case.description
- else:
- msg_ids = mail_message.search(cr, uid, [('model', '=', 'hr.applicant'), ('res_id', '=', case.id), ('email_from', '!=', ''), ('email_to', '!=', '')], limit=1)
- if msg_ids:
- return mail_message.browse(cr, uid, msg_ids[0], context=context).body_text
- return False
-
-
- _defaults = {
- 'user_id': _date_user,
- 'category_id': _date_category,
- 'note': _get_note
- }
-
- def make_phonecall(self, cr, uid, ids, context=None):
- mod_obj = self.pool.get('ir.model.data')
- job_case_obj = self.pool.get('hr.applicant')
- data_obj = self.pool.get('ir.model.data')
- phonecall_case_obj = self.pool.get('crm.phonecall')
- if context is None:
- context = {}
- form = self.browse(cr, uid, ids, context=context)[0]
- result = mod_obj._get_id(cr, uid, 'crm', 'view_crm_case_phonecalls_filter')
- res = mod_obj.read(cr, uid, result, ['res_id'], context=context)
- # Select the view
-
- id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_tree_view')
- id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_form_view')
- if id2:
- id2 = data_obj.browse(cr, uid, id2, context=context).res_id
- if id3:
- id3 = data_obj.browse(cr, uid, id3, context=context).res_id
- new_phonecall_id = []
- for job in job_case_obj.browse(cr, uid, context.get('active_ids', []), context=context):
- #TODO: Take other info from job
- new_phonecall_id = phonecall_case_obj.create(cr, uid, {
- 'name': job.name,
- 'user_id': form.user_id.id,
- 'categ_id': form.category_id.id,
- 'description': form.note,
- 'date': form.deadline,
- 'description': job.description,
- 'partner_id': job.partner_id.id,
- 'partner_phone': job.partner_phone,
- 'partner_mobile': job.partner_mobile,
- 'description': job.description,
- 'date':job.date,
- }, context=context)
- new_phonecall = phonecall_case_obj.browse(cr, uid, new_phonecall_id, context=context)
- vals = {}
- job_case_obj.write(cr, uid, [job.id], vals, context=context)
-# job_case_obj.case_cancel(cr, uid, [job.id])
- phonecall_case_obj.case_open(cr, uid, [new_phonecall_id])
-
- return {
- 'name': _('Phone Call'),
- 'view_type': 'form',
- 'view_mode': 'tree,form',
- 'res_model': 'crm.phonecall',
- 'res_id': new_phonecall_id,
- 'views': [(id3,'form'), (id2,'tree'), (False,'calendar'), (False,'graph')],
- 'type': 'ir.actions.act_window',
- 'search_view_id': res['res_id']
- }
-
-job2phonecall()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_phonecall_view.xml b/addons/hr_recruitment/wizard/hr_recruitment_phonecall_view.xml
deleted file mode 100644
index 8537186ac6f..00000000000
--- a/addons/hr_recruitment/wizard/hr_recruitment_phonecall_view.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
- hr.recruitment.job2phonecall.form
- hr.recruitment.job2phonecall
- form
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Schedule Phone Call
- ir.actions.act_window
- hr.recruitment.job2phonecall
- form
- form
- new
-
-
-
-
diff --git a/addons/hr_timesheet/hr_timesheet_report.xml b/addons/hr_timesheet/hr_timesheet_report.xml
index d3d2d745183..487dcd592bd 100644
--- a/addons/hr_timesheet/hr_timesheet_report.xml
+++ b/addons/hr_timesheet/hr_timesheet_report.xml
@@ -1,11 +1,6 @@
-
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 45bbb6456ef..7875aff12a0 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -26,29 +26,38 @@
hr.analytic.timesheet
form
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -112,10 +121,14 @@
hr.employee
-
+
-
-
+
+
+
+
+
+
diff --git a/addons/hr_timesheet/test/hr_timesheet_report.yml b/addons/hr_timesheet/test/hr_timesheet_report.yml
index 097bf764429..ae5b294aa16 100644
--- a/addons/hr_timesheet/test/hr_timesheet_report.yml
+++ b/addons/hr_timesheet/test/hr_timesheet_report.yml
@@ -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')
\ No newline at end of file
+ test_reports.try_report_action(cr, uid, 'action_hr_timesheet_users',wiz_data=data_dict, context=ctx, our_module='hr_timesheet')
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
index f72ccd1fc2a..afcf64808b7 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -9,16 +9,16 @@
form
-
+
@@ -34,39 +34,8 @@
-
-
-
- hr.analytical.timesheet.my.form
- hr.analytical.timesheet.employee
- form
-
-
-
-
-
-
-
-
-
-
-
-
-
- My Timesheet
- hr.analytical.timesheet.employee
- form
- tree,form
-
- new
-
-
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
index 32291489627..8ead6ea63d6 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -9,19 +9,22 @@
form
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
+
+
+
+
@@ -37,9 +40,8 @@
-
+ parent="hr.menu_hr_reporting_timesheet"
+ groups="base.group_hr_manager" sequence="2" icon="STOCK_PRINT"/>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
index c7b7f320c37..dc2a6c47b8d 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
@@ -7,15 +7,15 @@
form
-
+
@@ -26,11 +26,6 @@
form
-
@@ -40,6 +35,11 @@
+
@@ -60,12 +60,6 @@
form
-
@@ -80,6 +74,12 @@
+
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
index c279b27498e..f0679de8d95 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
@@ -8,22 +8,26 @@
form
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
@@ -38,7 +42,7 @@
+ parent="hr.menu_hr_reporting_timesheet" sequence="3" icon="STOCK_PRINT"/>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
index 28e8662f010..85d9538cc5b 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
@@ -27,11 +27,6 @@
form
-
@@ -39,6 +34,11 @@
+
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
index aec0b52d5e6..1c163a1ac0e 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
@@ -8,11 +8,6 @@
form
-
@@ -28,6 +23,11 @@
+
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index c43b1206541..6635c38b909 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -62,39 +62,50 @@
-
- From
- to
-
-
-
-
-
-
+ From to
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+ :
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
@@ -124,8 +135,6 @@
-
-
@@ -136,11 +145,6 @@
-
-
-
-
-
@@ -227,7 +231,7 @@
form
-
+
@@ -349,6 +353,17 @@
+
+
+ hr.timesheet.sheet.employee.extd_form
+ hr.employee
+
+
+
+
+
+
+
diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
index 8b102b19f72..fd5d6b0b6d1 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
@@ -82,6 +82,6 @@
+ parent="hr.menu_hr_reporting" sequence="3"/>
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index fe497b6f46c..613f92d3cf6 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -110,6 +110,6 @@
+ parent="hr.menu_hr_reporting" sequence="4" groups="base.group_hr_manager"/>
diff --git a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
index 2c04f116b48..b2dfabb310e 100644
--- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
+++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
@@ -7,14 +7,14 @@
form
-
+
diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index cc2c11bdd8a..3be4dd2e28d 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -49,7 +49,7 @@ class idea_idea(osv.osv):
'create_uid': fields.many2one('res.users', 'Creator', required=True, readonly=True),
'name': fields.char('Idea Summary', size=64, required=True, readonly=True, oldname='title', states={'draft':[('readonly',False)]}),
'description': fields.text('Description', help='Content of the idea', readonly=True, states={'draft':[('readonly',False)]}),
- 'category_ids': fields.many2many('idea.category', 'Tags', readonly=True, states={'draft':[('readonly',False)]}),
+ 'category_ids': fields.many2many('idea.category', string='Tags', readonly=True, states={'draft':[('readonly',False)]}),
'state': fields.selection([('draft', 'New'),
('open', 'Accepted'),
('cancel', 'Refused'),
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 9cee10c3cbb..8d7a726f015 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -72,11 +72,14 @@
+
-
-
+
+
+
+
diff --git a/addons/import_google/__openerp__.py b/addons/import_google/__openerp__.py
index 5c538e5912f..5242633747f 100644
--- a/addons/import_google/__openerp__.py
+++ b/addons/import_google/__openerp__.py
@@ -26,7 +26,7 @@
'description': """The module adds google contact in partner address and add google calendar events details in Meeting""",
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
- 'depends': ['base', 'import_base', 'google_base_account','crm'],
+ 'depends': ['base', 'import_base', 'google_base_account', 'base_calendar'],
'init_xml': [],
'update_xml': ['security/ir.model.access.csv',
'sync_google_calendar_view.xml',
diff --git a/addons/import_google/i18n/ar.po b/addons/import_google/i18n/ar.po
new file mode 100644
index 00000000000..1f6bda316dc
--- /dev/null
+++ b/addons/import_google/i18n/ar.po
@@ -0,0 +1,217 @@
+# Arabic translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-07-07 15:59+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Arabic \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-08 04:41+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
+
+#. module: import_google
+#: help:synchronize.google.import,group_name:0
+msgid "Choose which group to import, By default it takes all."
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import Google Calendar Events"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Import Events"
+msgstr "_جلب الأحداث"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:71
+#, python-format
+msgid ""
+"No Google Username or password Defined for user.\n"
+"Please define in user view"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:127
+#, python-format
+msgid ""
+"Invalid login detail !\n"
+" Specify Username/Password."
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,supplier:0
+msgid "Supplier"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import Options"
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,group_name:0
+msgid "Group Name"
+msgstr ""
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_crm_case_categ
+msgid "Category of Case"
+msgstr ""
+
+#. module: import_google
+#: model:ir.actions.act_window,name:import_google.act_google_login_contact_form
+#: model:ir.ui.menu,name:import_google.menu_sync_contact
+msgid "Import Google Contacts"
+msgstr "جلب اتصالات قوقل"
+
+#. module: import_google
+#: view:google.import.message:0
+msgid "Import Google Data"
+msgstr ""
+
+#. module: import_google
+#: view:crm.meeting:0
+msgid "Meeting Type"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google.py:38
+#: code:addons/import_google/wizard/import_google_data.py:28
+#, python-format
+msgid ""
+"Please install gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+msgstr ""
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_google_login
+msgid "Google Contact"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import contacts from a google account"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:133
+#, python-format
+msgid "Please specify correct user and password !"
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,customer:0
+msgid "Customer"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_synchronize_google_import
+msgid "synchronize.google.import"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Import Contacts"
+msgstr ""
+
+#. module: import_google
+#: model:ir.actions.act_window,name:import_google.act_google_login_form
+#: model:ir.ui.menu,name:import_google.menu_sync_calendar
+msgid "Import Google Calendar"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:50
+#, python-format
+msgid "Import google"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:127
+#: code:addons/import_google/wizard/import_google_data.py:133
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:71
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,create_partner:0
+msgid "Options"
+msgstr ""
+
+#. module: import_google
+#: view:google.import.message:0
+msgid "_Ok"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google.py:38
+#: code:addons/import_google/wizard/import_google_data.py:28
+#, python-format
+msgid "Google Contacts Import Error!"
+msgstr ""
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_google_import_message
+msgid "Import Message"
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,calendar_name:0
+msgid "Calendar Name"
+msgstr ""
+
+#. module: import_google
+#: help:synchronize.google.import,supplier:0
+msgid "Check this box to set newly created partner as Supplier."
+msgstr ""
+
+#. module: import_google
+#: selection:synchronize.google.import,create_partner:0
+msgid "Import only address"
+msgstr ""
+
+#. module: import_google
+#: field:crm.case.categ,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Partner Status for this Group:"
+msgstr ""
+
+#. module: import_google
+#: field:google.import.message,name:0
+msgid "Message"
+msgstr ""
+
+#. module: import_google
+#: selection:synchronize.google.import,create_partner:0
+msgid "Create partner for each contact"
+msgstr ""
+
+#. module: import_google
+#: help:synchronize.google.import,customer:0
+msgid "Check this box to set newly created partner as Customer."
+msgstr ""
diff --git a/addons/import_google/i18n/ja.po b/addons/import_google/i18n/ja.po
index ad1ab085495..75e4f08b159 100644
--- a/addons/import_google/i18n/ja.po
+++ b/addons/import_google/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-24 18:56+0000\n"
+"PO-Revision-Date: 2012-07-09 04:44+0000\n"
"Last-Translator: Akira Hiyama \n"
"Language-Team: Japanese \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-25 04:40+0000\n"
-"X-Generator: Launchpad (build 15288)\n"
+"X-Launchpad-Export-Date: 2012-07-10 05:34+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
#. module: import_google
#: help:synchronize.google.import,group_name:0
@@ -70,7 +70,7 @@ msgstr "グループ名"
#. module: import_google
#: model:ir.model,name:import_google.model_crm_case_categ
msgid "Category of Case"
-msgstr "ケースの分類"
+msgstr "案件の分類"
#. module: import_google
#: model:ir.actions.act_window,name:import_google.act_google_login_contact_form
diff --git a/addons/import_google/partner.py b/addons/import_google/partner.py
index 232f18d06a3..e7aa4dd8ca7 100644
--- a/addons/import_google/partner.py
+++ b/addons/import_google/partner.py
@@ -21,11 +21,11 @@
from osv import fields,osv
-class crm_case_categ(osv.osv):
- """ Category of Case """
- _inherit = "crm.case.categ"
+class crm_meeting_type(osv.osv):
+ """ Meeting Types """
+ _inherit = "crm.meeting.type"
_columns = {
'user_id': fields.many2one('res.users', 'User')
}
-crm_case_categ()
+
# vim:expandtab:smartindent:toabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/import_google/sync_google_calendar_view.xml b/addons/import_google/sync_google_calendar_view.xml
index 84f0176c5ec..626d803d4df 100644
--- a/addons/import_google/sync_google_calendar_view.xml
+++ b/addons/import_google/sync_google_calendar_view.xml
@@ -1,30 +1,14 @@
-
+
CRM - Meetings Form (Inherited)
crm.meeting
form
-
+
-
-
-
-
-
-
- CRM - Meetings Tree (Inherited)
- crm.meeting
- tree
-
-
-
-
+
diff --git a/addons/import_google/wizard/import_google.py b/addons/import_google/wizard/import_google.py
index 9a9b2802826..c34a14e224d 100644
--- a/addons/import_google/wizard/import_google.py
+++ b/addons/import_google/wizard/import_google.py
@@ -235,10 +235,10 @@ class google_import(import_framework):
def get_event_category(self, val, name):
- fields = ['name', 'object_id']
- nameid = 'event_category_'+name
- data = [name, 'crm.meeting']
- return self.import_object(fields, data, 'crm.case.categ', "crm_case_categ", nameid, [('name', 'ilike', name)])
+ nameid = 'event_category_' + name
+ fields = ['name']
+ data = [name]
+ return self.import_object(fields, data, 'crm.meeting.type', "crm_meeting_type", nameid, [('name', 'ilike', name)])
def get_rec(self, val):
if val.get("recurrency"):
diff --git a/addons/import_google/wizard/import_google_data_view.xml b/addons/import_google/wizard/import_google_data_view.xml
index 2968b009a51..b8adc71f2a5 100644
--- a/addons/import_google/wizard/import_google_data_view.xml
+++ b/addons/import_google/wizard/import_google_data_view.xml
@@ -7,11 +7,6 @@
form
-
@@ -21,6 +16,11 @@
+
@@ -33,14 +33,14 @@
form
-
+
diff --git a/addons/import_sugarcrm/i18n/ja.po b/addons/import_sugarcrm/i18n/ja.po
index 811bd6016fb..6f67aed9ada 100644
--- a/addons/import_sugarcrm/i18n/ja.po
+++ b/addons/import_sugarcrm/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-09 09:19+0000\n"
-"Last-Translator: Tomomi Mengelberg \n"
+"PO-Revision-Date: 2012-07-09 18:11+0000\n"
+"Last-Translator: Akira Hiyama \n"
"Language-Team: Japanese \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 05:15+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-07-10 05:34+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
#. module: import_sugarcrm
#: code:addons/import_sugarcrm/import_sugarcrm.py:1105
@@ -28,7 +28,7 @@ msgstr "エラー"
#: view:import.sugarcrm:0
msgid ""
"Use the SugarSoap API URL (read tooltip) and a full access SugarCRM login."
-msgstr ""
+msgstr "SugarSoap API URL(ツールヒントを参照)とフルアクセスのSugarCRMログインを使用します。"
#. module: import_sugarcrm
#: view:import.sugarcrm:0
@@ -51,11 +51,12 @@ msgid ""
"Choose data you want to import. Click 'Import' to get data manually or "
"'Schedule Reccurent Imports' to get recurrently and automatically data."
msgstr ""
+"インポートしたいデータを選択します。データを手動で取得するにはインポートを、データを繰り返し自動で取得するにはスケジュール反復インポートをクリックします。"
#. module: import_sugarcrm
#: field:import.sugarcrm,contact:0
msgid "Contacts"
-msgstr "連絡先"
+msgstr "コンタクト"
#. module: import_sugarcrm
#: view:import.sugarcrm:0
@@ -65,12 +66,12 @@ msgstr "人事"
#. module: import_sugarcrm
#: help:import.sugarcrm,bug:0
msgid "Check this box to import sugarCRM Bugs into OpenERP project issues"
-msgstr ""
+msgstr "OpenERPのプロジェクト問題にSugarCRMのバグをインポートするには、このボックスをクリックします。"
#. module: import_sugarcrm
#: field:import.sugarcrm,instance_name:0
msgid "Instance's Name"
-msgstr "事例の名前"
+msgstr "インスタンスの名前"
#. module: import_sugarcrm
#: field:import.sugarcrm,project_task:0
@@ -80,7 +81,7 @@ msgstr "プロジェクトのタスク"
#. module: import_sugarcrm
#: field:import.sugarcrm,email_from:0
msgid "Notify End Of Import To:"
-msgstr "へインポートの終了を通知する。"
+msgstr "インポート終了の通知先:"
#. module: import_sugarcrm
#: help:import.sugarcrm,user:0
@@ -89,35 +90,37 @@ msgid ""
"user with the same login exist in OpenERP, user information will be erase by "
"sugarCRM user information"
msgstr ""
+"OpenERPユーザにSugarCRMユーザをインポートするには、このボックスをチェックします。OpenERPの中に同じログインユーザが存在する場合は、S"
+"ugarCRMユーザ情報によりユーザ情報が消されることに注意して下さい。"
#. module: import_sugarcrm
#: code:addons/import_sugarcrm/sugarsoap_services.py:23
#, python-format
msgid "Please install SOAP for python - ZSI-2.0-rc3.tar.gz - python-zci"
-msgstr "Python SOAPをインストールしてください。- ZSI-2.0-rc3.tar.gz - python-zci"
+msgstr "Python SOAPをインストールして下さい。- ZSI-2.0-rc3.tar.gz - python-zci"
#. module: import_sugarcrm
#: view:import.sugarcrm:0
msgid "_Schedule Recurrent Imports"
-msgstr ""
+msgstr "スケジュール反復インポート"
#. module: import_sugarcrm
#: view:import.sugarcrm:0
msgid ""
"Do not forget the email address to be notified of the success of the import."
-msgstr "インポート完了を通知するEメールを忘れないで下さい。"
+msgstr "インポート完了を通知するEメールアドレスを忘れないで下さい。"
#. module: import_sugarcrm
#: help:import.sugarcrm,call:0
msgid "Check this box to import sugarCRM Calls into OpenERP calls"
-msgstr ""
+msgstr "OpenERP通話にSugarCRM通話をインポートするには、このボックスをチェックします。"
#. module: import_sugarcrm
#: view:import.sugarcrm:0
msgid ""
"If you make recurrent or ponctual import, data already in OpenERP will be "
"updated by SugarCRM data."
-msgstr ""
+msgstr "反復あるいは定時インポートをする場合、OpenERP内のデータはSugarCRMのデータによって更新されます。"
#. module: import_sugarcrm
#: field:import.sugarcrm,employee:0
@@ -132,12 +135,12 @@ msgstr "ドキュメント"
#. module: import_sugarcrm
#: help:import.sugarcrm,document:0
msgid "Check this box to import sugarCRM Documents into OpenERP documents"
-msgstr "SugarCRMドキュメントをOpenERPドキュメントへインポートするには、このボックスをチェックしてください。"
+msgstr "SugarCRMドキュメントをOpenERPドキュメントへインポートするには、このボックスをチェックします。"
#. module: import_sugarcrm
#: view:import.sugarcrm:0
msgid "Import Data From SugarCRM"
-msgstr "SugarCRMからデータをインポートする。"
+msgstr "SugarCRMからデータのインポート"
#. module: import_sugarcrm
#: view:import.sugarcrm:0
@@ -149,7 +152,7 @@ msgstr "CRM"
msgid ""
"Data are importing, the process is running in the background, an email will "
"be sent to the given email address if it was defined."
-msgstr ""
+msgstr "データインポートのプロセスはバックグラウンドで実行されます。それが定義されている場合、所定のEメールアドレスにEメールが送信されます。"
#. module: import_sugarcrm
#: field:import.sugarcrm,call:0
@@ -159,19 +162,19 @@ msgstr "通話"
#. module: import_sugarcrm
#: view:import.sugarcrm:0
msgid "Multi Instance Management"
-msgstr ""
+msgstr "複数インスタンスの管理"
#. module: import_sugarcrm
#: view:import.message:0
msgid "_Ok"
-msgstr "_OK"
+msgstr "OK"
#. module: import_sugarcrm
#: help:import.sugarcrm,opportunity:0
msgid ""
"Check this box to import sugarCRM Leads and Opportunities into OpenERP Leads "
"and Opportunities"
-msgstr ""
+msgstr "OpenERPのリードと商談の中に、SugarCRMのリードと商談をインポートするには、このボックスをチェックします。"
#. module: import_sugarcrm
#: field:import.sugarcrm,email_history:0
@@ -186,6 +189,9 @@ msgid ""
"application "
"http://trial.sugarcrm.com/qbquyj4802/index.php?module=Home&action=index"
msgstr ""
+"データを取得するためのWebサービスのURL。例:'http://example.com/sugarcrm/soap.php'、または、あなたのSugar"
+"CRMアプリケーションのアドレスをコピーします。 "
+"http://trial.sugarcrm.com/qbquyj4802/index.php?module=Home&action=index"
#. module: import_sugarcrm
#: model:ir.actions.act_window,name:import_sugarcrm.action_import_sugarcrm
@@ -196,7 +202,7 @@ msgstr "SugarCRMをインポート"
#. module: import_sugarcrm
#: view:import.sugarcrm:0
msgid "_Import"
-msgstr "インポート(_I)"
+msgstr "インポート"
#. module: import_sugarcrm
#: field:import.sugarcrm,user:0
@@ -208,18 +214,18 @@ msgstr "ユーザ"
#: code:addons/import_sugarcrm/import_sugarcrm.py:1131
#, python-format
msgid "%s data required %s Module to be installed, Please install %s module"
-msgstr ""
+msgstr "%s のデータは %s モジュールがインストールされていることを要求します。%s モジュールをインストールして下さい。"
#. module: import_sugarcrm
#: field:import.sugarcrm,claim:0
msgid "Cases"
-msgstr "お問合せ"
+msgstr "案件"
#. module: import_sugarcrm
#: help:import.sugarcrm,meeting:0
msgid ""
"Check this box to import sugarCRM Meetings and Tasks into OpenERP meetings"
-msgstr ""
+msgstr "OpenERPミーティングにSugarCRMのミーティングとタスクをインポートするには、このボックスをチェックします。"
#. module: import_sugarcrm
#: help:import.sugarcrm,email_history:0
@@ -227,6 +233,7 @@ msgid ""
"Check this box to import sugarCRM Emails, Notes and Attachments into OpenERP "
"Messages and Attachments"
msgstr ""
+"OpenERPメッセージと添付ファイにSugarCRMのEメール、ノート、添付ファイルをインポートするには、このボックスをチェックします。"
#. module: import_sugarcrm
#: field:import.sugarcrm,project:0
@@ -240,13 +247,13 @@ msgid ""
"Please install SOAP for python - ZSI-2.0-rc3.tar.gz from "
"http://pypi.python.org/pypi/ZSI/"
msgstr ""
-"Python SOAPをインストールしてください。- ZSI-2.0-rc3.tar.gz from "
+"Python SOAPをインストールして下さい。- ZSI-2.0-rc3.tar.gz from "
"http://pypi.python.org/pypi/ZSI/"
#. module: import_sugarcrm
#: help:import.sugarcrm,project:0
msgid "Check this box to import sugarCRM Projects into OpenERP projects"
-msgstr ""
+msgstr "OpenERPプロジェクトにSugarCRMプロジェクトをインポートするには、このボックスをチェックして下さい。"
#. module: import_sugarcrm
#: code:addons/import_sugarcrm/import_sugarcrm.py:1098
@@ -263,12 +270,12 @@ msgstr "ミーティング"
#. module: import_sugarcrm
#: help:import.sugarcrm,employee:0
msgid "Check this box to import sugarCRM Employees into OpenERP employees"
-msgstr ""
+msgstr "OpenERP従業員にSugarCRM従業員をインポートするには、このボックスをチェックします。"
#. module: import_sugarcrm
#: field:import.sugarcrm,url:0
msgid "SugarSoap Api url:"
-msgstr "SugarSoap Api url:"
+msgstr "SugarSoap API URL:"
#. module: import_sugarcrm
#: view:import.sugarcrm:0
@@ -282,6 +289,8 @@ msgid ""
"Authentication error !\n"
"Bad Username or Password bad SugarSoap Api url !"
msgstr ""
+"認証エラー。\n"
+"ユーザ名、パスワード、SugarSoap API URLの何れかに問題があります。"
#. module: import_sugarcrm
#: field:import.sugarcrm,bug:0
@@ -296,12 +305,12 @@ msgstr "プロジェクト"
#. module: import_sugarcrm
#: help:import.sugarcrm,project_task:0
msgid "Check this box to import sugarCRM Project Tasks into OpenERP tasks"
-msgstr ""
+msgstr "OpenERPタスクにSugarCRMプロジェクトタスクをインポートするには、このボックスをチェックします。"
#. module: import_sugarcrm
#: field:import.sugarcrm,opportunity:0
msgid "Leads & Opp"
-msgstr "見込み客 & 商談"
+msgstr "リード & 商談"
#. module: import_sugarcrm
#: code:addons/import_sugarcrm/import_sugarcrm.py:79
@@ -310,6 +319,8 @@ msgid ""
"Authentication error !\n"
"Bad Username or Password or bad SugarSoap Api url !"
msgstr ""
+"認証エラー。\n"
+"ユーザ名、パスワード、SugarSoap API URLの何れかに問題があります。"
#. module: import_sugarcrm
#: code:addons/import_sugarcrm/import_sugarcrm.py:79
@@ -330,12 +341,12 @@ msgstr "警告"
msgid ""
"Prefix of SugarCRM id to differentiate xml_id of SugarCRM models datas come "
"from different server."
-msgstr ""
+msgstr "SugarCRMモデルデータの xml_id を区別するためのSugarCRM IDのサフィックス(接頭辞)は異なるサーバから来ます。"
#. module: import_sugarcrm
#: help:import.sugarcrm,contact:0
msgid "Check this box to import sugarCRM Contacts into OpenERP addresses"
-msgstr ""
+msgstr "OpenERP住所録にSugarCRMコンタクトをインポートするには、このボックスをチェックします。"
#. module: import_sugarcrm
#: field:import.sugarcrm,password:0
@@ -350,12 +361,12 @@ msgstr "ログイン情報"
#. module: import_sugarcrm
#: help:import.sugarcrm,claim:0
msgid "Check this box to import sugarCRM Cases into OpenERP claims"
-msgstr ""
+msgstr "OpenERP苦情にSugarCRMケースをインポートするには、このボックスをチェックします。"
#. module: import_sugarcrm
#: view:import.sugarcrm:0
msgid "Email Notification When Import is Finished"
-msgstr ""
+msgstr "インポート完了時にEメール通知"
#. module: import_sugarcrm
#: field:import.sugarcrm,username:0
@@ -366,17 +377,17 @@ msgstr "ユーザ名"
#: view:import.message:0
#: model:ir.model,name:import_sugarcrm.model_import_message
msgid "Import Message"
-msgstr "メッセージをインポートする。"
+msgstr "メッセージのインポート"
#. module: import_sugarcrm
#: help:import.sugarcrm,account:0
msgid "Check this box to import sugarCRM Accounts into OpenERP partners"
-msgstr ""
+msgstr "OpenERPパートナにSugarCRMアカウントをインポートするには、このボックスをチェックします。"
#. module: import_sugarcrm
#: view:import.sugarcrm:0
msgid "Online documentation:"
-msgstr ""
+msgstr "オンラインドキュメンテーション:"
#. module: import_sugarcrm
#: field:import.sugarcrm,account:0
@@ -386,7 +397,7 @@ msgstr "顧客情報"
#. module: import_sugarcrm
#: view:import.sugarcrm:0
msgid "_Cancel"
-msgstr "キャンセル(_C)"
+msgstr "キャンセル"
#. module: import_sugarcrm
#: code:addons/import_sugarcrm/sugarsoap_services.py:23
@@ -403,4 +414,4 @@ msgstr "SugarCRMのデータをインポート"
#. module: import_sugarcrm
#: view:import.sugarcrm:0
msgid "Email Address to Notify"
-msgstr ""
+msgstr "通知のEメールアドレス"
diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index ad3488deb98..0cec5899c41 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -13,19 +13,17 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
+
+
+
+
+
+
diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
index 357dc78c9d7..30ff9a9ed8f 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
@@ -8,11 +8,6 @@
form
-
@@ -26,6 +21,11 @@
+
diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
index d4bcd756922..f0bdb2a2a3f 100644
--- a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
@@ -8,12 +8,6 @@
form
-
@@ -33,6 +27,12 @@
+
diff --git a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
index 46caa9f6478..79c7c08ffca 100644
--- a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
+++ b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
@@ -9,23 +9,17 @@
-
+
+
+
-
-
-
-
-
-
-
-
-
+
diff --git a/addons/l10n_ch/wizard/bvr_import_view.xml b/addons/l10n_ch/wizard/bvr_import_view.xml
index ed704810e45..222aad3b6b9 100644
--- a/addons/l10n_ch/wizard/bvr_import_view.xml
+++ b/addons/l10n_ch/wizard/bvr_import_view.xml
@@ -8,14 +8,14 @@
form
-
+
diff --git a/addons/l10n_ch/wizard/create_dta_view.xml b/addons/l10n_ch/wizard/create_dta_view.xml
index 1340d869941..7e9d5894dfc 100644
--- a/addons/l10n_ch/wizard/create_dta_view.xml
+++ b/addons/l10n_ch/wizard/create_dta_view.xml
@@ -8,14 +8,14 @@
form
-
+
diff --git a/addons/l10n_fr/plan_comptable_general.xml b/addons/l10n_fr/plan_comptable_general.xml
index 9d16f44252b..525dabfcc8a 100644
--- a/addons/l10n_fr/plan_comptable_general.xml
+++ b/addons/l10n_fr/plan_comptable_general.xml
@@ -8,135 +8,24 @@
jusqu'à décembre 2007
Version du fichier : 12-04-2008
+
+ Utilise les 'account types' de addons/account/data/data_account_type.xml
-->
-
-
- Dettes long terme
- dettes
- balance
-
-
-
- Immobilisations
- immobilization
- asset
- balance
-
-
-
- Stocks
- stocks
- asset
- balance
-
-
-
- Cloture
- cloture
- balance
-
-
-
- Receivable
- receivable
- asset
- unreconciled
-
-
-
- Payable
- payable
- liability
- unreconciled
-
-
-
- View
- view
- none
-
-
-
- Income
- income
- income
- none
-
-
-
- Expense
- expense
- expense
- none
-
-
-
- Tax
- tax
- unreconciled
-
-
-
- Cash
- cash
- asset
- balance
-
-
-
- Asset
- asset
- asset
- balance
-
-
-
- Equity
- equity
- liability
- balance
-
-
-
- Provisions
- provision
- balance
-
-
-
- Engagements
- commitment
- balance
-
-
-
- Actif circulant
- current asset
- asset
- balance
-
-
-
- Comptes spéciaux
- special
- none
-
-
Plan Comptable Général
0
view
-
+
Comptes de bilan
Classes 1 à 5
view
-
+
@@ -144,9 +33,8 @@
Comptes de capitaux
Classe 1
view
-
+
Capitaux propres, autres fonds propres, emprunts et dettes assimilées
-
@@ -154,8 +42,7 @@
Capital et réserves
10
view
-
-
+
@@ -163,9 +50,8 @@
Capital
101
view
-
+
Capital pour sociétés de type (SARL, SA). Pour une EI utiliser le compte 108
-
@@ -173,8 +59,7 @@
Capital souscrit - non appelé
1011
other
-
-
+
@@ -182,8 +67,7 @@
Capital souscrit - appelé non versé
1012
other
-
-
+
@@ -191,8 +75,7 @@
Capital souscrit - appelé versé
1013
view
-
-
+
@@ -200,8 +83,7 @@
Capital non amorti
10131
other
-
-
+
@@ -209,8 +91,7 @@
Capital amorti
10132
other
-
-
+
@@ -218,8 +99,7 @@
Capital souscrit soumis à des réglementations particulières
1018
other
-
-
+
@@ -227,8 +107,7 @@
Primes liées au capital social
104
view
-
-
+
@@ -236,8 +115,7 @@
Primes d'émission
1041
other
-
-
+
@@ -245,8 +123,7 @@
Primes de fusion
1042
other
-
-
+
@@ -254,8 +131,7 @@
Primes d'apport
1043
other
-
-
+
@@ -263,8 +139,7 @@
Primes de conversion d'obligations en actions
1044
other
-
-
+
@@ -272,8 +147,7 @@
Bons de souscription d'actions
1045
other
-
-
+
@@ -281,8 +155,7 @@
Écarts de réévaluation
105
view
-
-
+
@@ -290,8 +163,7 @@
Réserve spéciale de réévaluation
1051
other
-
-
+
@@ -299,8 +171,7 @@
Écart de réévaluation libre
1052
other
-
-
+
@@ -308,8 +179,7 @@
Réserve de réévaluation
1053
other
-
-
+
@@ -317,8 +187,7 @@
Écarts de réévaluation (autres opérations légales)
1055
other
-
-
+
@@ -326,8 +195,7 @@
Autres écarts de réévaluation en France
1057
other
-
-
+
@@ -335,8 +203,7 @@
Autres écarts de réévaluation à l'étranger
1058
other
-
-
+
@@ -344,8 +211,7 @@
Réserves
106
view
-
-
+
@@ -353,8 +219,7 @@
Réserve légale
1061
view
-
-
+
@@ -362,8 +227,7 @@
Réserve légale proprement dite
10611
other
-
-
+
@@ -371,8 +235,7 @@
Plus-values nettes à long terme
10612
other
-
-
+
@@ -380,8 +243,7 @@
Réserves indisponibles
1062
other
-
-
+
@@ -389,8 +251,7 @@
Réserves statutaires ou contractuelles
1063
other
-
-
+
@@ -398,8 +259,7 @@
Réserves réglementées
1064
view
-
-
+
@@ -407,8 +267,7 @@
Plus-values nettes à long terme
10641
other
-
-
+
@@ -416,8 +275,7 @@
Réserves consécutives à l'octroi de subventions d'investissement
10643
other
-
-
+
@@ -425,8 +283,7 @@
Autres réserves réglementées
10648
other
-
-
+
@@ -434,8 +291,7 @@
Autres réserves
1068
view
-
-
+
@@ -443,8 +299,7 @@
Réserve de propre assureur
10681
other
-
-
+
@@ -452,8 +307,7 @@
Réserves diverses
10688
other
-
-
+
@@ -461,8 +315,7 @@
Écarts d'équivalence
107
other
-
-
+
@@ -470,9 +323,8 @@
Compte de l'exploitant
108
other
-
+
Capital pour une Entreprise Individuelle
-
@@ -480,8 +332,7 @@
Actionnaires: capital souscrit - non appelé
109
other
-
-
+
@@ -489,8 +340,7 @@
Report à nouveau (solde créditeur ou débiteur)
11
view
-
-
+
@@ -498,8 +348,7 @@
Report à nouveau (solde créditeur)
110
other
-
-
+
@@ -507,8 +356,7 @@
Report à nouveau (solde débiteur)
119
other
-
-
+
@@ -516,8 +364,7 @@
Résultat de l'exercice (bénéfice ou perte)
12
view
-
-
+
@@ -525,8 +372,7 @@
Résultat de l'exercice (bénéfice)
120
other
-
-
+
@@ -534,8 +380,7 @@
Résultat de l'exercice (perte)
129
other
-
-
+
@@ -543,8 +388,7 @@
Subventions d'investissement
13
view
-
-
+
@@ -552,8 +396,7 @@
Subventions d'équipement
131
view
-
-
+
@@ -561,8 +404,7 @@
État
1311
other
-
-
+
@@ -570,8 +412,7 @@
Régions
1312
other
-
-
+
@@ -579,8 +420,7 @@
Départements
1313
other
-
-
+
@@ -588,8 +428,7 @@
Communes
1314
other
-
-
+
@@ -597,8 +436,7 @@
Collectivités publiques
1315
other
-
-
+
@@ -606,8 +444,7 @@
Entreprises publiques
1316
other
-
-
+
@@ -615,8 +452,7 @@
Entreprises et organismes privés
1317
other
-
-
+
@@ -624,8 +460,7 @@
Autres
1318
other
-
-
+
@@ -633,8 +468,7 @@
Autres subventions d'investissement (même ventilation que celle du compte 131)
138
other
-
-
+
@@ -642,8 +476,7 @@
Subventions d'investissement inscrites au compte de résultat
139
view
-
-
+
@@ -651,8 +484,7 @@
Subventions d'équipement
1391
view
-
-
+
@@ -660,8 +492,7 @@
Etat
13911
other
-
-
+
@@ -669,8 +500,7 @@
Régions
13912
other
-
-
+
@@ -678,8 +508,7 @@
Départements
13913
other
-
-
+
@@ -687,8 +516,7 @@
Communes
13914
other
-
-
+
@@ -696,8 +524,7 @@
Collectivités publiques
13915
other
-
-
+
@@ -705,8 +532,7 @@
Entreprises publiques
13916
other
-
-
+
@@ -714,8 +540,7 @@
Entreprises et organismes privés
13917
other
-
-
+
@@ -723,8 +548,7 @@
Autres
13918
other
-
-
+
@@ -732,8 +556,7 @@
Autres subventions d'investissement (même ventilation que celle du compte 1391)
1398
other
-
-
+
@@ -741,8 +564,7 @@
Provisions réglementées
14
view
-
-
+
@@ -750,8 +572,7 @@
Provisions réglementées relatives aux immobilisations
142
view
-
-
+
@@ -759,8 +580,7 @@
Provisions reconstitution des gisements miniers et pétroliers
1423
other
-
-
+
@@ -768,8 +588,7 @@
Provisions pour investissement (participation des salariés)
1424
other
-
-
+
@@ -777,8 +596,7 @@
Provisions réglementées relatives aux stocks
143
view
-
-
+
@@ -786,8 +604,7 @@
Hausse des prix
1431
other
-
-
+
@@ -795,8 +612,7 @@
Fluctuation des cours
1432
other
-
-
+
@@ -804,8 +620,7 @@
Provisions réglementées relatives aux autres éléments de l'actif
144
other
-
-
+
@@ -813,8 +628,7 @@
Amortissements dérogatoires
145
other
-
-
+
@@ -822,8 +636,7 @@
Provision spéciale de réévaluation
146
other
-
-
+
@@ -831,8 +644,7 @@
Plus-values réinvesties
147
other
-
-
+
@@ -840,8 +652,7 @@
Autres provisions réglementées
148
other
-
-
+
@@ -849,8 +660,7 @@
Provisions
15
view
-
-
+
@@ -858,8 +668,7 @@
Provisions pour risques
151
view
-
-
+
@@ -867,8 +676,7 @@
Provisions pour litiges
1511
other
-
-
+
@@ -876,8 +684,7 @@
Provisions pour garanties données aux clients
1512
other
-
-
+
@@ -885,8 +692,7 @@
Provisions pour pertes sur marchés à terme
1513
other
-
-
+
@@ -894,8 +700,7 @@
Provisions pour amendes et pénalités
1514
other
-
-
+
@@ -903,8 +708,7 @@
Provisions pour pertes de change
1515
other
-
-
+
@@ -912,8 +716,7 @@
Provisions pour pertes sur contrats
1516
other
-
-
+
@@ -921,8 +724,7 @@
Autres provisions pour risques
1518
other
-
-
+
@@ -930,8 +732,7 @@
Provisions pour pensions et obligations similaires
153
other
-
-
+
@@ -939,8 +740,7 @@
Provisions pour restructurations
154
other
-
-
+
@@ -948,8 +748,7 @@
Provisions pour impôts
155
other
-
-
+
@@ -957,8 +756,7 @@
Provisions pour renouvellement des immobilisations (entreprises concessionnaires)
156
other
-
-
+
@@ -966,8 +764,7 @@
Provisions pour charges à répartir sur plusieurs exercices
157
view
-
-
+
@@ -975,8 +772,7 @@
Provisions pour gros entretien ou grandes révisions
1572
other
-
-
+
@@ -984,8 +780,7 @@
Autres provisions pour charges
158
view
-
-
+
@@ -993,8 +788,7 @@
Provisions pour remises en état
1581
other
-
-
+
@@ -1002,8 +796,7 @@
Emprunts et dettes assimilées
16
view
-
-
+
@@ -1011,8 +804,7 @@
Emprunts obligataires convertibles
161
other
-
-
+
@@ -1020,8 +812,7 @@
Autres emprunts obligataires
163
other
-
-
+
@@ -1029,8 +820,7 @@
Emprunts auprès des établissements de crédit
164
other
-
-
+
@@ -1038,8 +828,7 @@
Dépôts et cautionnements reçus
165
view
-
-
+
@@ -1047,8 +836,7 @@
Dépôts
1651
other
-
-
+
@@ -1056,8 +844,7 @@
Cautionnements
1655
other
-
-
+
@@ -1065,8 +852,7 @@
Participation des salariés aux résultats
166
view
-
-
+
@@ -1074,8 +860,7 @@
Comptes bloqués
1661
other
-
-
+
@@ -1083,8 +868,7 @@
Fonds de participation
1662
other
-
-
+
@@ -1092,8 +876,7 @@
Emprunts et dettes assortis de conditions particulières
167
view
-
-
+
@@ -1101,8 +884,7 @@
Emissions de titres participatifs
1671
other
-
-
+
@@ -1110,8 +892,7 @@
Avances conditionnées de l'État
1674
other
-
-
+
@@ -1119,8 +900,7 @@
Emprunts participatifs
1675
other
-
-
+
@@ -1128,8 +908,7 @@
Autres emprunts et dettes assimilées
168
view
-
-
+
@@ -1137,8 +916,7 @@
Autres emprunts
1681
other
-
-
+
@@ -1146,8 +924,7 @@
Rentes viagères capitalisées
1685
other
-
-
+
@@ -1155,8 +932,7 @@
Autres dettes
1687
other
-
-
+
@@ -1164,8 +940,7 @@
Intérêts courus
1688
view
-
-
+
@@ -1173,8 +948,7 @@
Sur emprunts obligataires convertibles
16881
other
-
-
+
@@ -1182,8 +956,7 @@
Sur autres emprunts obligataires
16883
other
-
-
+
@@ -1191,8 +964,7 @@
Sur emprunts auprès des établissements de crédit
16884
other
-
-
+
@@ -1200,8 +972,7 @@
Sur dépôts et cautionnements reçus
16885
other
-
-
+
@@ -1209,8 +980,7 @@
Sur participation des salariés aux résultats
16886
other
-
-
+
@@ -1218,8 +988,7 @@
Sur emprunts et dettes assortis de conditions particulières
16887
other
-
-
+
@@ -1227,8 +996,7 @@
Sur autres emprunts et dettes assimilées
16888
other
-
-
+
@@ -1236,8 +1004,7 @@
Primes de remboursement des obligations
169
other
-
-
+
@@ -1245,8 +1012,7 @@
Dettes rattachées à des participations
17
view
-
-
+
@@ -1254,8 +1020,7 @@
Dettes rattachées à des participations (groupe)
171
other
-
-
+
@@ -1263,8 +1028,7 @@
Dettes rattachées à des participations (hors groupe)
174
other
-
-
+
@@ -1272,8 +1036,7 @@
Dettes rattachées à des sociétés en participation
178
view
-
-
+
@@ -1281,8 +1044,7 @@
Principal
1781
other
-
-
+
@@ -1290,8 +1052,7 @@
Intérêts courus
1788
other
-
-
+
@@ -1299,8 +1060,7 @@
Comptes de liaison des établissements et sociétés en participation
18
view
-
-
+
@@ -1308,8 +1068,7 @@
Comptes de liaison des établissements
181
other
-
-
+
@@ -1317,8 +1076,7 @@
Biens et prestations de services échangés entre établissements (charges)
186
other
-
-
+
@@ -1326,8 +1084,7 @@
Biens et prestations de services échangés entre établissements (produits)
187
other
-
-
+
@@ -1335,8 +1092,7 @@
Comptes de liaison des sociétés en participation
188
other
-
-
+
@@ -1344,9 +1100,8 @@
Comptes d'immobilisations
Classe 2
view
-
+
Immobilisations incorporelles, corporelles, financières et frais d'établissement
-
@@ -1354,8 +1109,7 @@
Immobilisations incorporelles
20
view
-
-
+
@@ -1363,8 +1117,7 @@
Frais d'établissement
201
view
-
-
+
@@ -1372,8 +1125,7 @@
Frais de constitution
2011
other
-
-
+
@@ -1381,8 +1133,7 @@
Frais de premier établissement
2012
view
-
-
+
@@ -1390,8 +1141,7 @@
Frais de prospection
20121
other
-
-
+
@@ -1399,8 +1149,7 @@
Frais de publicité
20122
other
-
-
+
@@ -1408,8 +1157,7 @@
Frais d'augmentation de capital et d'opérations diverses (fusions, scissions, transformations)
2013
other
-
-
+
@@ -1417,8 +1165,7 @@
Frais de recherche et de développement
203
other
-
-
+
@@ -1426,8 +1173,7 @@
Concessions et droits similaires, brevets, licences, marques, procédés, logiciels, droits et valeurs similaires
205
other
-
-
+
@@ -1435,8 +1181,7 @@
Droit au bail
206
other
-
-
+
@@ -1444,8 +1189,7 @@
Fonds commercial
207
other
-
-
+
@@ -1453,8 +1197,7 @@
Autres immobilisations incorporelles
208
other
-
-
+
@@ -1462,9 +1205,8 @@
Immobilisations corporelles
21
view
-
+
Si valeur unitaire supérieure à 500 Euros HT
-
@@ -1472,8 +1214,7 @@
Terrains
211
view
-
-
+
@@ -1481,8 +1222,7 @@
Terrains nus
2111
other
-
-
+
@@ -1490,8 +1230,7 @@
Terrains aménagés
2112
other
-
-
+
@@ -1499,8 +1238,7 @@
Sous-sols et sur-sols
2113
other
-
-
+
@@ -1508,8 +1246,7 @@
Terrains de gisement
2114
view
-
-
+
@@ -1517,8 +1254,7 @@
Carrières
21141
other
-
-
+
@@ -1526,8 +1262,7 @@
Terrains bâtis
2115
view
-
-
+
@@ -1535,8 +1270,7 @@
Ensembles immobiliers industriels (A, B, ...)
21151
other
-
-
+
@@ -1544,8 +1278,7 @@
Ensembles immobiliers administratifs et commerciaux (A, B, ...)
21155
other
-
-
+
@@ -1553,8 +1286,7 @@
Autres ensembles immobiliers
21158
view
-
-
+
@@ -1562,8 +1294,7 @@
Affectés aux opérations professionnelles (A, B, ...)
211581
other
-
-
+
@@ -1571,8 +1302,7 @@
Affectés aux opérations non professionnelles (A, B, ...)
211588
other
-
-
+
@@ -1580,8 +1310,7 @@
Compte d'ordre sur immobilisations
2116
other
-
-
+
@@ -1589,8 +1318,7 @@
Agencements et aménagements de terrains (même ventilation que celle du compte 211)
212
other
-
-
+
@@ -1598,8 +1326,7 @@
Constructions
213
view
-
-
+
@@ -1607,8 +1334,7 @@
Bâtiments
2131
view
-
-
+
@@ -1616,8 +1342,7 @@
Ensembles immobiliers industriels (A, B, ...)
21311
other
-
-
+
@@ -1625,8 +1350,7 @@
Ensembles immobiliers administratifs et commerciaux (A, B, ...)
21315
other
-
-
+
@@ -1634,8 +1358,7 @@
Autres ensembles immobiliers
21318
view
-
-
+
@@ -1643,8 +1366,7 @@
Affectés aux opérations professionnelles (A, B, ...)
213181
other
-
-
+
@@ -1652,8 +1374,7 @@
Affectés aux opérations non professionnelles (A, B, ...)
213188
other
-
-
+
@@ -1661,8 +1382,7 @@
Installations générales agencements aménagements des constructions (même ventilation que celle du compte 2131)
2135
other
-
-
+
@@ -1670,8 +1390,7 @@
Ouvrages d'infrastructure
2138
view
-
-
+
@@ -1679,8 +1398,7 @@
Voies de terre
21381
other
-
-
+
@@ -1688,8 +1406,7 @@
Voies de fer
21382
other
-
-
+
@@ -1697,8 +1414,7 @@
Voies d'eau
21383
other
-
-
+
@@ -1706,8 +1422,7 @@
Barrages
21384
other
-
-
+
@@ -1715,8 +1430,7 @@
Pistes d'aérodromes
21385
other
-
-
+
@@ -1724,8 +1438,7 @@
Constructions sur sol d'autrui (même ventilation que celle du compte 213)
214
other
-
-
+
@@ -1733,8 +1446,7 @@
Installations techniques matériels et outillages industriels
215
view
-
-
+
@@ -1742,8 +1454,7 @@
Installations complexes spécialisées
2151
view
-
-
+
@@ -1751,8 +1462,7 @@
Sur sol propre
21511
other
-
-
+
@@ -1760,8 +1470,7 @@
Sur sol d'autrui
21514
other
-
-
+
@@ -1769,8 +1478,7 @@
Installations à caractère spécifique
2153
view
-
-
+
@@ -1778,8 +1486,7 @@
Sur sol propre
21531
other
-
-
+
@@ -1787,8 +1494,7 @@
Sur sol d'autrui
21534
other
-
-
+
@@ -1796,8 +1502,7 @@
Matériel industriel
2154
other
-
-
+
@@ -1805,8 +1510,7 @@
Outillage industriel
2155
other
-
-
+
@@ -1814,8 +1518,7 @@
Agencements et aménagements du matériel et outillage industriels
2157
other
-
-
+
@@ -1823,8 +1526,7 @@
Autres immobilisations corporelles
218
view
-
-
+
@@ -1832,8 +1534,7 @@
Installations générales agencements aménagements divers
2181
other
-
-
+
@@ -1841,8 +1542,7 @@
Matériel de transport
2182
other
-
-
+
@@ -1850,8 +1550,7 @@
Matériel de bureau et matériel informatique
2183
other
-
-
+
@@ -1859,8 +1558,7 @@
Mobilier
2184
other
-
-
+
@@ -1868,8 +1566,7 @@
Cheptel
2185
other
-
-
+
@@ -1877,8 +1574,7 @@
Emballages récupérables
2186
other
-
-
+
@@ -1886,8 +1582,7 @@
Immobilisations mises en concession
22
view
-
-
+
@@ -1895,8 +1590,7 @@
Immobilisations en cours
23
view
-
-
+
@@ -1904,8 +1598,7 @@
Immobilisations corporelles en cours
231
view
-
-
+
@@ -1913,9 +1606,8 @@
Terrains
2312
other
-
+
Pas d'amortissement sur les terrains
-
@@ -1923,8 +1615,7 @@
Constructions
2313
other
-
-
+
@@ -1932,8 +1623,7 @@
Installations techniques matériel et outillage industriels
2315
other
-
-
+
@@ -1941,8 +1631,7 @@
Autres immobilisations corporelles
2318
other
-
-
+
@@ -1950,8 +1639,7 @@
Immobilisations incorporelles en cours
232
other
-
-
+
@@ -1959,8 +1647,7 @@
Avances et acomptes versés sur commandes d'immobilisations incorporelles
237
other
-
-
+
@@ -1968,8 +1655,7 @@
Avances et acomptes versés sur commandes d'immobilisations corporelles
238
view
-
-
+
@@ -1977,8 +1663,7 @@
Terrains
2382
other
-
-
+
@@ -1986,8 +1671,7 @@
Constructions
2383
other
-
-
+
@@ -1995,8 +1679,7 @@
Installations techniques matériel et outillage industriels
2385
other
-
-
+
@@ -2004,8 +1687,7 @@
Autres immobilisations corporelles
2388
other
-
-
+
@@ -2013,8 +1695,7 @@
Parts dans des entreprises liées et créances dans des entreprises liées
25
view
-
-
+
@@ -2022,8 +1703,7 @@
Participations et créances rattachées à des participations
26
view
-
-
+
@@ -2031,9 +1711,8 @@
Titres de participation
261
view
-
+
Pas d'amortissement sur les titres de participation
-
@@ -2041,8 +1720,7 @@
Actions
2611
other
-
-
+
@@ -2050,8 +1728,7 @@
Autres titres
2618
other
-
-
+
@@ -2059,9 +1736,8 @@
Titres évalués par équivalence
262
other
-
+
Pas d'amortissement sur les titres évalués par équivalence
-
@@ -2069,9 +1745,8 @@
Autres formes de participation
266
other
-
+
Pas d'amortissement sur les titres évalués par équivalence
-
@@ -2079,8 +1754,7 @@
Créances rattachées à des participations
267
view
-
-
+
@@ -2088,8 +1762,7 @@
Créances rattachées à des participations (groupe)
2671
other
-
-
+
@@ -2097,8 +1770,7 @@
Créances rattachées à des participations (hors groupe)
2674
other
-
-
+
@@ -2106,8 +1778,7 @@
Versements représentatifs d'apports non capitalisés (appel de fonds)
2675
other
-
-
+
@@ -2115,8 +1786,7 @@
Avances consolidables
2676
other
-
-
+
@@ -2124,8 +1794,7 @@
Autres créances rattachées à des participations
2677
other
-
-
+
@@ -2133,8 +1802,7 @@
Intérêts courus
2678
other
-
-
+
@@ -2142,8 +1810,7 @@
Créances rattachées à des sociétés en participation
268
view
-
-
+
@@ -2151,8 +1818,7 @@
Principal
2681
other
-
-
+
@@ -2160,8 +1826,7 @@
Intérêts courus
2688
other
-
-
+
@@ -2169,8 +1834,7 @@
Versements restant à effectuer sur titres de participation non libérés
269
other
-
-
+
@@ -2178,9 +1842,8 @@
Autres immobilisations financières
27
view
-
+
Pas d'amortissement sur les immobilisations financières
-
@@ -2188,8 +1851,7 @@
Titres immobilisés autres que les titres immobilisés de l'activité de portefeuille (droit de propriété)
271
view
-
-
+
@@ -2197,8 +1859,7 @@
Actions
2711
other
-
-
+
@@ -2206,8 +1867,7 @@
Autres titres
2718
other
-
-
+
@@ -2215,8 +1875,7 @@
Titres immobilisés (droit de créance)
272
view
-
-
+
@@ -2224,8 +1883,7 @@
Obligations
2721
other
-
-
+
@@ -2233,8 +1891,7 @@
Bons
2722
other
-
-
+
@@ -2242,8 +1899,7 @@
Titres immobilisés de l'activité de portefeuille (TIAP)
273
other
-
-
+
@@ -2251,8 +1907,7 @@
Prêts
274
view
-
-
+
@@ -2260,8 +1915,7 @@
Prêts participatifs
2741
other
-
-
+
@@ -2269,8 +1923,7 @@
Prêts aux associés
2742
other
-
-
+
@@ -2278,8 +1931,7 @@
Prêts au personnel
2743
other
-
-
+
@@ -2287,8 +1939,7 @@
Autres prêts
2748
other
-
-
+
@@ -2296,9 +1947,7 @@
Dépôts et cautionnements versés
275
view
-
- ex : badge autoroute..
-
+
@@ -2306,8 +1955,7 @@
Dépôts
2751
other
-
-
+
@@ -2315,8 +1963,7 @@
Cautionnements
2755
other
-
-
+
@@ -2324,8 +1971,7 @@
Autres créances immobilisées
276
view
-
-
+
@@ -2333,8 +1979,7 @@
Créances diverses
2761
other
-
-
+
@@ -2342,8 +1987,7 @@
Intérêts courus
2768
view
-
-
+
@@ -2351,8 +1995,7 @@
Sur titres immobilisés (droits de créance)
27682
other
-
-
+
@@ -2360,8 +2003,7 @@
Sur prêts
27684
other
-
-
+
@@ -2369,8 +2011,7 @@
Sur dépôts et cautionnements
27685
other
-
-
+
@@ -2378,8 +2019,7 @@
Sur créances diverses
27688
other
-
-
+
@@ -2387,8 +2027,7 @@
Actions propres ou parts propres
277
view
-
-
+
@@ -2396,8 +2035,7 @@
Actions propres ou parts propres
2771
other
-
-
+
@@ -2405,8 +2043,7 @@
Actions propres ou parts propres en voie d'annulation
2772
other
-
-
+
@@ -2414,8 +2051,7 @@
Versements restant à effectuer sur titres immobilisés non libérés
279
other
-
-
+
@@ -2423,9 +2059,8 @@
Amortissement des immobilisations
28
view
-
+
http://fr.wikipedia.org/wiki/Amortissement_comptable
-
@@ -2433,8 +2068,7 @@
Amortissements des immobilisations incorporelles
280
view
-
-
+
@@ -2442,8 +2076,7 @@
Frais d'établissement (même ventilation que celle du compte 201)
2801
other
-
-
+
@@ -2451,8 +2084,7 @@
Frais de recherche et de développement
2803
other
-
-
+
@@ -2460,8 +2092,7 @@
Concessions et droits similaires, brevets, licences, logiciels, droits et valeurs similaires
2805
other
-
-
+
@@ -2469,8 +2100,7 @@
Fonds commercial
2807
other
-
-
+
@@ -2478,8 +2108,7 @@
Autres immobilisations incorporelles
2808
other
-
-
+
@@ -2487,8 +2116,7 @@
Amortissements des immobilisations corporelles
281
view
-
-
+
@@ -2496,8 +2124,7 @@
Terrains de gisement
2811
other
-
-
+
@@ -2505,8 +2132,7 @@
Agencements aménagements de terrains (même ventilation que celle du compte 212)
2812
other
-
-
+
@@ -2514,8 +2140,7 @@
Constructions (même ventilation que celle du compte 213)
2813
other
-
-
+
@@ -2523,8 +2148,7 @@
Constructions sur sol d'autrui (même ventilation que celle du compte 214)
2814
other
-
-
+
@@ -2532,8 +2156,7 @@
Installations matériel et outillage industriels (même ventilation que celle du compte 215)
2815
other
-
-
+
@@ -2541,8 +2164,7 @@
Autres immobilisations corporelles (même ventilation que celle du compte 218)
2818
other
-
-
+
@@ -2550,8 +2172,7 @@
Amortissements des immobilisations mises en concession
282
other
-
-
+
@@ -2559,8 +2180,7 @@
Dépréciation des immobilisations
29
view
-
-
+
@@ -2568,8 +2188,7 @@
Dépréciations des immobilisations incorporelles
290
view
-
-
+
@@ -2577,8 +2196,7 @@
Marques, procédés, droits et valeurs similaires
2905
other
-
-
+
@@ -2586,8 +2204,7 @@
Droit au bail
2906
other
-
-
+
@@ -2595,8 +2212,7 @@
Fonds commercial
2907
other
-
-
+
@@ -2604,8 +2220,7 @@
Autres immobilisations incorporelles
2908
other
-
-
+
@@ -2613,8 +2228,7 @@
Dépréciations des immobilisations corporelles (même ventilation que celle du compte 21)
291
view
-
-
+
@@ -2622,8 +2236,7 @@
Terrains (autres que terrains de gisement)
2911
other
-
-
+
@@ -2631,8 +2244,7 @@
Dépréciations des immobilisations mises en concession
292
other
-
-
+
@@ -2640,8 +2252,7 @@
Dépréciations des immobilisations en cours
293
view
-
-
+
@@ -2649,8 +2260,7 @@
Immobilisations corporelles en cours
2931
other
-
-
+
@@ -2658,8 +2268,7 @@
Immobilisations incorporelles en cours
2932
other
-
-
+
@@ -2667,8 +2276,7 @@
Provisions pour dépréciation des participations et créances rattachées à des participations
296
view
-
-
+
@@ -2676,8 +2284,7 @@
Titres de participation
2961
other
-
-
+
@@ -2685,8 +2292,7 @@
Autres formes de participation
2966
other
-
-
+
@@ -2694,8 +2300,7 @@
Créances rattachées à des participations (même ventilation que celle du compte 267)
2967
other
-
-
+
@@ -2703,8 +2308,7 @@
Créances rattachées à des sociétés en participation (même ventilation que celle du compte 268)
2968
other
-
-
+
@@ -2712,8 +2316,7 @@
Dépréciations des autres immobilisations financières
297
view
-
-
+
@@ -2721,8 +2324,7 @@
Titres immobilisés autres que les titres immobilisés de l'activité de portefeuille - droit de propriété (ventilation : 271)
2971
other
-
-
+
@@ -2730,8 +2332,7 @@
Titres immobilisés - droit de créance (même ventilation que celle du compte 272)
2972
other
-
-
+
@@ -2739,16 +2340,14 @@
Titres immobilisés de l'activité de portefeuille
2973
other
-
-
+
Prêts (même ventilation que celle du compte 274)
2974
other
-
-
+
@@ -2756,8 +2355,7 @@
Dépôts et cautionnements versés (même ventilation que celle du compte 275)
2975
other
-
-
+
@@ -2765,8 +2363,7 @@
Autres créances immobilisées (même ventilation que celle du compte 276)
2976
other
-
-
+
@@ -2774,8 +2371,7 @@
Comptes de stocks et d'en-cours
Classe 3
view
-
-
+
@@ -2783,8 +2379,7 @@
Matières premières (et fourniture)
31
view
-
-
+
@@ -2792,7 +2387,7 @@
Matière (ou groupe) A
311
other
-
+
@@ -2800,8 +2395,7 @@
Matière (ou groupe) B
312
other
-
-
+
@@ -2809,8 +2403,7 @@
Fournitures A, B, C, ..
317
other
-
-
+
@@ -2818,8 +2411,7 @@
Autres approvisionnements
32
view
-
-
+
@@ -2827,8 +2419,7 @@
Matières consommables
321
view
-
-
+
@@ -2836,8 +2427,7 @@
Matière (ou groupe) C
3211
other
-
-
+
@@ -2845,8 +2435,7 @@
Matière (ou groupe) D
3212
other
-
-
+
@@ -2854,8 +2443,7 @@
Fournitures consommables
322
view
-
-
+
@@ -2863,8 +2451,7 @@
Combustibles
3221
other
-
-
+
@@ -2872,8 +2459,7 @@
Produits d'entretien
3222
other
-
-
+
@@ -2881,8 +2467,7 @@
Fournitures d'atelier et d usine
3223
other
-
-
+
@@ -2890,8 +2475,7 @@
Fournitures de magasin
3224
other
-
-
+
@@ -2899,8 +2483,7 @@
Fournitures de bureau
3225
other
-
-
+
@@ -2908,8 +2491,7 @@
Emballages
326
view
-
-
+
@@ -2917,8 +2499,7 @@
Emballages perdus
3261
other
-
-
+
@@ -2926,8 +2507,7 @@
Emballages récupérables non identifiables
3265
other
-
-
+
@@ -2935,8 +2515,7 @@
Emballages à usage mixte
3267
other
-
-
+
@@ -2944,8 +2523,7 @@
En-cours de production de biens
33
view
-
-
+
@@ -2953,8 +2531,7 @@
Produits en cours
331
view
-
-
+
@@ -2962,8 +2539,7 @@
Produit en cours P 1
3311
other
-
-
+
@@ -2971,8 +2547,7 @@
Produit en cours P 2
3312
other
-
-
+
@@ -2980,8 +2555,7 @@
Travaux en cours
335
view
-
-
+
@@ -2989,8 +2563,7 @@
Travaux en cours T 1
3351
other
-
-
+
@@ -2998,8 +2571,7 @@
Travaux en cours T 2
3352
other
-
-
+
@@ -3007,8 +2579,7 @@
En-cours de production de services
34
view
-
-
+
@@ -3016,8 +2587,7 @@
Études en cours
341
view
-
-
+
@@ -3025,8 +2595,7 @@
Études en cours E 1
3411
other
-
-
+
@@ -3034,8 +2603,7 @@
Études en cours E 2
3412
other
-
-
+
@@ -3043,8 +2611,7 @@
Prestations de services en cours
345
view
-
-
+
@@ -3052,8 +2619,7 @@
Prestations de services S 1
3451
other
-
-
+
@@ -3061,8 +2627,7 @@
Prestations de services S 2
3452
other
-
-
+
@@ -3070,8 +2635,7 @@
Stocks de produits
35
view
-
-
+
@@ -3079,8 +2643,7 @@
Produits intermédiaires
351
view
-
-
+
@@ -3088,8 +2651,7 @@
Produits intermédiaires (ou groupe) A
3511
other
-
-
+
@@ -3097,8 +2659,7 @@
Produits intermédiaires (ou groupe) B
3512
other
-
-
+
@@ -3106,8 +2667,7 @@
Produits finis
355
view
-
-
+
@@ -3115,8 +2675,7 @@
Produits finis (ou groupe) A
3551
other
-
-
+
@@ -3124,8 +2683,7 @@
Produits finis (ou groupe) B
3552
other
-
-
+
@@ -3133,8 +2691,7 @@
Produits résiduels (ou matières de récupération)
358
view
-
-
+
@@ -3142,8 +2699,7 @@
Déchets
3581
other
-
-
+
@@ -3151,8 +2707,7 @@
Rebuts
3585
other
-
-
+
@@ -3160,8 +2715,7 @@
Matières de récupération
3586
other
-
-
+
@@ -3169,8 +2723,7 @@
Stocks provenant d'immobilisations
36
view
-
-
+
@@ -3178,8 +2731,7 @@
Stocks de marchandises
37
view
-
-
+
@@ -3187,8 +2739,7 @@
Marchandises (ou groupe) A
371
other
-
-
+
@@ -3196,8 +2747,7 @@
Marchandises (ou groupe) B
372
other
-
-
+
@@ -3205,8 +2755,7 @@
Stocks en voie d'acheminement
38
view
-
-
+
@@ -3214,8 +2763,7 @@
Provisions pour dépréciation des stocks et en-cours
39
view
-
-
+
@@ -3223,8 +2771,7 @@
Provisions pour dépréciation des matières premières (et fournitures)
391
view
-
-
+
@@ -3232,8 +2779,7 @@
Matières (ou groupe) A
3911
other
-
-
+
@@ -3241,8 +2787,7 @@
Matières (ou groupe) B
3912
other
-
-
+
@@ -3250,8 +2795,7 @@
Fournitures A, B, C, ..
3917
other
-
-
+
@@ -3259,8 +2803,7 @@
Provisions pour dépréciation des autres approvisionnements
392
view
-
-
+
@@ -3268,8 +2811,7 @@
Matières consommables (même ventilation que celle du compte 321)
3921
other
-
-
+
@@ -3277,8 +2819,7 @@
Fournitures consommables (même ventilation que celle du compte 322)
3922
other
-
-
+
@@ -3286,8 +2827,7 @@
Emballages (même ventilation que celle du compte 326)
3926
other
-
-
+
@@ -3295,8 +2835,7 @@
Provisions pour dépréciation des en-cours de production de biens
393
view
-
-
+
@@ -3304,8 +2843,7 @@
Produits en cours (même ventilation que celle du compte 331)
3931
other
-
-
+
@@ -3313,8 +2851,7 @@
Travaux en cours (même ventilation que celle du compte 335)
3935
other
-
-
+
@@ -3322,8 +2859,7 @@
Provisions pour dépréciation des en-cours de production de services
394
view
-
-
+
@@ -3331,8 +2867,7 @@
Études en cours (même ventilation que celle du compte 341)
3941
other
-
-
+
@@ -3340,8 +2875,7 @@
Prestations de services en cours (même ventilation que celle du compte 345)
3945
other
-
-
+
@@ -3349,8 +2883,7 @@
Provisions pour dépréciation des stocks de produits
395
view
-
-
+
@@ -3358,8 +2891,7 @@
Produits intermédiaires (même ventilation que celle du compte 351)
3951
other
-
-
+
@@ -3367,8 +2899,7 @@
Produits finis (même ventilation que celle du compte 355)
3955
other
-
-
+
@@ -3376,8 +2907,7 @@
Provisions pour dépréciation des stocks de marchandises
397
view
-
-
+
@@ -3385,8 +2915,7 @@
Marchandises (ou groupe) A
3971
other
-
-
+
@@ -3394,8 +2923,7 @@
Marchandises (ou groupe) B
3972
other
-
-
+
@@ -3403,7 +2931,7 @@
Comptes de tiers
Classe 4
view
-
+
@@ -3411,7 +2939,7 @@
Fournisseurs et comptes rattachés
40
view
-
+
@@ -3420,7 +2948,7 @@
Fournisseurs et comptes rattachés
400
payable
-
+
@@ -3429,7 +2957,7 @@
Fournisseurs
401
view
-
+
@@ -3439,7 +2967,7 @@
Fournisseurs - Achats de biens et prestations de services
4011
payable
-
+
@@ -3449,7 +2977,7 @@
Fournisseurs - Retenues de garantie
4017
payable
-
+
@@ -3458,7 +2986,7 @@
Fournisseurs - Effets à payer
403
payable
-
+
@@ -3467,7 +2995,7 @@
Fournisseurs d'immobilisations
404
view
-
+
@@ -3476,7 +3004,7 @@
Fournisseurs - Achats d'immobilisations
4041
payable
-
+
@@ -3485,7 +3013,7 @@
Fournisseurs d'immobilisations - Retenues de garantie
4047
payable
-
+
@@ -3494,7 +3022,7 @@
Fournisseurs d'immobilisations - Effets à payer
405
payable
-
+
@@ -3503,8 +3031,7 @@
Fournisseurs - Factures non parvenues
408
view
-
-
+
@@ -3513,8 +3040,7 @@
Fournisseurs
4081
payable
-
-
+
@@ -3523,7 +3049,7 @@
Fournisseurs d'immobilisations
4084
payable
-
+
@@ -3532,8 +3058,7 @@
Fournisseurs - Intérêts courus
4088
payable
-
-
+
@@ -3542,8 +3067,7 @@
Fournisseurs débiteurs
409
view
-
-
+
@@ -3552,8 +3076,7 @@
Fournisseurs - Avances et acomptes versés sur commandes
4091
other
-
-
+
@@ -3562,8 +3085,7 @@
Fournisseurs - Créances pour emballages et matériel à rendre
4096
other
-
-
+
@@ -3572,8 +3094,7 @@
Fournisseurs - Autres avoirs
4097
view
-
-
+
@@ -3582,8 +3103,7 @@
Fournisseurs d'exploitation
40971
other
-
-
+
@@ -3592,8 +3112,7 @@
Fournisseurs d'immobilisations
40974
other
-
-
+
@@ -3602,8 +3121,7 @@
Rabais, remises, ristournes à obtenir et autres avoirs non encore reçus
4098
other
-
-
+
@@ -3612,8 +3130,7 @@
Clients et comptes rattachés
41
view
-
-
+
@@ -3622,8 +3139,7 @@
Clients et comptes rattachés
410
receivable
-
-
+
@@ -3632,8 +3148,7 @@
Clients
411
view
-
-
+
@@ -3643,8 +3158,7 @@
Clients - Ventes de biens ou de prestations de services
4111
receivable
-
-
+
@@ -3654,8 +3168,7 @@
Clients - Retenues de garantie
4117
receivable
-
-
+
@@ -3664,8 +3177,7 @@
Clients - Effets à recevoir
413
receivable
-
-
+
@@ -3674,8 +3186,7 @@
Clients douteux ou litigieux
416
receivable
-
-
+
@@ -3684,8 +3195,7 @@
Clients - Produits non encore facturés
418
view
-
-
+
@@ -3694,8 +3204,7 @@
Clients - Factures à établir
4181
receivable
-
-
+
@@ -3704,8 +3213,7 @@
Clients - Intérêts courus
4188
receivable
-
-
+
@@ -3714,8 +3222,7 @@
Clients créditeurs
419
view
-
-
+
@@ -3724,8 +3231,7 @@
Clients - Avances et acomptes reçus sur commandes
4191
other
-
-
+
@@ -3734,8 +3240,7 @@
Clients - Dettes pour emballages et matériels consignés
4196
other
-
-
+
@@ -3744,8 +3249,7 @@
Clients - Autres avoirs
4197
other
-
-
+
@@ -3754,8 +3258,7 @@
Rabais, remises, ristournes à accorder et autres avoirs à établir
4198
other
-
-
+
@@ -3764,17 +3267,15 @@
Personnel et comptes rattachés
42
view
-
-
+
Personnel - Rémunérations dues
421
- view
-
-
+ other
+
@@ -3783,8 +3284,7 @@
Comités d'entreprise d'établissement
422
other
-
-
+
@@ -3793,8 +3293,7 @@
Participation des salariés aux résultats
424
view
-
-
+
@@ -3803,8 +3302,7 @@
Réserve spéciale
4246
other
-
-
+
@@ -3813,8 +3311,7 @@
Comptes courants
4248
other
-
-
+
@@ -3823,8 +3320,7 @@
Personnel - Avances et acomptes
425
receivable
-
-
+
@@ -3833,8 +3329,7 @@
Personnel - Dépôts
426
other
-
-
+
@@ -3843,8 +3338,7 @@
Personnel - Oppositions
427
other
-
-
+
@@ -3853,8 +3347,7 @@
Personnel - Charges à payer et produits à recevoir
428
view
-
-
+
@@ -3863,8 +3356,7 @@
Dettes provisionnées pour congés à payer
4282
other
-
-
+
@@ -3873,8 +3365,7 @@
Dettes provisionnées pour participation des salariés aux résultats
4284
other
-
-
+
@@ -3883,8 +3374,7 @@
Autres charges à payer
4286
other
-
-
+
@@ -3893,8 +3383,7 @@
Produits à recevoir
4287
receivable
-
-
+
@@ -3903,8 +3392,7 @@
Sécurité Sociale et autres organismes sociaux
43
view
-
-
+
@@ -3912,8 +3400,7 @@
Sécurité Sociale
431
other
-
-
+
@@ -3921,9 +3408,8 @@
Autres organismes sociaux
437
- view
-
-
+ other
+
@@ -3932,8 +3418,7 @@
Organismes sociaux - Charges à payer et produits à recevoir
438
view
-
-
+
@@ -3942,8 +3427,7 @@
Charges sociales sur congés à payer
4382
other
-
-
+
@@ -3952,8 +3436,7 @@
Autres charges à payer
4386
other
-
-
+
@@ -3962,8 +3445,7 @@
Produits à recevoir
4387
receivable
-
-
+
@@ -3972,8 +3454,7 @@
Etat et autres collectivités publiques
44
view
-
-
+
@@ -3981,8 +3462,7 @@
État - Subventions à recevoir
441
view
-
-
+
@@ -3991,8 +3471,7 @@
Subventions d'investissement
4411
receivable
-
-
+
@@ -4001,8 +3480,7 @@
Subventions d'exploitation
4417
receivable
-
-
+
@@ -4011,8 +3489,7 @@
Subventions d'équilibre
4418
receivable
-
-
+
@@ -4021,8 +3498,7 @@
Avances sur subventions
4419
receivable
-
-
+
@@ -4031,8 +3507,7 @@
État -Impôts et taxes recouvrables sur des tiers
442
view
-
-
+
@@ -4041,8 +3516,7 @@
Obligataires
4424
other
-
-
+
@@ -4051,8 +3525,7 @@
Associés
4425
other
-
-
+
@@ -4061,8 +3534,7 @@
Opérations particulières avec l'État, les collectivités publiques, les organismes internationaux
443
view
-
-
+
@@ -4071,8 +3543,7 @@
Créances sur l'État résultant de la suppression de la règle du décalage d'un mois en matière de TVA
4431
receivable
-
-
+
@@ -4081,8 +3552,7 @@
Intérêts courus sur créances figurant au compte 4431
4438
other
-
-
+
@@ -4091,8 +3561,7 @@
État - Impôts sur les bénéfices
444
other
-
-
+
@@ -4101,8 +3570,7 @@
État - Taxes sur le chiffre d'affaires
445
view
-
-
+
@@ -4111,8 +3579,7 @@
TVA due intracommunautaire
4452
view
-
-
+
@@ -4121,8 +3588,7 @@
TVA due intracommunautaire 19,6%
445201
other
-
-
+
@@ -4131,8 +3597,7 @@
TVA due intracommunautaire 5,5%
445202
other
-
-
+
@@ -4141,8 +3606,7 @@
TVA due intracommunautaire (autre taux)
445203
other
-
-
+
@@ -4151,8 +3615,7 @@
Taxes sur le chiffre d'affaires à décaisser
4455
view
-
-
+
@@ -4161,8 +3624,7 @@
TVA à décaisser
44551
other
-
-
+
@@ -4171,8 +3633,7 @@
Taxes assimilées à la TVA
44558
other
-
-
+
@@ -4181,8 +3642,7 @@
Taxes sur le chiffre d'affaires déductibles
4456
view
-
-
+
@@ -4191,8 +3651,7 @@
TVA sur immobilisations
44562
other
-
-
+
@@ -4201,8 +3660,7 @@
TVA transférée par d'autres entreprises
44563
other
-
-
+
@@ -4211,8 +3669,7 @@
TVA sur autres biens et services
44566
other
-
-
+
@@ -4221,8 +3678,7 @@
TVA déductible intracommunautaire
445662
other
-
-
+
@@ -4231,9 +3687,8 @@
Crédit de TVA à reporter
44567
other
-
+
Si le remboursement n'a pas été demandé
-
@@ -4242,8 +3697,7 @@
Taxes assimilées à la TVA
44568
other
-
-
+
@@ -4252,8 +3706,7 @@
Taxes sur le chiffre d'affaires collectées par l'entreprise
4457
view
-
-
+
@@ -4262,8 +3715,7 @@
TVA collectée
44571
view
-
-
+
@@ -4272,8 +3724,7 @@
TVA collectée 19,6%
445711
other
-
-
+
@@ -4282,8 +3733,7 @@
TVA collectée 5,5%
445712
other
-
-
+
@@ -4292,8 +3742,7 @@
TVA collectée (autre taux)
445713
other
-
-
+
@@ -4302,8 +3751,7 @@
Taxes assimilées à la TVA
44578
other
-
-
+
@@ -4312,8 +3760,7 @@
Taxes sur le chiffre d'affaires à régulariser ou en attente
4458
view
-
-
+
@@ -4322,8 +3769,7 @@
Acomptes - Régime simplifié d'imposition
44581
other
-
-
+
@@ -4332,8 +3778,7 @@
Acomptes - Régime du forfait
44582
other
-
-
+
@@ -4342,8 +3787,7 @@
Remboursement de taxes sur le chiffre d'affaires demandé
44583
other
-
-
+
@@ -4352,8 +3796,7 @@
TVA récupérée d'avance
44584
other
-
-
+
@@ -4362,8 +3805,7 @@
Taxes sur le chiffre d'affaires sur factures non parvenues
44586
other
-
-
+
@@ -4372,8 +3814,7 @@
Taxes sur le chiffre d'affaires sur factures à établir
44587
other
-
-
+
@@ -4382,8 +3823,7 @@
Obligations cautionnées
446
other
-
-
+
@@ -4392,8 +3832,7 @@
Autres impôts, taxes et versements assimilés
447
other
-
-
+
@@ -4402,8 +3841,7 @@
État - Charges à payer et produits à recevoir
448
view
-
-
+
@@ -4412,8 +3850,7 @@
Charges fiscales sur congés à payer
4482
other
-
-
+
@@ -4422,8 +3859,7 @@
Charges à payer
4486
other
-
-
+
@@ -4432,8 +3868,7 @@
Produits à recevoir
4487
other
-
-
+
@@ -4442,8 +3877,7 @@
Quotas d'émission à restituer à l'État
449
other
-
-
+
@@ -4452,8 +3886,7 @@
Groupe et associés
45
view
-
-
+
@@ -4461,8 +3894,7 @@
Groupe
451
receivable
-
-
+
@@ -4471,9 +3903,8 @@
Associés - Comptes courants
455
view
-
+
Pour frais avancés personnellement
-
@@ -4482,8 +3913,7 @@
Principal
4551
receivable
-
-
+
@@ -4492,8 +3922,7 @@
Intérêts courus
4558
receivable
-
-
+
@@ -4502,8 +3931,7 @@
Associés - Opérations sur le capital
456
view
-
-
+
@@ -4512,8 +3940,7 @@
Associés - Comptes d'apport en société
4561
view
-
-
+
@@ -4522,8 +3949,7 @@
Apports en nature
45611
receivable
-
-
+
@@ -4532,8 +3958,7 @@
Apports en numéraire
45615
receivable
-
-
+
@@ -4542,8 +3967,7 @@
Apporteurs - Capital appelé, non versé
4562
view
-
-
+
@@ -4552,8 +3976,7 @@
Actionnaires - Capital souscrit et appelé, non versé
45621
receivable
-
-
+
@@ -4562,8 +3985,7 @@
Associés - Capital appelé, non versé
45625
receivable
-
-
+
@@ -4572,8 +3994,7 @@
Associés - Versements reçus sur augmentation de capital
4563
receivable
-
-
+
@@ -4582,8 +4003,7 @@
Associés - Versements anticipés
4564
receivable
-
-
+
@@ -4592,8 +4012,7 @@
Actionnaires défaillants
4566
receivable
-
-
+
@@ -4602,8 +4021,7 @@
Associés - Capital à rembourser
4567
receivable
-
-
+
@@ -4612,8 +4030,7 @@
Associés - Dividendes à payer
457
other
-
-
+
@@ -4622,8 +4039,7 @@
Associés - Opérations faites en commun et en GIE
458
view
-
-
+
@@ -4632,8 +4048,7 @@
Opérations courantes
4581
receivable
-
-
+
@@ -4642,8 +4057,7 @@
Intérêts courus
4588
receivable
-
-
+
@@ -4652,8 +4066,7 @@
Débiteurs divers et créditeurs divers
46
view
-
-
+
@@ -4661,8 +4074,7 @@
Créances sur cessions d'immobilisations
462
receivable
-
-
+
@@ -4671,8 +4083,7 @@
Dettes sur acquisitions de valeurs mobilières de placement
464
other
-
-
+
@@ -4681,8 +4092,7 @@
Créances sur cessions de valeurs mobilières de placement
465
receivable
-
-
+
@@ -4690,9 +4100,8 @@
Autres comptes débiteurs ou créditeurs
467
- view
-
-
+ other
+
@@ -4700,8 +4109,7 @@
Divers - Charges à payer et produits à recevoir
468
view
-
-
+
@@ -4710,8 +4118,7 @@
Charges à payer
4686
other
-
-
+
@@ -4720,8 +4127,7 @@
Produits à recevoir
4687
receivable
-
-
+
@@ -4730,8 +4136,7 @@
Comptes transitoires ou d'attente
47
view
-
-
+
@@ -4739,8 +4144,7 @@
Comptes d'attente 1
471
receivable
-
-
+
@@ -4749,8 +4153,7 @@
Comptes d'attente 2
472
receivable
-
-
+
@@ -4759,8 +4162,7 @@
Comptes d'attente 3
473
receivable
-
-
+
@@ -4769,8 +4171,7 @@
Comptes d'attente 4
474
receivable
-
-
+
@@ -4779,8 +4180,7 @@
Comptes d'attente 5
475
receivable
-
-
+
@@ -4789,8 +4189,7 @@
Différences de conversion - ACTIF
476
view
-
-
+
@@ -4799,8 +4198,7 @@
Diminution des créances
4761
receivable
-
-
+
@@ -4809,8 +4207,7 @@
Augmentation des dettes
4762
receivable
-
-
+
@@ -4819,8 +4216,7 @@
Différences compensées par couverture de change
4768
receivable
-
-
+
@@ -4829,8 +4225,7 @@
Différences de conversion - PASSIF
477
view
-
-
+
@@ -4839,8 +4234,7 @@
Augmentation des créances
4771
other
-
-
+
@@ -4849,8 +4243,7 @@
Diminution des dettes
4772
other
-
-
+
@@ -4859,8 +4252,7 @@
Différences compensées par couverture de change
4778
other
-
-
+
@@ -4868,9 +4260,8 @@
Autres comptes transitoires
478
- view
-
-
+ other
+
@@ -4878,8 +4269,7 @@
Comptes de régularisation
48
view
-
-
+
@@ -4887,8 +4277,7 @@
Charges à répartir sur plusieurs exercices
481
view
-
-
+
@@ -4897,8 +4286,7 @@
Frais d'émission des emprunts
4816
receivable
-
-
+
@@ -4907,8 +4295,7 @@
Charges constatées d'avance
486
receivable
-
-
+
@@ -4917,8 +4304,7 @@
Produits constatés d'avance
487
other
-
-
+
@@ -4927,8 +4313,7 @@
Comptes de répartition périodique des charges et des produits
488
view
-
-
+
@@ -4936,8 +4321,7 @@
Charges
4886
other
-
-
+
@@ -4946,8 +4330,7 @@
Produits
4887
receivable
-
-
+
@@ -4956,8 +4339,7 @@
Quotas d'émission alloués par l'État
489
receivable
-
-
+
@@ -4966,8 +4348,7 @@
Dépréciations des comptes de tiers
49
view
-
-
+
@@ -4975,8 +4356,7 @@
Dépréciation des comptes de clients
491
other
-
-
+
@@ -4985,8 +4365,7 @@
Dépréciation des comptes du groupe et des associés
495
view
-
-
+
@@ -4995,8 +4374,7 @@
Comptes du groupe
4951
other
-
-
+
@@ -5005,8 +4383,7 @@
Comptes courants des associés
4955
other
-
-
+
@@ -5015,8 +4392,7 @@
Opérations faites en commun et en GIE
4958
other
-
-
+
@@ -5025,8 +4401,7 @@
Dépréciations des comptes de débiteurs divers
496
view
-
-
+
@@ -5035,8 +4410,7 @@
Créances sur cessions d'immobilisations
4962
receivable
-
-
+
@@ -5045,8 +4419,7 @@
Créances sur cessions de valeurs mobilières de placement
4965
receivable
-
-
+
@@ -5055,8 +4428,7 @@
Autres comptes débiteurs
4967
receivable
-
-
+
@@ -5065,8 +4437,7 @@
Comptes financiers
Classe 5
view
-
-
+
@@ -5074,8 +4445,7 @@
Valeurs mobilières de placement
50
view
-
-
+
@@ -5083,8 +4453,7 @@
Parts dans entreprises liées
501
other
-
-
+
@@ -5092,8 +4461,7 @@
Actions propres
502
other
-
-
+
@@ -5101,8 +4469,7 @@
Actions
503
view
-
-
+
@@ -5110,8 +4477,7 @@
Titres cotés
5031
other
-
-
+
@@ -5119,8 +4485,7 @@
Titres non cotés
5035
other
-
-
+
@@ -5128,8 +4493,7 @@
Autres titres conférant un droit de propriété
504
other
-
-
+
@@ -5137,8 +4501,7 @@
Obligations et bons émis par la société et rachetés par elle
505
other
-
-
+
@@ -5146,8 +4509,7 @@
Obligations
506
view
-
-
+
@@ -5155,8 +4517,7 @@
Titres cotés
5061
other
-
-
+
@@ -5164,8 +4525,7 @@
Titres non cotés
5065
other
-
-
+
@@ -5173,8 +4533,7 @@
Bons du Trésor et bons de caisse à court terme
507
other
-
-
+
@@ -5182,8 +4541,7 @@
Autres valeurs mobilières de placement et autres créances assimilées
508
view
-
-
+
@@ -5191,8 +4549,7 @@
Autres valeurs mobilières
5081
other
-
-
+
@@ -5200,8 +4557,7 @@
Bons de souscription
5082
other
-
-
+
@@ -5209,8 +4565,7 @@
Intérêts courus sur obligations, bons et valeurs assimilées
5088
other
-
-
+
@@ -5218,8 +4573,7 @@
Versements restant à effectuer sur valeurs mobilières de placement non libérées
509
other
-
-
+
@@ -5227,8 +4581,7 @@
Banques établissements financiers et assimilés
51
view
-
-
+
@@ -5236,8 +4589,7 @@
Valeurs à l'encaissement
511
view
-
-
+
@@ -5245,8 +4597,7 @@
Coupons échus à l'encaissement
5111
other
-
-
+
@@ -5254,8 +4605,7 @@
Chèques à encaisser
5112
other
-
-
+
@@ -5263,8 +4613,7 @@
Effets à l'encaissement
5113
other
-
-
+
@@ -5272,8 +4621,7 @@
Effets à l'escompte
5114
other
-
-
+
@@ -5281,9 +4629,8 @@
Banques
512
view
-
+
Créer 1 compte par compte bancaire
-
@@ -5292,8 +4639,7 @@
Comptes en monnaie nationale
5121
view
-
-
+
@@ -5302,8 +4648,7 @@
Comptes en devises
5124
other
-
-
+
@@ -5311,7 +4656,7 @@
Chèques postaux
514
other
-
+
@@ -5319,8 +4664,7 @@
Caisses du Trésor et des établissements publics
515
other
-
-
+
@@ -5328,8 +4672,7 @@
Sociétés de bourse
516
other
-
-
+
@@ -5337,8 +4680,7 @@
Autres organismes financiers
517
other
-
-
+
@@ -5346,8 +4688,7 @@
Intérêts courus
518
view
-
-
+
@@ -5355,8 +4696,7 @@
Intérêts courus à payer
5181
other
-
-
+
@@ -5364,8 +4704,7 @@
Intérêts courus à recevoir
5188
other
-
-
+
@@ -5373,8 +4712,7 @@
Concours bancaires courants
519
view
-
-
+
@@ -5382,8 +4720,7 @@
Crédit de mobilisation de créances commerciales (CMCC)
5191
other
-
-
+
@@ -5391,8 +4728,7 @@
Mobilisation de créances nées à l'étranger
5193
other
-
-
+
@@ -5400,8 +4736,7 @@
Intérêts courus sur concours bancaires courants
5198
other
-
-
+
@@ -5409,8 +4744,7 @@
Instruments de trésorerie
52
view
-
-
+
@@ -5418,8 +4752,7 @@
Caisse
53
view
-
-
+
@@ -5427,8 +4760,7 @@
Caisse siège social
531
view
-
-
+
@@ -5436,8 +4768,7 @@
Caisse en monnaie nationale
5311
other
-
-
+
@@ -5445,8 +4776,7 @@
Caisse en devises
5314
other
-
-
+
@@ -5454,8 +4784,7 @@
Caisse succursale (ou usine) A
532
other
-
-
+
@@ -5463,8 +4792,7 @@
Caisse succursale (ou usine) B
533
other
-
-
+
@@ -5472,8 +4800,7 @@
Régies d'avances et accréditifs
54
view
-
-
+
@@ -5481,8 +4808,7 @@
Virements internes
58
view
-
-
+
@@ -5491,8 +4817,7 @@
Provisions pour dépréciation des comptes financiers
59
view
-
-
+
@@ -5500,8 +4825,7 @@
Provisions pour dépréciation des valeurs mobilières de placement
590
view
-
-
+
@@ -5509,8 +4833,7 @@
Actions
5903
other
-
-
+
@@ -5518,8 +4841,7 @@
Autres titres conférant un droit de propriété
5904
other
-
-
+
@@ -5527,8 +4849,7 @@
Obligations
5906
other
-
-
+
@@ -5536,8 +4857,7 @@
Autres valeurs mobilières de placement et créances assimilées (provisions)
5908
other
-
-
+
@@ -5545,8 +4865,7 @@
Comptes de gestion
Classes 6 et 7
view
-
-
+
@@ -5554,8 +4873,7 @@
Comptes de charges
Classe 6
view
-
-
+
@@ -5563,8 +4881,7 @@
Achats(sauf 603)
60
view
-
-
+
@@ -5572,9 +4889,8 @@
Achats stockés - Matières premières (et fournitures)
601
view
-
+
Destinés à la production ou revente
-
@@ -5582,8 +4898,7 @@
Matières (ou groupe) A
6011
other
-
-
+
@@ -5591,8 +4906,7 @@
Matières (ou groupe) B
6012
other
-
-
+
@@ -5600,8 +4914,7 @@
Fournitures A, B, C, ..
6017
other
-
-
+
@@ -5609,9 +4922,8 @@
Achats stockés - Autres approvisionnements
602
view
-
+
Destinés à la production ou revente
-
@@ -5619,8 +4931,7 @@
Matières consommables
6021
view
-
-
+
@@ -5628,8 +4939,7 @@
Matières (ou groupe) C
60211
other
-
-
+
@@ -5637,8 +4947,7 @@
Matières (ou groupe) D
60212
other
-
-
+
@@ -5646,8 +4955,7 @@
Fournitures consommables
6022
view
-
-
+
@@ -5655,8 +4963,7 @@
Combustibles
60221
other
-
-
+
@@ -5664,8 +4971,7 @@
Produits d'entretien
60222
other
-
-
+
@@ -5673,8 +4979,7 @@
Fournitures d'atelier et d'usine
60223
other
-
-
+
@@ -5682,8 +4987,7 @@
Fournitures de magasin
60224
other
-
-
+
@@ -5691,8 +4995,7 @@
Fournitures de bureau
60225
other
-
-
+
@@ -5700,8 +5003,7 @@
Emballages
6026
view
-
-
+
@@ -5709,8 +5011,7 @@
Emballages perdus
60261
other
-
-
+
@@ -5718,8 +5019,7 @@
Emballages récupérables non identifiables
60265
other
-
-
+
@@ -5727,8 +5027,7 @@
Emballages à usage mixte
60267
other
-
-
+
@@ -5737,9 +5036,8 @@
Variation des stocks (approvisionnements et marchandises)
603
view
-
+
Utilisé lors des inventaires
-
@@ -5748,8 +5046,7 @@
Variation des stocks de matières premières (et fournitures)
6031
other
-
-
+
@@ -5757,8 +5054,7 @@
Variation des stocks des autres approvisionnements
6032
other
-
-
+
@@ -5766,8 +5062,7 @@
Variation des stocks de marchandises
6037
other
-
-
+
@@ -5776,8 +5071,7 @@
Achats d'études et prestations de services
604
other
-
-
+
@@ -5785,8 +5079,7 @@
Achats de matériel équipements et travaux
605
other
-
-
+
@@ -5794,9 +5087,8 @@
Achats non stockés de matières et fournitures
606
view
-
+
Pour l'usage interne à l'entreprise
-
@@ -5804,8 +5096,7 @@
Fournitures non stockables (eau, énergie...)
6061
other
-
-
+
@@ -5813,8 +5104,7 @@
Fournitures d'entretien et de petit équipement
6063
other
-
-
+
@@ -5822,8 +5112,7 @@
Fournitures administratives
6064
other
-
-
+
@@ -5831,8 +5120,7 @@
Autres matières et fournitures
6068
other
-
-
+
@@ -5840,9 +5128,8 @@
Achats de marchandises
607
view
-
- Biens revendus tels quels (707) soit une marge
-
+
+ Biens revendus tels quels (707)
@@ -5850,9 +5137,8 @@
Marchandise (ou groupe) A
6071
other
-
+
Pour achats France
-
@@ -5860,9 +5146,8 @@
Marchandise (ou groupe) B
6072
other
-
+
Pour déclaration TVA intracommunautaire
-
@@ -5870,8 +5155,7 @@
Frais accessoires incorporés aux achats
608
other
-
-
+
@@ -5879,8 +5163,7 @@
Rabais, remises et ristournes obtenus sur achats
609
view
-
-
+
@@ -5888,8 +5171,7 @@
- de matières premières (et fournitures)
6091
other
-
-
+
@@ -5897,8 +5179,7 @@
- d'autres approvisionnements stockés
6092
other
-
-
+
@@ -5906,8 +5187,7 @@
- d'études et prestations de services
6094
other
-
-
+
@@ -5915,8 +5195,7 @@
- de matériel, équipements et travaux
6095
other
-
-
+
@@ -5924,8 +5203,7 @@
- d'approvisionnements non stockés
6096
other
-
-
+
@@ -5933,8 +5211,7 @@
- de marchandises
6097
other
-
-
+
@@ -5942,8 +5219,7 @@
Rabais, remises et ristournes non affectés
6098
other
-
-
+
@@ -5951,8 +5227,7 @@
Services extérieurs
61
view
-
-
+
@@ -5960,8 +5235,7 @@
Sous-traitance générale
611
other
-
-
+
@@ -5969,8 +5243,7 @@
Redevances de crédit-bail
612
view
-
-
+
@@ -5978,8 +5251,7 @@
Crédit-bail mobilier
6122
other
-
-
+
@@ -5987,8 +5259,7 @@
Crédit-bail immobilier
6125
other
-
-
+
@@ -5996,8 +5267,7 @@
Locations
613
view
-
-
+
@@ -6005,8 +5275,7 @@
Locations immobilières
6132
other
-
-
+
@@ -6014,8 +5283,7 @@
Locations mobilières
6135
other
-
-
+
@@ -6023,8 +5291,7 @@
Malis sur emballages
6136
other
-
-
+
@@ -6032,8 +5299,7 @@
Charges locatives et de copropriété
614
other
-
-
+
@@ -6041,8 +5307,7 @@
Entretien et réparations
615
view
-
-
+
@@ -6050,8 +5315,7 @@
- sur biens immobiliers
6152
other
-
-
+
@@ -6059,8 +5323,7 @@
- sur biens mobiliers
6155
other
-
-
+
@@ -6068,8 +5331,7 @@
Maintenance
6156
other
-
-
+
@@ -6077,8 +5339,7 @@
Primes d'assurance
616
view
-
-
+
@@ -6086,8 +5347,7 @@
Multirisques
6161
other
-
-
+
@@ -6095,8 +5355,7 @@
Assurance obligatoire dommage construction
6162
other
-
-
+
@@ -6104,8 +5363,7 @@
Assurance transport
6163
view
-
-
+
@@ -6113,8 +5371,7 @@
Assurance transport sur achats
61636
other
-
-
+
@@ -6122,8 +5379,7 @@
Assurance transportsur ventes
61637
other
-
-
+
@@ -6131,8 +5387,7 @@
Assurance transport sur autres biens
61638
other
-
-
+
@@ -6140,8 +5395,7 @@
Risques d'exploitation
6164
other
-
-
+
@@ -6149,8 +5403,7 @@
Insolvabilité clients
6165
other
-
-
+
@@ -6158,8 +5411,7 @@
Études et recherches
617
other
-
-
+
@@ -6167,8 +5419,7 @@
Divers
618
view
-
-
+
@@ -6176,8 +5427,7 @@
Documentation générale
6181
other
-
-
+
@@ -6185,8 +5435,7 @@
Documentation technique
6183
other
-
-
+
@@ -6194,8 +5443,7 @@
Frais de colloques, séminaires, conférences
6185
other
-
-
+
@@ -6203,8 +5451,7 @@
Rabais, remises et ristournes obtenus sur services extérieurs
619
other
-
-
+
@@ -6212,8 +5459,7 @@
Autres services extérieurs
62
view
-
-
+
@@ -6221,8 +5467,7 @@
Personnel extérieur à l'entreprise
621
view
-
-
+
@@ -6230,8 +5475,7 @@
Personnel intérimaire
6211
other
-
-
+
@@ -6239,8 +5483,7 @@
Personnel détaché ou prêté à l'entreprise
6214
other
-
-
+
@@ -6248,8 +5491,7 @@
Rémunérations d'intermédiaires et honoraires
622
view
-
-
+
@@ -6257,8 +5499,7 @@
Commissions et courtages sur achats
6221
other
-
-
+
@@ -6266,8 +5507,7 @@
Commissions et courtages sur ventes
6222
other
-
-
+
@@ -6275,8 +5515,7 @@
Rémunérations des transitaires
6224
other
-
-
+
@@ -6284,8 +5523,7 @@
Rémunérations d'affacturage
6225
other
-
-
+
@@ -6293,8 +5531,7 @@
Honoraires
6226
other
-
-
+
@@ -6302,8 +5539,7 @@
Frais d'actes et de contentieux
6227
other
-
-
+
@@ -6311,8 +5547,7 @@
Divers
6228
other
-
-
+
@@ -6320,9 +5555,8 @@
Publicité, publications, relations publiques
623
view
-
+
Dont annonces légales, greffe, cartes visites
-
@@ -6330,8 +5564,7 @@
Annonces et insertions
6231
other
-
-
+
@@ -6339,8 +5572,7 @@
Échantillons
6232
other
-
-
+
@@ -6348,8 +5580,7 @@
Foires et expositions
6233
other
-
-
+
@@ -6357,9 +5588,8 @@
Cadeaux à la clientèle
6234
other
-
+
Attention déclaration DAS fin d'année
-
@@ -6367,8 +5597,7 @@
Primes
6235
other
-
-
+
@@ -6376,8 +5605,7 @@
Catalogues et imprimés
6236
other
-
-
+
@@ -6385,8 +5613,7 @@
Publications
6237
other
-
-
+
@@ -6394,8 +5621,7 @@
Divers (pourboires, dons courants...)
6238
other
-
-
+
@@ -6403,8 +5629,7 @@
Transports de biens et transports collectifs du personnel
624
view
-
-
+
@@ -6412,8 +5637,7 @@
Transports sur achats
6241
other
-
-
+
@@ -6421,8 +5645,7 @@
Transports sur ventes
6242
other
-
-
+
@@ -6430,8 +5653,7 @@
Transports entre établissements ou chantiers
6243
other
-
-
+
@@ -6439,8 +5661,7 @@
Transports administratifs
6244
other
-
-
+
@@ -6448,8 +5669,7 @@
Transports collectifs du personnel
6247
other
-
-
+
@@ -6457,8 +5677,7 @@
Divers
6248
other
-
-
+
@@ -6466,8 +5685,7 @@
Déplacements missions et réceptions
625
view
-
-
+
@@ -6475,8 +5693,7 @@
Voyages et déplacements
6251
other
-
-
+
@@ -6484,8 +5701,7 @@
Frais de déménagement
6255
other
-
-
+
@@ -6493,8 +5709,7 @@
Missions
6256
other
-
-
+
@@ -6502,8 +5717,7 @@
Réceptions
6257
other
-
-
+
@@ -6511,8 +5725,7 @@
Frais postaux et frais de télécommunications
626
other
-
-
+
@@ -6520,9 +5733,8 @@
Services bancaires et assimilés
627
view
-
+
Frais de tenue de compte, etc
-
@@ -6530,8 +5742,7 @@
Frais sur titres (achat, vente, garde)
6271
other
-
-
+
@@ -6539,8 +5750,7 @@
Commissions et frais sur émission d'emprunts
6272
other
-
-
+
@@ -6548,8 +5758,7 @@
Frais sur effets
6275
other
-
-
+
@@ -6557,8 +5766,7 @@
Location de coffres
6276
other
-
-
+
@@ -6566,8 +5774,7 @@
Autres frais et commissions sur prestations de services
6278
other
-
-
+
@@ -6575,8 +5782,7 @@
Divers
628
view
-
-
+
@@ -6584,9 +5790,7 @@
Concours divers (cotisations...)
6281
other
-
- Dont sites internet (hébergement, nom domaine...)
-
+
@@ -6594,8 +5798,7 @@
Frais de recrutement de personnel
6284
other
-
-
+
@@ -6603,8 +5806,7 @@
Rabais, remises et ristournes obtenus sur autres services extérieurs
629
other
-
-
+
@@ -6612,8 +5814,7 @@
Impôts, taxes et versements assimilés
63
view
-
-
+
@@ -6621,8 +5822,7 @@
Impôts, taxes et versements assimilés sur rémunérations (administration des impôts)
631
view
-
-
+
@@ -6630,8 +5830,7 @@
Taxe sur les salaires
6311
other
-
-
+
@@ -6639,8 +5838,7 @@
Taxe d'apprentissage
6312
other
-
-
+
@@ -6648,8 +5846,7 @@
Participation des employeurs à la formation professionnelle continue
6313
other
-
-
+
@@ -6657,8 +5854,7 @@
Cotisation pour défaut d'investissement obligatoire dans la construction
6314
other
-
-
+
@@ -6666,8 +5862,7 @@
Autres
6318
other
-
-
+
@@ -6675,8 +5870,7 @@
Impôts, taxes et versements assimilés sur rémunérations (autres organismes)
633
view
-
-
+
@@ -6684,8 +5878,7 @@
Versement de transport
6331
other
-
-
+
@@ -6693,8 +5886,7 @@
Allocation logement
6332
other
-
-
+
@@ -6702,8 +5894,7 @@
Participation des employeurs à la formation professionnelle continue
6333
other
-
-
+
@@ -6711,8 +5902,7 @@
Participation des employeurs à l'effort de construction
6334
other
-
-
+
@@ -6720,8 +5910,7 @@
Versements libératoires ouvrant droit à l'exonération de la taxe d'apprentissage
6335
other
-
-
+
@@ -6729,8 +5918,7 @@
Autres
6338
other
-
-
+
@@ -6738,8 +5926,7 @@
Autres impôts, taxes et versements assimilés (administration des impôts)
635
view
-
-
+
@@ -6747,8 +5934,7 @@
Impôts directs (sauf impôts sur les bénéfices)
6351
view
-
-
+
@@ -6756,8 +5942,7 @@
Taxe professionnelle
63511
other
-
-
+
@@ -6765,8 +5950,7 @@
Taxes foncières
63512
other
-
-
+
@@ -6774,8 +5958,7 @@
Autres impôts locaux
63513
other
-
-
+
@@ -6783,8 +5966,7 @@
Taxe sur les véhicules des sociétés
63514
other
-
-
+
@@ -6792,8 +5974,7 @@
Taxes sur le chiffre d'affaires non récupérables
6352
other
-
-
+
@@ -6801,8 +5982,7 @@
Impôts indirects
6353
other
-
-
+
@@ -6810,8 +5990,7 @@
Droits d'enregistrement et de timbre
6354
view
-
-
+
@@ -6819,8 +5998,7 @@
Droits de mutation
63541
other
-
-
+
@@ -6828,8 +6006,7 @@
Autres droits
6358
other
-
-
+
@@ -6837,8 +6014,7 @@
Autres impôts, taxes et versements assimilés (autres organismes)
637
view
-
-
+
@@ -6846,8 +6022,7 @@
Contribution sociale de solidarité à la charge des sociétés
6371
other
-
-
+
@@ -6855,8 +6030,7 @@
Taxes perçues par les organismes publics internationaux
6372
other
-
-
+
@@ -6864,8 +6038,7 @@
Impôts et taxes exigibles à l'étranger
6374
other
-
-
+
@@ -6873,8 +6046,7 @@
Taxes diverses
6378
other
-
-
+
@@ -6882,8 +6054,7 @@
Charges de personnel
64
view
-
-
+
@@ -6891,8 +6062,7 @@
Rémunérations du personnel
641
view
-
-
+
@@ -6900,8 +6070,7 @@
Salaires et appointements
6411
other
-
-
+
@@ -6909,8 +6078,7 @@
Congés payés
6412
other
-
-
+
@@ -6918,8 +6086,7 @@
Primes et gratifications
6413
other
-
-
+
@@ -6927,8 +6094,7 @@
Indemnités et avantages divers
6414
other
-
-
+
@@ -6936,8 +6102,7 @@
Supplément familial
6415
other
-
-
+
@@ -6945,8 +6110,7 @@
Rémunération du travail de l'exploitant
644
other
-
-
+
@@ -6954,8 +6118,7 @@
Charges de Sécurité sociale et de prévoyance
645
view
-
-
+
@@ -6963,8 +6126,7 @@
Cotisations à l'URSSAF
6451
other
-
-
+
@@ -6972,8 +6134,7 @@
Cotisations aux mutuelles
6452
other
-
-
+
@@ -6981,8 +6142,7 @@
Cotisations aux caisses de retraites
6453
other
-
-
+
@@ -6990,8 +6150,7 @@
Cotisations aux ASSEDIC
6454
other
-
-
+
@@ -6999,17 +6158,15 @@
Cotisations aux autres organismes sociaux
6458
other
-
-
+
Cotisations sociales personnelles de l'exploitant
646
- view
-
-
+ other
+
@@ -7017,8 +6174,7 @@
Autres charges sociales
647
view
-
-
+
@@ -7026,8 +6182,7 @@
Prestations directes
6471
other
-
-
+
@@ -7035,8 +6190,7 @@
Versements aux comités d'entreprise et d'établissement
6472
other
-
-
+
@@ -7044,8 +6198,7 @@
Versements aux comités d'hygiène et de sécurité
6473
other
-
-
+
@@ -7053,8 +6206,7 @@
Versements aux autres oeuvres sociales
6474
other
-
-
+
@@ -7062,8 +6214,7 @@
Médecine du travail pharmacie
6475
other
-
-
+
@@ -7071,8 +6222,7 @@
Autres charges de personnel
648
other
-
-
+
@@ -7080,8 +6230,7 @@
Autres charges de gestion courante
65
view
-
-
+
@@ -7089,8 +6238,7 @@
Redevances pour concessions, brevets, licences, marques, procédés, logiciels, droits et valeurs similaires
651
view
-
-
+
@@ -7098,8 +6246,7 @@
Redevances pour concessions brevets, licences, marques, procédés, logiciels
6511
other
-
-
+
@@ -7107,8 +6254,7 @@
Droits d'auteur et de reproduction
6516
other
-
-
+
@@ -7116,8 +6262,7 @@
Autres droits et valeurs similaires
6518
other
-
-
+
@@ -7125,8 +6270,7 @@
Jetons de présence
653
other
-
-
+
@@ -7134,9 +6278,8 @@
Pertes sur créances irrécouvrables
654
view
-
+
Faire et conserver les relances et mises en demeures
-
@@ -7144,8 +6287,7 @@
Créances de l'exercice
6541
other
-
-
+
@@ -7153,8 +6295,7 @@
Créances des exercices antérieurs
6544
other
-
-
+
@@ -7162,8 +6303,7 @@
Quotes-parts de résultat sur opérations faites en commun
655
view
-
-
+
@@ -7171,8 +6311,7 @@
Quote-part de bénéfice transférée (comptabilité du gérant)
6551
other
-
-
+
@@ -7180,8 +6319,7 @@
Quote-part de perte supportée (comptabilité des associés non gérants)
6555
other
-
-
+
@@ -7189,8 +6327,7 @@
Charges diverses de gestion courante
658
other
-
-
+
@@ -7198,9 +6335,8 @@
Charges financières
66
view
-
+
Dont les intérêts d'emprunt
-
@@ -7208,8 +6344,7 @@
Charges d'intérêt
661
view
-
-
+
@@ -7217,8 +6352,7 @@
Intérêts des emprunts et dettes
6611
view
-
-
+
@@ -7226,8 +6360,7 @@
Intérêts des emprunts et dettes assimilées
66116
other
-
-
+
@@ -7235,8 +6368,7 @@
Intérêts des dettes rattachées à des participations
66117
other
-
-
+
@@ -7244,8 +6376,7 @@
Intérêts des comptes courants et des dépôts créditeurs
6615
other
-
-
+
@@ -7253,8 +6384,7 @@
Intérêts bancaires et sur opérations de financement (escompte, ...)
6616
other
-
-
+
@@ -7262,8 +6392,7 @@
Intérêts des obligations cautionnées
6617
other
-
-
+
@@ -7271,8 +6400,7 @@
Intérêts des autres dettes
6618
view
-
-
+
@@ -7280,8 +6408,7 @@
Intérêts des dettes commerciales
66181
other
-
-
+
@@ -7289,8 +6416,7 @@
Intérêts des dettes diverses
66188
other
-
-
+
@@ -7298,8 +6424,7 @@
Pertes sur créances liées à des participations
664
other
-
-
+
@@ -7307,8 +6432,7 @@
Escomptes accordés
665
other
-
-
+
@@ -7316,8 +6440,7 @@
Pertes de change
666
other
-
-
+
@@ -7325,9 +6448,8 @@
Charges nettes sur cessions de valeurs mobilières de placement
667
other
-
+
(contrepartie 767)
-
@@ -7335,8 +6457,7 @@
Autres charges financières
668
other
-
-
+
@@ -7344,8 +6465,7 @@
Charges exceptionnelles
67
view
-
-
+
@@ -7353,8 +6473,7 @@
Charges exceptionnelles sur opérations de gestion
671
view
-
-
+
@@ -7362,8 +6481,7 @@
Pénalités sur marchés (et dédits payés sur achats et ventes)
6711
other
-
-
+
@@ -7371,9 +6489,8 @@
Pénalités, amendes fiscales et pénales
6712
other
-
+
PV code de la route non déductibles
-
@@ -7381,8 +6498,7 @@
Dons, libéralités
6713
other
-
-
+
@@ -7390,8 +6506,7 @@
Créances devenues irrécouvrables dans l'exercice
6714
other
-
-
+
@@ -7399,8 +6514,7 @@
Subventions accordées
6715
other
-
-
+
@@ -7408,8 +6522,7 @@
Rappels d'impôts (autres qu'impôts sur les bénéfices)
6717
other
-
-
+
@@ -7417,8 +6530,7 @@
Autres charges exceptionnelles sur opération de gestion
6718
other
-
-
+
@@ -7426,8 +6538,7 @@
Charges sur exercices antérieurs (en cours d'exercice seulement)
672
other
-
-
+
@@ -7435,9 +6546,8 @@
Valeurs comptables des éléments d'actif cédés
675
view
-
+
Vente d'immobilisation = (Valeur d'origine - amortissements) (contrepartie 775)
-
@@ -7445,8 +6555,7 @@
Immobilisations incorporelles
6751
other
-
-
+
@@ -7454,8 +6563,7 @@
Immobilisations corporelles
6752
other
-
-
+
@@ -7463,8 +6571,7 @@
Immobilisations financières
6756
other
-
-
+
@@ -7472,8 +6579,7 @@
Autres éléments d'actif
6758
other
-
-
+
@@ -7482,8 +6588,7 @@
Autres charges exceptionnelles
678
view
-
-
+
@@ -7491,8 +6596,7 @@
Malis provenant de clauses d'indexation
6781
other
-
-
+
@@ -7500,8 +6604,7 @@
Lots
6782
other
-
-
+
@@ -7509,8 +6612,7 @@
Malis provenant du rachat par l'entreprise d'actions et obligations émises par elle-même
6783
other
-
-
+
@@ -7518,8 +6620,7 @@
Charges exceptionnelles diverses
6788
other
-
-
+
@@ -7527,8 +6628,7 @@
Dotations aux amortissements, dépréciations et provisions
68
view
-
-
+
@@ -7536,8 +6636,7 @@
Dotations aux amortissements, dépréciations et provisions - Charges d'exploitation
681
view
-
-
+
@@ -7545,8 +6644,7 @@
Dotations aux amortissements des immobilisations incorporelles et corporelles
6811
view
-
-
+
@@ -7554,8 +6652,7 @@
Immobilisations incorporelles
68111
other
-
-
+
@@ -7563,8 +6660,7 @@
Immobilisations corporelles
68112
other
-
-
+
@@ -7572,8 +6668,7 @@
Dotations aux amortissements des charges d'exploitation à répartir
6812
other
-
-
+
@@ -7581,8 +6676,7 @@
Dotations aux provisions pour risques et charges d'exploitation
6815
other
-
-
+
@@ -7590,8 +6684,7 @@
Dotations pour dépréciations des immobilisations incorporelles et corporelles
6816
view
-
-
+
@@ -7599,8 +6692,7 @@
Immobilisations incorporelles
68161
other
-
-
+
@@ -7608,8 +6700,7 @@
Immobilisations corporelles
68162
other
-
-
+
@@ -7617,8 +6708,7 @@
Dotations aux provisions pour dépréciation des actifs circulants
6817
view
-
-
+
@@ -7626,8 +6716,7 @@
Stocks et en-cours
68173
other
-
-
+
@@ -7635,8 +6724,7 @@
Créances
68174
other
-
-
+
@@ -7644,8 +6732,7 @@
Dotations aux amortissements, dépréciations et provisions - Charges financières
686
view
-
-
+
@@ -7653,8 +6740,7 @@
Dotations aux amortissements des primes de remboursement des obligations
6861
other
-
-
+
@@ -7662,8 +6748,7 @@
Dotations aux provisions pour risques et charges financiers
6865
other
-
-
+
@@ -7671,8 +6756,7 @@
Dotations aux dépréciation des éléments financiers
6866
view
-
-
+
@@ -7680,8 +6764,7 @@
Immobilisations financières
68662
other
-
-
+
@@ -7689,8 +6772,7 @@
Valeurs mobilières de placement
68665
other
-
-
+
@@ -7698,8 +6780,7 @@
Autres dotations
6868
other
-
-
+
@@ -7707,8 +6788,7 @@
Dotations aux amortissements, dépréciations et provisions - Charges exceptionnelles
687
view
-
-
+
@@ -7716,8 +6796,7 @@
Dotations aux amortissements exceptionnels des immobilisations
6871
other
-
-
+
@@ -7725,8 +6804,7 @@
Dotations aux provisions réglementées (immobilisations)
6872
view
-
-
+
@@ -7734,8 +6812,7 @@
Amortissements dérogatoires
68725
other
-
-
+
@@ -7743,8 +6820,7 @@
Dotations aux provisions réglementées (stocks)
6873
other
-
-
+
@@ -7752,8 +6828,7 @@
Dotations aux autres provisions réglementées
6874
other
-
-
+
@@ -7761,8 +6836,7 @@
Dotations aux provisions exceptionnelles
6875
other
-
-
+
@@ -7770,8 +6844,7 @@
Dotations aux dépréciations exceptionnelles
6876
other
-
-
+
@@ -7779,8 +6852,7 @@
Participation des salariés - Impôts sur les bénéfices et assimilés
69
view
-
-
+
@@ -7788,8 +6860,7 @@
Participation des salariés aux résultats
691
other
-
-
+
@@ -7797,8 +6868,7 @@
Impôts sur les bénéfices
695
view
-
-
+
@@ -7806,8 +6876,7 @@
Impôts dus en France
6951
other
-
-
+
@@ -7815,8 +6884,7 @@
Contribution additionnelle à l'impôt sur les bénéfices
6952
other
-
-
+
@@ -7824,8 +6892,7 @@
Impôts dus à l'étranger
6954
other
-
-
+
@@ -7833,8 +6900,7 @@
Supplément d'impôt sur les sociétés lié aux distributions
696
other
-
-
+
@@ -7842,8 +6908,7 @@
Imposition forfaitaire annuelle des sociétés
697
other
-
-
+
@@ -7851,8 +6916,7 @@
Intégration fiscale
698
view
-
-
+
@@ -7860,8 +6924,7 @@
Intégration fiscale - Charges
6981
other
-
-
+
@@ -7869,8 +6932,7 @@
Intégration fiscale - Produits
6989
other
-
-
+
@@ -7878,8 +6940,7 @@
Produits, Reports en arrière des déficits
699
other
-
-
+
@@ -7887,8 +6948,7 @@
Comptes de produits
Classe 7
view
-
-
+
@@ -7896,8 +6956,7 @@
Ventes de produits fabriqués - Prestations de service - Marchandises
70
view
-
-
+
@@ -7905,8 +6964,7 @@
Ventes de produits finis
701
view
-
-
+
@@ -7914,8 +6972,7 @@
Produits finis (ou groupe) A
7011
other
-
-
+
@@ -7924,8 +6981,7 @@
Produits finis (ou groupe) B
7012
other
-
-
+
@@ -7933,8 +6989,7 @@
Ventes de produits intermédiaires
702
other
-
-
+
@@ -7942,8 +6997,7 @@
Ventes de produits résiduels
703
other
-
-
+
@@ -7951,8 +7005,7 @@
Travaux
704
view
-
-
+
@@ -7960,8 +7013,7 @@
Travaux de catégorie (ou activité) A
7041
other
-
-
+
@@ -7969,8 +7021,7 @@
Travaux de catégorie (ou activité) B
7042
other
-
-
+
@@ -7978,8 +7029,7 @@
Études
705
other
-
-
+
@@ -7987,8 +7037,7 @@
Prestations de services
706
other
-
-
+
@@ -7996,9 +7045,8 @@
Ventes de marchandises
707
view
-
+
707-607 = marge commerciale (contrepartie 607)
-
@@ -8006,8 +7054,7 @@
Marchandises (ou groupe) A
7071
other
-
-
+
@@ -8015,8 +7062,7 @@
Marchandises (ou groupe) B
7072
other
-
-
+
@@ -8024,8 +7070,7 @@
Marchandises à l'exportation
7073
other
-
-
+
@@ -8033,9 +7078,8 @@
Produits des activités annexes
708
view
-
+
Activité accessoire ou occasionnelle
-
@@ -8043,8 +7087,7 @@
Produits des services exploités dans l'intérêt du personnel
7081
other
-
-
+
@@ -8052,8 +7095,7 @@
Commissions et courtages
7082
other
-
-
+
@@ -8061,8 +7103,7 @@
Locations diverses
7083
other
-
-
+
@@ -8070,8 +7111,7 @@
Mise à disposition de personnel facturée
7084
other
-
-
+
@@ -8079,8 +7119,7 @@
Ports et frais accessoires facturés
7085
other
-
-
+
@@ -8088,8 +7127,7 @@
Bonis sur reprises d'emballages consignés
7086
other
-
-
+
@@ -8097,8 +7135,7 @@
Bonifications obtenues des clients et primes sur ventes
7087
other
-
-
+
@@ -8106,8 +7143,7 @@
Autres produits d'activités annexes (cessions d'approvisionnements...)
7088
other
-
-
+
@@ -8115,8 +7151,7 @@
Rabais, remises et ristournes accordés par l'entreprise
709
view
-
-
+
@@ -8124,8 +7159,7 @@
- sur ventes de produits finis
7091
other
-
-
+
@@ -8133,8 +7167,7 @@
- sur ventes de produits intermédiaires
7092
other
-
-
+
@@ -8142,8 +7175,7 @@
- sur travaux
7094
other
-
-
+
@@ -8151,8 +7183,7 @@
- sur études
7095
other
-
-
+
@@ -8160,8 +7191,7 @@
- sur prestations de services
7096
other
-
-
+
@@ -8169,8 +7199,7 @@
- sur ventes de marchandises
7097
other
-
-
+
@@ -8178,8 +7207,7 @@
- sur produits des activités annexes
7098
other
-
-
+
@@ -8187,8 +7215,7 @@
Production stockée (ou déstockage)
71
view
-
-
+
@@ -8196,8 +7223,7 @@
Variation des stocks (en-cours de production, produits)
713
view
-
-
+
@@ -8205,8 +7231,7 @@
Variation des en-cours de production de biens
7133
view
-
-
+
@@ -8214,8 +7239,7 @@
Produits en cours
71331
other
-
-
+
@@ -8223,8 +7247,7 @@
Travaux en cours
71335
other
-
-
+
@@ -8232,8 +7255,7 @@
Variation des en-cours de production de services
7134
view
-
-
+
@@ -8241,8 +7263,7 @@
Études en cours
71341
other
-
-
+
@@ -8250,8 +7271,7 @@
Prestations de services en cours
71345
other
-
-
+
@@ -8259,8 +7279,7 @@
Variation des stocks de produits
7135
view
-
-
+
@@ -8268,8 +7287,7 @@
Produits intermédiaires
71351
other
-
-
+
@@ -8277,8 +7295,7 @@
Produits finis
71355
other
-
-
+
@@ -8286,8 +7303,7 @@
Produits résiduels
71358
other
-
-
+
@@ -8295,8 +7311,7 @@
Production immobilisée
72
view
-
-
+
@@ -8304,8 +7319,7 @@
Immobilisations incorporelles
721
other
-
-
+
@@ -8313,8 +7327,7 @@
Immobilisations corporelles
722
other
-
-
+
@@ -8322,8 +7335,7 @@
Subventions d'exploitation
74
view
-
-
+
@@ -8331,8 +7343,7 @@
Autres produits de gestion courante
75
view
-
-
+
@@ -8340,8 +7351,7 @@
Redevances pour concessions, brevets, licences, marques, procédés, logiciels, droits et valeurs similaires
751
view
-
-
+
@@ -8349,8 +7359,7 @@
Redevances pour concessions, brevets, licences, marques, procédés, logiciels
7511
other
-
-
+
@@ -8358,8 +7367,7 @@
Droits d'auteur et de reproduction
7516
other
-
-
+
@@ -8367,8 +7375,7 @@
Autres droits et valeurs similaires
7518
other
-
-
+
@@ -8376,8 +7383,7 @@
Revenus des immeubles non affectés aux activités professionnelles
752
other
-
-
+
@@ -8385,8 +7391,7 @@
Jetons de présence et rémunérations d'administrateurs, gérants..
753
other
-
-
+
@@ -8394,8 +7399,7 @@
Ristournes perçues des coopératives (provenant des excédents)
754
other
-
-
+
@@ -8403,8 +7407,7 @@
Quotes-parts de résultats sur opérations faites en commun
755
view
-
-
+
@@ -8412,8 +7415,7 @@
Quote-part de perte transférée (comptabilité du gérant)
7551
other
-
-
+
@@ -8421,8 +7423,7 @@
Quote-part de bénéfice attribuée (comptabilité des associés non-gérants)
7555
other
-
-
+
@@ -8430,8 +7431,7 @@
Produits divers de gestion courante
758
other
-
-
+
@@ -8439,9 +7439,8 @@
Produits financiers
76
view
-
+
Intérêts sur comptes rémunérés (SICAV....)
-
@@ -8449,8 +7448,7 @@
Produits de participations
761
view
-
-
+
@@ -8458,8 +7456,7 @@
Revenus des titres de participation
7611
other
-
-
+
@@ -8467,8 +7464,7 @@
Revenus sur autres formes de participation
7616
other
-
-
+
@@ -8476,8 +7472,7 @@
Revenus des créances rattachées à des participations
7617
other
-
-
+
@@ -8485,8 +7480,7 @@
Produits des autres immobilisations financières
762
view
-
-
+
@@ -8494,8 +7488,7 @@
Revenus des titres immobilisés
7621
other
-
-
+
@@ -8503,8 +7496,7 @@
Revenus des prêts
7626
other
-
-
+
@@ -8512,8 +7504,7 @@
Revenus des créances immobilisées
7627
other
-
-
+
@@ -8521,8 +7512,7 @@
Revenus des autres créances
763
view
-
-
+
@@ -8530,8 +7520,7 @@
Revenus des créances commerciales
7631
other
-
-
+
@@ -8539,8 +7528,7 @@
Revenus des créances diverses
7638
other
-
-
+
@@ -8548,8 +7536,7 @@
Revenus des valeurs mobilières de placement
764
other
-
-
+
@@ -8557,8 +7544,7 @@
Escomptes obtenus
765
other
-
-
+
@@ -8566,8 +7552,7 @@
Gains de change
766
other
-
-
+
@@ -8575,9 +7560,8 @@
Produits nets sur cessions de valeurs mobilières de placement
767
other
-
+
(contrepartie 667)
-
@@ -8585,8 +7569,7 @@
Autres produits financiers
768
other
-
-
+
@@ -8594,8 +7577,7 @@
Produits exceptionnels
77
view
-
-
+
@@ -8603,9 +7585,8 @@
Produits exceptionnels sur opérations de gestion
771
view
-
+
Écarts d'arrondis
-
@@ -8613,8 +7594,7 @@
Dédits et pénalités perçus sur achats et sur ventes
7711
other
-
-
+
@@ -8622,8 +7602,7 @@
Libéralités reçues
7713
other
-
-
+
@@ -8631,8 +7610,7 @@
Rentrées sur créances amorties
7714
other
-
-
+
@@ -8640,8 +7618,7 @@
Subventions d'équilibre
7715
other
-
-
+
@@ -8649,8 +7626,7 @@
Dégrèvements d'impôts autres qu'impôts sur les bénéfices
7717
other
-
-
+
@@ -8658,8 +7634,7 @@
Autres produits exceptionnels sur opérations de gestion
7718
other
-
-
+
@@ -8667,8 +7642,7 @@
Produits sur exercices antérieurs (en cours d'exercice seulement)
772
other
-
-
+
@@ -8676,9 +7650,8 @@
Produits des cessions d'éléments d'actif
775
view
-
+
vente d'immobilisation = prix de vente (contrepartie 675)
-
@@ -8686,8 +7659,7 @@
Immobilisations incorporelles
7751
other
-
-
+
@@ -8695,8 +7667,7 @@
Immobilisations corporelles
7752
other
-
-
+
@@ -8704,8 +7675,7 @@
Immobilisations financières
7756
other
-
-
+
@@ -8713,8 +7683,7 @@
Autres éléments d'actif
7758
other
-
-
+
@@ -8722,8 +7691,7 @@
Quote-part des subventions d'investissement virée au résultat de l'exercice
777
other
-
-
+
@@ -8731,8 +7699,7 @@
Autres produits exceptionnels
778
view
-
-
+
@@ -8740,8 +7707,7 @@
Bonis provenant de clauses d'indexation
7781
other
-
-
+
@@ -8749,8 +7715,7 @@
Lots
7782
other
-
-
+
@@ -8758,8 +7723,7 @@
Bonis provenant du rachat par l'entreprise d'actions et d'obligations émises par elle-même
7783
other
-
-
+
@@ -8767,8 +7731,7 @@
Produits exceptionnels divers
7788
other
-
-
+
@@ -8776,8 +7739,7 @@
Reprises sur amortissements, dépréciations et provisions
78
view
-
-
+
@@ -8785,8 +7747,7 @@
Reprises sur amortissements, dépréciations et provisions (à inscrire dans les produits d'exploitation)
781
view
-
-
+
@@ -8794,8 +7755,7 @@
Reprises sur amortissements des immobilisations incorporelles et corporelles
7811
view
-
-
+
@@ -8803,8 +7763,7 @@
Immobilisations incorporelles
78111
other
-
-
+
@@ -8812,8 +7771,7 @@
Immobilisations corporelles
78112
other
-
-
+
@@ -8821,8 +7779,7 @@
Reprises sur provisions d'exploitation
7815
other
-
-
+
@@ -8830,8 +7787,7 @@
Reprises sur dépréciations des immobilisations corporelles et incorporelles
7816
view
-
-
+
@@ -8839,8 +7795,7 @@
Immobilisations incorporelles
78161
other
-
-
+
@@ -8848,8 +7803,7 @@
Immobilisations corporelles
78162
other
-
-
+
@@ -8857,8 +7811,7 @@
Reprises sur dépréciations des actifs circulants
7817
view
-
-
+
@@ -8866,8 +7819,7 @@
Stocks et en-cours
78173
other
-
-
+
@@ -8875,8 +7827,7 @@
Créances
78174
other
-
-
+
@@ -8884,8 +7835,7 @@
Reprises sur dépréciations et provisions (à inscrire dans les produits financiers)
786
view
-
-
+
@@ -8893,8 +7843,7 @@
Reprises sur provisions financiers
7865
other
-
-
+
@@ -8902,8 +7851,7 @@
Reprises sur dépréciations des éléments financiers
7866
view
-
-
+
@@ -8911,8 +7859,7 @@
Immobilisations financières
78662
other
-
-
+
@@ -8920,8 +7867,7 @@
Valeurs mobilières de placement
78665
other
-
-
+
@@ -8929,8 +7875,7 @@
Reprises sur dépréciations et provisions (à inscrire dans les produits exceptionnels)
787
view
-
-
+
@@ -8938,8 +7883,7 @@
Reprises sur provisions réglementées (immobilisations)
7872
view
-
-
+
@@ -8947,8 +7891,7 @@
Amortissements dérogatoires
78725
other
-
-
+
@@ -8956,8 +7899,7 @@
Provision spéciale de réévaluation
78726
other
-
-
+
@@ -8965,8 +7907,7 @@
Plus-values réinvesties
78727
other
-
-
+
@@ -8974,8 +7915,7 @@
Reprises sur provisions réglementées (stocks)
7873
other
-
-
+
@@ -8983,8 +7923,7 @@
Reprises sur autres provisions réglementées
7874
other
-
-
+
@@ -8992,8 +7931,7 @@
Reprises sur provisions exceptionnelles
7875
other
-
-
+
@@ -9001,8 +7939,7 @@
Reprises pour dépréciations exceptionnelles
7876
other
-
-
+
@@ -9010,8 +7947,7 @@
Transferts de charges
79
view
-
-
+
@@ -9019,8 +7955,7 @@
Transferts de charges d'exploitation
791
other
-
-
+
@@ -9028,8 +7963,7 @@
Transferts de charges financières
796
other
-
-
+
@@ -9037,8 +7971,7 @@
Transferts de charges exceptionnelles
797
other
-
-
+
diff --git a/addons/l10n_fr/wizard/fr_report_bilan_view.xml b/addons/l10n_fr/wizard/fr_report_bilan_view.xml
index 440c182e336..f5358d9dd42 100644
--- a/addons/l10n_fr/wizard/fr_report_bilan_view.xml
+++ b/addons/l10n_fr/wizard/fr_report_bilan_view.xml
@@ -8,14 +8,14 @@
form
-
+
diff --git a/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml b/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
index d9f71c2ef3e..9d9b3b91c71 100644
--- a/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
+++ b/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
@@ -8,14 +8,14 @@
form
-
+
diff --git a/addons/l10n_lu/wizard/print_vat_view.xml b/addons/l10n_lu/wizard/print_vat_view.xml
index e5c13e7e4c4..1f60096e815 100644
--- a/addons/l10n_lu/wizard/print_vat_view.xml
+++ b/addons/l10n_lu/wizard/print_vat_view.xml
@@ -7,15 +7,15 @@
form
-
+
diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py
index 3b06ea5ce32..8cca4ced465 100644
--- a/addons/lunch/lunch.py
+++ b/addons/lunch/lunch.py
@@ -134,8 +134,8 @@ class lunch_order(osv.osv):
'product': fields.many2one('lunch.product', 'Product', required=True, \
readonly=True, states={'draft':[('readonly', False)]}, change_default=True),
'date': fields.date('Date', readonly=True, states={'draft':[('readonly', False)]}),
- 'cashmove': fields.many2one('lunch.cashmove', 'CashMove' , readonly=True),
- 'descript': fields.char('Description Order', readonly=True, size=250, \
+ 'cashmove': fields.many2one('lunch.cashmove', 'Cash Move' , readonly=True),
+ 'descript': fields.char('Comment', readonly=True, size=250, \
states = {'draft':[('readonly', False)]}),
'state': fields.selection([('draft', 'New'), ('confirmed', 'Confirmed'), ], \
'Status', readonly=True, select=True),
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 55a59f76762..5e870c085c9 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -30,14 +30,18 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -105,8 +109,10 @@
lunch.cashbox
-
-
+
+
+
+
@@ -145,14 +151,16 @@
lunch.cashmove
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -216,8 +224,9 @@
lunch.category
-
-
+
+
+
@@ -250,18 +259,19 @@
lunch.product
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/lunch/wizard/lunch_cashbox_clean_view.xml b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
index 287d283e212..eb05c0dc304 100644
--- a/addons/lunch/wizard/lunch_cashbox_clean_view.xml
+++ b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
@@ -10,14 +10,14 @@
form
-
+
diff --git a/addons/lunch/wizard/lunch_order_cancel_view.xml b/addons/lunch/wizard/lunch_order_cancel_view.xml
index cd96b9765c9..cb10eb57fd0 100644
--- a/addons/lunch/wizard/lunch_order_cancel_view.xml
+++ b/addons/lunch/wizard/lunch_order_cancel_view.xml
@@ -10,14 +10,14 @@
form
-
+
diff --git a/addons/lunch/wizard/lunch_order_confirm_view.xml b/addons/lunch/wizard/lunch_order_confirm_view.xml
index ade5b227cc2..282b79539f8 100644
--- a/addons/lunch/wizard/lunch_order_confirm_view.xml
+++ b/addons/lunch/wizard/lunch_order_confirm_view.xml
@@ -10,15 +10,15 @@
form
-
+
diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index f501cc58d2c..e911f24e809 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -20,36 +20,41 @@
##############################################################################
{
- 'name': 'Emails Management',
+ 'name': 'Social Network',
'version': '1.0',
- 'category': 'Hidden/Dependency',
+ 'category':'Social Network',
+ "sequence": 2,
'description': """
-A generic email subsystem with message storage and queuing
-==========================================================
+A bussiness oriented Social Networking with a fully-integrated email
+and message management.
+=====================================================================
+The Social Networking module provides an unified social network
+abstraction layer allowing applications to display a complete
+communication history on documents.It gives the users the possibility
+to read and send messages and emails in an unified way.
-This email subsystem is not intended to be used as as standalone
-application, but to provide a unified email abstraction that all
-other applications can use.
+It also provides a feeds page combined to a subscription mechanism, that
+allows to follow documents, and to be constantly updated about recent
+news.
+
+The main features of the module are :
-The main features are:
-
- * Relies on the global Outgoing Mail Servers configured in the
- Administration menu for delivering outgoing mail
- * Provides an API for sending messages and archiving them,
- grouped by conversation
- * Any OpenERP document can act as a conversation topic, provided
- it includes the necessary support for handling incoming emails
- (see the ``mail.thread`` class for more details).
- * Includes queuing mechanism with automated configurable
- scheduler-based processing
- * Includes a generic email composition assistant, that can turn
+ * a clean and renewed communication history for any OpenERP
+ document that can act as a discussion topic,
+ * a discussion mean on documents,
+ * a subscription mechanism to be updated about new messages on
+ interesting documents,
+ * an unified feeds page to see recent messages and activity
+ on followed documents,
+ * user communication through the feeds page,
+ * a threaded discussion design,
+ * relies on the global outgoing mail server, an integrated email
+ management system allowing to send emails with a configurable
+ scheduler-based processing engine
+ * includes an extensible generic email composition assistant, that can turn
into a mass-mailing assistant, and is capable of interpreting
simple *placeholder expressions* that will be replaced with
- dynamic data when each email is actually sent.
- This generic assistant is easily extensible to provide advanced
- features (see ``email_template`` for example, which adds email
- templating features to this assistant)
-
+ dynamic data when each email is actually sent
""",
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
@@ -69,6 +74,7 @@ The main features are:
],
'installable': True,
'auto_install': False,
+ 'application':True,
'certificate': '001056784984222247309',
'images': [
'images/customer_history.jpeg',
@@ -94,6 +100,6 @@ The main features are:
],
'demo': [
'mail_demo.xml',
- ],
+ ],
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 5668709af17..cdcaf4f464d 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -69,7 +69,7 @@ class mail_thread(osv.Model):
subscriber_ids = self.message_get_subscribers(cr, uid, [id], context=context)
res[id] = {
'message_ids': message_ids,
- 'message_summary': "Msg: %d . Fol: %d " % (len(message_ids), len(subscriber_ids)),
+ 'message_summary': "9 %d + %d " % (len(message_ids), len(subscriber_ids)),
}
return res
diff --git a/addons/mail/static/src/img/icon.png b/addons/mail/static/src/img/icon.png
new file mode 100644
index 00000000000..53ccc469127
Binary files /dev/null and b/addons/mail/static/src/img/icon.png differ
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 3c0b61c173e..2140bbe474a 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -91,7 +91,7 @@ openerp.mail = function(session) {
this.params = params;
this.params.parent_id = this.params.parent_id || false;
this.params.thread_level = this.params.thread_level || 0;
- this.params.msg_more_limit = this.params.msg_more_limit || 100;
+ this.params.msg_more_limit = this.params.msg_more_limit || 290;
this.params.limit = this.params.limit || 100;
this.params.offset = this.params.offset || 0;
this.params.records = this.params.records || null;
@@ -304,7 +304,6 @@ openerp.mail = function(session) {
// format date according to the user timezone
record.date = session.web.format_value(record.date, {type:"datetime"});
-
var rendered = session.web.qweb.render('mail.Thread.message', {'record': record, 'thread': this, 'params': this.params, 'display': this.display});
$(rendered).appendTo(this.$element.children('div.oe_mail_thread_display:first'));
// expand feature
@@ -541,7 +540,11 @@ openerp.mail = function(session) {
this._super.apply(this, arguments);
var self = this;
this.reinit();
- if (! this.view.datarecord.id) { this.$element.find('.oe_mail_thread').hide(); return; }
+ if (! this.view.datarecord.id ||
+ session.web.BufferedDataSet.virtual_id_regex.test(this.view.datarecord.id)) {
+ this.$element.find('.oe_mail_thread').hide();
+ return;
+ }
// fetch followers
var fetch_sub_done = this.fetch_subscribers();
// create and render Thread widget
@@ -635,6 +638,7 @@ openerp.mail = function(session) {
start: function () {
this._super.apply(this, arguments);
var self = this;
+ this.display_current_user();
// add events
this.add_event_handlers();
// load mail.message search view
@@ -694,6 +698,14 @@ openerp.mail = function(session) {
});
},
+ display_current_user: function () {
+ return this.$element.find('img.oe_mail_msg_image').attr('src', this.thread_get_avatar('res.users', 'avatar', this.session.uid));
+ },
+
+ thread_get_avatar: function(model, field, id) {
+ return this.session.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
+ },
+
/**
* Initializes the wall and calls fetch_comments
* @param {Number} limit: number of notifications to fetch
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 2eb3a390933..982fb8aeb2f 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -56,9 +56,7 @@
-
-
-
+
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index cb2ed1eec19..1b19a383c10 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -292,4 +292,43 @@ class mail_compose_message(osv.osv_memory):
return tools.ustr(result)
return template and EXPRESSION_PATTERN.sub(merge, template)
+
+
+class mail_compose_message_extended(osv.osv_memory):
+ """ Extension of 'mail.compose.message' to support default field values related
+ to CRM-like models that follow the following conventions:
+
+ 1. The model object must have an attribute '_mail_compose_message' equal to True.
+
+ 2. The model should define the following fields:
+ - 'name' as subject of the message (required);
+ - 'email_from' as destination email address (required);
+ - 'email_cc' as cc email addresses (required);
+ - 'section_id.reply_to' as reply-to address (optional).
+ """
+ _inherit = 'mail.compose.message'
+
+ def get_value(self, cr, uid, model, res_id, context=None):
+ """Overrides the default implementation to provide more default field values
+ related to the corresponding CRM case.
+ """
+ result = super(mail_compose_message_extended, self).get_value(cr, uid, model, res_id, context=context)
+ model_obj = self.pool.get(model)
+ if getattr(model_obj, '_mail_compose_message', False) and res_id:
+ data = model_obj.browse(cr, uid , res_id, context)
+ user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+ result.update({
+ 'model': model,
+ 'res_id': res_id,
+ 'email_from': user.user_email or tools.config.get('email_from', False),
+ 'email_to': data.email_from or False,
+ 'email_cc': tools.ustr(data.email_cc or ''),
+ 'subject': data.name or False,
+ 'body_text': '\n' + tools.ustr(user.signature or ''),
+ 'subtype': 'plain',
+ })
+ if hasattr(data, 'section_id'):
+ result['reply_to'] = data.section_id and data.section_id.reply_to or False
+ return result
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 3da63fb1adc..bcc11c4111d 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -7,11 +7,6 @@
form
-
@@ -33,6 +28,11 @@
+
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index a6294182301..417bd694624 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -439,7 +439,7 @@ class marketing_campaign_activity(osv.osv):
'revenue': fields.float('Revenue', help="Set an expected revenue if you consider that every campaign item that has reached this point has generated a certain revenue. You can get revenue statistics in the Reporting section", digits_compute=dp.get_precision('Sale Price')),
'signal': fields.char('Signal', size=128,
help='An activity with a signal can be called programmatically. Be careful, the workitem is always created when a signal is sent'),
- 'keep_if_condition_not_met': fields.boolean("Don't delete workitems",
+ 'keep_if_condition_not_met': fields.boolean("Don't Delete Workitems",
help="By activating this option, workitems that aren't executed because the condition is not met are marked as cancelled instead of being deleted.")
}
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 41ed78da709..6a06cb33f1d 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -9,6 +9,22 @@
Marketing Campaign
======================
-->
+
+
+
+
marketing.campaign.form
@@ -24,20 +40,30 @@
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
-
-
-
+
+
@@ -143,16 +169,11 @@
-
+
-
-
-
-
-
-
+
@@ -160,7 +181,8 @@
-
+
+
@@ -243,33 +265,34 @@
-
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
+
+
+
+
-
-
+
+
@@ -285,7 +308,8 @@
-
+
+
@@ -363,12 +387,13 @@
-
+
-
+
+
diff --git a/addons/membership/wizard/membership_invoice_view.xml b/addons/membership/wizard/membership_invoice_view.xml
index 7c26f5486ce..e97ad7445df 100644
--- a/addons/membership/wizard/membership_invoice_view.xml
+++ b/addons/membership/wizard/membership_invoice_view.xml
@@ -8,15 +8,15 @@
form
-
+
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 0b725108be4..6fe3d61a804 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -957,9 +957,8 @@
-
-
-
+
+
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 48938972f60..db337c9b178 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -12,25 +12,23 @@
or
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index cd6b8db2195..5d254f86b4e 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -80,3 +80,4 @@ access_product_pricelist_item_mrp_manager,product.pricelist.item mrp_manager,pro
access_resource_calendar_manufacturinguser,resource.calendar manufacturing.user,resource.model_resource_calendar,mrp.group_mrp_user,1,0,0,0
access_account_journal_mrp_manager,account.journal mrp manager,account.model_account_journal,mrp.group_mrp_manager,1,0,0,0
access_purchase_order_stock_user,purchase.order stock user,purchase.model_purchase_order,stock.group_stock_user,1,1,1,0
+access_mrp_bom_purchase_manager,mrp.bom,model_mrp_bom,purchase.group_purchase_manager,1,0,0,0
diff --git a/addons/mrp/wizard/change_production_qty_view.xml b/addons/mrp/wizard/change_production_qty_view.xml
index ee7f5eeb258..87b180f0aad 100644
--- a/addons/mrp/wizard/change_production_qty_view.xml
+++ b/addons/mrp/wizard/change_production_qty_view.xml
@@ -10,17 +10,17 @@
form
-
+
diff --git a/addons/mrp/wizard/mrp_price_view.xml b/addons/mrp/wizard/mrp_price_view.xml
index 6ba09ecbdb0..f8aaa7e3c5d 100644
--- a/addons/mrp/wizard/mrp_price_view.xml
+++ b/addons/mrp/wizard/mrp_price_view.xml
@@ -10,14 +10,14 @@
form
-
+
diff --git a/addons/mrp/wizard/mrp_product_produce_view.xml b/addons/mrp/wizard/mrp_product_produce_view.xml
index 23a51642630..72d0ccfcaa2 100644
--- a/addons/mrp/wizard/mrp_product_produce_view.xml
+++ b/addons/mrp/wizard/mrp_product_produce_view.xml
@@ -11,15 +11,15 @@
form
-
+
diff --git a/addons/mrp/wizard/mrp_workcenter_load_view.xml b/addons/mrp/wizard/mrp_workcenter_load_view.xml
index b40be0df0ac..439e180ca3c 100644
--- a/addons/mrp/wizard/mrp_workcenter_load_view.xml
+++ b/addons/mrp/wizard/mrp_workcenter_load_view.xml
@@ -10,17 +10,17 @@
form
-
+
diff --git a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
index ee0e47e1da3..b90d822121a 100644
--- a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
@@ -10,14 +10,14 @@
form
-
+
diff --git a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
index f18eac5ce89..ca4690df210 100644
--- a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
@@ -10,15 +10,15 @@
form
-
-
+
+
diff --git a/addons/mrp_subproduct/security/ir.model.access.csv b/addons/mrp_subproduct/security/ir.model.access.csv
index 7c012237dd6..e91c8158d19 100644
--- a/addons/mrp_subproduct/security/ir.model.access.csv
+++ b/addons/mrp_subproduct/security/ir.model.access.csv
@@ -1,3 +1,4 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_mrp_subproduct_user,mrp.subproduct,model_mrp_subproduct,mrp.group_mrp_user,1,1,1,1
-access_mrp_subproduct_manager,mrp.subproduct manager,model_mrp_subproduct,mrp.group_mrp_manager,1,0,0,0
+access_mrp_subproduct_user,mrp.subproduct,model_mrp_subproduct,mrp.group_mrp_user,1,0,0,0
+access_mrp_subproduct_manager,mrp.subproduct manager,model_mrp_subproduct,mrp.group_mrp_manager,1,1,1,1
+access_mrp_subproduct_all,mrp.subproduct,model_mrp_subproduct,base.group_user,1,0,0,0
diff --git a/addons/point_of_sale/i18n/ja.po b/addons/point_of_sale/i18n/ja.po
index ce858ab93b6..ac3e2983d30 100644
--- a/addons/point_of_sale/i18n/ja.po
+++ b/addons/point_of_sale/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME
\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-06-08 02:57+0000\n"
+"PO-Revision-Date: 2012-07-11 05:37+0000\n"
"Last-Translator: Akira Hiyama \n"
"Language-Team: Japanese \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-09 05:39+0000\n"
-"X-Generator: Launchpad (build 15376)\n"
+"X-Launchpad-Export-Date: 2012-07-12 04:40+0000\n"
+"X-Generator: Launchpad (build 15593)\n"
#. module: point_of_sale
#: field:report.transaction.pos,product_nb:0
@@ -765,7 +765,7 @@ msgstr "小計の合計"
#. module: point_of_sale
#: field:pos.order,lines:0
msgid "Order Lines"
-msgstr "受注行"
+msgstr "オーダー行"
#. module: point_of_sale
#: view:report.transaction.pos:0
diff --git a/addons/point_of_sale/wizard/pos_payment_report_user_view.xml b/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
index a8a69b2ff69..850ae6729a6 100644
--- a/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
+++ b/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
@@ -7,14 +7,14 @@
form
-
+
diff --git a/addons/point_of_sale/wizard/pos_receipt_view.xml b/addons/point_of_sale/wizard/pos_receipt_view.xml
index cd556fbb6de..fef823fe403 100644
--- a/addons/point_of_sale/wizard/pos_receipt_view.xml
+++ b/addons/point_of_sale/wizard/pos_receipt_view.xml
@@ -10,14 +10,14 @@
form
-
+
diff --git a/addons/point_of_sale/wizard/pos_return_view.xml b/addons/point_of_sale/wizard/pos_return_view.xml
index f197daeebff..09005712b78 100644
--- a/addons/point_of_sale/wizard/pos_return_view.xml
+++ b/addons/point_of_sale/wizard/pos_return_view.xml
@@ -7,11 +7,11 @@
form
-
+
diff --git a/addons/portal/wizard/portal_wizard_view.xml b/addons/portal/wizard/portal_wizard_view.xml
index 1809c33d20a..55a8404f54b 100644
--- a/addons/portal/wizard/portal_wizard_view.xml
+++ b/addons/portal/wizard/portal_wizard_view.xml
@@ -17,18 +17,18 @@
form
-
+
diff --git a/addons/procurement/wizard/make_procurement_view.xml b/addons/procurement/wizard/make_procurement_view.xml
index de371db211f..5e18892f464 100644
--- a/addons/procurement/wizard/make_procurement_view.xml
+++ b/addons/procurement/wizard/make_procurement_view.xml
@@ -10,11 +10,6 @@
form
-
@@ -23,6 +18,11 @@
+
diff --git a/addons/procurement/wizard/mrp_procurement_view.xml b/addons/procurement/wizard/mrp_procurement_view.xml
index 6e6b038d9fa..ab98e598a3d 100644
--- a/addons/procurement/wizard/mrp_procurement_view.xml
+++ b/addons/procurement/wizard/mrp_procurement_view.xml
@@ -10,15 +10,15 @@
form
-
-
-
-
+
diff --git a/addons/procurement/wizard/orderpoint_procurement_view.xml b/addons/procurement/wizard/orderpoint_procurement_view.xml
index 340624fc822..5a29959949e 100644
--- a/addons/procurement/wizard/orderpoint_procurement_view.xml
+++ b/addons/procurement/wizard/orderpoint_procurement_view.xml
@@ -10,17 +10,17 @@
form
-
+
diff --git a/addons/procurement/wizard/schedulers_all_view.xml b/addons/procurement/wizard/schedulers_all_view.xml
index 78922e2866d..01712a0cedd 100644
--- a/addons/procurement/wizard/schedulers_all_view.xml
+++ b/addons/procurement/wizard/schedulers_all_view.xml
@@ -10,14 +10,14 @@
form
-
-
-
-
+
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index ea29292f445..75882c4f5dd 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -155,7 +155,6 @@ class product_pricelist(osv.osv):
currency_obj = self.pool.get('res.currency')
product_obj = self.pool.get('product.product')
- product_template_obj = self.pool.get('product.template')
product_category_obj = self.pool.get('product.category')
product_uom_obj = self.pool.get('product.uom')
supplierinfo_obj = self.pool.get('product.supplierinfo')
@@ -246,7 +245,7 @@ class product_pricelist(osv.osv):
price = 0.0
if sinfo:
qty_in_product_uom = qty
- product_default_uom = product_template_obj.read(cr, uid, [tmpl_id], ['uom_id'])[0]['uom_id'][0]
+ product_default_uom = product_obj.read(cr, uid, [product_id], ['uom_id'])[0]['uom_id'][0]
supplier = supplierinfo_obj.browse(cr, uid, sinfo, context=context)[0]
seller_uom = supplier.product_uom and supplier.product_uom.id or False
if seller_uom and product_default_uom and product_default_uom != seller_uom:
diff --git a/addons/product/product.py b/addons/product/product.py
index a81074aa56e..3cbff880cf9 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -559,8 +559,8 @@ class product_product(osv.osv):
return False
def _check_ean_key(self, cr, uid, ids, context=None):
- for product in self.browse(cr, uid, ids, context=context):
- res = check_ean(product.ean13)
+ for product in self.read(cr, uid, ids, ['ean13'], context=context):
+ res = check_ean(product['ean13'])
return res
_constraints = [(_check_ean_key, 'Error: Invalid ean code', ['ean13'])]
diff --git a/addons/product/wizard/product_price_view.xml b/addons/product/wizard/product_price_view.xml
index d1a1b4b3a11..dbc57c4f6e7 100644
--- a/addons/product/wizard/product_price_view.xml
+++ b/addons/product/wizard/product_price_view.xml
@@ -10,11 +10,6 @@
form
-
@@ -23,6 +18,11 @@
+
diff --git a/addons/product_margin/wizard/product_margin_view.xml b/addons/product_margin/wizard/product_margin_view.xml
index 26e40b77189..f174c6af445 100644
--- a/addons/product_margin/wizard/product_margin_view.xml
+++ b/addons/product_margin/wizard/product_margin_view.xml
@@ -7,16 +7,16 @@
form
-
+
diff --git a/addons/product_visible_discount/product_visible_discount.py b/addons/product_visible_discount/product_visible_discount.py
index 5d833ea6b53..48e3c4a8283 100644
--- a/addons/product_visible_discount/product_visible_discount.py
+++ b/addons/product_visible_discount/product_visible_discount.py
@@ -47,7 +47,6 @@ class sale_order_line(osv.osv):
item_obj = self.pool.get('product.pricelist.item')
price_type_obj = self.pool.get('product.price.type')
product_obj = self.pool.get('product.product')
- template_obj = self.pool.get('product.template')
field_name = 'list_price'
if res_dict.get('item_id',False) and res_dict['item_id'].get(pricelist,False):
@@ -57,9 +56,7 @@ class sale_order_line(osv.osv):
field_name = price_type_obj.browse(cr, uid, item_base).field
product = product_obj.browse(cr, uid, product_id, context)
- product_tmpl_id = product.product_tmpl_id.id
-
- product_read = template_obj.read(cr, uid, product_tmpl_id, [field_name], context)
+ product_read = product_obj.read(cr, uid, product_id, [field_name], context=context)
factor = 1.0
if uom and uom != product.uom_id.id:
@@ -110,7 +107,6 @@ class account_invoice_line(osv.osv):
item_obj = self.pool.get('product.pricelist.item')
price_type_obj = self.pool.get('product.price.type')
product_obj = self.pool.get('product.product')
- template_obj = self.pool.get('product.template')
field_name = 'list_price'
if res_dict.get('item_id',False) and res_dict['item_id'].get(pricelist,False):
@@ -120,9 +116,7 @@ class account_invoice_line(osv.osv):
field_name = price_type_obj.browse(cr, uid, item_base).field
product = product_obj.browse(cr, uid, product_id, context)
- product_tmpl_id = product.product_tmpl_id.id
-
- product_read = template_obj.read(cr, uid, product_tmpl_id, [field_name], context)
+ product_read = product_obj.read(cr, uid, product_id, [field_name], context=context)
factor = 1.0
if uom and uom != product.uom_id.id:
diff --git a/addons/project/i18n/hr.po b/addons/project/i18n/hr.po
index ea508ead52c..d17da5727b3 100644
--- a/addons/project/i18n/hr.po
+++ b/addons/project/i18n/hr.po
@@ -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: 2010-08-03 09:16+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) \n"
+"PO-Revision-Date: 2012-07-06 12:24+0000\n"
+"Last-Translator: Marko Carevic \n"
"Language-Team: Vinteh\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:36+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-07 05:12+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
"Language: hr\n"
#. module: project
@@ -108,7 +108,7 @@ msgstr "Sati za procjenu"
#. module: project
#: view:project.project:0
msgid "Pending Projects"
-msgstr ""
+msgstr "Projekti na čekanju"
#. module: project
#: help:project.task,remaining_hours:0
@@ -191,7 +191,7 @@ msgstr "Tvrtka"
#. module: project
#: view:report.project.task.user:0
msgid "Pending tasks"
-msgstr ""
+msgstr "Zadaci na čekanju"
#. module: project
#: field:project.task.delegate,prefix:0
@@ -206,7 +206,7 @@ msgstr ""
#. module: project
#: model:process.transition.action,name:project.process_transition_action_openpendingtask0
msgid "Set pending"
-msgstr "Postavite u tijeku"
+msgstr "Staviti na čekanje"
#. module: project
#: selection:project.task,priority:0
@@ -281,7 +281,7 @@ msgstr "Zadatak"
#. module: project
#: view:project.project:0
msgid "Members"
-msgstr ""
+msgstr "Članovi"
#. module: project
#: view:board.board:0
@@ -641,7 +641,7 @@ msgstr "Srednji"
#. module: project
#: view:project.task:0 view:project.task.history.cumulative:0
msgid "Pending Tasks"
-msgstr ""
+msgstr "Zadaci na čekanju"
#. module: project
#: view:project.task:0 field:project.task,remaining_hours:0
@@ -705,7 +705,7 @@ msgstr ""
#: selection:project.vs.hours,state:0 view:report.project.task.user:0
#: selection:report.project.task.user,state:0 selection:task.by.days,state:0
msgid "Pending"
-msgstr "U toku"
+msgstr "Na čekanju"
#. module: project
#: field:project.task.delegate,name:0
diff --git a/addons/project/i18n/ja.po b/addons/project/i18n/ja.po
index 3fda3a1349c..8e9ece1452f 100644
--- a/addons/project/i18n/ja.po
+++ b/addons/project/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-06-20 17:12+0000\n"
-"Last-Translator: Akira Hiyama \n"
+"PO-Revision-Date: 2012-07-10 00:39+0000\n"
+"Last-Translator: Tomomi Mengelberg \n"
"Language-Team: Japanese \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:36+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-11 05:14+0000\n"
+"X-Generator: Launchpad (build 15593)\n"
#. module: project
#: view:report.project.task.user:0
@@ -1825,7 +1825,7 @@ msgstr "タスク %s は閉じられました。"
#. module: project
#: field:project.task,id:0
msgid "ID"
-msgstr ""
+msgstr "ID"
#. module: project
#: model:ir.actions.act_window,name:project.action_view_task_history_burndown
diff --git a/addons/project/project.py b/addons/project/project.py
index 487daa834bb..5810f34ad4a 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -215,7 +215,7 @@ class project(osv.osv):
'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Tasks Stages', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
'task_count': fields.function(_task_count, type='integer', string="Open Tasks"),
'color': fields.integer('Color Index'),
- 'privacy_visibility': fields.selection([('public','Public'), ('followers','Followers Only')], 'Privacy / Visibility'),
+ 'privacy_visibility': fields.selection([('public','Public'), ('followers','Followers Only')], 'Privacy / Visibility', required=True),
'state': fields.selection([('template', 'Template'),('draft','New'),('open','In Progress'), ('cancelled', 'Cancelled'),('pending','Pending'),('close','Closed')], 'Status', required=True,),
'followers': fields.function(_get_followers, method=True, fnct_search=_search_followers,
type='many2many', relation='res.users', string='Followers'),
@@ -236,6 +236,7 @@ class project(osv.osv):
'priority': 1,
'sequence': 10,
'type_ids': _get_type_common,
+ 'privacy_visibility': 'public',
}
# TODO: Why not using a SQL contraints ?
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index f18cfe4b682..53a56735ec8 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -239,7 +239,7 @@
- i
+ í
+
@@ -75,9 +76,6 @@
form
-
@@ -112,6 +110,9 @@
+
diff --git a/addons/stock/wizard/stock_partial_move_view.xml b/addons/stock/wizard/stock_partial_move_view.xml
index 497467025b5..3e0699ec3d8 100644
--- a/addons/stock/wizard/stock_partial_move_view.xml
+++ b/addons/stock/wizard/stock_partial_move_view.xml
@@ -21,13 +21,13 @@
form
-
-
-
+
diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml
index c8da4459efa..fdbcabb9ed7 100644
--- a/addons/stock/wizard/stock_partial_picking_view.xml
+++ b/addons/stock/wizard/stock_partial_picking_view.xml
@@ -16,11 +16,6 @@
form
-
@@ -36,6 +31,11 @@
+
diff --git a/addons/stock/wizard/stock_return_picking_view.xml b/addons/stock/wizard/stock_return_picking_view.xml
index 06e318c295e..5cdad44f681 100644
--- a/addons/stock/wizard/stock_return_picking_view.xml
+++ b/addons/stock/wizard/stock_return_picking_view.xml
@@ -59,16 +59,16 @@
form
-
+
diff --git a/addons/stock/wizard/stock_splitinto_view.xml b/addons/stock/wizard/stock_splitinto_view.xml
index 573014b7cac..52b182a3f27 100644
--- a/addons/stock/wizard/stock_splitinto_view.xml
+++ b/addons/stock/wizard/stock_splitinto_view.xml
@@ -7,15 +7,15 @@
form
-
+
diff --git a/addons/stock_planning/i18n/ja.po b/addons/stock_planning/i18n/ja.po
index 974a89fc4d5..4e21f56fa79 100644
--- a/addons/stock_planning/i18n/ja.po
+++ b/addons/stock_planning/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME
\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 \n"
"Language-Team: Japanese \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-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-06 04:58+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
#. module: stock_planning
#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
@@ -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 ""
+"このウィザードは一度に複数の予測行を作成するのを手助けします。それが作成された後、あなたは予測数量を埋める必要があります。同じ選択に対して同じものが存在す"
+"る場合、ウィザードは行を重複させません。"
diff --git a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
index 981688ae4be..72d70ae5203 100644
--- a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
@@ -9,7 +9,15 @@
form
-
+
+
+
+
+
+
+
+
+
or
@@ -17,15 +25,7 @@
or
-
-
-
-
-
-
-
-
-
+
diff --git a/addons/stock_planning/wizard/stock_planning_createlines.py b/addons/stock_planning/wizard/stock_planning_createlines.py
index a6e12ad4bc7..3d43241341d 100644
--- a/addons/stock_planning/wizard/stock_planning_createlines.py
+++ b/addons/stock_planning/wizard/stock_planning_createlines.py
@@ -56,7 +56,6 @@ class stock_planning_createlines(osv.osv_memory):
planning_obj = self.pool.get('stock.planning')
mod_obj = self.pool.get('ir.model.data')
prod_categ_obj = self.pool.get('product.category')
- template_obj = self.pool.get('product.template')
planning_lines = []
for f in self.browse(cr, uid, ids, context=context):
if f.forecasted_products:
@@ -67,8 +66,7 @@ class stock_planning_createlines(osv.osv_memory):
else:
categ_ids = f.product_categ_id.id and [f.product_categ_id.id] or []
prod_categ_ids = prod_categ_obj.search(cr,uid,[('parent_id','child_of',categ_ids)])
- templates_ids = template_obj.search(cr,uid,[('categ_id','in',prod_categ_ids)])
- products_id1 = product_obj.search(cr,uid,[('product_tmpl_id','in',templates_ids)])
+ products_id1 = product_obj.search(cr,uid,[('categ_id','in',prod_categ_ids)])
if len(products_id1)==0:
raise osv.except_osv(_('Error !'), _('No forecasts for selected period or no products in selected category !'))
diff --git a/addons/stock_planning/wizard/stock_planning_createlines_view.xml b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
index 5c5233f186b..00ee00f1c34 100644
--- a/addons/stock_planning/wizard/stock_planning_createlines_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
@@ -8,20 +8,18 @@
form
-
-
-
-
-
-
-
-
-
-
+
diff --git a/addons/stock_planning/wizard/stock_planning_forecast.py b/addons/stock_planning/wizard/stock_planning_forecast.py
index 9f73cf257eb..c72ac0599ea 100644
--- a/addons/stock_planning/wizard/stock_planning_forecast.py
+++ b/addons/stock_planning/wizard/stock_planning_forecast.py
@@ -49,13 +49,11 @@ class stock_sale_forecast_createlines(osv.osv_memory):
forecast_obj = self.pool.get('stock.sale.forecast')
mod_obj = self.pool.get('ir.model.data')
prod_categ_obj = self.pool.get('product.category')
- template_obj = self.pool.get('product.template')
forecast_lines = []
for f in self.browse(cr, uid, ids, context=context):
categ_ids = f.product_categ_id.id and [f.product_categ_id.id] or []
prod_categ_ids = prod_categ_obj.search(cr, uid, [('parent_id','child_of', categ_ids)])
- templates_ids = template_obj.search(cr, uid, [('categ_id','in',prod_categ_ids)])
- products_ids = product_obj.search(cr, uid, [('product_tmpl_id','in',templates_ids)])
+ products_ids = product_obj.search(cr, uid, [('categ_id','in',prod_categ_ids)])
if len(products_ids) == 0:
raise osv.except_osv(_('Error !'), _('No products in selected category !'))
copy = f.copy_forecast
diff --git a/addons/stock_planning/wizard/stock_planning_forecast_view.xml b/addons/stock_planning/wizard/stock_planning_forecast_view.xml
index 3c31404a070..0f3018350c0 100644
--- a/addons/stock_planning/wizard/stock_planning_forecast_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_forecast_view.xml
@@ -9,11 +9,6 @@
form
-
@@ -21,6 +16,11 @@
+
diff --git a/addons/survey/i18n/ja.po b/addons/survey/i18n/ja.po
new file mode 100644
index 00000000000..66630dfe697
--- /dev/null
+++ b/addons/survey/i18n/ja.po
@@ -0,0 +1,1712 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-07-06 03:16+0000\n"
+"Last-Translator: Akira Hiyama \n"
+"Language-Team: Japanese \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-07 05:13+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
+
+#. module: survey
+#: view:survey.print:0
+#: view:survey.print.answer:0
+msgid "Print Option"
+msgstr "オプションの印刷"
+
+#. module: survey
+#: code:addons/survey/survey.py:417
+#, python-format
+msgid ""
+"Minimum Required Answer you entered is "
+"greater than the number of answer. "
+"Please use a number that is smaller than %d."
+msgstr "あなたが入力した最小必要回答数が回答の数よりも多くなっています。%d より小さい数を使って下さい。"
+
+#. module: survey
+#: view:survey.question.wiz:0
+msgid "Your Messages"
+msgstr "あなたのメッセージ"
+
+#. module: survey
+#: field:survey.question,comment_valid_type:0
+#: field:survey.question,validation_type:0
+msgid "Text Validation"
+msgstr "テキストの検証"
+
+#. module: survey
+#: code:addons/survey/survey.py:429
+#, python-format
+msgid ""
+"Maximum Required Answer you entered for "
+"your maximum is greater than the number of answer. "
+" Please use a number that is smaller than %d."
+msgstr "あなたが入力した最大必要回答数が回答の数よりも多くなっています。%d より小さい数を使って下さい。"
+
+#. module: survey
+#: view:survey:0
+#: field:survey,invited_user_ids:0
+msgid "Invited User"
+msgstr "招待ユーザ"
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Character"
+msgstr "文字"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_form1
+#: model:ir.ui.menu,name:survey.menu_print_survey_form
+#: model:ir.ui.menu,name:survey.menu_reporting
+#: model:ir.ui.menu,name:survey.menu_survey_form
+#: model:ir.ui.menu,name:survey.menu_surveys
+msgid "Surveys"
+msgstr "調査"
+
+#. module: survey
+#: field:survey.question,in_visible_answer_type:0
+msgid "Is Answer Type Invisible?"
+msgstr "回答タイプは非表示ですか?"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+#: view:survey.request:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: survey
+#: view:survey.send.invitation.log:0
+msgid "Results :"
+msgstr "結果:"
+
+#. module: survey
+#: view:survey.request:0
+msgid "Survey Request"
+msgstr "調査要求"
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "A Range"
+msgstr "範囲"
+
+#. module: survey
+#: view:survey.response.line:0
+msgid "Table Answer"
+msgstr "表の回答"
+
+#. module: survey
+#: field:survey.history,date:0
+msgid "Date started"
+msgstr "開始日"
+
+#. module: survey
+#: field:survey,history:0
+msgid "History Lines"
+msgstr "履歴行"
+
+#. module: survey
+#: code:addons/survey/survey.py:443
+#, python-format
+msgid ""
+"You must enter one or more menu choices in "
+"column heading (white spaces not allowed)"
+msgstr "列見出しの中に1つ以上のメニュー選択を入力する必要があります(空白状態は許されません)。"
+
+#. module: survey
+#: field:survey.question.column.heading,in_visible_menu_choice:0
+msgid "Is Menu Choice Invisible??"
+msgstr "メニュー選択は非表示ですか?"
+
+#. module: survey
+#: field:survey.send.invitation,mail:0
+msgid "Body"
+msgstr "本文"
+
+#. module: survey
+#: field:survey.question,allow_comment:0
+msgid "Allow Comment Field"
+msgstr "コメント項目の許可"
+
+#. module: survey
+#: selection:survey.print,paper_size:0
+#: selection:survey.print.answer,paper_size:0
+msgid "A4 (210mm x 297mm)"
+msgstr "A4(210mm x 297mm)"
+
+#. module: survey
+#: field:survey.question,comment_maximum_date:0
+#: field:survey.question,validation_maximum_date:0
+msgid "Maximum date"
+msgstr "最大の日付"
+
+#. module: survey
+#: field:survey.question,in_visible_menu_choice:0
+msgid "Is Menu Choice Invisible?"
+msgstr "メニュー選択は非表示ですか?"
+
+#. module: survey
+#: view:survey:0
+msgid "Completed"
+msgstr "完了"
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "Exactly"
+msgstr "一致"
+
+#. module: survey
+#: view:survey:0
+msgid "Open Date"
+msgstr "開始日"
+
+#. module: survey
+#: view:survey.request:0
+msgid "Set to Draft"
+msgstr "ドラフトに設定"
+
+#. module: survey
+#: field:survey.question,is_comment_require:0
+msgid "Add Comment Field"
+msgstr "コメント項目の追加"
+
+#. module: survey
+#: code:addons/survey/survey.py:396
+#, python-format
+msgid ""
+"#Required Answer you entered is greater "
+"than the number of answer. Please use a "
+"number that is smaller than %d."
+msgstr "回答の数より入力した必要回答数が大きくなっています。%d より小さな数を使って下さい。"
+
+#. module: survey
+#: field:survey.question,tot_resp:0
+msgid "Total Answer"
+msgstr "合計回答"
+
+#. module: survey
+#: field:survey.tbl.column.heading,name:0
+msgid "Row Number"
+msgstr "行番号"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_name_wiz
+msgid "survey.name.wiz"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_question_form
+msgid "Survey Questions"
+msgstr "調査の質問"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Matrix of Choices (Only One Answers Per Row)"
+msgstr "選択の行列(1行に付き1回答)"
+
+#. module: survey
+#: code:addons/survey/survey.py:470
+#, python-format
+msgid ""
+"Maximum Required Answer you entered for your maximum is greater than the "
+"number of answer. Please use a number that is smaller than %d."
+msgstr "回答数よりも最大値のために入力した最大必要回答数が大きくなっています。%d よりも小さな数を使用して下さい。"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_question_message
+#: model:ir.model,name:survey.model_survey_question
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Survey Question"
+msgstr "調査の質問"
+
+#. module: survey
+#: view:survey.question.column.heading:0
+msgid "Use if question type is rating_scale"
+msgstr "質問タイプが評価尺度の場合に使用"
+
+#. module: survey
+#: field:survey.print,page_number:0
+#: field:survey.print.answer,page_number:0
+msgid "Include Page Number"
+msgstr "ページ番号を含む"
+
+#. module: survey
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Ok"
+msgstr "OK"
+
+#. module: survey
+#: field:survey.page,title:0
+msgid "Page Title"
+msgstr "ページタイトル"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_define_survey
+msgid "Define Surveys"
+msgstr "調査の定義"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_history
+msgid "Survey History"
+msgstr "調査の履歴"
+
+#. module: survey
+#: field:survey.response.answer,comment:0
+#: field:survey.response.line,comment:0
+msgid "Notes"
+msgstr "注記"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.request:0
+msgid "Search Survey"
+msgstr "調査の検索"
+
+#. module: survey
+#: field:survey.response.answer,answer:0
+#: field:survey.tbl.column.heading,value:0
+msgid "Value"
+msgstr "値"
+
+#. module: survey
+#: field:survey.question,column_heading_ids:0
+msgid " Column heading"
+msgstr " 列見出し"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_run_survey_form
+msgid "Answer a Survey"
+msgstr "調査の回答"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:87
+#, python-format
+msgid "Error!"
+msgstr "エラー"
+
+#. module: survey
+#: field:survey,tot_comp_survey:0
+msgid "Total Completed Survey"
+msgstr "終了した調査の合計"
+
+#. module: survey
+#: view:survey.response.answer:0
+msgid "(Use Only Question Type is matrix_of_drop_down_menus)"
+msgstr "(質問タイプがドロップダウンメニューの行列の時のみ使用)"
+
+#. module: survey
+#: model:ir.actions.report.xml,name:survey.survey_analysis
+msgid "Survey Statistics"
+msgstr "調査統計値"
+
+#. module: survey
+#: selection:survey,state:0
+#: view:survey.request:0
+#: selection:survey.request,state:0
+msgid "Cancelled"
+msgstr "キャンセル済"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Rating Scale"
+msgstr "評価尺度"
+
+#. module: survey
+#: field:survey.question,comment_field_type:0
+msgid "Comment Field Type"
+msgstr "コメント項目のタイプ"
+
+#. module: survey
+#: code:addons/survey/survey.py:370
+#: code:addons/survey/survey.py:382
+#: code:addons/survey/survey.py:396
+#: code:addons/survey/survey.py:401
+#: code:addons/survey/survey.py:411
+#: code:addons/survey/survey.py:417
+#: code:addons/survey/survey.py:423
+#: code:addons/survey/survey.py:429
+#: code:addons/survey/survey.py:433
+#: code:addons/survey/survey.py:439
+#: code:addons/survey/survey.py:443
+#: code:addons/survey/survey.py:453
+#: code:addons/survey/survey.py:457
+#: code:addons/survey/survey.py:462
+#: code:addons/survey/survey.py:468
+#: code:addons/survey/survey.py:470
+#: code:addons/survey/survey.py:472
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:479
+#: code:addons/survey/survey.py:630
+#: code:addons/survey/wizard/survey_answer.py:119
+#: code:addons/survey/wizard/survey_answer.py:126
+#: code:addons/survey/wizard/survey_answer.py:686
+#: code:addons/survey/wizard/survey_answer.py:725
+#: code:addons/survey/wizard/survey_answer.py:745
+#: code:addons/survey/wizard/survey_answer.py:774
+#: code:addons/survey/wizard/survey_answer.py:779
+#: code:addons/survey/wizard/survey_answer.py:787
+#: code:addons/survey/wizard/survey_answer.py:798
+#: code:addons/survey/wizard/survey_answer.py:807
+#: code:addons/survey/wizard/survey_answer.py:812
+#: code:addons/survey/wizard/survey_answer.py:886
+#: code:addons/survey/wizard/survey_answer.py:922
+#: code:addons/survey/wizard/survey_answer.py:940
+#: code:addons/survey/wizard/survey_answer.py:968
+#: code:addons/survey/wizard/survey_answer.py:971
+#: code:addons/survey/wizard/survey_answer.py:974
+#: code:addons/survey/wizard/survey_answer.py:986
+#: code:addons/survey/wizard/survey_answer.py:993
+#: code:addons/survey/wizard/survey_answer.py:996
+#: code:addons/survey/wizard/survey_selection.py:80
+#: code:addons/survey/wizard/survey_selection.py:83
+#: code:addons/survey/wizard/survey_send_invitation.py:74
+#, python-format
+msgid "Warning !"
+msgstr "警告"
+
+#. module: survey
+#: selection:survey.question,comment_field_type:0
+msgid "Single Line Of Text"
+msgstr "テキストの1行"
+
+#. module: survey
+#: view:survey.send.invitation:0
+#: field:survey.send.invitation,send_mail_existing:0
+msgid "Send Reminder for Existing User"
+msgstr "既存ユーザに注意喚起を送信"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Multiple Choice (Multiple Answer)"
+msgstr "複数の選択肢(複数回答)"
+
+#. module: survey
+#: view:survey:0
+msgid "Edit Survey"
+msgstr "調査の編集"
+
+#. module: survey
+#: view:survey.response.line:0
+msgid "Survey Answer Line"
+msgstr "調査の回答行"
+
+#. module: survey
+#: field:survey.question.column.heading,menu_choice:0
+msgid "Menu Choice"
+msgstr "メニュー選択"
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "At Most"
+msgstr "最大"
+
+#. module: survey
+#: view:survey:0
+msgid "My Survey(s)"
+msgstr "私の調査"
+
+#. module: survey
+#: field:survey.question,is_validation_require:0
+msgid "Validate Text"
+msgstr "テキストの検証"
+
+#. module: survey
+#: view:survey.send.invitation:0
+msgid "_Cancel"
+msgstr "キャンセル"
+
+#. module: survey
+#: field:survey.response.line,single_text:0
+msgid "Text"
+msgstr "テキスト"
+
+#. module: survey
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "選択した会社は、このユーザに許された会社ではありません。"
+
+#. module: survey
+#: selection:survey.print,paper_size:0
+#: selection:survey.print.answer,paper_size:0
+msgid "Letter (8.5\" x 11\")"
+msgstr "レター(8.5\" x 11\")"
+
+#. module: survey
+#: view:survey:0
+#: field:survey,responsible_id:0
+msgid "Responsible"
+msgstr "担当"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_request
+msgid "survey.request"
+msgstr ""
+
+#. module: survey
+#: field:survey.send.invitation,mail_subject:0
+#: field:survey.send.invitation,mail_subject_existing:0
+msgid "Subject"
+msgstr "件名"
+
+#. module: survey
+#: field:survey.question,comment_maximum_float:0
+#: field:survey.question,validation_maximum_float:0
+msgid "Maximum decimal number"
+msgstr "10進数値の最大値"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_tbl_column_heading
+msgid "survey.tbl.column.heading"
+msgstr ""
+
+#. module: survey
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "同じログインでは2つのユーザを持てません。"
+
+#. module: survey
+#: field:survey.send.invitation,mail_from:0
+msgid "From"
+msgstr "送信者"
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Don't Validate Comment Text."
+msgstr "コメントテキストを検証しない"
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be A Whole Number"
+msgstr "整数が必須"
+
+#. module: survey
+#: field:survey.answer,question_id:0
+#: field:survey.page,question_ids:0
+#: field:survey.question,question:0
+#: field:survey.question.column.heading,question_id:0
+#: field:survey.response.line,question_id:0
+msgid "Question"
+msgstr "質問"
+
+#. module: survey
+#: view:survey.page:0
+msgid "Search Survey Page"
+msgstr "調査ページの検索"
+
+#. module: survey
+#: field:survey.question.wiz,name:0
+msgid "Number"
+msgstr "番号"
+
+#. module: survey
+#: code:addons/survey/survey.py:439
+#, python-format
+msgid ""
+"You must enter one or more menu choices in "
+"column heading"
+msgstr "列見出しに1つ以上のメニュー選択の入力が必要です。"
+
+#. module: survey
+#: model:ir.actions.act_window,help:survey.action_survey_form1
+msgid ""
+"You can create survey for different purposes: recruitment interviews, "
+"employee's periodical evaluations, marketing campaigns, etc. A survey is "
+"made of pages containing questions of several types: text, multiple choices, "
+"etc. You can edit survey manually or click on the 'Edit Survey' for a "
+"WYSIWYG interface."
+msgstr ""
+"異なる目的の調査を作成することができます:採用面接、従業員の期間毎の評価、マーケティングキャンペーンなど。調査は複数のタイプの質問を含むページで作成されま"
+"す:テキスト、複数選択など。調査はWYSIWYGインタフェースで手動または調査の編集をクリックすることで編集可能です。"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.request:0
+#: field:survey.request,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: survey
+#: view:survey.request:0
+msgid "Evaluation Plan Phase"
+msgstr "計画段階の評価"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Between"
+msgstr "間"
+
+#. module: survey
+#: view:survey.print:0
+#: view:survey.print.answer:0
+#: view:survey.print.statistics:0
+msgid "Print"
+msgstr "印刷"
+
+#. module: survey
+#: view:survey:0
+msgid "New"
+msgstr "新規"
+
+#. module: survey
+#: field:survey.question,make_comment_field:0
+msgid "Make Comment Field an Answer Choice"
+msgstr "回答選択にコメント項目を作成"
+
+#. module: survey
+#: view:survey:0
+#: field:survey,type:0
+msgid "Type"
+msgstr "タイプ"
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Email"
+msgstr "Eメール"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_answer_surveys
+msgid "Answer Surveys"
+msgstr "調査の回答"
+
+#. module: survey
+#: selection:survey.response,state:0
+msgid "Not Finished"
+msgstr "未完了"
+
+#. module: survey
+#: view:survey.print:0
+msgid "Survey Print"
+msgstr "調査の印刷"
+
+#. module: survey
+#: view:survey.send.invitation:0
+msgid "Select Partner"
+msgstr "パートナの選択"
+
+#. module: survey
+#: field:survey.question,type:0
+msgid "Question Type"
+msgstr "質問タイプ"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:126
+#, python-format
+msgid "You can not answer this survey more than %s times"
+msgstr "%s 回以上はこの調査に回答できません。"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_answer
+msgid "Answers"
+msgstr "回答"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:119
+#, python-format
+msgid "You can not answer because the survey is not open"
+msgstr "調査は開かれていないため、回答できません。"
+
+#. module: survey
+#: selection:survey.response,response_type:0
+msgid "Link"
+msgstr "リンク"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_type_form
+#: model:ir.model,name:survey.model_survey_type
+#: view:survey.type:0
+msgid "Survey Type"
+msgstr "調査タイプ"
+
+#. module: survey
+#: field:survey.page,sequence:0
+msgid "Page Nr"
+msgstr "ページ番号"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+#: field:survey.question,descriptive_text:0
+#: selection:survey.question,type:0
+msgid "Descriptive Text"
+msgstr "説明文"
+
+#. module: survey
+#: field:survey.question,minimum_req_ans:0
+msgid "Minimum Required Answer"
+msgstr "最小必要回答数"
+
+#. module: survey
+#: code:addons/survey/survey.py:479
+#, python-format
+msgid ""
+"You must enter one or more menu choices in column heading (white spaces not "
+"allowed)"
+msgstr "列見出しに1つ以上のメニュー選択の入力が必要です(空白は許されません)。"
+
+#. module: survey
+#: field:survey.question,req_error_msg:0
+msgid "Error Message"
+msgstr "エラーメッセージ"
+
+#. module: survey
+#: code:addons/survey/survey.py:477
+#, python-format
+msgid "You must enter one or more menu choices in column heading"
+msgstr "列見出しに1つ以上のメニュー選択の入力が必要です。"
+
+#. module: survey
+#: field:survey.request,date_deadline:0
+msgid "Deadline date"
+msgstr "締切日"
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be A Date"
+msgstr "日付が必須"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_print
+msgid "survey.print"
+msgstr ""
+
+#. module: survey
+#: view:survey.question.column.heading:0
+#: field:survey.question.column.heading,title:0
+msgid "Column Heading"
+msgstr "列見出し"
+
+#. module: survey
+#: field:survey.question,is_require_answer:0
+msgid "Require Answer to Question"
+msgstr "質問の回答が必要"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_request_tree
+#: model:ir.ui.menu,name:survey.menu_survey_type_form1
+msgid "Survey Requests"
+msgstr "調査要求"
+
+#. module: survey
+#: code:addons/survey/survey.py:370
+#: code:addons/survey/survey.py:457
+#, python-format
+msgid "You must enter one or more column heading."
+msgstr "1つ以上の列見出しの入力が必要です。"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:745
+#: code:addons/survey/wizard/survey_answer.py:940
+#, python-format
+msgid "Please enter an integer value"
+msgstr "整数値を入力して下さい。"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_browse_answer
+msgid "survey.browse.answer"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_field_type:0
+msgid "Paragraph of Text"
+msgstr "テキストの段落"
+
+#. module: survey
+#: code:addons/survey/survey.py:423
+#, python-format
+msgid ""
+"Maximum Required Answer you entered for "
+"your maximum is greater than the number of answer. "
+" Please use a number that is smaller than %d."
+msgstr "最大値のためにあなたが入力した最大必要回答数が回答の数よりも多くなっています。%d より小さい数を使って下さい。"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "When the question is not answered, display this error message:"
+msgstr "質問に回答されない場合に、このエラーメッセージを表示します。"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Options"
+msgstr "オプション"
+
+#. module: survey
+#: view:survey.send.invitation.log:0
+msgid "_Ok"
+msgstr "OK"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_browse_survey_response
+msgid "Browse Answers"
+msgstr "回答のブラウズ"
+
+#. module: survey
+#: field:survey.response.answer,comment_field:0
+#: view:survey.response.line:0
+msgid "Comment"
+msgstr "コメント"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_answer
+#: model:ir.model,name:survey.model_survey_response_answer
+#: view:survey.answer:0
+#: view:survey.response:0
+#: view:survey.response.answer:0
+#: view:survey.response.line:0
+msgid "Survey Answer"
+msgstr "調査の回答"
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Selection"
+msgstr "選択"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_browse_survey_response
+#: view:survey:0
+msgid "Answer Survey"
+msgstr "調査の回答"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Comment Field"
+msgstr "コメント項目"
+
+#. module: survey
+#: selection:survey.response,response_type:0
+msgid "Manually"
+msgstr "手動"
+
+#. module: survey
+#: view:survey.send.invitation:0
+msgid "_Send"
+msgstr "送信"
+
+#. module: survey
+#: help:survey,responsible_id:0
+msgid "User responsible for survey"
+msgstr "調査を担当するユーザ"
+
+#. module: survey
+#: field:survey,page_ids:0
+#: view:survey.question:0
+#: field:survey.response.line,page_id:0
+msgid "Page"
+msgstr "ページ"
+
+#. module: survey
+#: field:survey.question,comment_column:0
+msgid "Add comment column in matrix"
+msgstr "行列でコメント列に追加"
+
+#. module: survey
+#: field:survey.answer,response:0
+msgid "#Answer"
+msgstr "回答番号"
+
+#. module: survey
+#: field:survey.print,without_pagebreak:0
+#: field:survey.print.answer,without_pagebreak:0
+msgid "Print Without Page Breaks"
+msgstr "改ページなしで印刷"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "When the comment is an invalid format, display this error message"
+msgstr "コメントが無効なフォーマットの場合、このエラーメッセージを表示します。"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_selection.py:83
+#, python-format
+msgid ""
+"You can not give more response. Please contact the author of this survey for "
+"further assistance."
+msgstr "あなたはこれ以上多くの応答を与えることができません。これ以上のサポートが必要であれば、この調査の作者に連絡をして下さい。"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_page_question
+#: model:ir.actions.act_window,name:survey.act_survey_question
+msgid "Questions"
+msgstr "質問"
+
+#. module: survey
+#: help:survey,response_user:0
+msgid "Set to one if you require only one Answer per user"
+msgstr "1ユーザにつき1回答のみとする場合は、1を設定します。"
+
+#. module: survey
+#: field:survey,users:0
+msgid "Users"
+msgstr "ユーザ"
+
+#. module: survey
+#: view:survey.send.invitation:0
+msgid "Message"
+msgstr "メッセージ"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.request:0
+msgid "MY"
+msgstr "私の"
+
+#. module: survey
+#: field:survey.question,maximum_req_ans:0
+msgid "Maximum Required Answer"
+msgstr "最大必要回答数"
+
+#. module: survey
+#: field:survey.name.wiz,page_no:0
+msgid "Page Number"
+msgstr "ページ番号"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:87
+#, python-format
+msgid "Cannot locate survey for the question wizard!"
+msgstr "質問ウィザードのための調査を見つけることができません。"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "and"
+msgstr "かつ"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_print_statistics
+#: view:survey.print.statistics:0
+msgid "Survey Print Statistics"
+msgstr "調査印刷統計値"
+
+#. module: survey
+#: field:survey.send.invitation.log,note:0
+msgid "Log"
+msgstr "ログ"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "When the choices do not add up correctly, display this error message"
+msgstr "選択肢を正しく追加していない場合、このエラーメッセージが表示されます。"
+
+#. module: survey
+#: field:survey,date_close:0
+msgid "Survey Close Date"
+msgstr "調査閉鎖日"
+
+#. module: survey
+#: field:survey,date_open:0
+msgid "Survey Open Date"
+msgstr "調査開設日"
+
+#. module: survey
+#: field:survey.question.column.heading,in_visible_rating_weight:0
+msgid "Is Rating Scale Invisible ??"
+msgstr "評価尺度は非表示ですか?"
+
+#. module: survey
+#: view:survey.browse.answer:0
+#: view:survey.name.wiz:0
+msgid "Start"
+msgstr "開始"
+
+#. module: survey
+#: code:addons/survey/survey.py:472
+#, python-format
+msgid "Maximum Required Answer is greater than Minimum Required Answer"
+msgstr "最大必要回答数は最小必要回答数よりも大きい。"
+
+#. module: survey
+#: field:survey.question,comment_maximum_no:0
+#: field:survey.question,validation_maximum_no:0
+msgid "Maximum number"
+msgstr "最大値"
+
+#. module: survey
+#: selection:survey.request,state:0
+#: selection:survey.response.line,state:0
+msgid "Draft"
+msgstr "ドラフト"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_print_statistics
+msgid "survey.print.statistics"
+msgstr ""
+
+#. module: survey
+#: selection:survey,state:0
+msgid "Closed"
+msgstr "閉鎖"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Matrix of Drop-down Menus"
+msgstr "ドロップダウンメニューの行列"
+
+#. module: survey
+#: view:survey:0
+#: field:survey.answer,answer:0
+#: field:survey.name.wiz,response:0
+#: view:survey.page:0
+#: view:survey.print.answer:0
+#: field:survey.print.answer,response_ids:0
+#: view:survey.question:0
+#: field:survey.question,answer_choice_ids:0
+#: field:survey.request,response:0
+#: field:survey.response,question_ids:0
+#: field:survey.response.answer,answer_id:0
+#: field:survey.response.answer,response_id:0
+#: view:survey.response.line:0
+#: field:survey.response.line,response_answer_ids:0
+#: field:survey.response.line,response_id:0
+#: field:survey.response.line,response_table_ids:0
+#: field:survey.send.invitation,partner_ids:0
+#: field:survey.tbl.column.heading,response_table_id:0
+msgid "Answer"
+msgstr "回答"
+
+#. module: survey
+#: field:survey,max_response_limit:0
+msgid "Maximum Answer Limit"
+msgstr "回答上限最大値"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_act_view_survey_send_invitation
+msgid "Send Invitations"
+msgstr "招待の送信"
+
+#. module: survey
+#: field:survey.name.wiz,store_ans:0
+msgid "Store Answer"
+msgstr "回答の保存"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Date and Time"
+msgstr "日付と時間"
+
+#. module: survey
+#: field:survey,state:0
+#: field:survey.response,state:0
+#: field:survey.response.line,state:0
+msgid "Status"
+msgstr "状態"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_print
+msgid "Print Survey"
+msgstr "調査の印刷"
+
+#. module: survey
+#: field:survey,send_response:0
+msgid "E-mail Notification on Answer"
+msgstr "回答のEメール通知"
+
+#. module: survey
+#: field:survey.response.answer,value_choice:0
+msgid "Value Choice"
+msgstr "値の選択"
+
+#. module: survey
+#: view:survey:0
+msgid "Started"
+msgstr "開始済"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_print_answer
+#: view:survey:0
+#: view:survey.print.answer:0
+msgid "Print Answer"
+msgstr "回答の印刷"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Multiple Textboxes"
+msgstr "複数のテキストボックス"
+
+#. module: survey
+#: selection:survey.print,orientation:0
+#: selection:survey.print.answer,orientation:0
+msgid "Landscape(Horizontal)"
+msgstr "横向き"
+
+#. module: survey
+#: field:survey.question,no_of_rows:0
+msgid "No of Rows"
+msgstr "行数"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.name.wiz:0
+msgid "Survey Details"
+msgstr "調査の詳細"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Multiple Textboxes With Different Type"
+msgstr "異なるタイプの複数のテキストボックス"
+
+#. module: survey
+#: view:survey.question.column.heading:0
+msgid "Menu Choices (each choice on separate lines)"
+msgstr "メニュー選択(行毎に別の選択)"
+
+#. module: survey
+#: field:survey.response,response_type:0
+msgid "Answer Type"
+msgstr "回答タイプ"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Validation"
+msgstr "検証"
+
+#. module: survey
+#: view:survey.request:0
+#: selection:survey.request,state:0
+msgid "Waiting Answer"
+msgstr "回答待ち"
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be A Decimal Number"
+msgstr "10進数値が必須"
+
+#. module: survey
+#: field:res.users,survey_id:0
+msgid "Groups"
+msgstr "グループ"
+
+#. module: survey
+#: selection:survey.answer,type:0
+#: selection:survey.question,type:0
+msgid "Date"
+msgstr "日付"
+
+#. module: survey
+#: view:survey:0
+msgid "All New Survey"
+msgstr "新規調査全て"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_send_invitation
+msgid "survey.send.invitation"
+msgstr ""
+
+#. module: survey
+#: field:survey.history,user_id:0
+#: view:survey.request:0
+#: field:survey.request,user_id:0
+#: field:survey.response,user_id:0
+msgid "User"
+msgstr "ユーザ"
+
+#. module: survey
+#: field:survey.name.wiz,transfer:0
+msgid "Page Transfer"
+msgstr "ページ転送"
+
+#. module: survey
+#: selection:survey.response.line,state:0
+msgid "Skiped"
+msgstr "スキップ済"
+
+#. module: survey
+#: field:survey.print,paper_size:0
+#: field:survey.print.answer,paper_size:0
+msgid "Paper Size"
+msgstr "用紙サイズ"
+
+#. module: survey
+#: field:survey.response.answer,column_id:0
+#: field:survey.tbl.column.heading,column_id:0
+msgid "Column"
+msgstr "列"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_response_line
+msgid "Survey Response Line"
+msgstr "調査回答行"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_selection.py:80
+#, python-format
+msgid "You can not give response for this survey more than %s times"
+msgstr "この調査には %s 回を超えての応答はできません。"
+
+#. module: survey
+#: model:ir.actions.report.xml,name:survey.report_survey_form
+#: model:ir.model,name:survey.model_survey
+#: view:survey:0
+#: view:survey.browse.answer:0
+#: field:survey.browse.answer,survey_id:0
+#: field:survey.history,survey_id:0
+#: view:survey.name.wiz:0
+#: field:survey.name.wiz,survey_id:0
+#: view:survey.page:0
+#: field:survey.page,survey_id:0
+#: view:survey.print:0
+#: field:survey.print,survey_ids:0
+#: field:survey.print.statistics,survey_ids:0
+#: field:survey.question,survey:0
+#: view:survey.request:0
+#: field:survey.request,survey_id:0
+#: field:survey.response,survey_id:0
+msgid "Survey"
+msgstr "調査"
+
+#. module: survey
+#: field:survey.question,in_visible_rating_weight:0
+msgid "Is Rating Scale Invisible?"
+msgstr "評価尺度は非表示ですか?"
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Integer"
+msgstr "整数"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Numerical Textboxes"
+msgstr "数値のテキストボックス"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_question_wiz
+msgid "survey.question.wiz"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "History"
+msgstr "履歴"
+
+#. module: survey
+#: view:survey.request:0
+msgid "Late"
+msgstr "遅延"
+
+#. module: survey
+#: field:survey.type,code:0
+msgid "Code"
+msgstr "コード"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_print_survey_statistics
+msgid "Surveys Statistics"
+msgstr ""
+
+#. module: survey
+#: field:survey.print,orientation:0
+#: field:survey.print.answer,orientation:0
+msgid "Orientation"
+msgstr "向き"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.answer:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Seq"
+msgstr "順序"
+
+#. module: survey
+#: field:survey.request,email:0
+msgid "E-mail"
+msgstr "Eメール"
+
+#. module: survey
+#: field:survey.question,comment_minimum_no:0
+#: field:survey.question,validation_minimum_no:0
+msgid "Minimum number"
+msgstr "最小値"
+
+#. module: survey
+#: field:survey.question,req_ans:0
+msgid "#Required Answer"
+msgstr "要求される回答数"
+
+#. module: survey
+#: field:survey.answer,sequence:0
+#: field:survey.question,sequence:0
+msgid "Sequence"
+msgstr "順序"
+
+#. module: survey
+#: field:survey.question,comment_label:0
+msgid "Field Label"
+msgstr "項目ラベル"
+
+#. module: survey
+#: view:survey:0
+msgid "Other"
+msgstr "その他"
+
+#. module: survey
+#: view:survey.request:0
+#: selection:survey.request,state:0
+msgid "Done"
+msgstr "完了"
+
+#. module: survey
+#: view:survey:0
+msgid "Test Survey"
+msgstr "テスト調査"
+
+#. module: survey
+#: field:survey.question,rating_allow_one_column_require:0
+msgid "Allow Only One Answer per Column (Forced Ranking)"
+msgstr "列毎に1個の回答のみを許可(強制ランキング)"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.browse.answer:0
+#: view:survey.name.wiz:0
+#: view:survey.print:0
+#: view:survey.print.answer:0
+#: view:survey.print.statistics:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: survey
+#: view:survey:0
+msgid "Close"
+msgstr "閉じる"
+
+#. module: survey
+#: field:survey.question,comment_minimum_float:0
+#: field:survey.question,validation_minimum_float:0
+msgid "Minimum decimal number"
+msgstr "最小10進数"
+
+#. module: survey
+#: view:survey:0
+#: selection:survey,state:0
+msgid "Open"
+msgstr "開く"
+
+#. module: survey
+#: field:survey,tot_start_survey:0
+msgid "Total Started Survey"
+msgstr "開始した調査合計"
+
+#. module: survey
+#: code:addons/survey/survey.py:462
+#, python-format
+msgid ""
+"#Required Answer you entered is greater than the number of answer. Please "
+"use a number that is smaller than %d."
+msgstr "入力した要求回答数が回答の数より大きいです。%d より小さな数を使用して下さい。"
+
+#. module: survey
+#: help:survey,max_response_limit:0
+msgid "Set to one if survey is answerable only once"
+msgstr "調査が1回のみ回答可能な場合、1を設定します。"
+
+#. module: survey
+#: selection:survey.response,state:0
+msgid "Finished "
+msgstr "完了 "
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_question_column_heading
+msgid "Survey Question Column Heading"
+msgstr "調査質問の列見出し"
+
+#. module: survey
+#: field:survey.answer,average:0
+msgid "#Avg"
+msgstr "平均数"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Matrix of Choices (Multiple Answers Per Row)"
+msgstr "選択の行列(1行に付き複数回答)"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_name
+msgid "Give Survey Answer"
+msgstr "調査の回答を提供"
+
+#. module: survey
+#: model:ir.model,name:survey.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: survey
+#: help:survey.browse.answer,response_id:0
+msgid ""
+"If this field is empty, all answers of the selected survey will be print."
+msgstr "この項目が空の場合、選択された調査の回答の全てが印刷されます。"
+
+#. module: survey
+#: selection:survey.response.line,state:0
+msgid "Answered"
+msgstr "回答済"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:425
+#, python-format
+msgid "Complete Survey Answer"
+msgstr "調査の回答の完了"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Comment/Essay Box"
+msgstr "コメント / エッセイボックス"
+
+#. module: survey
+#: field:survey.answer,type:0
+msgid "Type of Answer"
+msgstr "回答のタイプ"
+
+#. module: survey
+#: field:survey.question,required_type:0
+msgid "Respondent must answer"
+msgstr "回答者の回答必須"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_send_invitation
+#: view:survey.send.invitation:0
+msgid "Send Invitation"
+msgstr "招待の送信"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:779
+#, python-format
+msgid "You cannot select the same answer more than one time"
+msgstr "複数回の同じ回答は選択できません。"
+
+#. module: survey
+#: view:survey.question:0
+msgid "Search Question"
+msgstr "質問の検索"
+
+#. module: survey
+#: field:survey,title:0
+msgid "Survey Title"
+msgstr "調査タイトル"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Single Textbox"
+msgstr "単数テキストボックス"
+
+#. module: survey
+#: view:survey:0
+#: field:survey,note:0
+#: field:survey.name.wiz,note:0
+#: view:survey.page:0
+#: field:survey.page,note:0
+#: view:survey.response.line:0
+msgid "Description"
+msgstr "詳細"
+
+#. module: survey
+#: view:survey.name.wiz:0
+msgid "Select Survey"
+msgstr "調査の選択"
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "At Least"
+msgstr "最低"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_send_invitation_log
+#: model:ir.model,name:survey.model_survey_send_invitation_log
+msgid "survey.send.invitation.log"
+msgstr ""
+
+#. module: survey
+#: selection:survey.print,orientation:0
+#: selection:survey.print.answer,orientation:0
+msgid "Portrait(Vertical)"
+msgstr "縦向き"
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be Specific Length"
+msgstr "長さ指定が必須"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: field:survey.question,page_id:0
+msgid "Survey Page"
+msgstr "調査ページ"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Required Answer"
+msgstr "必要回答数"
+
+#. module: survey
+#: code:addons/survey/survey.py:468
+#, python-format
+msgid ""
+"Minimum Required Answer you entered is greater than the number of answer. "
+"Please use a number that is smaller than %d."
+msgstr "入力した最小必要回答数が回答数より大きくなっています。%d より小さな数を使用して下さい。"
+
+#. module: survey
+#: code:addons/survey/survey.py:453
+#, python-format
+msgid "You must enter one or more answer."
+msgstr "1個以上の回答の入力が必要です。"
+
+#. module: survey
+#: view:survey:0
+msgid "All Open Survey"
+msgstr "開いている調査全て"
+
+#. module: survey
+#: model:ir.actions.report.xml,name:survey.survey_browse_response
+#: field:survey.browse.answer,response_id:0
+msgid "Survey Answers"
+msgstr "調査の回答"
+
+#. module: survey
+#: view:survey.browse.answer:0
+msgid "Select Survey and Related Answer"
+msgstr "調査と関係する回答を選択"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_print_survey_answer
+msgid "Surveys Answers"
+msgstr "調査の回答"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_pages
+msgid "Pages"
+msgstr "ページ"
+
+#. module: survey
+#: code:addons/survey/survey.py:401
+#, python-format
+msgid ""
+"#Required Answer you entered is greater "
+"than the number of answer. Please use a "
+"number that is smaller than %d."
+msgstr "入力した要求回答数は回答の数より大きくなっています。%d より小さな数を使用して下さい。"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:971
+#, python-format
+msgid "You cannot select same answer more than one time'"
+msgstr "複数回の同じ回答は選択できません。"
+
+#. module: survey
+#: selection:survey.print,paper_size:0
+#: selection:survey.print.answer,paper_size:0
+msgid "Legal (8.5\" x 14\")"
+msgstr "リーガル(8.5\" x 14\")"
+
+#. module: survey
+#: field:survey.type,name:0
+msgid "Name"
+msgstr "名称"
+
+#. module: survey
+#: view:survey.page:0
+msgid "#Questions"
+msgstr "質問数"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_response
+msgid "survey.response"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_valid_err_msg:0
+#: field:survey.question,make_comment_field_err_msg:0
+#: field:survey.question,numeric_required_sum_err_msg:0
+#: field:survey.question,validation_valid_err_msg:0
+msgid "Error message"
+msgstr "エラーメッセージ"
+
+#. module: survey
+#: view:survey.send.invitation:0
+#: field:survey.send.invitation,send_mail:0
+msgid "Send Mail for New User"
+msgstr "新規ユーザのためのメール送信"
+
+#. module: survey
+#: code:addons/survey/survey.py:382
+#, python-format
+msgid "You must enter one or more Answer."
+msgstr "1つ以上の回答を入力する必要があります。"
+
+#. module: survey
+#: code:addons/survey/survey.py:411
+#, python-format
+msgid ""
+"Minimum Required Answer you entered is "
+"greater than the number of answer. Please "
+"use a number that is smaller than %d."
+msgstr "入力した最小必要回答数が回答数より大きくなっています。%d より小さな数を使用して下さい。"
+
+#. module: survey
+#: field:survey.answer,menu_choice:0
+msgid "Menu Choices"
+msgstr "メニュー選択"
+
+#. module: survey
+#: field:survey,id:0
+msgid "ID"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:433
+#, python-format
+msgid ""
+"Maximum Required Answer is greater than "
+"Minimum Required Answer"
+msgstr "最大必要回答数は最小必要回答数よりも大きい。"
+
+#. module: survey
+#: view:survey.send.invitation.log:0
+msgid "User creation"
+msgstr "ユーザの作成"
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "All"
+msgstr "全て"
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be An Email Address"
+msgstr "Eメールアドレスが必須"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Multiple Choice (Only One Answer)"
+msgstr "複数の選択肢(回答は1つのみ)"
+
+#. module: survey
+#: field:survey.answer,in_visible_answer_type:0
+msgid "Is Answer Type Invisible??"
+msgstr "回答タイプは非表示ですか?"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_print_answer
+msgid "survey.print.answer"
+msgstr ""
+
+#. module: survey
+#: view:survey.answer:0
+msgid "Menu Choices (each choice on separate by lines)"
+msgstr "メニュー選択(行毎に別の選択)"
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Float"
+msgstr "実数"
+
+#. module: survey
+#: view:survey.response.line:0
+msgid "Single Textboxes"
+msgstr "単数テキストボックス"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_send_invitation.py:74
+#, python-format
+msgid "%sSurvey is not in open state"
+msgstr "%s 調査は開いた状態ではありません。"
+
+#. module: survey
+#: field:survey.question.column.heading,rating_weight:0
+msgid "Weight"
+msgstr "重量"
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Date & Time"
+msgstr "日時"
+
+#. module: survey
+#: field:survey.response,date_create:0
+#: field:survey.response.line,date_create:0
+msgid "Create Date"
+msgstr "作成日"
+
+#. module: survey
+#: field:survey.question,column_name:0
+msgid "Column Name"
+msgstr "カラム名"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_page_form
+#: model:ir.model,name:survey.model_survey_page
+#: model:ir.ui.menu,name:survey.menu_survey_page_form1
+#: view:survey.page:0
+msgid "Survey Pages"
+msgstr "調査ページ"
+
+#. module: survey
+#: field:survey.question,numeric_required_sum:0
+msgid "Sum of all choices"
+msgstr "全選択の合計"
+
+#. module: survey
+#: selection:survey.question,type:0
+#: view:survey.response.line:0
+msgid "Table"
+msgstr "表"
+
+#. module: survey
+#: code:addons/survey/survey.py:630
+#, python-format
+msgid "You cannot duplicate the resource!"
+msgstr "リソースの複製はできません。"
+
+#. module: survey
+#: field:survey.question,comment_minimum_date:0
+#: field:survey.question,validation_minimum_date:0
+msgid "Minimum date"
+msgstr "最小の日付"
+
+#. module: survey
+#: field:survey,response_user:0
+msgid "Maximum Answer per User"
+msgstr "ユーザ毎の最大回答数"
+
+#. module: survey
+#: field:survey.name.wiz,page:0
+msgid "Page Position"
+msgstr "ページ位置"
diff --git a/addons/survey/static/src/css/survey.css b/addons/survey/static/src/css/survey.css
index 0102dc1ade6..c18f584c9ed 100644
--- a/addons/survey/static/src/css/survey.css
+++ b/addons/survey/static/src/css/survey.css
@@ -1,20 +1,3 @@
-.oe_module_survey{
- font-size: 12px;
- border-style:dotted;
- border-radius: 15px;
- text-align: left;
- height:145px;
- width:220px;
-}
-
-.oe_survey_title{
- font-size: 15px;
- height: auto;
- font-size: 16px;
- font-weight:bold;
- width: 205px;
-}
-
.oe_survey_responsible{
height: auto;
width: 200px;
@@ -26,12 +9,6 @@
width: 200px;
font-size: 14px;
}
-
-.oe_survey_fill{
- align:right;
- padding: 1px 165px;
-}
-
.oe_survey_rate{
font-size: 14px;
}
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 40f13b226f8..0ebaa2aa586 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -68,6 +68,7 @@ class survey(osv.osv):
'users': fields.many2many('res.users', 'survey_users_rel', 'sid', 'uid', 'Users'),
'send_response': fields.boolean('Email Notification on Answer'),
'type': fields.many2one('survey.type', 'Type'),
+ 'color': fields.integer('Color Index'),
'invited_user_ids': fields.many2many('res.users', 'survey_invited_user_rel', 'sid', 'uid', 'Invited User'),
}
_defaults = {
@@ -177,7 +178,7 @@ class survey_page(osv.osv):
_columns = {
'title': fields.char('Page Title', size=128, required=1),
'survey_id': fields.many2one('survey', 'Survey', ondelete='cascade'),
- 'question_ids': fields.one2many('survey.question', 'page_id', 'Question'),
+ 'question_ids': fields.one2many('survey.question', 'page_id', 'Questions'),
'sequence': fields.integer('Page Nr'),
'note': fields.text('Description'),
}
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 01e7de66a3e..cfefc8f7dea 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -26,189 +26,206 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -217,8 +234,8 @@
-
-
+
+
@@ -286,32 +303,37 @@
+
-
+
+
+ i
+
+
+
+
+
+ By:
+
+
+
+ Opened at
+
+ ,
+
+
+
+
+
+
@@ -344,149 +366,163 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/survey/wizard/survey_browse_answer.xml b/addons/survey/wizard/survey_browse_answer.xml
index 29cdd4ad5fb..20c028068bb 100644
--- a/addons/survey/wizard/survey_browse_answer.xml
+++ b/addons/survey/wizard/survey_browse_answer.xml
@@ -18,7 +18,6 @@
-
diff --git a/addons/survey/wizard/survey_selection.xml b/addons/survey/wizard/survey_selection.xml
index 7dc736d3008..15b4af6756f 100644
--- a/addons/survey/wizard/survey_selection.xml
+++ b/addons/survey/wizard/survey_selection.xml
@@ -16,10 +16,10 @@
or
-
+
-
+
diff --git a/addons/web_livechat/LICENSE b/addons/web_livechat/LICENSE
deleted file mode 100644
index ff64be448e9..00000000000
--- a/addons/web_livechat/LICENSE
+++ /dev/null
@@ -1,15 +0,0 @@
-OpenERP, Open Source Management Solution
-Copyright © 2010-2011 OpenERP SA ().
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public Lice
-along with this program. If not, see .
diff --git a/addons/web_livechat/__openerp__.py b/addons/web_livechat/__openerp__.py
deleted file mode 100644
index 860b7b162a9..00000000000
--- a/addons/web_livechat/__openerp__.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2010-2011 OpenERP s.a. ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-{
- 'name': 'Live Chat Support',
- 'version': '2.0',
- 'category': 'Tools',
- 'description': """
-Enable live chat support for those who have a maintenance contract.
-===================================================================
-
-Add "Support" button in header from where you can access OpenERP Support.
- """,
- 'author': 'OpenERP SA',
- 'website': 'http://openerp.com',
- 'depends': ['base'],
- 'update_xml': [],
- 'js' : [
- 'static/src/js/web_livechat.js',
- ],
- 'css' : [
- 'static/src/css/lc.css',
- ],
- 'qweb' : [
- "static/src/xml/*.xml",
- ],
- 'installable': True,
- 'auto_install': False,
- 'certificate': '0013762192410413',
- 'images': ['static/src/img/web_livechat_support.jpeg'],
-}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/web_livechat/i18n/ar.po b/addons/web_livechat/i18n/ar.po
deleted file mode 100644
index c4c5a7343b2..00000000000
--- a/addons/web_livechat/i18n/ar.po
+++ /dev/null
@@ -1,34 +0,0 @@
-# Arabic translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-01-07 23:53+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Arabic \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "ذلك العقد قد تمّ تسجيله في النظام سابقاً."
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "publisher_warranty.contract"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "التحدث مع الدعم الفني"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr "تمكين الدعم الفني المباشر للحاصلين علي عقد دعم فني"
diff --git a/addons/web_livechat/i18n/bg.po b/addons/web_livechat/i18n/bg.po
deleted file mode 100644
index 16d76a8898c..00000000000
--- a/addons/web_livechat/i18n/bg.po
+++ /dev/null
@@ -1,34 +0,0 @@
-# Bulgarian 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 , 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-03-01 14:52+0000\n"
-"Last-Translator: Dimitar Markov \n"
-"Language-Team: Bulgarian \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr ""
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "publisher_warranty.contract"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Поддръжка чат на живо"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr "Разрешете live chat поддръжка ако имате договор за поддръжка"
diff --git a/addons/web_livechat/i18n/ca.po b/addons/web_livechat/i18n/ca.po
deleted file mode 100644
index 6a48c986a27..00000000000
--- a/addons/web_livechat/i18n/ca.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# Catalan 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 , 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-03-05 23:39+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Catalan \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "Aquest contracte ja està registrat al sistema."
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "editor_garantia.contracte"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Xat d'assistència"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr ""
-#~ "Permet suport per xat per a aquells que ja tenen contracte de manteniment"
diff --git a/addons/web_livechat/i18n/cs.po b/addons/web_livechat/i18n/cs.po
deleted file mode 100644
index bb1aa79d289..00000000000
--- a/addons/web_livechat/i18n/cs.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# Czech translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-04-06 04:48+0000\n"
-"Last-Translator: Jiří Hajda \n"
-"Language-Team: Czech \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-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15060)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "Tato smlouva je již v systému registrována."
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "publisher_warranty.contract"
diff --git a/addons/web_livechat/i18n/da.po b/addons/web_livechat/i18n/da.po
deleted file mode 100644
index 59c10e9eac8..00000000000
--- a/addons/web_livechat/i18n/da.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# Danish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-01-27 06:45+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Danish \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr ""
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr ""
diff --git a/addons/web_livechat/i18n/de.po b/addons/web_livechat/i18n/de.po
deleted file mode 100644
index 2d2def6b604..00000000000
--- a/addons/web_livechat/i18n/de.po
+++ /dev/null
@@ -1,34 +0,0 @@
-# German 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 , 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-02-21 20:28+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp \n"
-"Language-Team: German \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "Der Wartungsvertrag wurde bereits im System registriert."
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "publisher_warranty.contract"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Live Chat Unterstützung"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr "Live Chat für Vetragsinhaber aktivieren"
diff --git a/addons/web_livechat/i18n/es.po b/addons/web_livechat/i18n/es.po
deleted file mode 100644
index 2df51c832a1..00000000000
--- a/addons/web_livechat/i18n/es.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Spanish 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 , 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-02-15 15:37+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Spanish \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "Ese contrato ya está registrado en el sistema."
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "editor_garantía.contrato"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Chat de asistencia"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr ""
-#~ "Permite soporte por chat para aquellos que ya tienen contrato de "
-#~ "mantenimiento"
diff --git a/addons/web_livechat/i18n/es_CR.po b/addons/web_livechat/i18n/es_CR.po
deleted file mode 100644
index c0bba0bc3f3..00000000000
--- a/addons/web_livechat/i18n/es_CR.po
+++ /dev/null
@@ -1,38 +0,0 @@
-# Spanish 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 , 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-02-18 23:24+0000\n"
-"Last-Translator: Carlos Vásquez (CLEARCORP) "
-"\n"
-"Language-Team: Spanish \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-19 05:43+0000\n"
-"X-Generator: Launchpad (build 14814)\n"
-"Language: es\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "Ese contrato ya está registrado en el sistema."
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "editor_garantía.contrato"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Chat de asistencia"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr ""
-#~ "Permite soporte por chat para aquellos que ya tienen contrato de "
-#~ "mantenimiento"
diff --git a/addons/web_livechat/i18n/es_MX.po b/addons/web_livechat/i18n/es_MX.po
deleted file mode 100644
index 1ae99905314..00000000000
--- a/addons/web_livechat/i18n/es_MX.po
+++ /dev/null
@@ -1,41 +0,0 @@
-# Spanish 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 , 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-02-15 15:37+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Spanish \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid ""
-"Your publisher warranty contract is already subscribed in the system !"
-msgstr "¡Su contrato de garantía del editor ya está inscrito en el sistema!"
-
-#. module: web_livechat
-#: model:ir.module.module,shortdesc:web_livechat.module_meta_information
-msgid "Live Chat Support"
-msgstr "Chat de asistencia"
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "editor_garantía.contrato"
-
-#. module: web_livechat
-#: model:ir.module.module,description:web_livechat.module_meta_information
-msgid "Enable live chat support for whom have a maintenance contract"
-msgstr ""
-"Permite soporte por chat para aquellos que ya tienen contrato de "
-"mantenimiento"
diff --git a/addons/web_livechat/i18n/es_VE.po b/addons/web_livechat/i18n/es_VE.po
deleted file mode 100644
index 1ae99905314..00000000000
--- a/addons/web_livechat/i18n/es_VE.po
+++ /dev/null
@@ -1,41 +0,0 @@
-# Spanish 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 , 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-02-15 15:37+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Spanish \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid ""
-"Your publisher warranty contract is already subscribed in the system !"
-msgstr "¡Su contrato de garantía del editor ya está inscrito en el sistema!"
-
-#. module: web_livechat
-#: model:ir.module.module,shortdesc:web_livechat.module_meta_information
-msgid "Live Chat Support"
-msgstr "Chat de asistencia"
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "editor_garantía.contrato"
-
-#. module: web_livechat
-#: model:ir.module.module,description:web_livechat.module_meta_information
-msgid "Enable live chat support for whom have a maintenance contract"
-msgstr ""
-"Permite soporte por chat para aquellos que ya tienen contrato de "
-"mantenimiento"
diff --git a/addons/web_livechat/i18n/fi.po b/addons/web_livechat/i18n/fi.po
deleted file mode 100644
index 10b984f68ab..00000000000
--- a/addons/web_livechat/i18n/fi.po
+++ /dev/null
@@ -1,34 +0,0 @@
-# Finnish 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 , 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-06-08 10:30+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Finnish \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "Sopimus on jo rekisteröity järjestelmään."
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr ""
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Chatin tuki"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr "Aloita chatti tuki ylläpitosopimuksen toimittajan kanssa"
diff --git a/addons/web_livechat/i18n/fr.po b/addons/web_livechat/i18n/fr.po
deleted file mode 100644
index 7a1a07f8bcf..00000000000
--- a/addons/web_livechat/i18n/fr.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# French 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 , 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-02-26 09:39+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: French \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "Ce contrat est déjà enregistré dans le système."
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "publisher_warranty.contract"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Support par messagerie instantanée"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr ""
-#~ "Valider le support par messagerie instantanée pour les détenteurs d'un "
-#~ "contrat de maintenance"
diff --git a/addons/web_livechat/i18n/gl.po b/addons/web_livechat/i18n/gl.po
deleted file mode 100644
index f78ff364431..00000000000
--- a/addons/web_livechat/i18n/gl.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# Galician 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 , 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-03-05 01:41+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Galician \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "O contrato xa está rexistrado no sistema."
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "editor_garantía.contrato"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Chat de asistencia"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr ""
-#~ "Permitir soporte por chat para aqueles que xa teñan contrato de mantemento"
diff --git a/addons/web_livechat/i18n/hr.po b/addons/web_livechat/i18n/hr.po
deleted file mode 100644
index 17a5919153b..00000000000
--- a/addons/web_livechat/i18n/hr.po
+++ /dev/null
@@ -1,34 +0,0 @@
-# Croatian 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 , 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-01-28 21:59+0000\n"
-"Last-Translator: Goran Kliska \n"
-"Language-Team: Croatian \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "Navedeni ugovor je već registriran u sustavu."
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "publisher_warranty.contract"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr "Omogući podršku za Live Chat za one koji imaju ugovor o održavanju"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Podrška za Live Chat"
diff --git a/addons/web_livechat/i18n/it.po b/addons/web_livechat/i18n/it.po
deleted file mode 100644
index 30f68ea8157..00000000000
--- a/addons/web_livechat/i18n/it.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# Italian 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 , 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-02-15 15:37+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Italian \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr ""
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "publisher_warranty.contract"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Supporto live chat"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr ""
-#~ "Abilita il supporto live chat per chi ha un contratto di manutenzione"
diff --git a/addons/web_livechat/i18n/ja.po b/addons/web_livechat/i18n/ja.po
deleted file mode 100644
index 1c50534b3ab..00000000000
--- a/addons/web_livechat/i18n/ja.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# Japanese translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-06-16 21:21+0000\n"
-"Last-Translator: Akira Hiyama \n"
-"Language-Team: Japanese \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-17 04:35+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "この契約は既にシステムに登録されています。"
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr ""
diff --git a/addons/web_livechat/i18n/sv.po b/addons/web_livechat/i18n/mn.po
similarity index 71%
rename from addons/web_livechat/i18n/sv.po
rename to addons/web_livechat/i18n/mn.po
index dd3ae799443..9ab220033ae 100644
--- a/addons/web_livechat/i18n/sv.po
+++ b/addons/web_livechat/i18n/mn.po
@@ -1,4 +1,4 @@
-# Swedish translation for openobject-addons
+# Mongolian translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR , 2012.
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-06-04 15:38+0000\n"
+"PO-Revision-Date: 2012-07-08 18:51+0000\n"
"Last-Translator: FULL NAME \n"
-"Language-Team: Swedish \n"
+"Language-Team: Mongolian \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-05 04:54+0000\n"
-"X-Generator: Launchpad (build 15353)\n"
+"X-Launchpad-Export-Date: 2012-07-09 04:51+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
#. module: web_livechat
#: sql_constraint:publisher_warranty.contract:0
msgid "That contract is already registered in the system."
-msgstr "Det kontraktet har redan registrerats i systemet."
+msgstr "Энэ гэрээг системд өмнө нь бүртгэгдсэн байна."
#. module: web_livechat
#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
diff --git a/addons/web_livechat/i18n/nl.po b/addons/web_livechat/i18n/nl.po
deleted file mode 100644
index db490d3768d..00000000000
--- a/addons/web_livechat/i18n/nl.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# Dutch 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 , 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-02-21 10:22+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) \n"
-"Language-Team: Dutch \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "Dat contract is al geregisteerd in het systeem."
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "publisher_warranty.contract"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Live Chat Support"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr ""
-#~ "Live chat support aanzetten voor diegenen die een onderhoudscontract hebben"
diff --git a/addons/web_livechat/i18n/oc.po b/addons/web_livechat/i18n/oc.po
deleted file mode 100644
index 00b746269f3..00000000000
--- a/addons/web_livechat/i18n/oc.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Occitan (post 1500) 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 , 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-11-20 09:29+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Occitan (post 1500) \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "Aqueste contracte es ja enregistrat dins lo sistèma."
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "publisher_warranty.contract"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Supòrt per messatjariá instantanèa"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr ""
-#~ "Validar lo supòrt per messatjariá instantanèa pels detentors d'un contracte "
-#~ "de mantenença"
diff --git a/addons/web_livechat/i18n/pt.po b/addons/web_livechat/i18n/pt.po
deleted file mode 100644
index d34c84f502b..00000000000
--- a/addons/web_livechat/i18n/pt.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Portuguese 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 , 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-07-31 22:18+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Portuguese \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "O contrato já está registado no sistema."
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "Copy text \t publisher_warranty.contract"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Suporte por mensagens instantâneas (chat)"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr ""
-#~ "Ativar suporte através de mensagens instantâneas para quem tenha contrato de "
-#~ "suporte"
diff --git a/addons/web_livechat/i18n/pt_BR.po b/addons/web_livechat/i18n/pt_BR.po
deleted file mode 100644
index d914a85facd..00000000000
--- a/addons/web_livechat/i18n/pt_BR.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# Brazilian Portuguese 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 , 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-01-18 02:51+0000\n"
-"Last-Translator: Rafael Sales - http://www.tompast.com.br \n"
-"Language-Team: Brazilian Portuguese \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "Esse contato já está registrado no sistema."
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "publisher_warranty.contract"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr ""
-#~ "Ativa o suporte com conversa ao vivo para quem tem um contrato de manutenção"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Suporte com Conversa ao Vivo"
diff --git a/addons/web_livechat/i18n/ro.po b/addons/web_livechat/i18n/ro.po
deleted file mode 100644
index 02d8930f340..00000000000
--- a/addons/web_livechat/i18n/ro.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Romanian translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-01-08 19:46+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Romanian \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "Acel contract este deja inregistrat in sistem."
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "publisher_warranty.contract (contract. garantie_editor)"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Asistentă tehnică pentru Discutiile online"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr ""
-#~ "Activează asistenta tehnică pentru discutiile online pentru cei care au un "
-#~ "contract de mentenantă."
diff --git a/addons/web_livechat/i18n/ru.po b/addons/web_livechat/i18n/ru.po
deleted file mode 100644
index 893a8328967..00000000000
--- a/addons/web_livechat/i18n/ru.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Russian 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 , 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-03-09 17:08+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Russian \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "Договор уже зарегистрирован в системе."
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "publisher_warranty.contract"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Техподдержка в режиме живого общения"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr ""
-#~ "Включить поддержку живого общения для тех, у кого есть договор на "
-#~ "обслуживание"
diff --git a/addons/web_livechat/i18n/sk.po b/addons/web_livechat/i18n/sk.po
deleted file mode 100644
index 5705a692a99..00000000000
--- a/addons/web_livechat/i18n/sk.po
+++ /dev/null
@@ -1,34 +0,0 @@
-# Slovak 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 , 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-02-21 13:46+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Slovak \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr ""
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "publisher_warranty.contract"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Live Chat Podpora"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr "Povoliť live chat podporu pre toho kto má servisnú zmluvu"
diff --git a/addons/web_livechat/i18n/sl.po b/addons/web_livechat/i18n/sl.po
deleted file mode 100644
index e772d67b8db..00000000000
--- a/addons/web_livechat/i18n/sl.po
+++ /dev/null
@@ -1,34 +0,0 @@
-# Slovenian 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 , 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-05-22 17:08+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Slovenian \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "Ta pogodba je v sistemu že vnešena"
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "publisher_warranty.contract"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Pomoč v živo"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr "Omogoči pomoč v živo za uporabnike z vzdrževalno pogodbo"
diff --git a/addons/web_livechat/i18n/sr@latin.po b/addons/web_livechat/i18n/sr@latin.po
deleted file mode 100644
index 7baff43edea..00000000000
--- a/addons/web_livechat/i18n/sr@latin.po
+++ /dev/null
@@ -1,34 +0,0 @@
-# Serbian Latin 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 , 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-10-17 13:43+0000\n"
-"Last-Translator: Milan Milosevic \n"
-"Language-Team: Serbian Latin \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr ""
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "publisher_warranty.contract"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr "Omogući podršku ćaskanja uživo za one koji imaju ugovor o održavanju"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Podrška ćaskanja uživo"
diff --git a/addons/web_livechat/i18n/tr.po b/addons/web_livechat/i18n/tr.po
deleted file mode 100644
index f9747e9d858..00000000000
--- a/addons/web_livechat/i18n/tr.po
+++ /dev/null
@@ -1,34 +0,0 @@
-# Turkish 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 , 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-04-26 14:31+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Turkish \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "Bu sözleşme sistemde zaten kayıtlı !"
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "publisher_warranty.contract"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "Canlı Sohbet Desteği"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr "Bakım sözleşmesi olanlar için canlı sohbet desteğini açar"
diff --git a/addons/web_livechat/i18n/web_livechat.pot b/addons/web_livechat/i18n/web_livechat.pot
deleted file mode 100644
index 1feb83270c6..00000000000
--- a/addons/web_livechat/i18n/web_livechat.pot
+++ /dev/null
@@ -1,46 +0,0 @@
-# #-#-#-#-# web_livechat.pot (OpenERP Server 6.1rc1) #-#-#-#-#
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * web_livechat
-#
-# #-#-#-#-# web_livechat.pot.web (PROJECT VERSION) #-#-#-#-#
-# Translations template for PROJECT.
-# Copyright (C) 2012 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR , 2012.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"#-#-#-#-# web_livechat.pot (OpenERP Server 6.1rc1) #-#-#-#-#\n"
-"Project-Id-Version: OpenERP Server 6.1rc1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-02-08 00:37+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-"#-#-#-#-# web_livechat.pot.web (PROJECT VERSION) #-#-#-#-#\n"
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: LANGUAGE \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr ""
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr ""
diff --git a/addons/web_livechat/i18n/zh_CN.po b/addons/web_livechat/i18n/zh_CN.po
deleted file mode 100644
index e8ce70adad1..00000000000
--- a/addons/web_livechat/i18n/zh_CN.po
+++ /dev/null
@@ -1,34 +0,0 @@
-# Chinese (Simplified) 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 , 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-04-08 07:20+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Chinese (Simplified) \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: web_livechat
-#: sql_constraint:publisher_warranty.contract:0
-msgid "That contract is already registered in the system."
-msgstr "该合同已登记到系统中。"
-
-#. module: web_livechat
-#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
-msgid "publisher_warranty.contract"
-msgstr "publisher_warranty.contract"
-
-#~ msgid "Live Chat Support"
-#~ msgstr "支持在线交流"
-
-#~ msgid "Enable live chat support for whom have a maintenance contract"
-#~ msgstr "其中一个维护合同支持在线交流"
diff --git a/addons/web_livechat/publisher_warranty.py b/addons/web_livechat/publisher_warranty.py
deleted file mode 100644
index 0328e4181a7..00000000000
--- a/addons/web_livechat/publisher_warranty.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2010-2011 OpenERP s.a. ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-from osv import osv
-from tools import cache
-
-def _gen_cache_clear(method):
- def func(self, cr, *args, **kwargs):
- s = super(publisher_warranty_contract, self)
- r = getattr(s, method)(cr, *args, **kwargs)
- self.is_livechat_enable.clear_cache(self)
- return r
- return func
-
-class publisher_warranty_contract(osv.osv):
- _inherit = 'publisher_warranty.contract'
-
- create = _gen_cache_clear('create')
- write = _gen_cache_clear('write')
- unlink = _gen_cache_clear('unlink')
-
- @cache(skiparg=3, timeout=300)
- def is_livechat_enable(self, cr, uid):
- domain = [('state', '=', 'valid'), ('check_support', '=', True)]
- return self.search_count(cr, uid, domain) != 0
-
-publisher_warranty_contract()
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/web_livechat/static/src/css/lc.css b/addons/web_livechat/static/src/css/lc.css
deleted file mode 100644
index 7f1876a2793..00000000000
--- a/addons/web_livechat/static/src/css/lc.css
+++ /dev/null
@@ -1,7 +0,0 @@
-.livechat span.online {
- text-shadow: 0 0 0.2em #9a0404, 0 0 0.2em #9a0404, 0 0 0.2em #9a0404, 0 0 0.2em #9a0404;
-}
-.livechat img {
- vertical-align: middle;
- margin-right: 0.5em;
-}
diff --git a/addons/web_livechat/static/src/img/available.png b/addons/web_livechat/static/src/img/available.png
deleted file mode 100644
index e9eea88ae5f..00000000000
Binary files a/addons/web_livechat/static/src/img/available.png and /dev/null differ
diff --git a/addons/web_livechat/static/src/img/away.png b/addons/web_livechat/static/src/img/away.png
deleted file mode 100644
index f0a0847059f..00000000000
Binary files a/addons/web_livechat/static/src/img/away.png and /dev/null differ
diff --git a/addons/web_livechat/static/src/img/busy.png b/addons/web_livechat/static/src/img/busy.png
deleted file mode 100644
index ddb24377f0f..00000000000
Binary files a/addons/web_livechat/static/src/img/busy.png and /dev/null differ
diff --git a/addons/web_livechat/static/src/js/web_livechat.js b/addons/web_livechat/static/src/js/web_livechat.js
deleted file mode 100644
index 540af94310f..00000000000
--- a/addons/web_livechat/static/src/js/web_livechat.js
+++ /dev/null
@@ -1,127 +0,0 @@
-/*############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2011-2012 OpenERP SA ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-############################################################################*/
-
-var __lc_buttons = [];
-
-openerp.web_livechat = function (openerp) {
-
-openerp.web_livechat.Livechat = openerp.web.Widget.extend({
- template: 'Systray.LiveChat',
-
- start: function() {
- this._super();
- if (!this.session)
- return;
- var self = this;
- var pwc = new openerp.web.Model("publisher_warranty.contract");
- pwc.get_func('is_livechat_enable')().then(function(res) {
- if(res) {
- self.$element.click(self.do_load_livechat);
- } else {
- self.$element.click(self.do_open_url);
- }
- });
- },
-
- do_open_url: function(evt) {
- evt.preventDefault();
- openerp.webclient.action_manager.do_action({type: 'ir.actions.act.url', url: 'http://www.openerp.com/support-or-publisher-warranty-contract', target: 'new'});
- },
-
- do_load_livechat: function(evt) {
- var self = this;
- if (evt) {
- evt.preventDefault();
- }
-
- this.$element.unbind('click', this.do_load_livechat);
-
- var lc_id = _.uniqueId('livechat_');
- this.$element.attr('id', lc_id);
-
- var pwc = new openerp.web.Model("publisher_warranty.contract");
-
- pwc.get_func('is_livechat_enable')().then(function(res) {
- if(!res) {
- return;
- }
-
- // connect to LiveChat
- __lc_load();
-
- __lc_buttons.push({
- elementId: lc_id, //'livechat_status',
- language: 'en',
- skill: '2',
- type: 'text',
- labels: {
- online: ' ',
- offline: ' ',
- }
- });
- });
- }
-});
-
-openerp.web.UserMenu.include({
- do_update: function() {
- var self = this;
- this._super.apply(this, arguments);
- this.update_promise.then(function() {
- if (self.livechat) {
- self.livechat.destroy();
- }
- self.livechat = new openerp.web_livechat.Livechat(self);
- self.livechat.appendTo(openerp.webclient.$element.find('.oe_systray'));
- });
- }
-});
-
-if (openerp.webclient) {
- // tracking code from LiveChat
- var license = '1035052',
- params = '',
- lang = 'en',
- skill = '0';
- __lc_load = function (p) {
- if (typeof __lc_loaded != 'function')
- if (p) {
- var d = document,
- l = d.createElement('script'),
- s = d.getElementsByTagName('script')[0],
- a = unescape('%26'),
- h = ('https:' == d.location.protocol ? 'https://' : 'http://');
- l.type = 'text/javascript';
- l.async = true;
- l.src = h + 'gis' + p +'.livechatinc.com/gis.cgi?serverType=control'+a+'licenseID='+license+a+'jsonp=__lc_load';
- if (!(typeof p['server'] !== 'string' || typeof __lc_serv === 'string')) {
- l.src = h + (__lc_serv = p['server']) + '/licence/'+license+'/script.cgi?lang='+lang+a+'groups='+skill;
- l.src += (params == '') ? '' : a+'params='+encodeURIComponent(encodeURIComponent(params));
- s.parentNode.insertBefore(l, s);
- } else
- setTimeout(__lc_load, 1000);
- if(typeof __lc_serv != 'string'){
- s.parentNode.insertBefore(l, s);
- }
- } else __lc_load(Math.ceil(Math.random()*5));
- }
-}
-
-};
diff --git a/addons/web_livechat/static/src/xml/web_livechat.xml b/addons/web_livechat/static/src/xml/web_livechat.xml
deleted file mode 100644
index 0f1bf073bc2..00000000000
--- a/addons/web_livechat/static/src/xml/web_livechat.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/addons/web_shortcuts/static/src/css/web_shortcuts.css b/addons/web_shortcuts/static/src/css/web_shortcuts.css
index e39f7870249..8424e146d06 100644
--- a/addons/web_shortcuts/static/src/css/web_shortcuts.css
+++ b/addons/web_shortcuts/static/src/css/web_shortcuts.css
@@ -1,6 +1,6 @@
/* Shortcuts*/
-.oe_systray_shortcuts {
- margin: 3px;
+.oe_systray_shortcuts .oe_star_off {
+ color: #eee;
}
.oe_shortcuts_toggle {
height: 20px;
diff --git a/addons/web_shortcuts/static/src/xml/web_shortcuts.xml b/addons/web_shortcuts/static/src/xml/web_shortcuts.xml
index ce4d61e66bd..0b9701f9f1a 100644
--- a/addons/web_shortcuts/static/src/xml/web_shortcuts.xml
+++ b/addons/web_shortcuts/static/src/xml/web_shortcuts.xml
@@ -3,8 +3,8 @@
-->
-
-
+
+ 7
diff --git a/addons/wiki/wizard/wiki_create_menu_view.xml b/addons/wiki/wizard/wiki_create_menu_view.xml
index 45c4ba6a487..213ca9dd2e2 100644
--- a/addons/wiki/wizard/wiki_create_menu_view.xml
+++ b/addons/wiki/wizard/wiki_create_menu_view.xml
@@ -10,15 +10,15 @@
form
-
+
diff --git a/addons/wiki/wizard/wiki_make_index_view.xml b/addons/wiki/wizard/wiki_make_index_view.xml
index c818721c09c..90139c3afac 100644
--- a/addons/wiki/wizard/wiki_make_index_view.xml
+++ b/addons/wiki/wizard/wiki_make_index_view.xml
@@ -10,13 +10,13 @@
form
-
-
-
+
diff --git a/addons/wiki/wizard/wiki_show_diff_view.xml b/addons/wiki/wizard/wiki_show_diff_view.xml
index c5b3583b1e5..4729586c858 100644
--- a/addons/wiki/wizard/wiki_show_diff_view.xml
+++ b/addons/wiki/wizard/wiki_show_diff_view.xml
@@ -10,11 +10,11 @@
form
-
+
diff --git a/addons/wiki/wizard/wiki_wiki_page_open_view.xml b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
index 9be2d4d22aa..49f333e453f 100644
--- a/addons/wiki/wizard/wiki_wiki_page_open_view.xml
+++ b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
@@ -10,12 +10,12 @@
form
-
-
+