diff --git a/addons/account/i18n/ja.po b/addons/account/i18n/ja.po index 21c7bea93f3..d71bbe0de56 100644 --- a/addons/account/i18n/ja.po +++ b/addons/account/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:35+0000\n" -"PO-Revision-Date: 2012-06-20 16:18+0000\n" -"Last-Translator: Raphael Collet (OpenERP) \n" +"PO-Revision-Date: 2012-07-06 02:41+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-22 04:38+0000\n" -"X-Generator: Launchpad (build 15461)\n" +"X-Launchpad-Export-Date: 2012-07-06 04:58+0000\n" +"X-Generator: Launchpad (build 15558)\n" #. module: account #: view:account.invoice.report:0 @@ -4942,7 +4942,7 @@ msgstr "会計表" #. module: account #: field:account.journal.column,name:0 msgid "Column Name" -msgstr "カラム名" +msgstr "列名" #. module: account #: view:account.general.journal:0 diff --git a/addons/analytic_contract_expense_project/__openerp__.py b/addons/analytic_contract_expense_project/__openerp__.py index 41e0bbd084a..9dc4c114743 100644 --- a/addons/analytic_contract_expense_project/__openerp__.py +++ b/addons/analytic_contract_expense_project/__openerp__.py @@ -23,7 +23,7 @@ { 'name': 'Projects Management: hr_expense link', 'version': '1.1', - 'category': 'Sales Management', + 'category': 'Hidden', 'description': """ This module is for modifying project view to show some data related to the hr_expense module. ====================================================================================================== diff --git a/addons/analytic_contract_hr_expense/__openerp__.py b/addons/analytic_contract_hr_expense/__openerp__.py index 981f7226d6a..fb56d3d1749 100644 --- a/addons/analytic_contract_hr_expense/__openerp__.py +++ b/addons/analytic_contract_hr_expense/__openerp__.py @@ -23,7 +23,7 @@ { 'name': 'Contracts Management: hr_expense link', 'version': '1.1', - 'category': 'Sales Management', + 'category': 'Hidden', 'description': """ This module is for modifying account analytic view to show some data related to the hr_expense module. ====================================================================================================== diff --git a/addons/analytic_contract_project/__openerp__.py b/addons/analytic_contract_project/__openerp__.py index ccf712dc987..7ad28c911ba 100644 --- a/addons/analytic_contract_project/__openerp__.py +++ b/addons/analytic_contract_project/__openerp__.py @@ -23,6 +23,7 @@ "name" : "Contract On Project", "version": "1.1", "author" : "OpenERP SA", + 'category': 'Hidden', "website" : "http://www.openerp.com", "depends" : ["project", "account_analytic_analysis"], "description": """ diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 2579fa75cda..85f9a4aab5d 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -289,7 +289,7 @@
- i + í
- - oe_kanban_text_red - - - - : - - + oe_kanban_text_red + + : +
- - + 7 + 7 -
- -
-
- - - - - - - + +
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -359,16 +363,25 @@ + 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_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..66f486dc9cc 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,45 @@
- - - - - - - +
+

+ , +

+

+
+
+
+
+

+
- - - + + + + + + - - - - - - - - + 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_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_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index 34a61654faa..1237cdb14f4 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 @@ - - - - - - - - - - + + + + + + - - - - - - - - + + + + + + + + + + + + + + +