From a02445bf2d9919585e87fcb0dae5b8b9a93075d5 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Fri, 8 Jun 2012 19:20:16 +0200
Subject: [PATCH 01/93] more improvement to chatter

bzr revid: mit@openerp.com-20120608172016-nkay98ce3yq8gc4o
---
 addons/mail/static/src/js/mail.js   | 15 ++++++++++++---
 addons/mail/static/src/xml/mail.xml | 16 ++++++++--------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 905e95f3aef..1133769a4ee 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -95,7 +95,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;
@@ -282,8 +282,8 @@ openerp.mail = function(session) {
                     ).appendTo(this.$element.children('div.oe_mail_thread_display:first'));
             // truncated: hide full-text, show summary, add buttons
             if (record.tr_body) {
-                var node_body = this.$element.find('span.oe_mail_msg_body:last').append(' <a href="#" class="reduce">[ ... Show less]</a>');
-                var node_body_short = this.$element.find('span.oe_mail_msg_body_short:last').append(' <a href="#" class="expand">[ ... Show more]</a>');
+                var node_body = this.$element.find('span.oe_mail_msg_body:last').append('... <a href="#" class="reduce">Less</a>');
+                var node_body_short = this.$element.find('span.oe_mail_msg_body_short:last').append('... <a href="#" class="expand">More</a>');
                 node_body.hide();
                 node_body.find('a:last').click(function() { node_body.hide(); node_body_short.show(); return false; });
                 node_body_short.find('a:last').click(function() { node_body_short.hide(); node_body.show(); return false; });
@@ -613,6 +613,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
@@ -672,6 +673,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 a34e362960b..9f5fb8cd818 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -72,27 +72,27 @@
     <t t-name="NoteDisplay">
         <p class="oe_mail_msg">
             <t t-if="params.thread_level > 0">
-                <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
+                <a href="#" class="intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
             </t>
             <span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
             <t t-if="record.tr_body"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></span></t><br/>
             <ul>
               <t t-if="display['show_reply']">
-                <li><a href="#" class="oe_mail_msg_reply oe_mail_oe_intlink">Reply</a><span class="oe_mail_oe_space oe_fade"> · </span></li>
+                <li><a href="#" class="oe_mail_msg_reply">Reply</a><span class="oe_mail_oe_space oe_fade"> · </span></li>
               </t>
               <t t-if="display['show_delete']">
                 <t t-if="thread._is_author(record.user_id[0])">
-                  <li><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete oe_mail_oe_intlink">Delete</a><span class="oe_mail_oe_space oe_fade"> · </span></li>
+                  <li><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete">Delete</a><span class="oe_mail_oe_space oe_fade"> · </span></li>
                 </t>
               </t>
               <t t-if="display['show_hide']">
                 <t t-if="!(thread._is_author(record.user_id[0]))">
-                  <li><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide oe_mail_oe_intlink">Hide</a><span class="oe_mail_oe_space oe_fade"> · </span></li>
+                  <li><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide">Hide</a><span class="oe_mail_oe_space oe_fade"> · </span></li>
                 </t>
               </t>
               <li>
                 <span class="oe_fade"><t t-raw="record.date"/>
-                  by <a href="#" class="intlink oe_mail_oe_intlink" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a>
+                  by <a href="#" class="intlink" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a>
                 </span>
               </li>
             </ul>
@@ -102,7 +102,7 @@
     <t t-name="EmailDisplay">
         <p class="oe_mail_msg oe_mail_msg_p_email_header">
             <t t-if="params.thread_level > 0">
-                <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
+                <a href="#" class="intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
             </t>
         </p>
         <p><span class="oe_mail_oe_bold">From:</span> <t t-esc="record.email_from"/></p>
@@ -115,12 +115,12 @@
         <ul>
           <t t-if="display['show_delete']">
             <t t-if="thread._is_author(record.user_id[0])">
-              <li><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete oe_mail_oe_intlink">Delete</a><span class="oe_mail_oe_space oe_fade"> · </span></li>
+              <li><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete">Delete</a><span class="oe_mail_oe_space oe_fade"> · </span></li>
             </t>
           </t>
           <t t-if="display['show_hide']">
             <t t-if="!(thread._is_author(record.user_id[0]))">
-              <li><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide oe_mail_oe_intlink">Hide</a><span class="oe_mail_oe_space oe_fade"> · </span></li>
+              <li><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide">Hide</a><span class="oe_mail_oe_space oe_fade"> · </span></li>
             </t>
           </t>
           <li>

From c54a82ef4f5148f3e9d3a84f9f712dd0cde712d4 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Thu, 14 Jun 2012 19:33:58 +0200
Subject: [PATCH 02/93] Fixed chatter textarea

bzr revid: mit@openerp.com-20120614173358-yto27o9cstqyb2sr
---
 addons/mail/static/src/xml/mail.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 5ff8a996116..9ea137916fe 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -45,9 +45,7 @@
     <div t-name="mail.Thread" class="oe_mail oe_mail_thread">
         <div class="oe_mail_thread_action">
             <img class="oe_mail_msg_image oe_left" alt="User img"/>
-            <div class="oe_mail_msg_content">
-                <textarea class="oe_mail oe_mail_action_textarea" placeholder="Add your comment here..." onfocus="this.value = '';"/>
-            </div>
+            <textarea class="oe_mail oe_mail_action_textarea" placeholder="Add your comment here..." onfocus="this.value = '';"/>
         </div>
         <div class="oe_mail_thread_display"></div>
         <div class="oe_mail_thread_more">

From 7ad658375fd805497e4d9e0ff318cb65a7c1abed Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 21 Jun 2012 11:43:33 +0530
Subject: [PATCH 03/93] [IMP]clean form view and improve hr employee form view

bzr revid: sgo@tinyerp.com-20120621061333-zfjlr55m0oo83f24
---
 addons/hr/hr_view.xml                         | 76 +++++++++----------
 addons/hr_attendance/hr_attendance_view.xml   |  4 +-
 addons/hr_holidays/hr_holidays_view.xml       |  5 +-
 addons/hr_payroll/hr_payroll_view.xml         | 46 +++++------
 addons/hr_timesheet/hr_timesheet_view.xml     |  2 +-
 .../hr_timesheet_sheet_view.xml               | 11 +++
 6 files changed, 79 insertions(+), 65 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index c5fd64e586c..f46262309e7 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -26,54 +26,52 @@
                         <!-- Put here related buttons -->
                     </div>
                     <field class="oe_right" name="photo" widget='image' on_change="onchange_photo(photo)"/>
-                    <div class="oe_title">
-                        <label for="name" class="oe_edit_only"/>
-                        <h1><field name="name"/></h1>
-
-                        <label for="company_id" class="oe_edit_only" groups="base.group_multi_company"/>
-                        <h2><field name="company_id" widget="selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/></h2>
-
-                        <label for="department_id" class="oe_edit_only"/>
-                        <h2><field name="department_id" on_change="onchange_department_id(department_id)"/></h2>
-                    </div>
+                    <label for="name" class="oe_edit_only"/>
+                       <h1><field name="name"/>,
+                        <field name="company_id" class="oe_inline" widget="selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/>at
+                        <field name="job_id" class="oe_inline oe_edit_only" domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
+                    </h1>
+                    <label for="department_id" class="oe_edit_only"/>
+                    <h2><field name="department_id" on_change="onchange_department_id(department_id)"/></h2>
+                    <h3><field name="category_ids" widget="many2many_tags"/></h3>
+                    <group colspan="4" col="4">
+                        <field name="work_email" widget="email" />
+                        <field name="work_phone"/>
+                        <field name="address_id" on_change="onchange_address_id(address_id)" />
+                        <field name="mobile_phone"/>
+                    </group>
                     <notebook>
                         <page string="Personal Information">
                             <group>
-                                <group string="General">
-                                    <field name="user_id" on_change="onchange_user(user_id)"/>
-                                    <field name="active"/>
+                                <group string="Linked User" colspan="4" col="4">
+                                    <field name="identification_id" groups="base.group_hr_user"/>
                                     <field name="parent_id" />
+                                    <field name="passport_id" groups="base.group_hr_user"/>
+                                    <field name="coach_id"/>
+                                    <field name="otherid" groups="base.group_hr_user"/>
+                                    <field name="active"/>
                                 </group>
-                                <group groups="base.group_hr_user" string="Social IDs">
-                                    <field name="identification_id"/>
-                                    <field name="passport_id"/>
-                                    <field name="otherid"/>
-                                </group>
-                                <group groups="base.group_hr_user" string="Status">
-                                    <field name="gender"/>
-                                    <field name="marital"/>
-                                    <field name="country_id"/>
+                                <!-- <group string="General">
+                                    <field name="user_id" on_change="onchange_user(user_id)"/>
+                                </group> -->
+                               <!--  <group groups="base.group_hr_user" string="Status">
                                     <field name="birthday"/>
-                                </group>
-                                <group string="Contact Information">
-                                    <field name="address_home_id"/>
-                                    <field name="address_id" on_change="onchange_address_id(address_id)" />
-                                    <field name="work_phone"/>
-                                    <field name="mobile_phone"/>
-                                    <field name="work_email" widget="email" />
+                                </group> -->
+                                <!-- <group string="Contact Information">
                                     <field name="work_location"/>
-                                </group>
-                                <group string="Job Information">
-                                    <field name="job_id" domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
-                                    <field name="coach_id" />
-                                </group>
+                                </group> -->
                             </group>
+                            <separator string="Notes"/>
+                            <field name="notes" placeholder="Other Information ..."/>
                         </page>
-                        <page string="Categories" groups="base.group_hr_user">
-                            <field name="category_ids" widget="many2many_tags"/>
-                        </page>
-                        <page string="Notes" groups="base.group_hr_user">
-                            <field name="notes"/>
+                        <page string="Miscellaneous" groups="base.group_hr_user">
+                            <group colspan="4" col="4">
+                                 <field name="country_id"/>
+                                 <field name="gender"/>
+                                 <field name="marital"/>
+                                 <field name="address_home_id"/>
+                                 <field name="birthday"/>
+                            </group>
                         </page>
                     </notebook>
                     </sheet>
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 92e2a8bcbed..627d6057a88 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -133,8 +133,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <field name="coach_id" position="after">
-                    <group colspan="2">
+                <field name="active" position="before">
+                    <group colspan="2" col="5">
                         <field name="state"/>
                         <button name="attendance_action_change" states="present" string="Sign Out" type="object" icon="gtk-go-forward" context="{'type':'sign_out'}" groups="base.group_hr_user"/>
                         <button name="attendance_action_change" states="absent" string="Sign In" type="object" icon="gtk-go-back" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 4342fb145e5..cd43704d6e4 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -491,7 +491,10 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <field name="coach_id" position="after">
+                <div class="oe_right oe_button_box" position="inside">
+                     <button name="%(act_hr_employee_holiday_request)d" string="Leaves" type="action"/>
+                 </div>
+                <field name="active" position="before">
                     <field name="remaining_leaves"/>
                 </field>
             </field>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 4770e82481e..4139a0a265f 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -14,24 +14,26 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="//page[@string='Personal Information']" position="after">
-                    <page string="Miscellaneous" groups="base.group_hr_user">
-                        <group colspan="2" col="2">
-                            <separator string="Personal Info" colspan="2"/>
-                            <field name="bank_account_id" context="{'display_partner':True, 'partner_id':partner_id}"/>
-                            <field name="place_of_birth"/>
-                            <field name="children"/>
-                            <!-- <field name="basic" invisible="0"/> -->
-                        </group>
-                        <group colspan="2" col="2">
-                            <separator string="Job Info" colspan="2"/>
-                            <field name="manager" select="1"/>
-                            <field name="vehicle" select="1"/>
-                            <field name="vehicle_distance" select="1"/>
-                            <field name="medic_exam" select="1" string="Medical Examination"/>
-                        </group>
-                    </page>
-                </xpath>
+                <div class="oe_right oe_button_box" position="inside">
+                     <button name="%(act_hr_employee_payslip_list)d" string="Payslips" type="action"/>
+                 </div>
+                  <xpath expr="//field[@name='identification_id']" position="before">
+                    <field name="manager" select="1"/>
+                 </xpath>
+                 <field name="otherid" position="after">
+                         <field name="vehicle" select="1"/>
+                         <field name="medic_exam" select="1" string="Medical Examination"/>
+                         <field name="vehicle_distance" select="1"/>
+                  </field>
+                <field name="address_home_id" position="after">
+                    <field name="children"/>
+                </field>
+                <field name="birthday" position="after">
+                    <field name="place_of_birth"/>
+                </field>
+                <field name="marital" position="before">
+                    <field name="bank_account_id" context="{'display_partner':True, 'partner_id':partner_id}"/>
+                </field>
             </data>
             </field>
         </record>
@@ -45,9 +47,10 @@
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="//group[@name='right_column']" position="before">
-                    <separator string="Payslip Info" colspan="2"/>
-                    <field name="struct_id" required="1"/>
+                <xpath expr="//group[@name='right_column']" position="inside">
+                    <group string="Payslip Info" colspan="2" col="2">
+                        <field name="struct_id" required="1"/>
+                    </group>
                 </xpath>
                  <xpath expr="//field[@name='working_hours']" position="after">
                     <field name="schedule_pay"/>
@@ -753,7 +756,6 @@
         <!--  Shortcuts -->
 
         <act_window name="Payslips"
-            domain="[('employee_id', '=', active_id)]"
             context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
             res_model="hr.payslip"
             src_model="hr.employee"
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 4c5c22d9894..ad7a5733d04 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -98,7 +98,7 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <page string="Categories" position="after">
+                <page string="Personal Information" position="after">
                     <page string="Timesheets" groups="base.group_hr_user">
                         <field name="product_id" domain="[('type','=','service')]"/>
                         <field name="journal_id" widget="selection"/>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 3ed1b943ced..bfe98177734 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -366,6 +366,17 @@
                 </tree>
             </field>
         </record>
+        
+        <record id="hr_timesheet_sheet_employee_extd_form" model="ir.ui.view">
+            <field name="name">hr.timesheet.sheet.employee.extd_form</field>
+            <field name="model">hr.employee</field>
+            <field name="inherit_id" ref="hr.view_employee_form"/>
+            <field name="arch" type="xml">
+                <div class="oe_right oe_button_box" position="inside">
+                     <button name="%(act_hr_employee_2_hr_timesheet)d" string="Timesheets" type="action"/>
+                 </div>
+            </field>
+        </record>
 
   <!-- Timesheet Button on Employee Form -->
   <act_window

From 3f068c097be477c21fe17779de055830f7d905d1 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 21 Jun 2012 12:26:08 +0530
Subject: [PATCH 04/93] [IMP]Payslip Info and Advantage should be in 2 columns

bzr revid: sgo@tinyerp.com-20120621065608-5mw14bj3iwec2z0o
---
 addons/hr_contract/hr_contract_view.xml |  8 ++-
 addons/hr_payroll/hr_payroll_view.xml   | 80 ++++++++++++-------------
 2 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 142cb6b7667..83cd1ee7b0b 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -87,15 +87,17 @@
                                     <field name="trial_date_start" />
                                     <field name="trial_date_end" />
                                 </group>
-                                <group name="right_column" string="Advantages">
-                                    <field name="advantages" nolabel="1" colspan="2"/>
+                                <group name="right_column" colspan="4" col="4">
+                                    <group string="Advantages" colspan="2" col="2">
+                                        <field name="advantages" nolabel="1" />
+                                    </group>
                                 </group>
                             </group>
                             <separator string="Notes"/>
                             <field name="notes"/>
                         </page>
                         <page string="Work Permit">
-                            <group string="Valid for">
+                            <group>
                                 <field name="visa_no"/>
                                 <field name="permit_no"/>
                                 <field name="visa_expire"/>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 4139a0a265f..51f25c03271 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -6,37 +6,8 @@
         <menuitem id="payroll_configure" parent="hr.menu_hr_configuration" name="Payroll" groups="base.group_hr_manager" sequence="45"/>
         <menuitem id="menu_hr_root_payroll" parent="hr.menu_hr_root" name="Payroll" sequence="30"/>
         <menuitem id="menu_hr_payroll_reporting" parent="hr.menu_hr_reporting" name="Payroll" groups="base.group_hr_manager"/>
-
-        <!-- Employee View -->
-        <record id="hr_contract.hr_hr_employee_view_form2" model="ir.ui.view">
-            <field name="name">hr.hr.employee.view.form2</field>
-            <field name="model">hr.employee</field>
-            <field name="inherit_id" ref="hr.view_employee_form"/>
-            <field name="arch" type="xml">
-            <data>
-                <div class="oe_right oe_button_box" position="inside">
-                     <button name="%(act_hr_employee_payslip_list)d" string="Payslips" type="action"/>
-                 </div>
-                  <xpath expr="//field[@name='identification_id']" position="before">
-                    <field name="manager" select="1"/>
-                 </xpath>
-                 <field name="otherid" position="after">
-                         <field name="vehicle" select="1"/>
-                         <field name="medic_exam" select="1" string="Medical Examination"/>
-                         <field name="vehicle_distance" select="1"/>
-                  </field>
-                <field name="address_home_id" position="after">
-                    <field name="children"/>
-                </field>
-                <field name="birthday" position="after">
-                    <field name="place_of_birth"/>
-                </field>
-                <field name="marital" position="before">
-                    <field name="bank_account_id" context="{'display_partner':True, 'partner_id':partner_id}"/>
-                </field>
-            </data>
-            </field>
-        </record>
+        
+        
         <!-- End Employee View -->
 
         <!-- Contract View -->
@@ -47,7 +18,7 @@
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="//group[@name='right_column']" position="inside">
+                <xpath expr="//group[@string='Advantages']" position="before">
                     <group string="Payslip Info" colspan="2" col="2">
                         <field name="struct_id" required="1"/>
                     </group>
@@ -416,7 +387,44 @@
             <field name="search_view_id" ref="view_hr_payslip_filter"/>
         </record>
         <menuitem action="action_view_hr_payslip_form" id="menu_department_tree" parent="menu_hr_root_payroll"/>
+        <act_window name="Payslips"
+                    context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
+                    res_model="hr.payslip"
+                    src_model="hr.employee"
+                    view_id ="view_hr_payslip_tree"
+                    id="act_hr_employee_payslip_list"
+                    groups="base.group_hr_manager"/>
 
+        <!-- Employee View -->
+        <record id="hr_contract.hr_hr_employee_view_form2" model="ir.ui.view">
+            <field name="name">hr.hr.employee.view.form2</field>
+            <field name="model">hr.employee</field>
+            <field name="inherit_id" ref="hr.view_employee_form"/>
+            <field name="arch" type="xml">
+            <data>
+                <div class="oe_right oe_button_box" position="inside">
+                     <button name="%(act_hr_employee_payslip_list)d" string="Payslips" type="action"/>
+                 </div>
+                  <xpath expr="//field[@name='identification_id']" position="before">
+                    <field name="manager" select="1"/>
+                 </xpath>
+                 <field name="otherid" position="after">
+                         <field name="vehicle" select="1"/>
+                         <field name="medic_exam" select="1" string="Medical Examination"/>
+                         <field name="vehicle_distance" select="1"/>
+                  </field>
+                <field name="address_home_id" position="after">
+                    <field name="children"/>
+                </field>
+                <field name="birthday" position="after">
+                    <field name="place_of_birth"/>
+                </field>
+                <field name="marital" position="before">
+                    <field name="bank_account_id" context="{'display_partner':True, 'partner_id':partner_id}"/>
+                </field>
+            </data>
+            </field>
+        </record>
         <!-- Salary Category-->
         <record id="hr_salary_rule_category_form" model="ir.ui.view">
             <field name="name">hr.salary.rule.category.form</field>
@@ -755,14 +763,6 @@
 
         <!--  Shortcuts -->
 
-        <act_window name="Payslips"
-            context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
-            res_model="hr.payslip"
-            src_model="hr.employee"
-            view_id ="view_hr_payslip_tree"
-            id="act_hr_employee_payslip_list"
-            groups="base.group_hr_manager"/>
-
         <act_window name="Payslip Computation Details"
         	domain="[('slip_id', '=', active_id)]"
         	context="{'default_slip_id': active_id}"

From 4f72ea02f9147c58d7dd521599d2306ba8aaa909 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 21 Jun 2012 14:00:53 +0530
Subject: [PATCH 05/93] [IMP]change view in hr_timesheet and hr_payroll

bzr revid: sgo@tinyerp.com-20120621083053-ojvyk5t2qm4m42ey
---
 addons/hr_recruitment/hr_recruitment.py       |  2 +-
 addons/hr_recruitment/hr_recruitment_view.xml | 20 +++++++++----------
 .../hr_timesheet_sheet_view.xml               | 12 +++++------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index c893755c7c0..48649f8aa96 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -200,7 +200,7 @@ class hr_applicant(base_stage, osv.Model):
                       If the case needs to be reviewed then the state is \
                       set to \'Pending\'.'),
         'company_id': fields.many2one('res.company', 'Company'),
-        'user_id': fields.many2one('res.users', 'Responsible'),
+        'user_id': fields.many2one('res.users', 'HR Manager'),
         # Applicant Columns
         'date_closed': fields.datetime('Closed', readonly=True, select=True),
         'date_open': fields.datetime('Opened', readonly=True, select=True),
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 63263d78c9d..24682f7be37 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -111,25 +111,29 @@
                 </div>
                 <div class="oe_title">
                     <label for="name" class="oe_edit_only"/>
-                    <h1><field name="name"/></h1>
+                    <h1><field name="name" string="Subject"/></h1>
                     <label for="partner_name" class="oe_edit_only"/>
-                    <h2><field name="partner_name"/></h2>
+                    <h2><field name="partner_name"/>
                     <field name="type_id" placeholder="Degree"/>
+                    apply for<field name="job_id" on_change="onchange_job(job_id)"/>
+                    </h2>
                 </div>
 
                 <group>
                     <group>
                         <field name="user_id"/>
-                        <field name="title_action"/>
-                        <field name="date_action"/>
+                        <label for="title_action"/>
+                        <div>
+                            <field name="date_action" nolabel="1"/> -
+                            <field name="title_action" class="oe_inline" nolabel="1" placeholder="Call for proposal"/>
+                        </div>
                     </group>
                     <group>
-                        <field name="job_id" on_change="onchange_job(job_id)"/>
                         <field name="priority" string="Appreciation"/>
                         <field name="survey" invisible="1"/>
                         <field name="response" invisible="1"/>
                         <field name="department_id" widget="selection" on_change="onchange_department_id(department_id)"/>
-                        <field name="state" groups="base.group_no_one"/>
+                        <field name="state" nolabel="1" groups="base.group_no_one"/>
                     </group>
                 </group>
                 <notebook>
@@ -140,10 +144,6 @@
                                 <div>
                                     <field name="partner_id" class="oe_inline"
                                         on_change="onchange_partner_id(partner_id, email_from)"/>
-                                    <button class="oe_inline"
-                                        string="Create" help="Create a new contact for this applicant" icon="gtk-index"
-                                        name="%(action_hr_recruitment_partner_create)d" type="action"
-                                        attrs="{'invisible':[('partner_id','!=',False)]}"/>
                                 </div>
                                 <field name="email_from" widget="email"/>
                                 <field name="partner_phone"/>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index bfe98177734..1eb0bffd5d3 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -367,7 +367,12 @@
             </field>
         </record>
         
-        <record id="hr_timesheet_sheet_employee_extd_form" model="ir.ui.view">
+  <!-- Timesheet Button on Employee Form -->
+  <act_window
+           context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
+           id="act_hr_employee_2_hr_timesheet" name="Timesheets" res_model="hr_timesheet_sheet.sheet" src_model="hr.employee"/>
+           
+      <record id="hr_timesheet_sheet_employee_extd_form" model="ir.ui.view">
             <field name="name">hr.timesheet.sheet.employee.extd_form</field>
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
@@ -378,10 +383,5 @@
             </field>
         </record>
 
-  <!-- Timesheet Button on Employee Form -->
-  <act_window
-           context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
-           id="act_hr_employee_2_hr_timesheet" name="Timesheets" res_model="hr_timesheet_sheet.sheet" src_model="hr.employee"/>
-
     </data>
 </openerp>

From 1e7817740b65511e63baa6e991a5150003eef4f1 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 21 Jun 2012 14:20:13 +0530
Subject: [PATCH 06/93] [IMP]improve and clean hr_timesheet_sheet

bzr revid: sgo@tinyerp.com-20120621085013-sz80dz60mq18f0jn
---
 .../hr_timesheet_sheet_view.xml                  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 1eb0bffd5d3..1486a346fc9 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -75,14 +75,14 @@
                     <h1><field name="employee_id" on_change="onchange_employee_id(employee_id)"/></h1>
                     <label for="date_from" class="oe_edit_only" string="Timesheet Period"/>
                     <h2>
-                        From <field name="date_from"/>
+                        From <field name="date_from" />
                         to <field name="date_to"/>
                     </h2>
                     <group col="4">
-                        <field name="name"/>
-                        <field name="department_id"/>
-                        <field name="company_id" groups="base.group_multi_company"/>
-                        <field name="user_id" invisible="1"/>
+                        <field name="name" class="oe_edit_only"/>
+                        <field name="department_id" class="oe_edit_only"/>
+                        <field name="company_id" groups="base.group_multi_company" class="oe_edit_only"/>
+                        <field name="user_id" invisible="1" class="oe_edit_only"/>
                     </group>
                     <notebook>
                         <page string="Daily">
@@ -149,9 +149,9 @@
                                 </tree>
                             </field>
                             <group colspan="4" col="6">
-                                <field name="total_attendance" widget="float_time"/>
-                                <field name="total_timesheet" widget="float_time"/>
-                                <field name="total_difference" widget="float_time"/>
+                                <field name="total_attendance" widget="float_time" class="oe_edit_only"/>
+                                <field name="total_timesheet" widget="float_time" class="oe_edit_only"/>
+                                <field name="total_difference" widget="float_time" class="oe_edit_only"/>
                             </group>
                         </page>
                     </notebook>

From 5b6c2985f732a8bd06ec26b377046c4859d10088 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 21 Jun 2012 14:36:02 +0530
Subject: [PATCH 07/93] [IMP]improve and clean hr_expense

bzr revid: sgo@tinyerp.com-20120621090602-m72nm166odf8h05k
---
 addons/hr_expense/hr_expense_view.xml | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index e57f20734eb..7e3e928a1e1 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -86,22 +86,17 @@
                         <page string="Description">
                             <field name="line_ids" context="{'currency_id': currency_id}">
                                 <form string="Expense Lines" version="7.0">
-                                    <group col="6" colspan="4">
+                                    <group col="4" colspan="4">
                                         <field name="product_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id, context)" context="{'default_hr_expense_ok':1}"/>
-                                        <field name="name" colspan="4"/>
-                                        <newline/>
                                         <field name="unit_amount"/>
-                                        <field name="unit_quantity"/>
-                                        <field name="uom_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id, context)"/>
-                                    </group>
-                                    <group colspan="2" col="2" groups="analytic.group_analytic_accounting">
-                                        <separator string="Customer Project" colspan="2"/>
-                                        <field domain="[('type','=','normal')]" name="analytic_account"/>
-                                    </group>
-                                    <group colspan="2" col="2">
-                                        <separator string="References" colspan="2"/>
-                                        <field name="date_value" />
+                                        <field name="name"/>
+                                        <group colspan="2" col="4">
+                                            <field name="unit_quantity"/>
+                                            <field name="uom_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id, context)" class="oe_edit_only"/>
+                                        </group>
                                         <field name="ref"/>
+                                        <field name="date_value" />
+                                        <field domain="[('type','=','normal')]" name="analytic_account" groups="analytic.group_analytic_accounting"/>
                                     </group>
                                 </form>
                             </field>

From 33473284a3062c30f8bdf15e2ba1b565bdbfde4e Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 21 Jun 2012 15:26:46 +0530
Subject: [PATCH 08/93] [IMP]improve and clean hr_timesheet_sheet

bzr revid: sgo@tinyerp.com-20120621095646-t6dv93hfv8x1jkww
---
 addons/hr_holidays/hr_holidays_view.xml       | 18 ++++-----
 .../hr_timesheet_sheet_view.xml               | 38 ++++++++++---------
 2 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index cd43704d6e4..66c0ec04280 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -73,23 +73,21 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                 </header>
                 <sheet string="Leave Request" layout="auto">
-                    <group col="8" colspan="4">
+                    <group col="4" colspan="4">
                     <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
+                    <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft'), ('state','!=','confirm')],'invisible':[('holiday_type','=','employee')]}"/>
                     <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_user"/>
-                    <group attrs="{'invisible':[('holiday_type','=','employee')]}">
-                        <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft'), ('state','!=','confirm')]}"/>
-                        </group>
-                        <group attrs="{'invisible':[('holiday_type','=','category')]}">
-                        <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')]}" groups="base.group_hr_user"/>
-                        </group>
+                    <group>
+                        <field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1"/>
+                        <field name="date_to" on_change="onchange_date_from(date_to, date_from)" required="1"/>
+                        <field name="number_of_days_temp"/>
+                    </group>
+                    <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')],'invisible':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General">
                             <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
                             <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
-                            <field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1"/>
-                            <field name="date_to" on_change="onchange_date_from(date_to, date_from)" required="1"/>
-                            <field name="number_of_days_temp"/>
                             <field name="double_validation" invisible="1"/>
                             <newline/>
                             <field name="manager_id" groups="base.group_no_one"/>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 1486a346fc9..e2f60eb3c93 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -78,11 +78,11 @@
                         From <field name="date_from" />
                         to <field name="date_to"/>
                     </h2>
-                    <group col="4">
-                        <field name="name" class="oe_edit_only"/>
-                        <field name="department_id" class="oe_edit_only"/>
-                        <field name="company_id" groups="base.group_multi_company" class="oe_edit_only"/>
-                        <field name="user_id" invisible="1" class="oe_edit_only"/>
+                    <group col="4" class="oe_edit_only">
+                        <field name="name"/>
+                        <field name="department_id"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
+                        <field name="user_id" invisible="1"/>
                     </group>
                     <notebook>
                         <page string="Daily">
@@ -94,19 +94,23 @@
                                 <button name="date_today" string="Today" type="object" icon="terp-go-today"/>
                                 <button icon="terp-gtk-go-back-rtl" name="date_next" string="" type="object"/>
                             </group>
-
-                            <field colspan="3" context="{'name':date_current,'user_id':user_id}" height="100" name="attendances_ids" nolabel="1">
-                                <tree string="Attendances" editable="bottom">
-                                    <field name="name"/>
-                                    <field name="action"/>
-                                    <field invisible="1" name="employee_id"/>
-                                </tree>
-                            </field>
-                            <group col="4" colspan="1">
+                            <group colspan="4" col="3">
+                                <field context="{'name':date_current,'user_id':user_id}" name="attendances_ids" nolabel="1">
+                                    <tree string="Attendances" editable="bottom">
+                                        <field name="name"/>
+                                        <field name="action"/>
+                                        <field invisible="1" name="employee_id"/>
+                                    </tree>
+                                </field>
+                                <group colspan="2" col="2">
+                                    <button name="sign_in" string="Sign In" type="object" icon="terp-gtk-jump-to-ltr"/>
+                                    <button name="sign_out" string="Sign Out" type="object" icon="terp-gtk-jump-to-rtl"/>
+                                </group>
+                            </group>
+                            
+                            <group col="4">
                                 <field name="state_attendance"/>
-                                <button name="sign_in" string="Sign In" type="object" icon="terp-gtk-jump-to-ltr"/>
-                                <button name="sign_out" string="Sign Out" type="object" icon="terp-gtk-jump-to-rtl"/>
-                                <field name="total_attendance_day" widget="float_time" colspan="4"/>
+                                <field name="total_attendance_day" widget="float_time"/>
                             </group>
                             <field colspan="4" context="{'date':date_current,'user_id':user_id}" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1">
                                 <tree editable="top" string="Timesheet Lines">

From b58e3b19b123d0e5fd4b4488ebf6d21efe705eed Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 21 Jun 2012 17:04:28 +0530
Subject: [PATCH 09/93] [IMP]improve and clean hr_timesheet_sheet hr_holidays
 and hr_evaluation

bzr revid: sgo@tinyerp.com-20120621113428-gefe64xwyeh4dfwr
---
 addons/hr_evaluation/hr_evaluation_view.xml   | 31 ++++++++++---------
 addons/hr_holidays/hr_holidays_view.xml       | 25 +++++++--------
 .../hr_timesheet_sheet_view.xml               | 10 +++---
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 982ea1c4000..5769bbdce0b 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -132,7 +132,7 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <page string="Notes" position="before">
+                <page string="Miscellaneous" position="after">
                     <page string="Appraisal" groups="base.group_hr_user">
                         <field name="evaluation_plan_id" on_change="onchange_evaluation_plan_id(evaluation_plan_id, evaluation_date)"/>
                         <field name="evaluation_date"/>
@@ -157,14 +157,17 @@
                 </header>
                 <sheet>
                     <group>
-                        <group string="Appraisal Data">
-                            <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
-                            <field name="plan_id"/>
+                        <label for="employee_id" class="oe_edit_only"/>
+                         <h1><field name="employee_id" on_change="onchange_employee_id(employee_id)"/></h1>
+                         
+                        <label for="plan_id" class="oe_edit_only"/>
+                         <h1><field name="plan_id"/></h1>
+                         <group colspan="4" col="3">
                             <field name="date"/>
-                        </group>
-                        <group attrs="{'invisible':['|', ('state','=','draft'), ('state', '=', 'wait')]}" string="Ending Summary">
-                            <field name="rating" attrs="{'readonly':[('state','&lt;&gt;','progress')]}"/>
-                            <field name="date_close" readonly="1"/>
+                            <group attrs="{'invisible':['|', ('state','=','draft'), ('state', '=', 'wait')]}">
+                                <field name="rating" attrs="{'readonly':[('state','&lt;&gt;','progress')]}"/>
+                                <field name="date_close" readonly="1"/>
+                            </group>
                         </group>
                     </group>
                     <notebook>
@@ -178,11 +181,11 @@
                                             <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="done" icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0,}" attrs="{'readonly':[('response','=',False)]}" />
                                         </div>
                                         <field name="date_deadline"/>
-                                        <field name="response" readonly="1"/>
                                         <field name="user_to_review_id"/>
+                                        <field name="response" readonly="1"/>
                                         <field name="user_id" string="Interviewer"/>
                                     </group>
-                                    <group col="4" string="Status">
+                                    <group col="4" string="Status" invisible="1">
                                          <field name="state"/>
                                          <div>
                                              <button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" />
@@ -287,12 +290,12 @@
                     </header>
                     <sheet>
                         <group col="4">
-                             <field name="user_to_review_id"/>
-                             <field name="user_id" string="Interviewer"/>
-                             <field name="date_deadline"/>
                              <field name="survey_id"/>
-                             <field name="evaluation_id"/>
+                             <field name="date_deadline"/>
+                             <field name="user_to_review_id"/>
                              <field name="response" readonly="1"/>
+                             <field name="user_id" string="Interviewer"/>
+                             <field name="evaluation_id"/>
                         </group>
                     </sheet>
                 </form>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 66c0ec04280..25d471d622a 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -75,25 +75,25 @@
                 <sheet string="Leave Request" layout="auto">
                     <group col="4" colspan="4">
                     <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
-                    <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft'), ('state','!=','confirm')],'invisible':[('holiday_type','=','employee')]}"/>
+                    <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
                     <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_user"/>
-                    <group>
+                    <label for="number_of_days_temp"/>
+                    <div>
                         <field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1"/>
                         <field name="date_to" on_change="onchange_date_from(date_to, date_from)" required="1"/>
-                        <field name="number_of_days_temp"/>
-                    </group>
+                        <field name="number_of_days_temp" string="Duration"/>
+                    </div>
+                    <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft'), ('state','!=','confirm')],'invisible':[('holiday_type','=','employee')]}"/>
                     <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')],'invisible':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General">
-                            <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
                             <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
                             <field name="double_validation" invisible="1"/>
                             <newline/>
                             <field name="manager_id" groups="base.group_no_one"/>
                             <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}" groups="base.group_no_one"/>
-                            <separator string="Reasons" colspan="4"/>
-                            <field name="notes" nolabel="1" colspan="4"/>
+                            <field name="notes" nolabel="1" colspan="4" placeholder="Add a reason..."/>
                         </page>
                     </notebook>
                 </sheet>
@@ -120,24 +120,23 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                 </header>
                 <sheet>
-                <group>
+                <group colspan="4" col="4">
                     <field name="name"/>
+                    <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
                     <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Mode" groups="base.group_hr_manager"/>
+                    <field name="number_of_days_temp"/>
                     <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')], 'invisible':[('holiday_type','=','category')]}"/>
                     <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')], 'invisible':[('holiday_type','=','employee')]}"/>
+                    <field name="department_id" attrs="{'readonly':['|', ('holiday_type','=','category'), ('state','not in' ,('draft', 'confirm'))]}"/>
                 </group>
                 <notebook>
                     <page string="General">
                         <group col="4">
-                            <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
-                            <field name="department_id" attrs="{'readonly':['|', ('holiday_type','=','category'), ('state','not in' ,('draft', 'confirm'))]}"/>
-                            <field name="number_of_days_temp"/>
                             <field name="double_validation" invisible="1"/>
                             <field name="manager_id"/>
                             <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
                         </group>
-                        <separator string="Reasons"/>
-                        <field name="notes"/>
+                        <field name="notes" placeholder="Add a reason..."/>
                     </page>
                 </notebook>
             </sheet>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index e2f60eb3c93..ba067b458c0 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -78,10 +78,13 @@
                         From <field name="date_from" />
                         to <field name="date_to"/>
                     </h2>
-                    <group col="4" class="oe_edit_only">
+                    <group col="4" colspan="4">
                         <field name="name"/>
+                        <field name="total_attendance" widget="float_time"/>
                         <field name="department_id"/>
+                        <field name="total_timesheet" widget="float_time"/>
                         <field name="company_id" groups="base.group_multi_company"/>
+                        <field name="total_difference" widget="float_time"/>
                         <field name="user_id" invisible="1"/>
                     </group>
                     <notebook>
@@ -152,11 +155,6 @@
                                     <field name="total_difference" widget="float_time"/>
                                 </tree>
                             </field>
-                            <group colspan="4" col="6">
-                                <field name="total_attendance" widget="float_time" class="oe_edit_only"/>
-                                <field name="total_timesheet" widget="float_time" class="oe_edit_only"/>
-                                <field name="total_difference" widget="float_time" class="oe_edit_only"/>
-                            </group>
                         </page>
                     </notebook>
                 </sheet>

From cf2b8e1737388dc7d787be59a992a570d7020a97 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 21 Jun 2012 18:55:01 +0530
Subject: [PATCH 10/93] [IMP]improve and clean hr_department hr_job,
 hr_payroll_status,hr,hr_holidays as per new form view guidelines

bzr revid: sgo@tinyerp.com-20120621132501-srjmo019uho1mgif
---
 addons/hr/hr_department_view.xml        |  2 +-
 addons/hr/hr_view.xml                   | 28 +++++++++---------
 addons/hr_holidays/hr_holidays_view.xml | 18 +++---------
 addons/hr_payroll/hr_payroll_view.xml   | 39 +++++++++++++++----------
 4 files changed, 43 insertions(+), 44 deletions(-)

diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index d6fd393edf8..4387a9f6dd8 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -15,8 +15,8 @@
                 <form string="department" version="7.0">
                     <group col="4">
                         <field name="name"/>
-                        <field name="parent_id"/>
                         <field name="manager_id"/>
+                        <field name="parent_id"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
                 </form>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index f46262309e7..89ab6d2512c 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -357,17 +357,20 @@
                         <field name="state" widget="statusbar" statusbar_visible="recruit,open"/>
                     </header>
                     <sheet>
-                        <group>
-                            <group>
-                                <field name="name" />
-                                <field name="department_id" />
-                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                            </group>
-                            <group>
-                                <field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/>
-                                <field name="no_of_employee"/>
-                                <field name="expected_employees"/>
-                            </group>
+                        <label for="name" class="oe_edit_only"/>
+                        <h1>
+                            <field name="name" />
+                            (<field name="department_id"/>)
+                        </h1>
+                        <label for="employee_ids" class="oe_edit_only"/>
+                        <h2>
+                            <field name="employee_ids" widget="many2many_tags" mode="tree,form"/>
+                        </h2>
+                        <group col="4">
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                            <field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/>
+                            <field name="no_of_employee"/>
+                            <field name="expected_employees"/>
                         </group>
                         <notebook>
                             <page string="Description">
@@ -376,9 +379,6 @@
                                 <label for="requirements"/>
                                 <field name="requirements"/>
                             </page>
-                            <page string="Employees">
-                                <field name="employee_ids" widget="many2many" mode="tree,form"/>
-                            </page>
                         </notebook>
                     </sheet>
                 </form>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index c55b7cc7678..89e0bf10339 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -368,22 +368,12 @@
                 <form string="Leave Type" version="7.0">
                     <group col="4">
                         <field name="name"/>
-                        <field name="color_name"/>
+                        <field name="double_validation"/>
                         <field name="categ_id" widget="selection"/>
+                        <field name="limit"/>
+                        <field name="color_name"/>
+                        <field name="active"/>
                     </group>
-                    <notebook>
-                      <page string="Details">
-                          <group>
-                              <group name="selection" string="Validation">
-                                  <field name="double_validation"/>
-                                  <field name="limit"/>
-                              </group>
-                              <group name="second" string="Misc">
-                                  <field name="active"/>
-                              </group>
-                          </group>
-                      </page>
-                    </notebook>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 51f25c03271..dcb5230cc4c 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -80,7 +80,7 @@
             <field name="model">hr.payroll.structure</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Employee Function">
+                <form string="Employee Function" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="code"/>
@@ -224,6 +224,12 @@
                 </tree>
             </field>
         </record>
+        
+        <act_window name="Payslip Computation Details"
+            context="{'default_slip_id': active_id,'search_default_slip_id': active_id}"
+            res_model="hr.payslip.line"
+            src_model="hr.payslip"
+            id="act_payslip_lines"/>
 
         <record id="view_hr_payslip_form" model="ir.ui.view">
             <field name="name">hr.payslip.form</field>
@@ -240,6 +246,9 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet>
+                    <div class="oe_right oe_button_box">
+                        <button name="%(act_payslip_lines)d" string="Payslip Computation Details" type="action"/>
+                    </div>
                     <label for="employee_id" class="oe_edit_only"/>
                     <h1><field name="employee_id" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/></h1>
                     <label for="date_from" class="oe_edit_only" string="Period"/>
@@ -335,13 +344,13 @@
                             </field>
                        </page>
                        <page string="Other Information">
-                            <group col="2" string="Other Information">
+                            <group col="2">
                                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                                 <field name="payslip_run_id" domain="[('state','=','draft')]"/>
                                 <field name="paid" readonly="1"/>
-                            </group>
-                            <group string="Notes">
-                            <field name="note"/>
+                                <div>
+                                    <field name="note" Placeholder="Add an internal note..."/>
+                                </div>
                             </group>
                        </page>
                     </notebook>
@@ -740,11 +749,18 @@
                     <field name="state" widget="statusbar"/>
                 </header>
                 <sheet>
-                    <group col="4">
+                    <label for="name" class="oe_edit_only"/>
+                    <h1>
                         <field name="name"/>
-                        <field name="credit_note"/>
-                        <field name="date_start"/>
+                    </h1>
+                    <h2>
+                        Period from 
+                        <field name="date_start"/> 
+                        to 
                         <field name="date_end"/>
+                    </h2>
+                    <group col="4">
+                        <field name="credit_note"/>
                     </group>
                     <field name="slip_ids"/>
                 </sheet>
@@ -763,13 +779,6 @@
 
         <!--  Shortcuts -->
 
-        <act_window name="Payslip Computation Details"
-        	domain="[('slip_id', '=', active_id)]"
-        	context="{'default_slip_id': active_id}"
-        	res_model="hr.payslip.line"
-        	src_model="hr.payslip"
-        	id="act_payslip_lines"/>
-
         <act_window name="Payslip Lines"
         	domain="[('register_id', '=', active_id)]"
         	context="{'default_register_id': active_id, 'search_default_register_id': 1}"

From 43752878d24799c785dbbe77693ebe09c760ad4f Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Fri, 22 Jun 2012 10:46:45 +0530
Subject: [PATCH 11/93] [IMP]view improvement in hr and timesheet

bzr revid: sgo@tinyerp.com-20120622051645-b0cldnh13z550sd3
---
 addons/hr/hr_view.xml                                 | 10 ++++++----
 addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 89ab6d2512c..0edb22c0c82 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -27,10 +27,12 @@
                     </div>
                     <field class="oe_right" name="photo" widget='image' on_change="onchange_photo(photo)"/>
                     <label for="name" class="oe_edit_only"/>
-                       <h1><field name="name"/>,
-                        <field name="company_id" class="oe_inline" widget="selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/>at
-                        <field name="job_id" class="oe_inline oe_edit_only" domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
-                    </h1>
+                       <h1><field name="name"/>,</h1>
+                    <label for="company_id" class="oe_edit_only"/>
+                        <h1><field name="company_id" class="oe_inline" widget="selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/></h1>
+                     <label for="job_id" class="oe_edit_only"/>
+                        <h1>at <field name="job_id" class="oe_inline" domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/></h1>
+                    
                     <label for="department_id" class="oe_edit_only"/>
                     <h2><field name="department_id" on_change="onchange_department_id(department_id)"/></h2>
                     <h3><field name="category_ids" widget="many2many_tags"/></h3>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 3978b61b686..75edeb6c6f6 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -93,7 +93,7 @@
                                         <field invisible="1" name="employee_id"/>
                                     </tree>
                                 </field>
-                                <group colspan="2" col="2">
+                                <group class="oe_right">
                                     <button name="sign_in" string="Sign In" type="object" icon="terp-gtk-jump-to-ltr"/>
                                     <button name="sign_out" string="Sign Out" type="object" icon="terp-gtk-jump-to-rtl"/>
                                 </group>

From e78a09065a3e4d3fff5a4af8b30d1cfe0b0d3ce2 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 22 Jun 2012 17:53:00 +0530
Subject: [PATCH 12/93] [IMP]:improved hr view with new style.

bzr revid: apa@tinyerp.com-20120622122300-c623awtkcjvzsqp6
---
 addons/hr/hr_view.xml                       | 106 ++++++++++----------
 addons/hr_attendance/hr_attendance_view.xml |   8 +-
 addons/hr_holidays/hr_holidays_view.xml     |   6 +-
 addons/hr_payroll/hr_payroll_view.xml       |  46 +++++----
 4 files changed, 85 insertions(+), 81 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 0edb22c0c82..01999885426 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -22,60 +22,64 @@
             <field name="arch" type="xml">
                 <form string="Employee" version="7.0">
                     <sheet>
-                    <div class="oe_right oe_button_box">
-                        <!-- Put here related buttons -->
-                    </div>
-                    <field class="oe_right" name="photo" widget='image' on_change="onchange_photo(photo)"/>
-                    <label for="name" class="oe_edit_only"/>
-                       <h1><field name="name"/>,</h1>
-                    <label for="company_id" class="oe_edit_only"/>
-                        <h1><field name="company_id" class="oe_inline" widget="selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/></h1>
-                     <label for="job_id" class="oe_edit_only"/>
-                        <h1>at <field name="job_id" class="oe_inline" domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/></h1>
-                    
-                    <label for="department_id" class="oe_edit_only"/>
-                    <h2><field name="department_id" on_change="onchange_department_id(department_id)"/></h2>
-                    <h3><field name="category_ids" widget="many2many_tags"/></h3>
-                    <group colspan="4" col="4">
-                        <field name="work_email" widget="email" />
-                        <field name="work_phone"/>
-                        <field name="address_id" on_change="onchange_address_id(address_id)" />
-                        <field name="mobile_phone"/>
-                    </group>
-                    <notebook>
-                        <page string="Personal Information">
-                            <group>
-                                <group string="Linked User" colspan="4" col="4">
-                                    <field name="identification_id" groups="base.group_hr_user"/>
-                                    <field name="parent_id" />
-                                    <field name="passport_id" groups="base.group_hr_user"/>
-                                    <field name="coach_id"/>
-                                    <field name="otherid" groups="base.group_hr_user"/>
-                                    <field name="active"/>
-                                </group>
+                        <field name="photo" widget='image' class="oe_right" on_change="onchange_photo(photo)"/>    
+                        <div class="oe_right oe_button_box" name="button_box">
+                            <!-- Put here related buttons -->
+                        </div>
+                        <div class="oe_title">
+                            <label for="name" class="oe_edit_only"/>
+                            <h1>
+                                <field name="name" class="oe_inline"/>
+                                <label class="oe_inline" string="," attrs="{'invisible': [('job_id', '=', False)]}"/>
+                                <field class="oe_inline" name="job_id" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>
+                                <label class="oe_inline" string="at" attrs="{'invisible': [('work_location', '=', False)]}"/>
+                                <field class="oe_inline" name="work_location" domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
+                            </h1>
+                            <label for="department_id" class="oe_edit_only"/>
+                            <h2><field name="department_id" on_change="onchange_department_id(department_id)" class="oe_inline"/></h2>
+                            <h3><field name="category_ids" widget="many2many_tags" class="oe_inline"/></h3>
+                        </div>
+                        <group colspan="4" col="4">
+                            <field name="work_email" widget="email" />
+                            <field name="work_phone"/>
+                            <field name="address_id" on_change="onchange_address_id(address_id)" />
+                            <field name="mobile_phone"/>
+                        </group>
+                        <notebook>
+                            <page string="Information">
+                                <group col="4">
+                                    <group string="Linked User">
+                                        <field name="parent_id" />
+                                        <field name="coach_id"/>
+                                        
+                                    </group>
+                                    <group>
+                                        <field name="identification_id" groups="base.group_hr_user"/>
+                                        <field name="passport_id" groups="base.group_hr_user"/>
+                                        <field name="otherid" groups="base.group_hr_user"/>
+                                        <field name="active"/>
+                                    </group>
                                 <!-- <group string="General">
                                     <field name="user_id" on_change="onchange_user(user_id)"/>
                                 </group> -->
-                               <!--  <group groups="base.group_hr_user" string="Status">
-                                    <field name="birthday"/>
-                                </group> -->
-                                <!-- <group string="Contact Information">
-                                    <field name="work_location"/>
-                                </group> -->
-                            </group>
-                            <separator string="Notes"/>
-                            <field name="notes" placeholder="Other Information ..."/>
-                        </page>
-                        <page string="Miscellaneous" groups="base.group_hr_user">
-                            <group colspan="4" col="4">
-                                 <field name="country_id"/>
-                                 <field name="gender"/>
-                                 <field name="marital"/>
-                                 <field name="address_home_id"/>
-                                 <field name="birthday"/>
-                            </group>
-                        </page>
-                    </notebook>
+                                </group>
+                                <field name="notes" placeholder="Other Information ..." colspan="4"/>
+                            </page>
+                            <page string="Personal Information" groups="base.group_hr_user">
+                                <group col="4">
+                                    <group>
+                                        <field name="country_id"/>
+                                        <field name="bank_account_id"/>
+                                        <field name="address_home_id"/>
+                                    </group>
+                                    <group>
+                                        <field name="gender"/>
+                                        <field name="marital"/>
+                                        <field name="birthday"/>
+                                    </group>
+                                </group>
+                            </page>
+                        </notebook>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 627d6057a88..c452fdb43e8 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -134,11 +134,9 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
                 <field name="active" position="before">
-                    <group colspan="2" col="5">
-                        <field name="state"/>
-                        <button name="attendance_action_change" states="present" string="Sign Out" type="object" icon="gtk-go-forward" context="{'type':'sign_out'}" groups="base.group_hr_user"/>
-                        <button name="attendance_action_change" states="absent" string="Sign In" type="object" icon="gtk-go-back" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
-                    </group>
+					<field name="state" class="oe_inline"/>
+					<button class="oe_inline" name="attendance_action_change" states="present" string="Sign Out" type="object" icon="gtk-go-forward" context="{'type':'sign_out'}" groups="base.group_hr_user"/>
+					<button class="oe_inline" name="attendance_action_change" states="absent" string="Sign In" type="object" icon="gtk-go-back" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
                 </field>
             </field>
         </record>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 89e0bf10339..6f28edf482e 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -477,9 +477,9 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <div class="oe_right oe_button_box" position="inside">
-                     <button name="%(act_hr_employee_holiday_request)d" string="Leaves" type="action"/>
-                 </div>
+                <xpath expr="//div[@name='button_box']" position="inside">
+                    <button name="%(act_hr_employee_holiday_request)d" string="Leaves" type="action"/>
+                </xpath>
                 <field name="active" position="before">
                     <field name="remaining_leaves"/>
                 </field>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index dcb5230cc4c..54a78ad68e7 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -410,28 +410,30 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-            <data>
-                <div class="oe_right oe_button_box" position="inside">
-                     <button name="%(act_hr_employee_payslip_list)d" string="Payslips" type="action"/>
-                 </div>
-                  <xpath expr="//field[@name='identification_id']" position="before">
-                    <field name="manager" select="1"/>
-                 </xpath>
-                 <field name="otherid" position="after">
-                         <field name="vehicle" select="1"/>
-                         <field name="medic_exam" select="1" string="Medical Examination"/>
-                         <field name="vehicle_distance" select="1"/>
-                  </field>
-                <field name="address_home_id" position="after">
-                    <field name="children"/>
-                </field>
-                <field name="birthday" position="after">
-                    <field name="place_of_birth"/>
-                </field>
-                <field name="marital" position="before">
-                    <field name="bank_account_id" context="{'display_partner':True, 'partner_id':partner_id}"/>
-                </field>
-            </data>
+                <data>
+                    <xpath expr="//div[@name='button_box']" position="inside">
+                        <button name="%(act_hr_employee_payslip_list)d" string="Payslips" type="action"/>
+                    </xpath>
+                    <xpath expr="//field[@name='parent_id']" position="before">
+                        <field name="manager"/>
+                    </xpath>
+                    <field name="coach_id" position="after">
+                        <field name="vehicle"/>
+                        <field name="vehicle_distance"/>
+                    </field>
+                    <field name="active" position="before">
+                        <field name="medic_exam" string="Medical Examination"/>
+                    </field>
+                    <field name="birthday" position="before">
+                        <field name="children"/>
+                    </field>
+                    <field name="birthday" position="after">
+                        <field name="place_of_birth"/>
+                    </field>
+                    <field name="bank_account_id" position="replace">
+                        <field name="bank_account_id" context="{'display_partner':True, 'partner_id':partner_id}"/>
+                    </field>
+                </data>
             </field>
         </record>
         <!-- Salary Category-->

From e1f8485ce392257d037e2bfe5b7bbb3fc683e09d Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 22 Jun 2012 18:17:58 +0530
Subject: [PATCH 13/93] [IMP]:improved hr view with new style.

bzr revid: apa@tinyerp.com-20120622124758-epddnzizjmkk3dgz
---
 addons/hr/hr_view.xml                                 | 4 ++--
 addons/hr_timesheet/hr_timesheet_view.xml             | 6 ++++--
 addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml | 6 +++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 01999885426..4aae6c42a18 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -36,8 +36,8 @@
                                 <field class="oe_inline" name="work_location" domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
                             </h1>
                             <label for="department_id" class="oe_edit_only"/>
-                            <h2><field name="department_id" on_change="onchange_department_id(department_id)" class="oe_inline"/></h2>
-                            <h3><field name="category_ids" widget="many2many_tags" class="oe_inline"/></h3>
+                            <h2><field name="department_id" on_change="onchange_department_id(department_id)"/></h2>
+                            <h3><field name="category_ids" widget="many2many_tags"/></h3>
                         </div>
                         <group colspan="4" col="4">
                             <field name="work_email" widget="email" />
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index ad7a5733d04..31917bee75a 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -100,8 +100,10 @@
             <field name="arch" type="xml">
                 <page string="Personal Information" position="after">
                     <page string="Timesheets" groups="base.group_hr_user">
-                        <field name="product_id" domain="[('type','=','service')]"/>
-                        <field name="journal_id" widget="selection"/>
+                        <group col="4">
+                            <field name="product_id" domain="[('type','=','service')]"/>
+                            <field name="journal_id"/>
+                        </group>
                     </page>
                 </page>
             </field>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 75edeb6c6f6..997616740b2 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -356,9 +356,9 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <div class="oe_right oe_button_box" position="inside">
-                     <button name="%(act_hr_employee_2_hr_timesheet)d" string="Timesheets" type="action"/>
-                 </div>
+                <xpath expr="//div[@name='button_box']" position="inside">
+                    <button name="%(act_hr_employee_2_hr_timesheet)d" string="Timesheets" type="action"/>
+                </xpath>
             </field>
         </record>
 

From 77d6dcbdd86f30fb28af2282e170de0cfcf61fd2 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 22 Jun 2012 18:32:11 +0530
Subject: [PATCH 14/93] [IMP]:improved view

bzr revid: apa@tinyerp.com-20120622130211-6iwa12n7sx303n6m
---
 addons/hr/hr_view.xml                       | 9 +++++----
 addons/hr_evaluation/hr_evaluation_view.xml | 8 +++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 4aae6c42a18..caf5a354f0c 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -30,13 +30,14 @@
                             <label for="name" class="oe_edit_only"/>
                             <h1>
                                 <field name="name" class="oe_inline"/>
-                                <label class="oe_inline" string="," attrs="{'invisible': [('job_id', '=', False)]}"/>
-                                <field class="oe_inline" name="job_id" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>
-                                <label class="oe_inline" string="at" attrs="{'invisible': [('work_location', '=', False)]}"/>
-                                <field class="oe_inline" name="work_location" domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
+                                <label class="oe_inline" string="," attrs="{'invisible': [('company_id', '=', False)]}"/>
+                                <field class="oe_inline" name="company_id" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>
+                                <label class="oe_inline" string="at" attrs="{'invisible': [('job_id', '=', False)]}"/>
+                                <field class="oe_inline" name="job_id" domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
                             </h1>
                             <label for="department_id" class="oe_edit_only"/>
                             <h2><field name="department_id" on_change="onchange_department_id(department_id)"/></h2>
+                            <label for="category_ids" class="oe_edit_only"/>
                             <h3><field name="category_ids" widget="many2many_tags"/></h3>
                         </div>
                         <group colspan="4" col="4">
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 5769bbdce0b..51709935fd8 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -132,10 +132,12 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <page string="Miscellaneous" position="after">
+                <page string="Personal Information" position="after">
                     <page string="Appraisal" groups="base.group_hr_user">
-                        <field name="evaluation_plan_id" on_change="onchange_evaluation_plan_id(evaluation_plan_id, evaluation_date)"/>
-                        <field name="evaluation_date"/>
+                        <group col="4">
+                            <field name="evaluation_plan_id" on_change="onchange_evaluation_plan_id(evaluation_plan_id, evaluation_date)"/>
+                            <field name="evaluation_date"/>
+                        </group>
                     </page>
                 </page>
             </field>

From 8c3da42b7746d7d2e12efa2dee4fc1ce8ea01761 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 22 Jun 2012 18:34:56 +0530
Subject: [PATCH 15/93] [IMP]:hr_attendance:removed tabs

bzr revid: apa@tinyerp.com-20120622130456-iuhexz3m6hiwt2jh
---
 addons/hr_attendance/hr_attendance_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index c452fdb43e8..d269407e072 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -8,7 +8,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Employee attendances" version="7.0">
-                	<sheet>
+                    <sheet>
                     <group>
                         <field name="employee_id"/>
                         <field name="name"/>
@@ -134,9 +134,9 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
                 <field name="active" position="before">
-					<field name="state" class="oe_inline"/>
-					<button class="oe_inline" name="attendance_action_change" states="present" string="Sign Out" type="object" icon="gtk-go-forward" context="{'type':'sign_out'}" groups="base.group_hr_user"/>
-					<button class="oe_inline" name="attendance_action_change" states="absent" string="Sign In" type="object" icon="gtk-go-back" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
+                    <field name="state" class="oe_inline"/>
+                    <button class="oe_inline" name="attendance_action_change" states="present" string="Sign Out" type="object" icon="gtk-go-forward" context="{'type':'sign_out'}" groups="base.group_hr_user"/>
+                    <button class="oe_inline" name="attendance_action_change" states="absent" string="Sign In" type="object" icon="gtk-go-back" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
                 </field>
             </field>
         </record>

From b6b97caa6b3283a10119acbd786b884b444ed32d Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 22 Jun 2012 18:57:35 +0530
Subject: [PATCH 16/93] [IMP]:hr_contract:improved view

bzr revid: apa@tinyerp.com-20120622132735-hds4xywi4rckbuq8
---
 addons/hr_contract/hr_contract_view.xml | 12 ++++++------
 addons/hr_payroll/hr_payroll_view.xml   |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 83cd1ee7b0b..ce50d7f4cf1 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -87,17 +87,17 @@
                                     <field name="trial_date_start" />
                                     <field name="trial_date_end" />
                                 </group>
-                                <group name="right_column" colspan="4" col="4">
-                                    <group string="Advantages" colspan="2" col="2">
-                                        <field name="advantages" nolabel="1" />
-                                    </group>
-                                </group>
                             </group>
+							<group col="4">
+								<group col="1" name="advantages" colspan="2">
+									<field name="advantages"/>
+								</group>
+							</group>
                             <separator string="Notes"/>
                             <field name="notes"/>
                         </page>
                         <page string="Work Permit">
-                            <group>
+                            <group col="4">
                                 <field name="visa_no"/>
                                 <field name="permit_no"/>
                                 <field name="visa_expire"/>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 54a78ad68e7..4b25e9899d9 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -18,8 +18,8 @@
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="//group[@string='Advantages']" position="before">
-                    <group string="Payslip Info" colspan="2" col="2">
+                <xpath expr="//group[@name='advantages']" position="before">
+                    <group col="3" colspan="2">
                         <field name="struct_id" required="1"/>
                     </group>
                 </xpath>

From b5fa697d8ce105c6e6055fcd080f5ca646765238 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 22 Jun 2012 19:04:30 +0530
Subject: [PATCH 17/93] [IMP]:hr:add notes seprator

bzr revid: apa@tinyerp.com-20120622133430-um46d6vq54hbdpt3
---
 addons/hr/hr_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index caf5a354f0c..fab7d4085a6 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -52,7 +52,6 @@
                                     <group string="Linked User">
                                         <field name="parent_id" />
                                         <field name="coach_id"/>
-                                        
                                     </group>
                                     <group>
                                         <field name="identification_id" groups="base.group_hr_user"/>
@@ -64,6 +63,7 @@
                                     <field name="user_id" on_change="onchange_user(user_id)"/>
                                 </group> -->
                                 </group>
+                                <separator string="Notes"/>
                                 <field name="notes" placeholder="Other Information ..." colspan="4"/>
                             </page>
                             <page string="Personal Information" groups="base.group_hr_user">

From 0b367184b563b016cd0385f147a80a7e74358baa Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 25 Jun 2012 11:25:31 +0530
Subject: [PATCH 18/93] [IMP]:hr_contract:improved view

bzr revid: apa@tinyerp.com-20120625055531-y9w9vwztzrgrl99l
---
 addons/hr_contract/hr_contract_view.xml | 40 ++++++++++++-------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 5622d3dac17..52ad8c568c7 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -8,30 +8,30 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <page string="Personal Information" position="after">
-                    <page string="Miscellaneous" groups="base.group_hr_user">
-                        <group colspan="2" col="2">
-                        <separator string="Personal Info" colspan="2"/>
-                        <field name="bank_account_id"/>
-                        <field name="place_of_birth"/>
+				<data>
+                    <xpath expr="//field[@name='parent_id']" position="before">
+                        <field name="manager"/>
+                    </xpath>
+                    <field name="coach_id" position="after">
+                        <field name="vehicle"/>
+                        <field name="vehicle_distance"/>
+                    </field>
+                    <field name="active" position="before">
+                        <field name="medic_exam" string="Medical Examination"/>
+                    </field>
+                    <field name="birthday" position="before">
                         <field name="children"/>
-                        </group>
-                        <group colspan="2" col="2">
-                        <separator string="Job Info" colspan="2"/>
-                        <field name="manager" />
-                        <field name="vehicle" />
-                        <field name="vehicle_distance" />
-                        </group>
-                        <group colspan="2" col="2">
-                        <separator string="Others Info" colspan="2"/>
-                        <field name="medic_exam" />
-                        </group>
-                    </page>
-                </page>
+                    </field>
+                    <field name="birthday" position="after">
+                        <field name="place_of_birth"/>
+                    </field>
+                    <field name="bank_account_id" position="replace">
+                        <field name="bank_account_id" context="{'display_partner':True, 'partner_id':partner_id}"/>
+                    </field>
+				</data>
             </field>
         </record>
 
-
         <record id="hr_contract_view_search" model="ir.ui.view">
             <field name="name">hr.contract.view.search</field>
             <field name="model">hr.contract</field>

From 87e079367a4f806d53d26be362176ddd9037610d Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 25 Jun 2012 11:59:22 +0530
Subject: [PATCH 19/93] [IMP]:hr,hr_contract:improved view

bzr revid: apa@tinyerp.com-20120625062922-lvv1arp9yr7z801y
---
 addons/hr/hr_view.xml                   | 2 +-
 addons/hr_contract/hr_contract_view.xml | 6 +++---
 addons/hr_payroll/hr_payroll_view.xml   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 975681a9a66..6f514e8803b 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -30,7 +30,7 @@
                             <label for="name" class="oe_edit_only"/>
                             <h1>
                                 <field name="name" class="oe_inline"/>
-                                <label class="oe_inline" string="," attrs="{'invisible': [('company_id', '=', False)]}"/>
+                                <label class="oe_inline" string="," attrs="{'invisible': [('company_id', '=', False)]}" groups="base.group_multi_company"/>
                                 <field class="oe_inline" name="company_id" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>
                                 <label class="oe_inline" string="at" attrs="{'invisible': [('job_id', '=', False)]}"/>
                                 <field class="oe_inline" name="job_id" domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 52ad8c568c7..bb74e35ddb4 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -87,9 +87,9 @@
                                     <field name="trial_date_end" />
                                 </group>
                             </group>
-							<group col="4">
-								<group col="1" name="advantages" colspan="2">
-									<field name="advantages"/>
+							<group>
+								<group name="right_column" string="Advantages">
+									<field name="advantages" nolabel="1"/>
 								</group>
 							</group>
                             <separator string="Notes"/>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index e4e552cc0d9..1335bab0a70 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -18,8 +18,8 @@
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="//group[@name='advantages']" position="before">
-                    <group col="3" colspan="2">
+                <xpath expr="//group[@name='right_column']" position="before">
+                    <group string="Payslip Info">
                         <field name="struct_id" required="1"/>
                     </group>
                 </xpath>

From 24eff02343c988f37bc47f05ad6909ff122ea78d Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 25 Jun 2012 12:08:48 +0530
Subject: [PATCH 20/93] [IMP]:clean code for contract view.

bzr revid: apa@tinyerp.com-20120625063848-rnlta80rr7ptfaay
---
 .../l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml   | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

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..5482b9a8a2b 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,7 +9,7 @@
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
             <data>
-                 <xpath expr="//page[@name='information']/group/group[@name='right_column']" position="before">
+                 <xpath expr="//field[@name='struct_id']" position="after">
                     <field name="travel_reimbursement_amount"/>
                     <field name="car_company_amount"/>
                     <field name="misc_onss_deduction"/>
@@ -20,12 +20,10 @@
                     <field name="retained_net_amount"/>
                  </xpath>
                  <xpath expr="//field[@name='trial_date_end']" position="after">
-                    <group colspan="2" col="2">
-                        <separator string="by Worker" colspan="2"/>
-                        <field name="insurance_employee_deduction"/>
-                        <field name="meal_voucher_employee_deduction"/>
-                        <field name="car_employee_deduction"/>
-                    </group>
+                    <separator string="By Worker" colspan="2"/>
+                    <field name="insurance_employee_deduction"/>
+                    <field name="meal_voucher_employee_deduction"/>
+                    <field name="car_employee_deduction"/>
                  </xpath>
             </data>
             </field>

From ff28ffd8803b94e2d8c1abd604112cc6798fd580 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 25 Jun 2012 12:47:05 +0530
Subject: [PATCH 21/93] [IMP]:hr_recruitment:improved view as new style.

bzr revid: apa@tinyerp.com-20120625071705-nww473l8i18ezqmm
---
 addons/hr_recruitment/hr_recruitment.py       |  2 +-
 addons/hr_recruitment/hr_recruitment_view.xml | 22 +++++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 48649f8aa96..ec2de4a9918 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -181,7 +181,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."),
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 281e7a74107..ed57698258e 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -109,31 +109,35 @@
                         string="Print Interview" icon="gtk-print" help="Print interview report"
                         attrs="{'invisible':[('survey','=',False)]}"/>
                 </div>
+                
                 <div class="oe_title">
                     <label for="name" class="oe_edit_only"/>
-                    <h1><field name="name" string="Subject"/></h1>
+                    <h1><field name="name"/></h1>
                     <label for="partner_name" class="oe_edit_only"/>
-                    <h2><field name="partner_name"/>
-                    <field name="type_id" placeholder="Degree"/>
-                    apply for<field name="job_id" on_change="onchange_job(job_id)"/>
+                    <h2>
+                        <field name="partner_name" class="oe_inline"/>
+                        <label class="oe_inline" string="(" attrs="{'invisible': [('type_id', '=', False)]}"/>
+                        <field name="type_id" placeholder="Degree" class="oe_inline"/>
+                        <label class="oe_inline" string=")" attrs="{'invisible': [('type_id', '=', False)]}"/>
+                        <label class="oe_inline" string="apply for " attrs="{'invisible': [('job_id', '=', False)]}"/>
+                        <field name="job_id" on_change="onchange_job(job_id)" class="oe_inline"/>
                     </h2>
                 </div>
-
                 <group>
                     <group>
                         <field name="user_id"/>
                         <label for="title_action"/>
                         <div>
-                            <field name="date_action" nolabel="1"/> -
-                            <field name="title_action" class="oe_inline" nolabel="1" placeholder="Call for proposal"/>
+                            <field name="date_action"/> -
+                            <field name="title_action" class="oe_inline" placeholder="Call for proposal"/>
                         </div>
                     </group>
                     <group>
                         <field name="priority" string="Appreciation"/>
                         <field name="survey" invisible="1"/>
                         <field name="response" invisible="1"/>
-                        <field name="department_id" widget="selection" on_change="onchange_department_id(department_id)"/>
-                        <field name="state" nolabel="1" groups="base.group_no_one"/>
+                        <field name="department_id" on_change="onchange_department_id(department_id)"/>
+                        <div><field name="state" groups="base.group_no_one"/></div>
                     </group>
                 </group>
                 <notebook>

From 588246ea1b28480976582664254785a557e1a971 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 25 Jun 2012 14:13:52 +0530
Subject: [PATCH 22/93] [IMP]:hr_timesheet_sheet:improved view

bzr revid: apa@tinyerp.com-20120625084352-2elq2jy3r04zenki
---
 .../hr_timesheet_sheet_view.xml               | 51 ++++++++++---------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index a0ba6e88dda..5df49e7a6fe 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -62,28 +62,32 @@
                     <label for="employee_id" class="oe_edit_only"/>
                     <h1><field name="employee_id" on_change="onchange_employee_id(employee_id)"/></h1>
                     <label for="date_from" class="oe_edit_only" string="Timesheet Period"/>
-                    <h2>
-                        From <field name="date_from" />
-                        to <field name="date_to"/>
-                    </h2>
-                    <group col="4" colspan="4">
-                        <field name="name"/>
-                        <field name="total_attendance" widget="float_time"/>
-                        <field name="department_id"/>
-                        <field name="total_timesheet" widget="float_time"/>
-                        <field name="company_id" groups="base.group_multi_company"/>
-                        <field name="total_difference" widget="float_time"/>
-                        <field name="user_id" invisible="1"/>
+                    <h2>From <field name="date_from"/> to <field name="date_to"/></h2>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="department_id"/>
+                            <field name="company_id" groups="base.group_multi_company"/>
+                        </group>
+                        <group>
+                            <field name="total_attendance" widget="float_time"/>
+                            <field name="total_timesheet" widget="float_time"/>
+                            <field name="total_difference" widget="float_time"/>
+                            <field name="user_id" invisible="1"/>
+                        </group>
                     </group>
                     <notebook>
                         <page string="Daily">
-                            <group col="6" colspan="4">
-                                <button name="button_dummy" string="Go to:" type="object" icon="terp-gtk-jump-to-ltr"/>
-                                <field name="date_current" nolabel="1"/>
-                                <label string=""/>
-                                <button icon="terp-gtk-go-back-ltr" name="date_previous" string="" type="object"/>
-                                <button name="date_today" string="Today" type="object" icon="terp-go-today"/>
-                                <button icon="terp-gtk-go-back-rtl" name="date_next" string="" type="object"/>
+                            <group>
+                                <div>
+                                    <button name="button_dummy" class="oe_inline" string="Go to" type="object" icon="terp-gtk-jump-to-ltr"/> :
+                                    <field name="date_current" class="oe_inline"/>
+                                </div>
+                                <div align="right">
+                                    <button class="oe_inline" icon="terp-gtk-go-back-ltr" name="date_previous" string="" type="object"/>
+                                    <button class="oe_inline" name="date_today" string="Today" type="object" icon="terp-go-today"/>
+                                    <button class="oe_inline" icon="terp-gtk-go-back-rtl" name="date_next" string="" type="object"/>
+                                </div>
                             </group>
                             <group colspan="4" col="3">
                                 <field context="{'name':date_current,'user_id':user_id}" name="attendances_ids" nolabel="1">
@@ -93,12 +97,13 @@
                                         <field invisible="1" name="employee_id"/>
                                     </tree>
                                 </field>
-                                <group class="oe_right">
-                                    <button name="sign_in" string="Sign In" type="object" icon="terp-gtk-jump-to-ltr"/>
-                                    <button name="sign_out" string="Sign Out" type="object" icon="terp-gtk-jump-to-rtl"/>
+                                <group>
+                                    <div align="right">
+                                        <button name="sign_in" string="Sign In" type="object" icon="terp-gtk-jump-to-ltr"/>
+                                        <button name="sign_out" string="Sign Out" type="object" icon="terp-gtk-jump-to-rtl"/>
+                                    </div>
                                 </group>
                             </group>
-                            
                             <group col="4">
                                 <field name="state_attendance"/>
                                 <field name="total_attendance_day" widget="float_time"/>

From 9175b5008e187ea2cd22c28aac43715103e1238d Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 25 Jun 2012 14:25:27 +0530
Subject: [PATCH 23/93] [IMP]:hr_expense:improved expense line view

bzr revid: apa@tinyerp.com-20120625085527-g33k4hwd94gs1dy9
---
 addons/hr_expense/hr_expense_view.xml | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 1e8e5ebdf3b..e560540e433 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -87,17 +87,22 @@
                         <page string="Description">
                             <field name="line_ids" context="{'currency_id': currency_id}">
                                 <form string="Expense Lines" version="7.0">
-                                    <group col="4" colspan="4">
-                                        <field name="product_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id, context)" context="{'default_hr_expense_ok':1}"/>
-                                        <field name="unit_amount"/>
-                                        <field name="name"/>
-                                        <group colspan="2" col="4">
-                                            <field name="unit_quantity"/>
-                                            <field name="uom_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id, context)" class="oe_edit_only"/>
+                                    <group>
+                                        <group>
+                                            <field name="product_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id, context)" context="{'default_hr_expense_ok':1}"/>
+                                            <field name="name"/>
+                                            <field name="ref"/>
+                                            <field domain="[('type','=','normal')]" name="analytic_account" groups="analytic.group_analytic_accounting"/>
+                                        </group>
+                                        <group>
+                                            <field name="unit_amount"/>
+                                            <label for="unit_quantity"/>
+                                            <div>
+                                                <field name="unit_quantity" class="oe_inline"/> 
+                                                <field name="uom_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id, context)" class="oe_inline"/>
+                                            </div>
+                                            <field name="date_value" />
                                         </group>
-                                        <field name="ref"/>
-                                        <field name="date_value" />
-                                        <field domain="[('type','=','normal')]" name="analytic_account" groups="analytic.group_analytic_accounting"/>
                                     </group>
                                 </form>
                             </field>

From afc972bd45be693bbcc1d43ec7bbed9f79c8cc95 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 25 Jun 2012 14:56:43 +0530
Subject: [PATCH 24/93] [IMP]:hr_holidays:improved view

bzr revid: apa@tinyerp.com-20120625092643-q04fwfo16n3qrbu5
---
 addons/hr_holidays/hr_holidays_view.xml | 81 +++++++++++++------------
 1 file changed, 42 insertions(+), 39 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 32bc38fc699..7d559c5704d 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -67,19 +67,22 @@
                     <button string="Reset to New" name="set_to_draft" states="refuse,validate" type="object" groups="base.group_hr_user"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                 </header>
-                <sheet string="Leave Request" layout="auto">
-                    <group col="4" colspan="4">
-                    <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
-                    <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
-                    <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_user"/>
-                    <label for="number_of_days_temp"/>
-                    <div>
-                        <field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1"/>
-                        <field name="date_to" on_change="onchange_date_from(date_to, date_from)" required="1"/>
-                        <field name="number_of_days_temp" string="Duration"/>
-                    </div>
-                    <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft'), ('state','!=','confirm')],'invisible':[('holiday_type','=','employee')]}"/>
-                    <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')],'invisible':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
+                <sheet string="Leave Request">
+                    <group>
+                        <group>
+                            <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
+                            <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_user"/>
+                            <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')],'invisible':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
+                        </group>
+                        <group>
+                            <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
+                            <label for="number_of_days_temp"/>
+                            <div>
+                                <field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1"/> - 
+                                <field name="date_to" on_change="onchange_date_from(date_to, date_from)" required="1"/>
+                                <field name="number_of_days_temp" string="Duration"/> days
+                            </div>
+                        </group>
                     </group>
                     <notebook colspan="4">
                         <page string="General">
@@ -92,9 +95,6 @@
                         </page>
                     </notebook>
                 </sheet>
-                <div class="oe_sheet_width">
-                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                </div>
                 </form>
             </field>
         </record>
@@ -115,30 +115,33 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                 </header>
                 <sheet>
-                <group colspan="4" col="4">
-                    <field name="name"/>
-                    <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
-                    <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Mode" groups="base.group_hr_manager"/>
-                    <field name="number_of_days_temp"/>
-                    <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')], 'invisible':[('holiday_type','=','category')]}"/>
-                    <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')], 'invisible':[('holiday_type','=','employee')]}"/>
-                    <field name="department_id" attrs="{'readonly':['|', ('holiday_type','=','category'), ('state','not in' ,('draft', 'confirm'))]}"/>
-                </group>
-                <notebook>
-                    <page string="General">
-                        <group col="4">
-                            <field name="double_validation" invisible="1"/>
-                            <field name="manager_id"/>
-                            <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Mode" groups="base.group_hr_manager"/>
+                            <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')], 'invisible':[('holiday_type','=','category')]}"/>
+                            <field name="department_id" attrs="{'readonly':['|', ('holiday_type','=','category'), ('state','not in' ,('draft', 'confirm'))]}"/>
                         </group>
-                        <field name="notes" placeholder="Add a reason..."/>
-                    </page>
-                </notebook>
-            </sheet>
-            <div class="oe_sheet_width">
-                <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-            </div>
-            </form>
+                        <group>
+                            <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
+                            <field name="number_of_days_temp"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="General">
+                            <group col="4">
+                                <field name="double_validation" invisible="1"/>
+                                <field name="manager_id"/>
+                                <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
+                            </group>
+                            <field name="notes" placeholder="Add a reason..."/>
+                        </page>
+                    </notebook>
+                </sheet>
+                <div class="oe_sheet_width">
+                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                </div>
+                </form>
             </field>
         </record>
 

From 6ebcfe8ac1ee86db5510d0db791f6514d7b694a1 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 25 Jun 2012 15:18:05 +0530
Subject: [PATCH 25/93] [IMP]:hr_evaluation

bzr revid: apa@tinyerp.com-20120625094805-7t1tibrzh370m4jy
---
 addons/hr_evaluation/hr_evaluation_view.xml | 74 ++++++++++++---------
 1 file changed, 41 insertions(+), 33 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 71e2d717dec..29abd73c7dc 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -159,41 +159,45 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,progress,wait,done" statusbar_colors='{"progress":"blue"}'/>
                 </header>
                 <sheet>
+                    <label for="employee_id" class="oe_edit_only"/>
+                    <h1><field name="employee_id" on_change="onchange_employee_id(employee_id)"/></h1>
+                    <label for="plan_id" class="oe_edit_only"/>
+                    <h2><field name="plan_id"/></h2>
                     <group>
-                        <label for="employee_id" class="oe_edit_only"/>
-                         <h1><field name="employee_id" on_change="onchange_employee_id(employee_id)"/></h1>
-                         
-                        <label for="plan_id" class="oe_edit_only"/>
-                         <h1><field name="plan_id"/></h1>
-                         <group colspan="4" col="3">
+                        <group>
                             <field name="date"/>
-                            <group attrs="{'invisible':['|', ('state','=','draft'), ('state', '=', 'wait')]}">
-                                <field name="rating" attrs="{'readonly':[('state','&lt;&gt;','progress')]}"/>
-                                <field name="date_close" readonly="1"/>
-                            </group>
+                        </group>
+                        <group attrs="{'invisible':['|', ('state','=','draft'), ('state', '=', 'wait')]}">
+                            <field name="rating" attrs="{'readonly':[('state','&lt;&gt;','progress')]}"/>
+                            <field name="date_close" readonly="1"/>
                         </group>
                     </group>
                     <notebook>
                         <page string="Appraisal" attrs="{'invisible':[('state','=','draft')]}">
                             <field name="survey_request_ids">
                                 <form string="Interview Appraisal" version="7.0">
-                                    <group col="4">
-                                        <field name="survey_id"/>
-                                        <div colspan="2">
-                                            <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
-                                            <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="done" icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0,}" attrs="{'readonly':[('response','=',False)]}" />
-                                        </div>
-                                        <field name="date_deadline"/>
-                                        <field name="user_to_review_id"/>
-                                        <field name="response" readonly="1"/>
-                                        <field name="user_id" string="Interviewer"/>
-                                    </group>
-                                    <group col="4" string="Status" invisible="1">
-                                         <field name="state"/>
-                                         <div>
-                                             <button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" />
-                                         </div>
+                                    <div class="oe_right oe_button_box">
+                                        <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
+                                        <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="done" icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0,}" attrs="{'readonly':[('response','=',False)]}" />
+                                    </div>
+                                    <group>
+                                        <group>
+                                            <field name="survey_id"/>
+                                            <field name="user_to_review_id"/>
+                                            <field name="user_id" string="Interviewer"/>
+                                        </group>
+                                        <group>
+                                            
+                                            <field name="date_deadline"/>
+                                            <field name="response" readonly="1"/>
+                                        </group>
                                     </group>
+                                    <!--<group col="4" string="Status">-->
+                                    <!--     <field name="state"/>-->
+                                    <!--     <div>-->
+                                    <!--         <button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" />-->
+                                    <!--     </div>-->
+                                    <!--</group>-->
                                 </form>
                             </field>
                         </page>
@@ -285,13 +289,17 @@
                         <field name="state" widget="statusbar" statusbar_visible="waiting_answer,done"/>
                     </header>
                     <sheet>
-                        <group col="4">
-                             <field name="survey_id"/>
-                             <field name="date_deadline"/>
-                             <field name="user_to_review_id"/>
-                             <field name="response" readonly="1"/>
-                             <field name="user_id" string="Interviewer"/>
-                             <field name="evaluation_id"/>
+                        <group>
+                            <group>
+                                <field name="survey_id"/>
+                                <field name="user_to_review_id"/>
+                                <field name="user_id" string="Interviewer"/>
+                            </group>
+                            <group>
+                                <field name="date_deadline"/>
+                                <field name="response" readonly="1"/>
+                                <field name="evaluation_id" string="Appraisal Plan"/>
+                            </group>
                         </group>
                     </sheet>
                 </form>

From 23de44d8ffe46479b139cf45baeeab67b1723fed Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 25 Jun 2012 15:35:30 +0530
Subject: [PATCH 26/93] [IMP]:improved views

bzr revid: apa@tinyerp.com-20120625100530-b1ba3l7g3i7pnaav
---
 addons/hr/hr_department_view.xml        | 14 ++++++++------
 addons/hr/hr_view.xml                   |  4 ++--
 addons/hr_holidays/hr_holidays_view.xml | 22 ++++++++++++++--------
 addons/hr_payroll/hr_payroll_view.xml   | 16 +++++++++-------
 4 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 8e28ca4cc2c..bbf66f0d4c3 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -13,12 +13,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="department" version="7.0">
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="manager_id"/>
-                        <field name="parent_id"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    </group>
+                    <sheet>
+                        <group col="4">
+                            <field name="name"/>
+                            <field name="manager_id"/>
+                            <field name="parent_id"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 6f514e8803b..5b2e5adf5db 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -366,8 +366,8 @@
                     <sheet>
                         <label for="name" class="oe_edit_only"/>
                         <h1>
-                            <field name="name" />
-                            (<field name="department_id"/>)
+                            <field name="name" class="oe_inline"/>
+                            (<field name="department_id" class="oe_inline"/>)
                         </h1>
                         <label for="employee_ids" class="oe_edit_only"/>
                         <h2>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 7d559c5704d..d2847715000 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -365,14 +365,20 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Leave Type" version="7.0">
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="double_validation"/>
-                        <field name="categ_id" widget="selection"/>
-                        <field name="limit"/>
-                        <field name="color_name"/>
-                        <field name="active"/>
-                    </group>
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="name"/>
+                                <field name="categ_id"/>
+                                <field name="color_name"/>
+                                <field name="active"/>
+                            </group>
+                            <group>
+                                <field name="double_validation"/>
+                                <field name="limit"/>
+                            </group>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 1335bab0a70..422b3722c11 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -248,13 +248,15 @@
                     <div class="oe_right oe_button_box">
                         <button name="%(act_payslip_lines)d" string="Payslip Computation Details" type="action"/>
                     </div>
-                    <label for="employee_id" class="oe_edit_only"/>
-                    <h1><field name="employee_id" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/></h1>
-                    <label for="date_from" class="oe_edit_only" string="Period"/>
-                    <h2>
-                        from <field name="date_from" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/>
-                        to <field name="date_to"/>
-                    </h2>
+                    <div class="oe_title">
+                        <label for="employee_id" class="oe_edit_only"/>
+                        <h1><field name="employee_id" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/></h1>
+                        <label for="date_from" class="oe_edit_only" string="Period"/>
+                        <h2>
+                            From <field name="date_from" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/>
+                            to <field name="date_to"/>
+                        </h2>
+                    </div>
                     <group col="4">
                         <field name="contract_id" domain="[('employee_id','=',employee_id)]" on_change="onchange_contract_id(date_from, date_to, employee_id, contract_id)"/>
                         <field name="number"/>

From 7083c77885142f2f4cf339b6c192f86f095a7972 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 25 Jun 2012 15:42:04 +0530
Subject: [PATCH 27/93] [IMP]:minor view changes

bzr revid: apa@tinyerp.com-20120625101204-yqxr2q0fupdhvkd0
---
 addons/hr/hr_view.xml                       | 1 -
 addons/hr_attendance/hr_attendance_view.xml | 9 ++++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 5b2e5adf5db..13f16960961 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -63,7 +63,6 @@
                                     <field name="user_id" on_change="onchange_user(user_id)"/>
                                 </group> -->
                                 </group>
-                                <separator string="Notes"/>
                                 <field name="notes" placeholder="Other Information ..." colspan="4"/>
                             </page>
                             <page string="Personal Information" groups="base.group_hr_user">
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 9c50a1ab1de..306caa76a22 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -134,9 +134,12 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
                 <field name="active" position="before">
-                    <field name="state" class="oe_inline"/>
-                    <button class="oe_inline" name="attendance_action_change" states="present" string="Sign Out" type="object" icon="gtk-go-forward" context="{'type':'sign_out'}" groups="base.group_hr_user"/>
-                    <button class="oe_inline" name="attendance_action_change" states="absent" string="Sign In" type="object" icon="gtk-go-back" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
+					<label for="state"/>
+					<div>
+						<field name="state" class="oe_inline"/> 
+						<button class="oe_inline" name="attendance_action_change" states="present" string="Sign Out" type="object" icon="gtk-go-forward" context="{'type':'sign_out'}" groups="base.group_hr_user"/>
+						<button class="oe_inline" name="attendance_action_change" states="absent" string="Sign In" type="object" icon="gtk-go-back" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
+					</div>
                 </field>
             </field>
         </record>

From dd2b3227a8c2e8d39fad5139ff575eea6d02d660 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Mon, 25 Jun 2012 16:48:45 +0200
Subject: [PATCH 28/93] Graph dropdown toggle improvement

bzr revid: mit@openerp.com-20120625144845-idyfjd3px6pct5jj
---
 addons/web/static/src/css/base.css            | 7 ++++++-
 addons/web/static/src/css/base.sass           | 2 ++
 addons/web_graph/static/src/css/graph.css     | 2 +-
 addons/web_graph/static/src/xml/web_graph.xml | 2 +-
 addons/web_kanban/static/src/css/kanban.css   | 9 ++++++---
 addons/web_kanban/static/src/css/kanban.sass  | 6 ++++--
 6 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 0d4912c2840..986539e5555 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1,4 +1,4 @@
-@charset "utf-8";
+@charset "UTF-8";
 @font-face {
   font-family: "mnmliconsRegular";
   src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@@ -315,6 +315,11 @@
   list-style: none;
   zoom: 1;
 }
+.openerp .oe_notebook.ui-corner-all {
+  -moz-border-radius: 0;
+  -webkit-border-radius: 0;
+  border-radius: 0;
+}
 .openerp .oe_notebook:before, .openerp .oe_notebook:after {
   display: table;
   content: "";
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 35e1d08e17f..389490bcd0a 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -275,6 +275,8 @@ $colour4: #8a89ba
         padding: 0 16px
         list-style: none
         zoom: 1
+    .oe_notebook.ui-corner-all
+        @include radius(0)
     .oe_notebook:before, .oe_notebook:after
         display: table
         content: ""
diff --git a/addons/web_graph/static/src/css/graph.css b/addons/web_graph/static/src/css/graph.css
index 69c79542497..367d1de5ef5 100644
--- a/addons/web_graph/static/src/css/graph.css
+++ b/addons/web_graph/static/src/css/graph.css
@@ -18,7 +18,7 @@
 .openerp .graph-dropdown {
     display: none;
     position: absolute;
-    top: 40px;
+    top: 32px;
     right: 8px;
     padding: 8px;
     border: 1px solid #afafb6;
diff --git a/addons/web_graph/static/src/xml/web_graph.xml b/addons/web_graph/static/src/xml/web_graph.xml
index e1d9ba29a75..80b2fc16f81 100644
--- a/addons/web_graph/static/src/xml/web_graph.xml
+++ b/addons/web_graph/static/src/xml/web_graph.xml
@@ -1,8 +1,8 @@
 <template>
     <div t-name="GraphView" id="element-chart" class="editor-render" style="position:relative; width: 300px;">
+        <a href="#" class="oe_e dropdown-menu-icon" data-toggle="dropdown" title="Graph Options">&amp;iacute;</a>
         <div class="graph_header_legend">
         </div>
-        <a href="#" class="oe_i dropdown-menu-icon" data-toggle="dropdown" title="Graph Options">B</a>
         <div class="graph-dropdown">
             <h3 class="menu-section">
                 Graph Mode
diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index b0ba5c58928..41fcbe5f00d 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -1,4 +1,3 @@
-@charset "utf-8";
 .openerp .oe_kanban_view {
   height: inherit;
 }
@@ -378,8 +377,12 @@
   background-image: radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%);
 }
 .openerp .oe_kanban_view .oe_kanban_text_red {
-  background: red;
-  color: black;
+  background: #a61300;
+  color: white;
+  padding: 2px 4px;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  border-radius: 4px;
 }
 .openerp .oe_kanban_view .oe_kanban_ellipsis {
   overflow: hidden;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 2509db68eb7..7d08265cfa7 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -311,8 +311,10 @@
         background: red
         @include radial-gradient((#ee7777 0%, #cc3333 40%, #bb0808 100%))
     .oe_kanban_text_red
-        background: red
-        color: #000
+        background: #A61300
+        color: white
+        padding: 2px 4px
+        @include radius(4px)
     .oe_kanban_ellipsis
         overflow: hidden
         text-overflow: ellipsis

From 5aad4f319da2c0ba239d15f70f9c093cedbda103 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Mon, 25 Jun 2012 18:46:28 +0200
Subject: [PATCH 29/93] Improved visibility of the bookmark star

bzr revid: mit@openerp.com-20120625164628-wjk8mc0hly5qmk6n
---
 addons/crm/crm_lead_view.xml                | 14 +++++---------
 addons/project/project_view.xml             |  2 +-
 addons/project_issue/project_issue_view.xml |  2 +-
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 4fa4d778082..6a2979c5269 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -269,18 +269,14 @@
                                     <field name="partner_id"/>
                                 </div>
                                 <div style="padding-left: 0.5em">
-                                    <i>
-                                        <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="red">oe_kanban_text_red</t>
-                                        <span t-attf-class="#{red || ''}">
-                                            <field name="date_action"/>
-                                        </span>
-                                        <t t-if="record.date_action.raw_value"> : </t>
-                                        <field name="title_action"/>
-                                    </i>
+                                    <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="red">oe_kanban_text_red</t>
+                                    <span t-attf-class="#{red || ''}"><field name="date_action"/></span>
+                                    <t t-if="record.date_action.raw_value"> : </t>
+                                    <field name="title_action"/>
                                 </div>
                                 <div class="oe_right">
                                     <a t-if="record.priority.raw_value == 1" icon="star-on" type="object" name="set_normal_priority"/>
-                                    <a t-if="record.priority.raw_value != 1" icon="star-off" type="object" name="set_high_priority" style="opacity:0.7; filter:alpha(opacity=70);"/>
+                                    <a t-if="record.priority.raw_value != 1" icon="star-off" type="object" name="set_high_priority"/>
                                     <!--
                                     <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="red">oe_kaban_status_red</t>
                                     <span t-attf-class="oe_kanban_status #{red}"> </span>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 9521969857d..7cd03c07934 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -461,7 +461,7 @@
                                     <tr>
                                         <td align="left" valign="middle" width="16">
                                             <a t-if="record.priority.raw_value == 1" icon="star-on" type="object" name="set_normal_priority"/>
-                                            <a t-if="record.priority.raw_value != 1" icon="star-off" type="object" name="set_high_priority" style="opacity:0.6; filter:alpha(opacity=60);"/>
+                                            <a t-if="record.priority.raw_value != 1" icon="star-off" type="object" name="set_high_priority"/>
                                         </td>
                                         <td align="left" valign="middle" class="oe_kanban_title" tooltip="task_details">
                                             <field name="name"/>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 1d8fe6b2509..88599cb00e7 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -229,7 +229,7 @@
                                 <tr>
                                     <td align="left" valign="middle" width="16">
                                         <a t-if="record.priority.raw_value == 1" icon="star-on" type="object" name="set_normal_priority"/>
-                                        <a t-if="record.priority.raw_value != 1" icon="star-off" type="object" name="set_high_priority" style="opacity:0.6; filter:alpha(opacity=60);"/>
+                                        <a t-if="record.priority.raw_value != 1" icon="star-off" type="object" name="set_high_priority"/>
                                     </td>
                                     <td align="left" valign="middle" class="oe_kanban_title">
                                         <field name="name"/>

From 3de5e7c8c5ff1b6fbcaaed406f523180a18baecf Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 26 Jun 2012 10:51:21 +0530
Subject: [PATCH 30/93] [IMP]:improved hr and hr holidays view

bzr revid: apa@tinyerp.com-20120626052121-0bl4wt48xw25falt
---
 addons/hr/hr_view.xml                   | 6 +++---
 addons/hr_holidays/hr_holidays_view.xml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 13f16960961..d26776af5e3 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -30,10 +30,10 @@
                             <label for="name" class="oe_edit_only"/>
                             <h1>
                                 <field name="name" class="oe_inline"/>
-                                <label class="oe_inline" string="," attrs="{'invisible': [('company_id', '=', False)]}" groups="base.group_multi_company"/>
-                                <field class="oe_inline" name="company_id" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>
-                                <label class="oe_inline" string="at" attrs="{'invisible': [('job_id', '=', False)]}"/>
+                                <label class="oe_inline" string="," attrs="{'invisible': [('job_id', '=', False)]}"/>
                                 <field class="oe_inline" name="job_id" domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
+                                <label class="oe_inline" string="at" attrs="{'invisible': [('company_id', '=', False)]}" groups="base.group_multi_company"/>
+                                <field class="oe_inline" name="company_id" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>
                             </h1>
                             <label for="department_id" class="oe_edit_only"/>
                             <h2><field name="department_id" on_change="onchange_department_id(department_id)"/></h2>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index d2847715000..2de9f718186 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -76,11 +76,11 @@
                         </group>
                         <group>
                             <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
-                            <label for="number_of_days_temp"/>
+                            <label for="number_of_days_temp" string="Duration"/>
                             <div>
                                 <field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1"/> - 
                                 <field name="date_to" on_change="onchange_date_from(date_to, date_from)" required="1"/>
-                                <field name="number_of_days_temp" string="Duration"/> days
+                                <field name="number_of_days_temp"/> days
                             </div>
                         </group>
                     </group>

From c2e22e9b1ca185e6a61e1f936aa7bb374bd1c7dd Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 26 Jun 2012 15:39:45 +0530
Subject: [PATCH 31/93] [IMP]:hr_holidays:improved view

bzr revid: apa@tinyerp.com-20120626100945-f869ems0hal6v9z0
---
 addons/hr_holidays/hr_holidays_view.xml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 2de9f718186..daff57bad80 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -86,11 +86,17 @@
                     </group>
                     <notebook colspan="4">
                         <page string="General">
-                            <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
-                            <field name="double_validation" invisible="1"/>
+                            <group>
+                                <group>
+                                    <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
+                                    <field name="double_validation" invisible="1"/>
+                                </group>
+                                <group>
+                                    <field name="manager_id" groups="base.group_no_one"/>
+                                    <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}" groups="base.group_no_one"/>
+                                </group>
+                            </group>
                             <newline/>
-                            <field name="manager_id" groups="base.group_no_one"/>
-                            <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}" groups="base.group_no_one"/>
                             <field name="notes" nolabel="1" colspan="4" placeholder="Add a reason..."/>
                         </page>
                     </notebook>

From a1221b39dd9d5836e5eb2e73c139d0d9f69da29d Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 26 Jun 2012 15:55:08 +0530
Subject: [PATCH 32/93] [IMP]:hr_holidays:improved view

bzr revid: apa@tinyerp.com-20120626102508-cgcpz3depggh032l
---
 addons/hr_holidays/hr_holidays_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index daff57bad80..3102fdf5f8a 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -73,6 +73,7 @@
                             <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
                             <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_user"/>
                             <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')],'invisible':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
+                            <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
                         </group>
                         <group>
                             <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
@@ -88,11 +89,10 @@
                         <page string="General">
                             <group>
                                 <group>
-                                    <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
+                                    <field name="manager_id" groups="base.group_no_one"/>
                                     <field name="double_validation" invisible="1"/>
                                 </group>
                                 <group>
-                                    <field name="manager_id" groups="base.group_no_one"/>
                                     <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}" groups="base.group_no_one"/>
                                 </group>
                             </group>

From d2db1989848fb6c94fa641e83de2e89fce771456 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 26 Jun 2012 16:28:41 +0530
Subject: [PATCH 33/93] [IMP]:hr,hr_payroll:improved view

bzr revid: apa@tinyerp.com-20120626105841-3fosyc7jnum2vlc4
---
 addons/hr/hr_view.xml                 |  4 +++-
 addons/hr_payroll/hr_payroll_view.xml | 17 ++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index d26776af5e3..266ade646bf 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -366,7 +366,9 @@
                         <label for="name" class="oe_edit_only"/>
                         <h1>
                             <field name="name" class="oe_inline"/>
-                            (<field name="department_id" class="oe_inline"/>)
+                            <label class="oe_inline" string="(" attrs="{'invisible': [('department_id', '=', False)]}"/>
+                            <field name="department_id" class="oe_inline"/>
+                            <label class="oe_inline" string=")" attrs="{'invisible': [('department_id', '=', False)]}"/>
                         </h1>
                         <label for="employee_ids" class="oe_edit_only"/>
                         <h2>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 422b3722c11..669c9affb37 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -345,14 +345,17 @@
                             </field>
                        </page>
                        <page string="Other Information">
-                            <group col="2">
-                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                <field name="payslip_run_id" domain="[('state','=','draft')]"/>
-                                <field name="paid" readonly="1"/>
-                                <div>
-                                    <field name="note" Placeholder="Add an internal note..."/>
-                                </div>
+                            <group>
+                                <group>
+                                    <field name="company_id" groups="base.group_multi_company"/>
+                                    <field name="payslip_run_id" domain="[('state','=','draft')]"/>
+                                    <field name="paid" readonly="1"/>
+                                </group>
+                                <group/>
                             </group>
+                            <div colspan="4">
+                                <field name="note" Placeholder="Add an internal note..."/>
+                            </div>
                        </page>
                     </notebook>
                     </sheet>

From 2a50a8d1385d6057f306ef16b6713aa88c03cc72 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 26 Jun 2012 16:50:09 +0530
Subject: [PATCH 34/93] [FIX]:hr_evaluation:Unknown field state in domain
 [['state','not in',['waiting_answer','done','cancel']]]

bzr revid: apa@tinyerp.com-20120626112009-yrirtuqm4zby47dj
---
 addons/hr_evaluation/hr_evaluation_view.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 29abd73c7dc..b4e37d5bf8e 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -192,12 +192,12 @@
                                             <field name="response" readonly="1"/>
                                         </group>
                                     </group>
-                                    <!--<group col="4" string="Status">-->
-                                    <!--     <field name="state"/>-->
-                                    <!--     <div>-->
-                                    <!--         <button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" />-->
-                                    <!--     </div>-->
-                                    <!--</group>-->
+                                    <group col="4" string="Status" invisible="1">
+                                         <field name="state"/>
+                                         <div>
+                                             <button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" />
+                                         </div>
+                                    </group>
                                 </form>
                             </field>
                         </page>

From 3927e5e6363940f6bbd7a2eddd22b61e06468516 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Tue, 26 Jun 2012 16:57:09 +0530
Subject: [PATCH 35/93] [IMP] bank view change

bzr revid: kjo@tinyerp.com-20120626112709-t3r6ngflmnkn5a70
---
 openerp/addons/base/res/res_bank_view.xml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/openerp/addons/base/res/res_bank_view.xml b/openerp/addons/base/res/res_bank_view.xml
index 8857534983a..d4be11419e5 100644
--- a/openerp/addons/base/res/res_bank_view.xml
+++ b/openerp/addons/base/res/res_bank_view.xml
@@ -102,12 +102,17 @@
                     <group>
                         <group name="owner" string="Bank Account Owner">
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-                            <field name="owner_name"/>
-                            <field name="street"/>
-                            <field name="city"/>
-                            <field name="zip"/>
-                            <field name="country_id"/>
-                            <field name="state_id"/>
+                            <label for="street" string="Address"/>
+                            <div>
+                                <field name="owner_name" placeholder="Name"/>
+                                <field name="street" placeholder="Street..."/>
+                                <div>
+                                    <field name="zip" class="oe_inline" placeholder="ZIP"/>
+                                    <field name="city" class="oe_inline" placeholder="City"/>
+                                </div>
+                                <field name="state_id" placeholder="State"/>
+                                <field name="country_id" placeholder="Country"/>
+                            </div>
                         </group>
                         <group name="bank" string="Information About the Bank">
                             <field name="bank" on_change="onchange_bank_id(bank)"/>

From be0fdd3b4d105810db82c42ae157dc5011dea8e2 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Tue, 26 Jun 2012 14:29:10 +0200
Subject: [PATCH 36/93] dropdown icon

bzr revid: mit@openerp.com-20120626122910-hygnh0fbzd5gitav
---
 addons/crm/crm_lead_view.xml    | 6 +++---
 addons/project/project_view.xml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 6a2979c5269..5c31183c83c 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -247,7 +247,7 @@
                     <t t-name="kanban-box">
                         <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card">
                             <div class="oe_dropdown_toggle oe_dropdown_kanban">
-                                <span class="oe_e">i</span>
+                                <span class="oe_e">í</span>
                                 <ul class="oe_dropdown_menu">
                                     <li><a type="edit" >Edit...</a></li>
                                     <li><a type="delete">Delete</a></li>
@@ -275,8 +275,8 @@
                                     <field name="title_action"/>
                                 </div>
                                 <div class="oe_right">
-                                    <a t-if="record.priority.raw_value == 1" icon="star-on" type="object" name="set_normal_priority"/>
-                                    <a t-if="record.priority.raw_value != 1" icon="star-off" type="object" name="set_high_priority"/>
+                                    <a t-if="record.priority.raw_value == 1" type="object" name="set_normal_priority" class="oe_e oe_star_on">7</a>
+                                    <a t-if="record.priority.raw_value != 1" type="object" name="set_high_priority" class="oe_e oe_star_off">7</a>
                                     <!--
                                     <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="red">oe_kaban_status_red</t>
                                     <span t-attf-class="oe_kanban_status #{red}"> </span>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 7cd03c07934..f12cd015c0e 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -206,7 +206,7 @@
                         <t t-name="kanban-box">
                             <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_auto_height oe_kanban_global_click">
                                 <div class="oe_dropdown_toggle oe_dropdown_kanban">
-                                    <span class="oe_e">i</span>
+                                    <span class="oe_e">í</span>
                                     <ul class="oe_dropdown_menu">
                                         <li><a type="edit">Edit...</a></li>
                                         <li><a type="delete">Delete</a></li>

From e8b30b84fb368c45475a96708e95361c8ce5aca9 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Wed, 27 Jun 2012 14:29:11 +0530
Subject: [PATCH 37/93] [IMP] Change form view of Campaigns in marketing &
 remove all separator title

bzr revid: fka@tinyerp.com-20120627085911-q3fouh5wxw5ffl33
---
 .../marketing_campaign_view.xml               | 52 ++++++++++---------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index aa8ea08217e..f9393dc2adf 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -25,19 +25,18 @@
             </header>
             <sheet string="Campaign">
                 <group>
-                    <group string="Campaign">
+                    <group>
                         <field name="name"/>
                         <field name="mode"/>
+                        <field name="fixed_cost"/>
                     </group>
-                    <group string="Resource">
+                    <group>
                         <field name="object_id"/>
                         <field name="partner_field_id"/>
                         <field name="unique_field_id"/>
                     </group>
-                    <group string="Cost">
-                        <field name="fixed_cost"/>
-                    </group>
                 </group>
+                <separator string="Activities"/>
                 <field name="activity_ids" context="{'default_object_id': object_id, 'default_campaign_id': active_id}" />
             </sheet>
             </form>
@@ -143,15 +142,15 @@
             </header>
             <sheet string="Segments" layout="auto">
                 <group>
-                    <group string="Segment">
+                    <group>
                         <field name="name"/>
                         <field name="campaign_id" on_change="onchange_campaign_id(campaign_id)"/>
                         <field name="object_id" invisible="1"/>
                     </group>
-                    <group string="Filter">
+                    <group>
                         <field name="ir_filter_id"/>
                     </group>
-                    <group string="Synchronization">
+                    <group>
                        <field name="sync_mode" required="True"/>
                        <label for="sync_last_date"/>
                        <div>
@@ -160,7 +159,7 @@
                        </div>
                        <field name="date_next_sync"/>
                     </group>
-                    <group string="History">
+                    <group>
                         <field name="date_run" readonly="1"/>
                         <field name="date_done" readonly="1"/>
                     </group>
@@ -243,32 +242,33 @@
         <field name="arch" type="xml">
             <form string="Activities" version="7.0">
                 <group>
-                    <group string="Activity">
+                    <group>
                         <field name="name"/>
                         <field name="signal" groups="base.group_no_one"/>
                         <field name="start"/>
                         <field name="object_id" invisible="1"/>
                         <field name="campaign_id" invisible="1"/>
                     </group>
-                    <group string="Cost / Revenue">
+                    <group>
                         <field name="variable_cost"/>
                         <field name="revenue"/>
                     </group>
                 </group>
-                <group string="Condition" col="4">
-                    <field name="condition" widget="char" colspan="4"/>
-                    <field name="keep_if_condition_not_met"/>
-                </group>
-                <group col="4">
-                    <separator string="Action" colspan="4"/>
-                    <field name="type"/>
-                    <field name="email_template_id" attrs="{'required':[('type','=','email')], 'invisible':[('type','!=','email')]}"
+                <group  col="4" colspan="4">
+                    <group colspan="2">
+                        <field name="condition" widget="char"/>
+                        <field name="keep_if_condition_not_met"/>
+                    </group>
+                    <group colspan="2">
+                        <field name="type"/>
+                        <field name="email_template_id" attrs="{'required':[('type','=','email')], 'invisible':[('type','!=','email')]}"
                            context="{'default_model_id':object_id}" />
-                    <field name="server_action_id" attrs="{'required':[('type','=','action')],'invisible':[('type','!=','action')]}" domain="[('model_id','=',object_id)]"/>
-                    <field name="report_id" attrs="{'required':[('type','=','report')],'invisible':[('type','!=','report')]}" context="{'object_id':object_id}"/>
-                    <field name="report_directory_id" attrs="{'required':[('type','=','report')],'invisible':[('type','!=','report')]}"/>
+                        <field name="server_action_id" attrs="{'required':[('type','=','action')],'invisible':[('type','!=','action')]}" domain="[('model_id','=',object_id)]"/>
+                        <field name="report_id" attrs="{'required':[('type','=','report')],'invisible':[('type','!=','report')]}" context="{'object_id':object_id}"/>
+                        <field name="report_directory_id" attrs="{'required':[('type','=','report')],'invisible':[('type','!=','report')]}"/>
+                    </group>
                 </group>
-                <separator string="Transitions"/>
+                <separator string="Previous Activities"/>
                 <field name="from_ids" mode="tree,form" context="{'default_activity_to_id': active_id}">
                     <tree string="Incoming Transitions" editable="bottom">
                         <field name="activity_from_id" domain="[('campaign_id', '=', parent.campaign_id)]"/>
@@ -285,6 +285,7 @@
                         </group>
                     </form>
                 </field>
+                <separator string="Next Activities"/>
                 <field name="to_ids" nolabel="1" mode="tree,form" context="{'default_activity_from_id': active_id}" colspan="2">
                     <tree string="Outgoing Transitions" editable="bottom">
                         <field name="activity_to_id" domain="[('campaign_id', '=', parent.campaign_id)]"/>
@@ -363,12 +364,13 @@
             </header>
             <sheet>
                 <group>
-                    <group string="Campaign Step">
+                    <group>
                         <field name="campaign_id"/>
                         <field name="segment_id"/>
                         <field name="activity_id" context="{'segment_id':segment_id}"/>
                         <field name="date"/>
-                    </group><group string="Related Resource">
+                    </group>
+                    <group>
                         <field name="object_id" readonly="True"/>
                         <field name="res_name"/>
                         <field name="res_id"/>

From e65b5db25a8b4f072973d21e6e56c817509a0504 Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Wed, 27 Jun 2012 17:26:13 +0530
Subject: [PATCH 38/93] [IMP]reporting-checker-wizards-menus

bzr revid: pna@tinyerp.com-20120627115613-e6q3wh7428b217e6
---
 .../report/hr_evaluation_report_view.xml      |  2 +-
 .../report/hr_expense_report_view.xml         |  4 +-
 addons/hr_holidays/__openerp__.py             |  1 -
 addons/hr_holidays/hr_holidays_wizard.xml     | 10 --
 addons/hr_holidays/hr_holidays_workflow.xml   | 98 -------------------
 .../report/available_holidays_view.xml        |  2 +-
 .../hr_holidays_summary_department_view.xml   |  2 +-
 .../report/hr_recruitment_report_view.xml     |  2 +-
 addons/hr_timesheet/hr_timesheet_report.xml   |  4 +-
 .../hr_timesheet_print_employee_view.xml      | 38 +------
 .../wizard/hr_timesheet_print_users_view.xml  | 33 ++++---
 .../hr_timesheet_analytic_profit_view.xml     | 37 +++----
 .../report/hr_timesheet_report_view.xml       |  2 +-
 .../report/timesheet_report_view.xml          |  2 +-
 addons/project/report/project_cumulative.xml  |  2 +-
 addons/project/report/project_report_view.xml |  4 +-
 16 files changed, 52 insertions(+), 191 deletions(-)
 delete mode 100644 addons/hr_holidays/hr_holidays_wizard.xml
 delete mode 100644 addons/hr_holidays/hr_holidays_workflow.xml

diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index b6f76777f54..1f41411409e 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 @@
         <field name="search_view_id" ref="view_evaluation_report_search"/>
     </record>
 
-    <menuitem action="action_evaluation_report_all" id="menu_evaluation_report_all" parent="hr.menu_hr_reporting" sequence="3" groups="base.group_hr_manager"/>
+    <menuitem action="action_evaluation_report_all" id="menu_evaluation_report_all" parent="hr.menu_hr_reporting" sequence="2" groups="base.group_hr_manager"/>
 
     </data>
 </openerp>
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 1299f4e9ce5..346378a05ae 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -97,7 +97,7 @@
     </record>
 
     <record id="action_hr_expense_report_all" model="ir.actions.act_window">
-        <field name="name">Expenses Analysis</field>
+        <field name="name">Expense Analysis</field>
         <field name="res_model">hr.expense.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
@@ -105,7 +105,7 @@
         <field name="search_view_id" ref="view_hr_expense_report_search"/>
     </record>
 
-    <menuitem action="action_hr_expense_report_all" id="menu_hr_expense_report_all" parent="hr.menu_hr_reporting" sequence="2"/>
+    <menuitem action="action_hr_expense_report_all" id="menu_hr_expense_report_all" parent="hr.menu_hr_reporting" sequence="1"/>
 
 </data>
 </openerp>
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index 09809e488ba..6f9f61afabc 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -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_wizard.xml b/addons/hr_holidays/hr_holidays_wizard.xml
deleted file mode 100644
index 7ed381636cf..00000000000
--- a/addons/hr_holidays/hr_holidays_wizard.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-    <data>
-     <menuitem
-            id="menu_hr_reporting_holidays"
-            name="Leaves"
-            parent="hr.menu_hr_reporting"
-            sequence="6"/>
- 	</data>
-</openerp>
diff --git a/addons/hr_holidays/hr_holidays_workflow.xml b/addons/hr_holidays/hr_holidays_workflow.xml
deleted file mode 100644
index 7013d62a5ed..00000000000
--- a/addons/hr_holidays/hr_holidays_workflow.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-<data>
-
-    <!-- Workflow definition -->
-
-    <record model="workflow" id="wkf_holidays">
-        <field name="name">hr.wkf.holidays</field>
-        <field name="osv">hr.holidays</field>
-        <field name="on_create">True</field>
-    </record>
-
-    <record model="workflow.activity" id="act_draft">
-        <field name="wkf_id" ref="wkf_holidays" />
-        <field name="flow_start">True</field>
-        <field name="name">draft</field>
-    </record>
-
-    <record model="workflow.activity" id="act_confirm">
-        <field name="wkf_id" ref="wkf_holidays" />
-        <field name="name">confirm</field>
-        <field name="kind">function</field>
-        <field name="action">holidays_confirm()</field>
-        <field name="split_mode">OR</field>
-    </record>
-
-    <record model="workflow.activity" id="act_validate">
-        <field name="wkf_id" ref="wkf_holidays" />
-        <field name="name">validate</field>
-        <field name="kind">function</field>
-        <field name="action">holidays_validate()</field>
-    </record>
-
-    <record model="workflow.activity" id="act_validate1">
-        <field name="wkf_id" ref="wkf_holidays" />
-        <field name="name">second_validate</field>
-        <field name="kind">function</field>
-        <field name="action">holidays_validate2()</field>
-    </record>
-
-
-    <record model="workflow.activity" id="act_refuse">
-        <field name="wkf_id" ref="wkf_holidays" />
-        <field name="name">refuse</field>
-        <field name="flow_stop">True</field>
-        <field name="kind">stopall</field>
-    </record>
-
-    <!--
-        workflow transition
-    -->
-
-    <record model="workflow.transition" id="t1">
-        <field name="act_from" ref="act_draft" />
-        <field name="act_to" ref="act_confirm" />
-        <field name="signal">confirm</field>
-    </record>
-
-    <record model="workflow.transition" id="t2">
-        <field name="act_from" ref="act_confirm" />
-        <field name="act_to" ref="act_validate" />
-        <field name="signal">validate</field>
-        <field name="condition">True</field>
-        <field name="group_id" ref="base.group_hr_user"/>
-    </record>
-
-    <record model="workflow.transition" id="t3">
-        <field name="act_from" ref="act_confirm" />
-        <field name="act_to" ref="act_refuse" />
-        <field name="signal">refuse</field>
-        <field name="condition">holidays_refuse('first_approval')</field>
-        <field name="group_id" ref="base.group_hr_user"/>
-    </record>
-
-    <record model="workflow.transition" id="t4">
-        <field name="act_from" ref="act_validate" />
-        <field name="act_to" ref="act_refuse" />
-        <field name="signal">refuse</field>
-        <field name="condition">holidays_refuse('second_approval')</field>
-        <field name="group_id" ref="base.group_hr_user"/>
-    </record>
-
-    <record model="workflow.transition" id="t8">
-        <field name="act_from" ref="act_validate" />
-        <field name="act_to" ref="act_validate1" />
-        <field name="signal">second_validate</field>
-        <field name="group_id" ref="base.group_hr_manager" />
-    </record>
-
-    <record model="workflow.transition" id="t11">
-        <field name="act_from" ref="act_validate" />
-        <field name="act_to" ref="act_validate1" />
-        <field name="condition">not holiday_status_id.double_validation</field>
-        <field name="signal" eval="False"/>
-    </record>
-
-</data>
-</openerp>
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" />
 
 
     </data>
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 72844a58ccb..d2518a0d7f7 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
@@ -32,7 +32,7 @@
 
         <menuitem
             name="Leaves by Department"
-            parent="menu_hr_reporting_holidays"
+            parent="hr_timesheet.menu_hr_reporting_timesheet"
             action="action_hr_holidays_summary_dept"
             id="menu_account_central_journal"
             icon="STOCK_PRINT"/>
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 @@
         <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_department':1,'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="search_view_id" ref="view_hr_recruitment_report_search"/>
     </record>
-    <menuitem action="action_hr_recruitment_report_all" id="menu_hr_recruitment_report_all" parent="hr.menu_hr_reporting" sequence="1"/>
+    <menuitem action="action_hr_recruitment_report_all" id="menu_hr_recruitment_report_all" parent="hr.menu_hr_reporting" sequence="0"/>
 
 </data>
 </openerp>
diff --git a/addons/hr_timesheet/hr_timesheet_report.xml b/addons/hr_timesheet/hr_timesheet_report.xml
index d3d2d745183..ab24066b1de 100644
--- a/addons/hr_timesheet/hr_timesheet_report.xml
+++ b/addons/hr_timesheet/hr_timesheet_report.xml
@@ -3,9 +3,9 @@
     <data>
          <menuitem
             id="menu_hr_reporting_timesheet"
-            name="Timesheet"
+            name="Reports"
             parent="hr.menu_hr_reporting"
-            sequence="5" />
+            sequence="6" />
         <report auto="False" id="report_user_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee timesheet" xsl="hr_timesheet/report/user_timesheet.xsl"/>
 
         <report auto="False" id="report_users_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet_users" string="Employees Timesheet" xsl="hr_timesheet/report/users_timesheet.xsl"/>
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 1eda6de05cb..ae7de4c03c7 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -2,43 +2,7 @@
 <openerp>
     <data>
 
-		<!-- Print Employee Timesheet -->
-    	<record id="view_hr_timesheet_employee" model="ir.ui.view">
-            <field name="name">hr.analytical.timesheet.employee.form</field>
-            <field name="model">hr.analytical.timesheet.employee</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-				<form string="Monthly Employee Timesheet">
-					<group colspan="4">
-						<field name="month"/>
-						<field name="year"/>
-						<field name="employee_id" colspan="3"/>
-					</group>
-					<separator colspan="4"/>
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-print" string="Print" name="print_report" type="object"/>
-                   </group>
-                </form>
-			</field>
-		</record>
-
-		<record id="action_hr_timesheet_employee" model="ir.actions.act_window">
-            <field name="name">Employee Timesheet</field>
-            <field name="res_model">hr.analytical.timesheet.employee</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_hr_timesheet_employee"/>
-           <field name="target">new</field>
-        </record>
-
-        <menuitem action="action_hr_timesheet_employee"
-        	id="menu_hr_timesheet_employee"
-        	parent="menu_hr_reporting_timesheet"
-        	sequence="2" icon="STOCK_PRINT"/>
-
-
-      <!-- Print My Timesheet -->
+		<!-- Print My Timesheet -->
       <record id="view_hr_timesheet_my" model="ir.ui.view">
             <field name="name">hr.analytical.timesheet.my.form</field>
             <field name="model">hr.analytical.timesheet.employee</field>
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 95b7bd3b93e..69fc0f04188 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -8,20 +8,25 @@
             <field name="model">hr.analytical.timesheet.users</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-				<form string="Monthly Employees Timesheet">
-					<group height="260" width="460">
-						<group colspan="4">
-							<field name="month"/>
-							<field name="year"/>
-                            <separator string="Employees" colspan="4"/>
-							<field name="employee_ids" colspan="4" nolabel="1"/>
-						</group>
-						<separator colspan="4"/>
-						<group colspan="4">
-							<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-							<button icon="gtk-print" string="Print" name="print_report" type="object"/>
-						</group>
-					</group>
+				<form string="Monthly Employees Timesheet" version="7.0">
+                    <header>
+                    	<button icon="gtk-print" string="Print" name="print_report" type="object"/> or
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+	                </header>
+                    <sheet>
+                        <group><label for="month" string="Period" />
+             				<div>
+								<field name="month" nolabel="1" class="oe_inline"/>
+								<field name="year" nolabel="1" class="oe_inline"/>
+							</div> 
+                        </group>
+                        <group>
+                            <div>
+                                <separator string="Employees" colspan="4"/>
+							    <field name="employee_ids" colspan="4" nolabel="1"/>
+                            </div> 
+                        </group>						
+                    </sheet>
 				</form>
             </field>
         </record>
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 56c18c82b7a..014361dfbde 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
@@ -7,23 +7,26 @@
             <field name="model">hr.timesheet.analytic.profit</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-				<form string="Timesheet Profit">
-					<group height="420" width="370">
-						<group col="4" colspan="4">
-							<field name="date_from"/>
-							<field name="date_to"/>
-                            <separator string="Journals" colspan="4"/>
-							<field name="journal_ids" colspan="4" nolabel="1"/>
-                            <separator string="Users" colspan="4"/>
-							<field name="employee_ids" colspan="4" nolabel="1"/>
-						</group>
-						<separator colspan="4"/>
-						<group col="2" colspan="4">
-							<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-							<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
-						</group>
-					</group>
-				</form>
+				<form string="Timesheet Profit" version="7.0">
+                   <header>
+                        <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/> or
+                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                   </header>
+                   <sheet>
+                       <group> <label for="date_from" string="Duration" />					
+                           <div>
+ 						       <field name="date_from" nolabel="1" class="oe_inline" />
+                               - <field name="date_to" nolabel="1" class="oe_inline"/>
+                           </div>
+                       </group>
+                       <group>
+                           <separator string="Journals" colspan="4"/>
+						   <field name="journal_ids" colspan="4" nolabel="1"/>
+                           <separator string="Users" colspan="4"/>
+						   <field name="employee_ids" colspan="4" nolabel="1"/>
+					   </group>
+                   </sheet>
+			   </form>
             </field>
         </record>
 
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 @@
         <menuitem
             action="action_hr_timesheet_report_stat_all"
             id="menu_hr_timesheet_report_all"
-            parent="hr_timesheet.menu_hr_reporting_timesheet" sequence="0"/>
+            parent="hr.menu_hr_reporting" sequence="3"/>
     </data>
 </openerp>
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 @@
             <field name="search_view_id" ref="view_timesheet_report_search"/>
         </record>
         <menuitem action="action_timesheet_report_stat_all" id="menu_timesheet_report_all"
-                parent="hr_timesheet.menu_hr_reporting_timesheet" sequence="1" groups="base.group_hr_manager"/>
+                parent="hr.menu_hr_reporting" sequence="4" groups="base.group_hr_manager"/>
     </data>
 </openerp>
diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml
index 69daeefc758..f1992b19965 100644
--- a/addons/project/report/project_cumulative.xml
+++ b/addons/project/report/project_cumulative.xml
@@ -83,7 +83,7 @@
         </record>
         <menuitem action="action_view_task_history_cumulative"
             id="menu_action_view_task_history_cumulative"
-            parent="project_report_task" />
+            parent="base.menu_project_report" />
 
 
         <!--<record id="action_view_task_history_burndown" model="ir.actions.act_window">-->
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index a5711239f87..40537a34fb7 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -5,8 +5,6 @@
         <menuitem id="base.menu_project_report" name="Project"
             groups="project.group_project_manager"
             parent="base.menu_reporting" sequence="25"/>
-        <menuitem id="project_report_task" name="Tasks Analysis"
-            parent="base.menu_project_report"/>
 
         <record id="view_task_project_user_tree" model="ir.ui.view">
             <field name="name">report.project.task.user.tree</field>
@@ -135,7 +133,7 @@
             <field name="help">This report allows you to analyse the performance of your projects and users. You can analyse the quantities of tasks, the hours spent compared to the planned hours, the average number of days to open or close a task, etc.</field>
         </record>
 
-        <menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="project_report_task"/>
+        <menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="base.menu_project_report"/>
 
     </data>
 </openerp>

From 63c9656baa420c1d7a21188e0e9c525ff4b6b630 Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Wed, 27 Jun 2012 17:32:34 +0530
Subject: [PATCH 39/93] [IMP]reporting-checker-wizards-menus

bzr revid: pna@tinyerp.com-20120627120234-k4lfwbz2dspg9pq4
---
 addons/hr_holidays/hr_holidays_workflow.xml | 98 +++++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 addons/hr_holidays/hr_holidays_workflow.xml

diff --git a/addons/hr_holidays/hr_holidays_workflow.xml b/addons/hr_holidays/hr_holidays_workflow.xml
new file mode 100644
index 00000000000..7013d62a5ed
--- /dev/null
+++ b/addons/hr_holidays/hr_holidays_workflow.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" ?>
+<openerp>
+<data>
+
+    <!-- Workflow definition -->
+
+    <record model="workflow" id="wkf_holidays">
+        <field name="name">hr.wkf.holidays</field>
+        <field name="osv">hr.holidays</field>
+        <field name="on_create">True</field>
+    </record>
+
+    <record model="workflow.activity" id="act_draft">
+        <field name="wkf_id" ref="wkf_holidays" />
+        <field name="flow_start">True</field>
+        <field name="name">draft</field>
+    </record>
+
+    <record model="workflow.activity" id="act_confirm">
+        <field name="wkf_id" ref="wkf_holidays" />
+        <field name="name">confirm</field>
+        <field name="kind">function</field>
+        <field name="action">holidays_confirm()</field>
+        <field name="split_mode">OR</field>
+    </record>
+
+    <record model="workflow.activity" id="act_validate">
+        <field name="wkf_id" ref="wkf_holidays" />
+        <field name="name">validate</field>
+        <field name="kind">function</field>
+        <field name="action">holidays_validate()</field>
+    </record>
+
+    <record model="workflow.activity" id="act_validate1">
+        <field name="wkf_id" ref="wkf_holidays" />
+        <field name="name">second_validate</field>
+        <field name="kind">function</field>
+        <field name="action">holidays_validate2()</field>
+    </record>
+
+
+    <record model="workflow.activity" id="act_refuse">
+        <field name="wkf_id" ref="wkf_holidays" />
+        <field name="name">refuse</field>
+        <field name="flow_stop">True</field>
+        <field name="kind">stopall</field>
+    </record>
+
+    <!--
+        workflow transition
+    -->
+
+    <record model="workflow.transition" id="t1">
+        <field name="act_from" ref="act_draft" />
+        <field name="act_to" ref="act_confirm" />
+        <field name="signal">confirm</field>
+    </record>
+
+    <record model="workflow.transition" id="t2">
+        <field name="act_from" ref="act_confirm" />
+        <field name="act_to" ref="act_validate" />
+        <field name="signal">validate</field>
+        <field name="condition">True</field>
+        <field name="group_id" ref="base.group_hr_user"/>
+    </record>
+
+    <record model="workflow.transition" id="t3">
+        <field name="act_from" ref="act_confirm" />
+        <field name="act_to" ref="act_refuse" />
+        <field name="signal">refuse</field>
+        <field name="condition">holidays_refuse('first_approval')</field>
+        <field name="group_id" ref="base.group_hr_user"/>
+    </record>
+
+    <record model="workflow.transition" id="t4">
+        <field name="act_from" ref="act_validate" />
+        <field name="act_to" ref="act_refuse" />
+        <field name="signal">refuse</field>
+        <field name="condition">holidays_refuse('second_approval')</field>
+        <field name="group_id" ref="base.group_hr_user"/>
+    </record>
+
+    <record model="workflow.transition" id="t8">
+        <field name="act_from" ref="act_validate" />
+        <field name="act_to" ref="act_validate1" />
+        <field name="signal">second_validate</field>
+        <field name="group_id" ref="base.group_hr_manager" />
+    </record>
+
+    <record model="workflow.transition" id="t11">
+        <field name="act_from" ref="act_validate" />
+        <field name="act_to" ref="act_validate1" />
+        <field name="condition">not holiday_status_id.double_validation</field>
+        <field name="signal" eval="False"/>
+    </record>
+
+</data>
+</openerp>

From 7e477e1f57aa13b0b9acb28069d5a3e28339e339 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Wed, 27 Jun 2012 19:04:23 +0530
Subject: [PATCH 40/93] [IMP] Add "Follow-Up" & "Segments" buttons in campaign

bzr revid: fka@tinyerp.com-20120627133423-6cw0ax315xapulof
---
 .../marketing_campaign_view.xml               | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index f9393dc2adf..51d2d3d4b95 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -24,17 +24,31 @@
                 <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
             </header>
             <sheet string="Campaign">
-                <group>
-                    <group>
+                <group colspan="6" col="6">
+                    <group colspan="2">
                         <field name="name"/>
                         <field name="mode"/>
                         <field name="fixed_cost"/>
                     </group>
-                    <group>
+                    <group colspan="2">
                         <field name="object_id"/>
                         <field name="partner_field_id"/>
                         <field name="unique_field_id"/>
                     </group>
+                    <group colspan="2">
+                        <div class="oe_right oe_button_box" name="buttons">
+                            <group colspan="1">
+                                <button type="action"
+                                name="%(act_marketing_campaing_followup)d"
+                                string="Follow-Up" />
+                            </group>
+                            <group colspan="1">
+                                <button type="action"
+                                name="%(act_marketing_campaing_segment_opened)d"
+                                string="Segments" />
+                            </group>
+                        </div>
+                    </group>
                 </group>
                 <separator string="Activities"/>
                 <field name="activity_ids" context="{'default_object_id': object_id, 'default_campaign_id': active_id}" />
@@ -146,12 +160,7 @@
                         <field name="name"/>
                         <field name="campaign_id" on_change="onchange_campaign_id(campaign_id)"/>
                         <field name="object_id" invisible="1"/>
-                    </group>
-                    <group>
-                        <field name="ir_filter_id"/>
-                    </group>
-                    <group>
-                       <field name="sync_mode" required="True"/>
+                        <field name="sync_mode" required="True"/>
                        <label for="sync_last_date"/>
                        <div>
                            <field name="sync_last_date" class="oe_inline"/>
@@ -160,6 +169,7 @@
                        <field name="date_next_sync"/>
                     </group>
                     <group>
+                        <field name="ir_filter_id"/>
                         <field name="date_run" readonly="1"/>
                         <field name="date_done" readonly="1"/>
                     </group>

From e16e9ae7c88d076e3bac059c0f8519dba6d1f231 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 28 Jun 2012 11:21:35 +0530
Subject: [PATCH 41/93] [IMP] set act_window

bzr revid: kjo@tinyerp.com-20120628055135-yyyaa52v0aav2owu
---
 .../marketing_campaign_view.xml               | 33 +++++++++----------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 0abf591012f..534e4d6f3e6 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -9,6 +9,22 @@
     Marketing Campaign
     ======================
     -->
+    <act_window name="All Segments"
+        res_model="marketing.campaign.segment"
+        src_model="marketing.campaign"
+        view_type="form"
+        view_mode="tree,form"
+        id="act_marketing_campaing_segment_opened"
+        context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"
+    />
+
+    <!-- Campaign Followups -->
+    <act_window
+        context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"
+        id="act_marketing_campaing_followup"
+        name="Campaign Follow-up" res_model="marketing.campaign.workitem"
+        src_model="marketing.campaign" view_mode="tree,form"
+        view_type="form" />
 
     <record model="ir.ui.view" id="view_marketing_campaign_form">
         <field name="name">marketing.campaign.form</field>
@@ -447,23 +463,6 @@
 
     <menuitem id="menu_action_marketing_campaign_workitem" parent="menu_marketing_campaign" action="action_marketing_campaign_workitem" sequence="10"/>
 
-    <act_window name="All Segments"
-        res_model="marketing.campaign.segment"
-        src_model="marketing.campaign"
-        view_type="form"
-        view_mode="tree,form"
-        id="act_marketing_campaing_segment_opened"
-        context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"
-    />
-
-    <!-- Campaign Followups -->
-    <act_window
-        context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"
-        id="act_marketing_campaing_followup"
-        name="Campaign Follow-up" res_model="marketing.campaign.workitem"
-        src_model="marketing.campaign" view_mode="tree,form"
-        view_type="form" />
-
     <!-- Campaign Statistics -->
     <act_window
         context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"

From da82eab86ecdc1cd614a45d85cedab94cf7f7a8c Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 28 Jun 2012 18:09:01 +0530
Subject: [PATCH 42/93] [IMP]maketing_campagin: set button

bzr revid: kjo@tinyerp.com-20120628123901-qaqcsyqbif2p6s9b
---
 addons/marketing_campaign/marketing_campaign_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 534e4d6f3e6..b0109984582 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -56,8 +56,7 @@
                         <field name="unique_field_id"/>
                     </group>
                     <group col="1">
-                    
-                    <div class="oe_right oe_button_box">
+                    <div class="oe_right">
                         <button type="action"
                         name="%(act_marketing_campaing_followup)d"
                         string="Follow-Up" />

From 1325558868c6b23851122135a01146a2f6f394f9 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 28 Jun 2012 18:42:10 +0530
Subject: [PATCH 43/93] [IMP]:improved HR Application view after reviewed

bzr revid: apa@tinyerp.com-20120628131210-gpy7i3d2ekg6b7da
---
 addons/hr/hr_view.xml                                 |  8 +++++---
 addons/hr_attendance/hr_attendance_view.xml           |  3 ++-
 addons/hr_contract/hr_contract_view.xml               | 10 ++++++----
 addons/hr_holidays/hr_holidays_view.xml               | 10 ++++++----
 addons/hr_payroll/hr_payroll_view.xml                 | 10 ++++++----
 addons/hr_timesheet/hr_timesheet_view.xml             |  9 +++++++--
 addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml |  4 ++--
 7 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 266ade646bf..5483d066fe8 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -48,15 +48,17 @@
                         </group>
                         <notebook>
                             <page string="Information">
-                                <group col="4">
-                                    <group string="Linked User">
+                                <group>
+                                    <group>
                                         <field name="parent_id" />
                                         <field name="coach_id"/>
                                     </group>
                                     <group>
-                                        <field name="identification_id" groups="base.group_hr_user"/>
+                                        <!--<field name="identification_id" groups="base.group_hr_user"/>-->
                                         <field name="passport_id" groups="base.group_hr_user"/>
                                         <field name="otherid" groups="base.group_hr_user"/>
+                                    </group>
+                                    <group name="active_group">
                                         <field name="active"/>
                                     </group>
                                 <!-- <group string="General">
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 306caa76a22..ff707d3453a 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -136,7 +136,8 @@
                 <field name="active" position="before">
 					<label for="state"/>
 					<div>
-						<field name="state" class="oe_inline"/> 
+						<field name="state" class="oe_inline"/>
+						<label/>
 						<button class="oe_inline" name="attendance_action_change" states="present" string="Sign Out" type="object" icon="gtk-go-forward" context="{'type':'sign_out'}" groups="base.group_hr_user"/>
 						<button class="oe_inline" name="attendance_action_change" states="absent" string="Sign In" type="object" icon="gtk-go-back" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
 					</div>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index bb74e35ddb4..0c6d9617a3c 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -12,10 +12,12 @@
                     <xpath expr="//field[@name='parent_id']" position="before">
                         <field name="manager"/>
                     </xpath>
-                    <field name="coach_id" position="after">
-                        <field name="vehicle"/>
-                        <field name="vehicle_distance"/>
-                    </field>
+					<xpath expr="//group[@name='active_group']" position="before">
+                        <group>
+							<field name="vehicle"/>
+							<field name="vehicle_distance"/>
+						</group>
+                    </xpath>
                     <field name="active" position="before">
                         <field name="medic_exam" string="Medical Examination"/>
                     </field>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 3102fdf5f8a..4b2f3707ac2 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -489,11 +489,13 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//div[@name='button_box']" position="inside">
-                    <button name="%(act_hr_employee_holiday_request)d" string="Leaves" type="action"/>
-                </xpath>
                 <field name="active" position="before">
-                    <field name="remaining_leaves"/>
+                    <label for="remaining_leaves"/>
+                    <div>
+                        <field name="remaining_leaves" class="oe_inline"/>
+                        <label/>
+                        <button name="%(act_hr_employee_holiday_request)d" string="Leaves" type="action" class="oe_inline"/>
+                    </div>
                 </field>
             </field>
         </record>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 669c9affb37..f789f85e2c1 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -422,10 +422,12 @@
                     <xpath expr="//field[@name='parent_id']" position="before">
                         <field name="manager"/>
                     </xpath>
-                    <field name="coach_id" position="after">
-                        <field name="vehicle"/>
-                        <field name="vehicle_distance"/>
-                    </field>
+                    <xpath expr="//group[@name='active_group']" position="before">
+                        <group>
+							<field name="vehicle"/>
+							<field name="vehicle_distance"/>
+						</group>
+                    </xpath>
                     <field name="active" position="before">
                         <field name="medic_exam" string="Medical Examination"/>
                     </field>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 24ab5d2b43c..169824e7475 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -114,9 +114,14 @@
             <field name="arch" type="xml">
                 <page string="Personal Information" position="after">
                     <page string="Timesheets" groups="base.group_hr_user">
+                        <div class="oe_right oe_button_box" name="button_timesheet">
+                            <!-- Put here related buttons -->
+                        </div>
                         <group col="4">
-                            <field name="product_id" domain="[('type','=','service')]"/>
-                            <field name="journal_id"/>
+                            <group col="2">
+                                <field name="product_id" domain="[('type','=','service')]"/>
+                                <field name="journal_id"/>
+                            </group>
                         </group>
                     </page>
                 </page>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 157ff40e3d8..bd691fc0032 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -360,9 +360,9 @@
       <record id="hr_timesheet_sheet_employee_extd_form" model="ir.ui.view">
             <field name="name">hr.timesheet.sheet.employee.extd_form</field>
             <field name="model">hr.employee</field>
-            <field name="inherit_id" ref="hr.view_employee_form"/>
+            <field name="inherit_id" ref="hr_timesheet.hr_timesheet_employee_extd_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//div[@name='button_box']" position="inside">
+                <xpath expr="//div[@name='button_timesheet']" position="inside">
                     <button name="%(act_hr_employee_2_hr_timesheet)d" string="Timesheets" type="action"/>
                 </xpath>
             </field>

From faddab4935cb9e4fc054a097f54a25b42c355106 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Fri, 29 Jun 2012 12:14:43 +0530
Subject: [PATCH 44/93] [IMP]reorganize group in contract form and remove total
 from my timesheet

bzr revid: sgo@tinyerp.com-20120629064443-kwyp4r59620qse3k
---
 addons/hr_contract/hr_contract_view.xml        |  9 +++------
 addons/hr_payroll/hr_payroll_view.xml          |  2 +-
 .../hr_payroll_account_view.xml                |  9 +++++----
 .../hr_timesheet_sheet_view.xml                |  3 ---
 .../l10n_be_hr_payroll_view.xml                | 18 ++++++++++--------
 5 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 0c6d9617a3c..447461cee1a 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -84,16 +84,13 @@
                                     <field name="date_end" />
                                     <field name="working_hours"/>
                                 </group>
-                                <group string="Trial Period">
+                                <group name="trail" string="Trial Period">
                                     <field name="trial_date_start" />
                                     <field name="trial_date_end" />
+                                    <separator string="Advantages" colspan="2"/>
+                                    <field name="advantages" nolabel="1"/>
                                 </group>
                             </group>
-							<group>
-								<group name="right_column" string="Advantages">
-									<field name="advantages" nolabel="1"/>
-								</group>
-							</group>
                             <separator string="Notes"/>
                             <field name="notes"/>
                         </page>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index f789f85e2c1..cca555bafa6 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -18,7 +18,7 @@
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="//group[@name='right_column']" position="before">
+                <xpath expr="//group[@name='trail']" position="after">
                     <group string="Payslip Info">
                         <field name="struct_id" required="1"/>
                     </group>
diff --git a/addons/hr_payroll_account/hr_payroll_account_view.xml b/addons/hr_payroll_account/hr_payroll_account_view.xml
index e06a43588c4..ff0293a27f6 100644
--- a/addons/hr_payroll_account/hr_payroll_account_view.xml
+++ b/addons/hr_payroll_account/hr_payroll_account_view.xml
@@ -44,10 +44,11 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='advantages']" position="after">
-                   <separator colspan="4" string="Accounting"/>
-                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
-                    <field name="journal_id"/>
+                <xpath expr="//group[@name='trail']" position="after">
+                   <group string="Accounting">
+                        <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
+                        <field name="journal_id"/>
+                    </group>
                 </xpath>
             </field>
         </record>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index bd691fc0032..36827fe7c48 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -106,7 +106,6 @@
                             </group>
                             <group col="4">
                                 <field name="state_attendance"/>
-                                <field name="total_attendance_day" widget="float_time"/>
                             </group>
                             <field colspan="4" context="{'date':date_current,'user_id':user_id}" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1">
                                 <tree editable="top" string="Timesheet Lines">
@@ -136,8 +135,6 @@
                                     <field name="user_id" required="1"/>
                                 </form>
                             </field>
-                            <field name="total_difference_day" widget="float_time"/>
-                            <field name="total_timesheet_day" widget="float_time"/>
                         </page>
                         <page string="Summary">
                             <field colspan="4" name="period_ids" nolabel="1">
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 5482b9a8a2b..c40ddbc3a78 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
@@ -15,15 +15,17 @@
                     <field name="misc_onss_deduction"/>
                     <field name="meal_voucher_amount"/>
                     <field name="misc_advantage_amount"/>
-                    <separator string="Miscellaneous" colspan="2"/>
-                    <field name="additional_net_amount"/>
-                    <field name="retained_net_amount"/>
                  </xpath>
-                 <xpath expr="//field[@name='trial_date_end']" position="after">
-                    <separator string="By Worker" colspan="2"/>
-                    <field name="insurance_employee_deduction"/>
-                    <field name="meal_voucher_employee_deduction"/>
-                    <field name="car_employee_deduction"/>
+                 <xpath expr="//group[@name='trail']" position="after">
+                     <group string="Miscellaneous">
+                         <field name="additional_net_amount"/>
+                         <field name="retained_net_amount"/>
+                     </group>
+                    <group string="By Worker">
+                        <field name="insurance_employee_deduction"/>
+                        <field name="meal_voucher_employee_deduction"/>
+                        <field name="car_employee_deduction"/>
+                    </group>
                  </xpath>
             </data>
             </field>

From 621e546580e503720e9e5a2c8d9ac19115e38cea Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Fri, 29 Jun 2012 14:19:33 +0530
Subject: [PATCH 45/93] [IMP]improve view as per review

bzr revid: sgo@tinyerp.com-20120629084933-q6g14p68wwt818v7
---
 addons/hr_holidays/hr_holidays_view.xml       |  8 ++--
 addons/hr_timesheet/hr_timesheet_view.xml     | 43 +++++++++++--------
 .../hr_timesheet_sheet_view.xml               |  2 +-
 3 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 4b2f3707ac2..cff01b599e1 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -79,9 +79,11 @@
                             <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
                             <label for="number_of_days_temp" string="Duration"/>
                             <div>
-                                <field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1"/> - 
-                                <field name="date_to" on_change="onchange_date_from(date_to, date_from)" required="1"/>
-                                <field name="number_of_days_temp"/> days
+                                <field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1" class="oe_inline"/> - 
+                                <field name="date_to" on_change="onchange_date_from(date_to, date_from)" required="1" class="oe_inline"/>
+                                <div>
+                                    <field name="number_of_days_temp" class="oe_inline"/> days
+                                </div>
                             </div>
                         </group>
                     </group>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 169824e7475..399c31c148b 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -26,29 +26,38 @@
             <field name="model">hr.analytic.timesheet</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Timesheet Lines">
-                    <group col="4">
-                        <field name="name" colspan="4"/>
-                        <field name="user_id" on_change="on_change_user_id(user_id)" required="1"/>
-                        <field name="date" on_change="on_change_date(date)"/>
+                <form string="Timesheet Lines" version="7.0">
+                    <sheet>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="user_id" on_change="on_change_user_id(user_id)" required="1"/>
+                        </group>
+                        <group>
+                            <field name="date" on_change="on_change_date(date)"/>
+                        </group>
                     </group>
                     <notebook>
                         <page string="Information">
-                            <group>
-                                <group string="Product">
-                                    <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" required="1" domain="[('type','=','service')]"/>
-                                    <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)"/>
-                                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time"/>
-                                </group>
-                                <group string="Accounting">
-                                    <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close'),('parent_id','!=',False)]" name="account_id" select="1"/>
-                                    <field name="amount"/>
-                                    <field name="general_account_id"/>
-                                    <field name="journal_id"/>
-                                </group>
+                        <group>
+                            <group string="Product">
+                                <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" required="1" domain="[('type','=','service')]"/>
+                                <label string="Quantity" for="unit_amount" align="1.0"/>
+                                <div>
+                                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" class="oe_inline"/>
+                                    <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" class="oe_inline"/>
+                                </div>
                             </group>
+                            <group string="Accounting">
+                                <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close'),('parent_id','!=',False)]" name="account_id" select="1"/>
+                                <field name="amount"/>
+                                <field name="general_account_id"/>
+                                <field name="journal_id"/>
+                            </group>
+                        </group>
                         </page>
                     </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 36827fe7c48..8d0a6d1bec6 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -231,7 +231,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_search"/>
             <field name="arch" type="xml">
-                <field name="user_id" position="before">
+                <field name="date" position="before">
                     <field name="sheet_id"/>
                 </field>
             </field>

From 996a8795015fe44952532cbb2a6df73cdd35a0c7 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Fri, 29 Jun 2012 14:36:43 +0530
Subject: [PATCH 46/93] [IMP]hr_job:improve job position view

bzr revid: sgo@tinyerp.com-20120629090643-3s988dh0ryf7iy5o
---
 addons/hr/hr_view.xml                         | 12 ++++++++----
 addons/hr_evaluation/hr_evaluation_view.xml   | 14 +++++++++-----
 addons/hr_recruitment/hr_recruitment_view.xml |  2 +-
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 5483d066fe8..76e162160cf 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -377,10 +377,14 @@
                             <field name="employee_ids" widget="many2many_tags" mode="tree,form"/>
                         </h2>
                         <group col="4">
-                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                            <field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/>
-                            <field name="no_of_employee"/>
-                            <field name="expected_employees"/>
+                            <group>
+                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                                <field name="no_of_employee"/>
+                                <field name="expected_employees"/>
+                            </group>
+                            <group>
+                                <field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/>
+                            </group>
                         </group>
                         <notebook>
                             <page string="Description">
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index b4e37d5bf8e..6818cdb0fe6 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -28,11 +28,15 @@
             <field name="arch" type="xml">
                 <form string="Appraisal Plan" version="7.0">
                     <group col="4">
-                        <field name="name"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                        <field name="month_first"/>
-                        <field name="month_next"/>
-                        <field name="active"/>
+                        <group>
+                            <field name="name"/>
+                            <field name="active"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        </group>
+                        <group>
+                            <field name="month_first"/>
+                            <field name="month_next"/>
+                        </group>
                     </group>
                      <notebook>
                          <page string="Appraisal Phases">
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index ed57698258e..560826e4c27 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -342,7 +342,7 @@
         <field name="type">form</field>
         <field name="inherit_id" ref="hr.view_hr_job_form"/>
         <field name="arch" type="xml">
-            <field name="expected_employees" version="7.0" position="after">
+            <field name="no_of_recruitment" version="7.0" position="after">
                 <label for="survey_id" />
                 <div>
                     <field name="survey_id" class="oe_inline"/>

From 8ee0fb34bab5493d99738972c8d3f9126543b77e Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 29 Jun 2012 14:59:40 +0530
Subject: [PATCH 47/93] [IMP]:hr_holidays:improved holidays view

bzr revid: apa@tinyerp.com-20120629092940-f0bgquhszllt0vvi
---
 addons/hr_holidays/hr_holidays_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index cff01b599e1..aad81a389f7 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -308,7 +308,7 @@
         <record model="ir.actions.act_window.view" id="action_request_approve_holidays_form">
             <field name="sequence" eval="2"/>
             <field name="view_mode">form</field>
-            <field name="view_id" ref="allocation_leave_new"/>
+            <field name="view_id" ref="edit_holiday_new"/>
             <field name="act_window_id" ref="request_approve_holidays"/>
         </record>
 

From e74341be06a11d010cd65cb384c0afb70c717ce8 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 29 Jun 2012 15:06:08 +0530
Subject: [PATCH 48/93] [IMP]:improved evaoaution view

bzr revid: apa@tinyerp.com-20120629093608-fx9xt5c4kc9n4fj3
---
 addons/hr_evaluation/hr_evaluation_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 6818cdb0fe6..5e08301d834 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -30,8 +30,8 @@
                     <group col="4">
                         <group>
                             <field name="name"/>
-                            <field name="active"/>
                             <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                            <field name="active"/>
                         </group>
                         <group>
                             <field name="month_first"/>

From 2ae4d917b0fad30ca8252c518f6ef4be81dbb418 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 29 Jun 2012 15:20:28 +0530
Subject: [PATCH 49/93] [IMP]:improve job position

bzr revid: apa@tinyerp.com-20120629095028-e4xolvuef04te7bx
---
 addons/hr/hr_view.xml                         |  4 ++--
 addons/hr_recruitment/hr_recruitment_view.xml | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 6bd3de11253..2f12f48b096 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -377,10 +377,10 @@
                         <group col="4">
                             <group>
                                 <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                                <field name="no_of_employee"/>
-                                <field name="expected_employees"/>
                             </group>
                             <group>
+                                <field name="no_of_employee"/>
+                                <field name="expected_employees"/>
                                 <field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/>
                             </group>
                         </group>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 560826e4c27..2cbf3a0d341 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -343,14 +343,14 @@
         <field name="inherit_id" ref="hr.view_hr_job_form"/>
         <field name="arch" type="xml">
             <field name="no_of_recruitment" version="7.0" position="after">
-                <label for="survey_id" />
-                <div>
-                    <field name="survey_id" class="oe_inline"/>
-                    <button class="oe_inline"
-                        string="Interview" icon="gtk-print"
-                        name="action_print_survey" type="object"
-                        attrs="{'invisible':[('survey_id','=',False)]}"/>
-                </div>
+            <label for="survey_id" />
+            <div>
+                <field name="survey_id" class="oe_inline"/>
+                <button class="oe_inline"
+                    string="Interview" icon="gtk-print"
+                    name="action_print_survey" type="object"
+                    attrs="{'invisible':[('survey_id','=',False)]}"/>
+            </div>
             </field>
         </field>
     </record>

From e8d8218de646f55585b949b8f02b78fc5c20eb87 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Fri, 29 Jun 2012 16:30:19 +0530
Subject: [PATCH 50/93] [IMP]marketing_campaign:  change text of field

bzr revid: kjo@tinyerp.com-20120629110019-jc3satr1ra66fqxe
---
 addons/marketing_campaign/marketing_campaign.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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.")
     }
 

From f6c543f2e6e994e341729f05f6eec5e5b39244b3 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Fri, 29 Jun 2012 19:17:39 +0530
Subject: [PATCH 51/93] [IMP]change res_partner view

bzr revid: kjo@tinyerp.com-20120629134739-1sbzv733y3i755qq
---
 openerp/addons/base/res/res_partner.py       |  2 +-
 openerp/addons/base/res/res_partner_view.xml | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 1f4e11fca26..6034b48ce89 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -151,7 +151,7 @@ class res_partner(osv.osv):
         'customer': fields.boolean('Customer', help="Check this box if the partner is a customer."),
         'supplier': fields.boolean('Supplier', help="Check this box if the partner is a supplier. If it's not checked, purchase people will not see it when encoding a purchase order."),
         'employee': fields.boolean('Employee', help="Check this box if the partner is an Employee."),
-        'function': fields.char('Function', size=128),
+        'function': fields.char('Job Position', size=128),
         'type': fields.selection( [('default','Default'),('invoice','Invoice'),
                                    ('delivery','Delivery'), ('contact','Contact'),
                                    ('other','Other')],
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index aaab3a7d008..384b0beed46 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -113,22 +113,17 @@
                         <h1>
                             <field name="name"/>
                         </h1>
-                        <div attrs="{'invisible': [('is_company','=', True)]}">
-                            <label for="parent_id" class="oe_edit_only"/>
-                        </div>
                         <h2 attrs="{'invisible': [('is_company','=', True)]}">
+                            <label for="parent_id" class="oe_edit_only oe_inline"/>
+                            
                             <field name="parent_id"
                                 domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
                                 class="oe_inline"
                                 on_change="onchange_address(use_parent_address, parent_id)"/>, 
-                            
-                        </h2>
-                        <div attrs="{'invisible' : [('is_company', '=', True)]}">
-                            <label for="function" class="oe_edit_only" />
-                        </div>
-                        <h2 attrs="{'invisible' : [('is_company', '=', True)]}">
+                            <label for="function" class="oe_inline oe_edit_only" />
                             <field name="function" class="oe_inline" placeholder="Job Position"/>
                         </h2>
+                    
                         <field name="category_id" widget="many2many_tags" placeholder="Tags..."/>
                     </div>
 
@@ -226,6 +221,8 @@
                                 <group>
                                     <field name="user_id" />
                                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                </group>
+                                <group>
                                     <field name="ref"/>
                                     <field name="lang"/>
                                     <field name="date"/>

From b864de994b689d07270d1fec24c72106c116cf43 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Fri, 29 Jun 2012 18:06:06 +0200
Subject: [PATCH 52/93] Many small improvements to Kanban view

bzr revid: mit@openerp.com-20120629160606-8dyxa381pm3xcde6
---
 addons/web/static/src/css/base.css            |  6 +-
 addons/web/static/src/css/base.sass           |  5 +-
 addons/web_kanban/static/src/css/kanban.css   | 55 ++++++++++++-------
 addons/web_kanban/static/src/css/kanban.sass  | 51 +++++++++++------
 addons/web_kanban/static/src/js/kanban.js     |  4 +-
 .../web_kanban/static/src/xml/web_kanban.xml  | 13 ++++-
 6 files changed, 84 insertions(+), 50 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 986539e5555..db152e391ad 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -950,10 +950,8 @@
   border-right: 4px solid transparent;
   border-top: 4px solid #4c4c4c;
 }
-.openerp .oe_application {
-  width: 100%;
-}
 .openerp .oe_application a {
+  width: 100%;
   color: #8a89ba;
 }
 .openerp .oe_application a:hover {
@@ -1158,7 +1156,7 @@
 .openerp .oe_searchview input, .openerp .oe_searchview textarea {
   padding: 3px;
   height: 14px;
-  font-size: 11px;
+  font-size: 12px;
   line-height: 18px;
 }
 .openerp .oe_searchview.oe_focused {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 389490bcd0a..85d22c20809 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -363,7 +363,6 @@ $colour4: #8a89ba
         border-right: 4px solid transparent
         border-top: 4px solid#404040
         @include opacity(0.5)
-
     .oe_sidebar
         white-space: nowrap
         .oe_dropdown_menu
@@ -755,8 +754,8 @@ $colour4: #8a89ba
     // }}}
     // ActionManager {{{
     .oe_application
-        width: 100%
         a
+            width: 100%
             color: $colour4
             &:hover
                 text-decoration: underline
@@ -917,7 +916,7 @@ $colour4: #8a89ba
         input, textarea
             padding: 3px
             height: 14px
-            font-size: 11px
+            font-size: 12px
             line-height: 18px
         &.oe_focused
             border-color: $facets-border-selected
diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 41fcbe5f00d..3bc5b57eee4 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -15,24 +15,40 @@
 .openerp .oe_kanban_view .oe_kanban_clear {
   clear: both;
 }
+.openerp .oe_kanban_view .oe_kanban_content .oe_star_on, .openerp .oe_kanban_view .oe_kanban_content .oe_star_off {
+  color: #cccccc;
+  text-shadow: 0 0 2px black;
+  vertical-align: top;
+  position: relative;
+  top: -5px;
+}
+.openerp .oe_kanban_view .oe_kanban_content .oe_star_on:hover, .openerp .oe_kanban_view .oe_kanban_content .oe_star_off:hover {
+  text-decoration: none;
+}
+.openerp .oe_kanban_view .oe_kanban_content .oe_star_on {
+  color: gold;
+}
 .openerp .oe_kanban_view .oe_kanban_content div:first-child {
   margin-right: 12px;
 }
+.openerp .oe_kanban_view .oe_kanban_button_new {
+  color: white;
+  background: #dc5f59;
+}
 .openerp .oe_kanban_view .oe_kanban_groups {
   height: inherit;
   width: 100%;
 }
 .openerp .oe_kanban_view .oe_kanban_group_title {
-  margin: 1px 1px 4px;
-  padding-left: 2px;
-  font-size: 100%;
+  margin-bottom: 4px;
+  font-size: 16px;
   font-weight: bold;
   color: #333333;
   text-shadow: 0 1px 0 white;
 }
 .openerp .oe_kanban_view .oe_kanban_column, .openerp .oe_kanban_view .oe_kanban_group_header {
   vertical-align: top;
-  padding: 6px 7px 6px 6px;
+  padding: 6px 7px 0 6px;
 }
 .openerp .oe_kanban_view .oe_kanban_column.oe_kanban_grouped, .openerp .oe_kanban_view .oe_kanban_group_header {
   background: #f0eeee;
@@ -92,20 +108,19 @@
   height: 16px;
   background: url(/web_kanban/static/src/img/minus-icon.png) no-repeat;
 }
-.openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_fold_icon {
-  background: url(/web_kanban/static/src/img/plus-icon.png) no-repeat;
-}
-.openerp .oe_kanban_view .oe_kanban_add {
+.openerp .oe_kanban_view .oe_kanban_add, .openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_toggle {
+  float: right;
+  margin-left: 4px;
   cursor: pointer;
-  position: absolute;
-  top: 6px;
-  right: 6px;
-  width: 16px;
-  height: 16px;
-  background: url(/web_kanban/static/src/img/plus-icon.png) no-repeat;
+  position: relative;
+  top: -8px;
 }
 .openerp .oe_kanban_view .oe_kanban_quick_create {
   overflow: hidden;
+  margin-bottom: 4px;
+}
+.openerp .oe_kanban_view .oe_kanban_quick_create_buttons {
+  margin: 4px 0;
 }
 .openerp .oe_kanban_view .oe_kanban_no_group .oe_kanban_quick_create {
   width: 200px;
@@ -113,12 +128,10 @@
 }
 .openerp .oe_kanban_view .oe_kanban_quick_create input {
   display: block;
+  font-size: 13px;
   box-sizing: border-box;
   width: 100%;
 }
-.openerp .oe_kanban_view .oe_kanban_quick_create button {
-  float: right;
-}
 .openerp .oe_kanban_view .oe_kanban_vignette {
   padding: 8px;
   min-height: 100px;
@@ -335,6 +348,9 @@
 .openerp .oe_kanban_view .oe_kanban_card h3:hover {
   text-decoration: none;
 }
+.openerp .oe_kanban_view .oe_kanban_card .oe_dropdown_kanban {
+  margin-top: 4px;
+}
 .openerp .oe_kanban_view .oe_kanban_star {
   float: left;
   position: inline-block;
@@ -377,9 +393,8 @@
   background-image: radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%);
 }
 .openerp .oe_kanban_view .oe_kanban_text_red {
-  background: #a61300;
-  color: white;
-  padding: 2px 4px;
+  color: #a61300;
+  font-weight: bold;
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
   border-radius: 4px;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 7d08265cfa7..3eef049959f 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -33,24 +33,36 @@
     .oe_kanban_clear
         clear: both
     .oe_kanban_content
+        .oe_star_on, .oe_star_off
+            color: #ccc
+            text-shadow: 0 0 2px black
+            vertical-align: top
+            position: relative
+            top: -5px
+            &:hover
+                text-decoration: none
+        .oe_star_on
+            color: gold
         div:first-child
             margin-right: 12px
+    .oe_kanban_button_new
+        color: white
+        background: #DC5F59
     // }}}
     // KanbanGroups {{{
     .oe_kanban_groups
         height: inherit
         width: 100%
     .oe_kanban_group_title
-        margin: 1px 1px 4px
-        padding-left: 2px
-        font-size: 100%
+        margin-bottom: 4px
+        font-size: 16px
         font-weight: bold
         color: #333333
         text-shadow: 0 1px 0 white
 
     .oe_kanban_column, .oe_kanban_group_header
         vertical-align: top
-        padding: 6px 7px 6px 6px
+        padding: 6px 7px 0 6px
 
     .oe_kanban_column.oe_kanban_grouped, .oe_kanban_group_header
         background: #f0eeee
@@ -103,30 +115,32 @@
         height: 16px
         background: url(/web_kanban/static/src/img/minus-icon.png) no-repeat
     .oe_kanban_group_folded .oe_kanban_fold_icon
-        background: url(/web_kanban/static/src/img/plus-icon.png) no-repeat
     // }}}
     // KanbanQuickCreate {{{
-    .oe_kanban_add
+    .oe_kanban_add, .oe_kanban_header .oe_dropdown_toggle
+        float: right
+        margin-left: 4px
         cursor: pointer
-        position: absolute
-        top: 6px
-        right: 6px
-        width: 16px
-        height: 16px
-        background: url(/web_kanban/static/src/img/plus-icon.png) no-repeat
+        position: relative
+        top: -8px
+        //right: 6px
+        //width: 16px
+        //height: 16px
+
     .oe_kanban_quick_create
-        // apply block formatting context
         overflow: hidden
+        margin-bottom: 4px
+    .oe_kanban_quick_create_buttons
+        margin: 4px 0
     .oe_kanban_no_group .oe_kanban_quick_create
         width: 200px
         padding: 10px
     .oe_kanban_quick_create input
         display: block
         // margins within width
+        font-size: 13px
         box-sizing: border-box
         width: 100%
-    .oe_kanban_quick_create button
-        float: right
     // }}}
     // KanbanRecords {{{
     .oe_kanban_vignette
@@ -288,6 +302,8 @@
             text-decoration: none
         h3:hover
             text-decoration: none
+        .oe_dropdown_kanban
+            margin-top: 4px
     .oe_kanban_star
         float: left
         position: inline-block
@@ -311,9 +327,8 @@
         background: red
         @include radial-gradient((#ee7777 0%, #cc3333 40%, #bb0808 100%))
     .oe_kanban_text_red
-        background: #A61300
-        color: white
-        padding: 2px 4px
+        color: #A61300
+        font-weight: bold
         @include radius(4px)
     .oe_kanban_ellipsis
         overflow: hidden
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 6811953465d..e9479b27429 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -258,7 +258,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
                 scroll: false
             });
         } else {
-            this.$element.find('.oe_kanban_draghandle').removeClass('oe_kanban_draghandle');
+            this.$element.find('.oe_kanban_draghandle').removeClass('oe_kanban_draghandle').removeClass('oe_kanban_card');
         }
     },
     on_record_moved : function(record, old_group, old_index, new_group, new_index) {
@@ -592,7 +592,7 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({
 
         // If no draghandle is found, make the whole card as draghandle
         if (!this.$element.find('.oe_kanban_draghandle').length) {
-            this.$element.children(':first').addClass('oe_kanban_draghandle');
+            this.$element.children(':first').addClass('oe_kanban_draghandle').addClass('oe_kanban_card');
         }
 
         this.$element.find('.oe_kanban_action').click(function() {
diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml
index b50c2910e3c..4ae39003a50 100644
--- a/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@ -13,7 +13,7 @@
 <div t-name="KanbanView.buttons" class="oe_kanban_buttons">
     <t t-if="widget.options.action_buttons !== false">
         <t t-if="widget._is_create_enabled()">
-            <button type="button" class="oe_button oe_kanban_button_new oe_form_button_hi">
+            <button type="button" class="oe_button oe_kanban_button_new oe_highlight oe_form_button_hi">
                 <t t-esc="widget.options.create_text || _t('Create')"/>
             </button>
         </t>
@@ -23,9 +23,16 @@
     <td class="oe_kanban_group_header">
         <t t-if="widget.view.group_by">
             <div class="oe_kanban_header">
-                <div class="oe_kanban_fold_icon"></div>
+                <div class="oe_dropdown_toggle">
+                  <span class="oe_e">í</span>
+                  <ul class="oe_dropdown_menu">
+                    <li><a href="#">Fold</a></li>
+                    <li><a href="#">Edit</a></li>
+                    <li><a href="#">Delete</a></li>
+                  </ul>
+                </div>
                 <t t-if="widget.view._is_quick_create_enabled()">
-                    <div class="oe_kanban_add"></div>
+                    <div class="oe_kanban_add oe_e">]</div>
                 </t>
                 <div class="oe_fold_column">
                     <div t-attf-class="oe_kanban_group_title #{widget.undefined_title ? 'oe_kanban_group_title_undefined' : ''}">

From 9997bd5f8d93cac00713aa1f549208357b5212dc Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 2 Jul 2012 14:53:41 +0530
Subject: [PATCH 53/93] [IMP]hr_holidays: remove calss and add icon to button

bzr revid: kjo@tinyerp.com-20120702092341-pn0beqbf3tnwqxwd
---
 .../wizard/hr_holidays_summary_department_view.xml           | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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 7c684e8c979..d2f1ecfb308 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
@@ -9,9 +9,8 @@
             <field name="arch" type="xml">
             <form string="Leaves by Department" version="7.0">
                 <header>
-                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
+                    <button icon="gtk-print" name="print_report" string="Print" type="object"/>
+                    <button icon="gtk-cancel" string="Cancel" special="cancel" />
                 </header>
                 <group>
                     <field name="date_from" />

From 0c9b077fc816b135a9e7c7e5059c52e7b1386d00 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 2 Jul 2012 15:34:09 +0530
Subject: [PATCH 54/93] [IMP]hr_timesheet: report menu in hr

bzr revid: kjo@tinyerp.com-20120702100409-8i7fkuwzuy5cdi9z
---
 addons/hr/hr_view.xml                                        | 2 ++
 .../wizard/hr_holidays_summary_department_view.xml           | 2 +-
 addons/hr_timesheet/hr_timesheet_report.xml                  | 5 -----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 5e6953a29d2..c51ee3ad1ce 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -9,6 +9,8 @@
         <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
         <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/>
         <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="25"/>
+        <menuitem id="menu_hr_reporting_timesheet" name="Reports"
+            parent="hr.menu_hr_reporting" sequence="6" />
 
         <!--Employee form view -->
         <record id="view_employee_form" model="ir.ui.view">
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 d2f1ecfb308..598b0b2ac23 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
@@ -32,7 +32,7 @@
 
         <menuitem
             name="Leaves by Department"
-            parent="hr_timesheet.menu_hr_reporting_timesheet"
+            parent="hr.menu_hr_reporting_timesheet"
             action="action_hr_holidays_summary_dept"
             id="menu_account_central_journal"
             icon="STOCK_PRINT"/>
diff --git a/addons/hr_timesheet/hr_timesheet_report.xml b/addons/hr_timesheet/hr_timesheet_report.xml
index ab24066b1de..487dcd592bd 100644
--- a/addons/hr_timesheet/hr_timesheet_report.xml
+++ b/addons/hr_timesheet/hr_timesheet_report.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-         <menuitem
-            id="menu_hr_reporting_timesheet"
-            name="Reports"
-            parent="hr.menu_hr_reporting"
-            sequence="6" />
         <report auto="False" id="report_user_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee timesheet" xsl="hr_timesheet/report/user_timesheet.xsl"/>
 
         <report auto="False" id="report_users_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet_users" string="Employees Timesheet" xsl="hr_timesheet/report/users_timesheet.xsl"/>

From 8ad41e791dbeb51a6b10fb2d1bf2355b1ae962fd Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 2 Jul 2012 16:01:11 +0530
Subject: [PATCH 55/93] [IMP] change menu sequence

bzr revid: kjo@tinyerp.com-20120702103111-blnzv4b6jb6xola0
---
 addons/hr/__openerp__.py                                      | 2 +-
 addons/hr/hr_view.xml                                         | 2 +-
 addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml  | 4 ++--
 .../wizard/hr_timesheet_analytic_profit_view.xml              | 2 +-
 addons/project_timesheet/report/task_report_view.xml          | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

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_view.xml b/addons/hr/hr_view.xml
index c51ee3ad1ce..310f8af37be 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -10,7 +10,7 @@
         <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/>
         <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="25"/>
         <menuitem id="menu_hr_reporting_timesheet" name="Reports"
-            parent="hr.menu_hr_reporting" sequence="6" />
+            parent="menu_hr_reporting" sequence="6" />
 
         <!--Employee form view -->
         <record id="view_employee_form" model="ir.ui.view">
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 c8c48d7bb26..b855d62d649 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -42,8 +42,8 @@
 
         <menuitem action="action_hr_timesheet_users"
             id="menu_hr_timesheet_users"
-            parent="menu_hr_reporting_timesheet"
-            groups="base.group_hr_manager" sequence="3" icon="STOCK_PRINT"/>
+            parent="hr.menu_hr_reporting_timesheet"
+            groups="base.group_hr_manager" sequence="2" icon="STOCK_PRINT"/>
 
 
      </data>
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 eff5508a803..c46c227bfc2 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
@@ -41,7 +41,7 @@
 
            <menuitem action="action_hr_timesheet_analytic_profit"
             id="menu_hr_timesheet_analytic_profit"
-            parent="hr_timesheet.menu_hr_reporting_timesheet" icon="STOCK_PRINT"/>
+            parent="hr.menu_hr_reporting_timesheet" sequence="3" icon="STOCK_PRINT"/>
 
     </data>
 </openerp>
diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml
index 6bc424ce60c..7e79b3793b7 100644
--- a/addons/project_timesheet/report/task_report_view.xml
+++ b/addons/project_timesheet/report/task_report_view.xml
@@ -66,7 +66,7 @@
             <field name="view_mode">tree,graph</field>
             <field name="context">{'search_default_year':1,'search_default_month':1, 'search_default_group_user_id':1}</field>
         </record>
-        <menuitem id="menu_timesheet_task_user" parent="hr_timesheet.menu_hr_reporting_timesheet"
+        <menuitem id="menu_timesheet_task_user" parent="hr.menu_hr_reporting_timesheet"
                     action="action_report_timesheet_task_user" sequence="1"/>
 
     </data>

From 8f7be976761ff4c7b05967e13a1fbcfbd1efecc9 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 2 Jul 2012 16:37:47 +0530
Subject: [PATCH 56/93] [IMP] set button class

bzr revid: kjo@tinyerp.com-20120702110747-s3f0iv72d6iv3wzj
---
 .../wizard/hr_holidays_summary_department_view.xml            | 4 ++--
 addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml  | 4 ++--
 .../wizard/hr_timesheet_analytic_profit_view.xml              | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

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 598b0b2ac23..c5e408a6748 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
@@ -9,8 +9,8 @@
             <field name="arch" type="xml">
             <form string="Leaves by Department" version="7.0">
                 <header>
-                    <button icon="gtk-print" name="print_report" string="Print" type="object"/>
-                    <button icon="gtk-cancel" string="Cancel" special="cancel" />
+                    <button name="print_report" string="Print" type="object" class="oe_highlight"/> or
+                    <button string="Cancel" special="cancel" class="oe_link"/>
                 </header>
                 <group>
                     <field name="date_from" />
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 b855d62d649..c4ef649f12e 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -10,8 +10,8 @@
             <field name="arch" type="xml">
 				<form string="Monthly Employees Timesheet" version="7.0">
                     <header>
-                    	<button icon="gtk-print" string="Print" name="print_report" type="object"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button string="Print" name="print_report" type="object" class="oe_highlight"/> or
+                        <button string="Cancel" class="oe_link" special="cancel" />
 	                </header>
                     <sheet>
                         <group><label for="month" string="Period" />
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 c46c227bfc2..d7b6cd1135b 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
@@ -9,8 +9,8 @@
             <field name="arch" type="xml">
 				<form string="Timesheet Profit" version="7.0">
                    <header>
-                        <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="print_report" string="Print" colspan="1" type="object" class="oe_highlight"/> or
+                        <button special="cancel" string="Cancel" class="oe_link"/>
                    </header>
                    <sheet>
                        <group> <label for="date_from" string="Duration" />					

From 84c3f2410970dd85b4accfb045cb0522f32f1c1b Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 3 Jul 2012 10:55:24 +0200
Subject: [PATCH 57/93] [IMP] suability improvements in form view of
 res.partner.bank and res.partner

bzr revid: qdp-launchpad@openerp.com-20120703085524-ct76l12zax0qxnyo
---
 openerp/addons/base/res/res_bank_view.xml    | 2 +-
 openerp/addons/base/res/res_partner_view.xml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/openerp/addons/base/res/res_bank_view.xml b/openerp/addons/base/res/res_bank_view.xml
index d4be11419e5..13419f7a881 100644
--- a/openerp/addons/base/res/res_bank_view.xml
+++ b/openerp/addons/base/res/res_bank_view.xml
@@ -105,7 +105,7 @@
                             <label for="street" string="Address"/>
                             <div>
                                 <field name="owner_name" placeholder="Name"/>
-                                <field name="street" placeholder="Street..."/>
+                                <field name="street" placeholder="Street"/>
                                 <div>
                                     <field name="zip" class="oe_inline" placeholder="ZIP"/>
                                     <field name="city" class="oe_inline" placeholder="City"/>
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 3b361777e9b..5159a7075cc 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -113,8 +113,10 @@
                         <h1>
                             <field name="name"/>
                         </h1>
+                        <div attrs="{'invisible': [('is_company','=', True)]}">
+                            <label for="parent_id" class="oe_edit_only"/>
+                        </div>
                         <h2 attrs="{'invisible': [('is_company','=', True)]}">
-                            <label for="parent_id" class="oe_edit_only oe_inline"/>
                             <field name="parent_id"
                                 domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
                                 class="oe_inline"
@@ -218,8 +220,6 @@
                                 <group>
                                     <field name="user_id" />
                                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                </group>
-                                <group>
                                     <field name="ref"/>
                                     <field name="lang"/>
                                     <field name="date"/>

From 50413828c552636b596b1b572addc68fae5c261c Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 3 Jul 2012 11:53:11 +0200
Subject: [PATCH 58/93] [FIX] problem in m2o due to wrong element destruction
 in dialogs

bzr revid: nicolas.vanhoren@openerp.com-20120703095311-4p3g3btqlsn4z0bl
---
 addons/web/static/src/js/chrome.js | 10 +++++++---
 addons/web/static/src/js/views.js  |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 031dc6cf9a5..b87ebe56856 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -136,14 +136,18 @@ instance.web.Dialog = instance.web.Widget.extend({
     },
     on_close: function() {
         if (this.dialog_options.destroy_on_close) {
-            this.$element.dialog('destroy');
+            this.destroy();
         }
     },
     on_resized: function() {
     },
     destroy: function () {
-        this.close();
-        this.$element.dialog('destroy');
+        _.each(this.getChildren(), function(el) {
+            el.destroy();
+        });
+	if (! this.isDestroyed()) {
+	    this.$element.dialog('destroy');
+	}
         this._super();
     }
 });
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index a364b9e0669..98df8a0af0d 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -144,7 +144,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
                 this.dialog_viewmanager.destroy();
             }
             this.dialog.dialog_title = action.name;
-            this.dialog_viewmanager = new instance.web.ViewManagerAction(this, action);
+            this.dialog_viewmanager = new instance.web.ViewManagerAction(this.dialog, action);
             this.dialog_viewmanager.appendTo(this.dialog.$element);
             this.dialog_viewmanager.$element.addClass("oe_view_manager_" + action.target);
             this.dialog.open();

From 59f4820da36df40009d5bae943e3e77d6efd48a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 3 Jul 2012 14:35:09 +0200
Subject: [PATCH 59/93] [REF] Chatter: ThreadView widget now named mail_thread.

bzr revid: tde@openerp.com-20120703123509-0qvtq0sjo3ki3n7s
---
 addons/mail/static/src/js/mail.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index da54130d093..6eddd6da712 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -598,7 +598,7 @@ openerp.mail = function(session) {
             return this.session.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
         },
     });
-    session.web.form.widgets.add( 'ThreadView', 'openerp.mail.RecordThread');
+    session.web.form.widgets.add( 'mail_thread', 'openerp.mail.RecordThread');
 
     /** WallView widget: a wall of messages */
     mail.WallView = session.web.Widget.extend({

From 27a1ac68d4443dfd08f8b15141716a8c98098faa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 3 Jul 2012 14:41:11 +0200
Subject: [PATCH 60/93] [REF] ThreadView widget renamed to mail_thread. Also
 added some footers where they were not used.

bzr revid: tde@openerp.com-20120703124111-smgj0kw3ct32552y
---
 addons/account/account_invoice_view.xml       |  4 +--
 .../account_voucher/account_voucher_view.xml  |  2 +-
 .../voucher_payment_receipt_view.xml          |  4 +--
 .../voucher_sales_purchase_view.xml           |  4 +--
 addons/analytic/analytic_view.xml             |  2 +-
 addons/crm/crm_lead_view.xml                  |  4 +--
 addons/crm/crm_meeting_view.xml               |  2 +-
 addons/crm/crm_phonecall_view.xml             |  2 +-
 addons/crm_claim/crm_claim_view.xml           |  6 ++---
 .../crm_fundraising/crm_fundraising_view.xml  |  2 +-
 addons/crm_helpdesk/crm_helpdesk_view.xml     |  2 +-
 addons/event/event_view.xml                   | 25 +++++--------------
 addons/hr_holidays/hr_holidays_view.xml       | 16 ++++++------
 addons/hr_recruitment/hr_recruitment_view.xml |  2 +-
 addons/idea/idea_view.xml                     |  2 +-
 addons/mail/doc/mail_openchatter_howto.rst    |  6 ++---
 addons/mail/mail_group_view.xml               |  2 +-
 addons/mail/res_partner_view.xml              |  2 +-
 addons/mail/res_users_view.xml                |  2 +-
 addons/mail/static/src/js/mail.js             |  2 +-
 addons/mrp/mrp_view.xml                       |  2 +-
 addons/mrp_operations/mrp_operations_view.xml |  2 +-
 addons/procurement/procurement_view.xml       |  2 +-
 addons/product/product_view.xml               |  2 +-
 addons/project/project_view.xml               |  4 +--
 addons/project_issue/project_issue_view.xml   |  2 +-
 addons/purchase/purchase_view.xml             |  2 +-
 .../purchase_requisition_view.xml             |  2 +-
 addons/sale/sale_view.xml                     |  2 +-
 addons/stock/stock_view.xml                   |  8 +++---
 30 files changed, 54 insertions(+), 67 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index e85a0002bf8..7121094641c 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -270,7 +270,7 @@
                     </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" widget="ThreadView"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </footer>
                 </form>
             </field>
@@ -405,7 +405,7 @@
                     </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                 </footer>
                 </form>
             </field>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 5f12eb080b3..2c294fa628c 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -112,7 +112,7 @@
                     </notebook>
                   </sheet>
                     <footer>
-                        <field name="message_ids" widget="ThreadView"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 5bda06622b1..c3291fb3bc3 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -258,7 +258,7 @@
                     </notebook>
                     </sheet>
                     <footer>
-                        <field name="message_ids" widget="ThreadView"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </footer>
                 </form>
             </field>
@@ -431,7 +431,7 @@
                     </notebook>
                     </sheet>
                     <footer>
-                        <field name="message_ids" widget="ThreadView"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 710a065c341..adb078fac22 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -168,7 +168,7 @@
                     </notebook>
                     </sheet>
                     <footer>
-                        <field name="message_ids" widget="ThreadView"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </footer>
                 </form>
             </field>
@@ -321,7 +321,7 @@
                     </notebook>
                     </sheet>
                     <footer>
-                        <field name="message_ids" widget="ThreadView"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index 85a1520e561..0c06c90150c 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -44,7 +44,7 @@
                         </notebook>
                     </sheet>
                     <footer>
-                        <field name="message_ids" widget="ThreadView"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index b8f519c4578..2579fa75cda 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -213,7 +213,7 @@
                     </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" widget="ThreadView"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </footer>
             </form>
         </field>
@@ -569,7 +569,7 @@
                     </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" widget="ThreadView"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 5473b727ea3..88ef7134735 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -258,7 +258,7 @@
                 </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" widget="ThreadView"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 6d09b2f2947..a874eeee239 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -146,7 +146,7 @@
                 <field name="description" placeholder="Description..." />
             </sheet>
             <footer>
-                <field name="message_ids" widget="ThreadView"/>
+                <field name="message_ids" widget="mail_thread"/>
             </footer>
             </form>
         </field>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 5c6e66de076..cf803fe6384 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -168,9 +168,9 @@
                         </notebook>
                     </group>
                 </sheet>
-                <div class="oe_sheet_width">
-                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                </div>
+                <footer>
+                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
+                </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 212ef29a6a1..26a95c99505 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -129,7 +129,7 @@
                     </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                 </footer>
                 </form>
             </field>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 4b7af86799a..79760a0a9fd 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -100,7 +100,7 @@
                     </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" widget="ThreadView"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </footer>
                 </form>
             </field>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index fcf8231f5f7..ea2788594b7 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -167,9 +167,9 @@
                     </page>
                     </notebook>
                     </sheet>
-                    <div class="oe_sheet_width">
-                        <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                    </div>
+                    <footer>
+                        <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
+                    </footer>
             </form>
             </field>
         </record>
@@ -468,19 +468,6 @@
                             </group>
                         </page>
                         <page string="Emails">
-<!--
-                            <field name="message_ids" colspan="4" nolabel="1" mode="tree">
-                                <tree string="History">
-                                    <field name="display_text" string="History Information"/>
-                                    <field name="reply_to" invisible="1"/>
-                                    <button
-                                        string="Reply" attrs="{'invisible': [('reply_to', '=', False)]}"
-                                        name="%(mail.action_email_compose_message_wizard)d"
-                                        context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
-                                        icon="terp-mail-replied" type="action" />
-                                </tree>
-                            </field>
--->
                             <button string="Send New Email"
                                 name="%(mail.action_email_compose_message_wizard)d"
                                 icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action"/>
@@ -488,9 +475,9 @@
 
                     </notebook>
                     </sheet>
-                    <div class="oe_sheet_width">
-                        <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                    </div>
+                    <footer>
+                        <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index bda18f1bc6c..34a61654faa 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -136,9 +136,9 @@
                         </page>
                     </notebook>
                 </sheet>
-                <div class="oe_sheet_width">
-                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                </div>
+                <footer>
+                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
+                </footer>
                 </form>
             </field>
         </record>
@@ -179,11 +179,11 @@
                         <field name="notes"/>
                     </page>
                 </notebook>
-            </sheet>
-            <div class="oe_sheet_width">
-                <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-            </div>
-            </form>
+                </sheet>
+                <footer>
+                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
+                </footer>
+                </form>
             </field>
         </record>
 
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 00b300cb6f6..b90e8d25658 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -204,7 +204,7 @@
                 </notebook>
             </sheet>
             <footer>
-                <field name="message_ids" widget="ThreadView"/>
+                <field name="message_ids" widget="mail_thread"/>
             </footer>
           </form>
         </field>
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 31fbb6d3924..9cee10c3cbb 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -78,7 +78,7 @@
                     <h2><field name="category_ids"/></h2>
                     <field name="description"/>
                 <footer>
-                    <field name="message_ids" widget="ThreadView"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/mail/doc/mail_openchatter_howto.rst b/addons/mail/doc/mail_openchatter_howto.rst
index 7ca52348d99..4c8797e7f8b 100644
--- a/addons/mail/doc/mail_openchatter_howto.rst
+++ b/addons/mail/doc/mail_openchatter_howto.rst
@@ -38,7 +38,7 @@ Make your module inheriting from the ``mail.thread`` class.
     # inherit from mail.thread allows the use of OpenChatter
     _inherit = ['mail.thread']
 
-Use the thread viewer widget inside your form view by using the ThreadView widget on the message_ids field inherited from mail.thread.
+Use the thread viewer widget inside your form view by using the mail_thread widget on the message_ids field inherited from mail.thread.
 
 ::
 
@@ -50,7 +50,7 @@ Use the thread viewer widget inside your form view by using the ThreadView widge
     <field name="arch" type="xml">
       <form>
       [...]
-      <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+      <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
       </form>
     </field>
   </record>
@@ -131,7 +131,7 @@ The drawback of this method is that it is no longer possible to those subscriber
 Messages display management
 ++++++++++++++++++++++++++++
 
-By default, the ThreadView widget shows all messages related to the current document beside the document, in the History and comments section. However, you may want to display other messages in the widget. For example, the OpenChatter on res.users model shows
+By default, the mail_thread widget shows all messages related to the current document beside the document, in the History and comments section. However, you may want to display other messages in the widget. For example, the OpenChatter on res.users model shows
 
  - messages related to the user, as usual (messages with ``model = res.users, res_id = current_document_id``)
  - messages directly pushed to this user (containing @login)
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 4b9cfd09c3d..6ad1792b3b4 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -73,7 +73,7 @@
                         </group>
                     </sheet>
                     <footer class="openerp_mail_group_footer">
-                        <field name="message_ids" widget="ThreadView"
+                        <field name="message_ids" widget="mail_thread"
                                 options='{"thread_level": 1}'/>
                     </footer>
                 </form>
diff --git a/addons/mail/res_partner_view.xml b/addons/mail/res_partner_view.xml
index 0a9860dc979..15f6618c8e5 100644
--- a/addons/mail/res_partner_view.xml
+++ b/addons/mail/res_partner_view.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
                 <xpath expr="//sheet" position="after">
                     <footer>
-                    <field name="message_ids" widget="ThreadView" 
+                    <field name="message_ids" widget="mail_thread" 
                             options='{"thread_level": 1}'/>
                     </footer>
                 </xpath>
diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index 428f53d092e..918f77e0ace 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -28,7 +28,7 @@
                 </field>
                 <xpath expr="/form/sheet" position="after">
                     <div class="oe_bottom">
-                        <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                        <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                     </div>
                 </xpath>
             </data>
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 6eddd6da712..3c0b61c173e 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -497,7 +497,7 @@ openerp.mail = function(session) {
     });
     session.web.form.widgets.add( 'Thread', 'openerp.mail.Thread');
 
-    /** ThreadView widget: thread of comments */
+    /** mail_thread widget: thread of comments */
     mail.RecordThread = session.web.form.AbstractField.extend({
         template: 'mail.RecordThread',
 
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 9da070bc0f2..0b725108be4 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -796,7 +796,7 @@
                     </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" widget="ThreadView"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </footer>
                 </form>
             </field>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index a0b318661e6..85cbaca0cbc 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -112,7 +112,7 @@
                 </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" widget="ThreadView"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index fde8b4ea2fe..3b0404d376b 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -94,7 +94,7 @@
                     </notebook>
                     </sheet>
                     <footer>
-                        <field name="message_ids" widget="ThreadView"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 0fb0b0559f9..cdf4d48c904 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -184,7 +184,7 @@
                         </notebook>
                     </sheet>
                     <footer>
-                        <field name="message_ids" widget="ThreadView"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index cf501740456..f18cfe4b682 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -148,7 +148,7 @@
                     </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" widget="ThreadView"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </footer>
                 </form>
             </field>
@@ -496,7 +496,7 @@
                     </notebook>
                     </sheet>
                     <footer>
-                        <field name="message_ids" widget="ThreadView"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index cdcea2cbb62..c6629f2f9d4 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -157,7 +157,7 @@
                     </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" widget="ThreadView"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </footer>
                 </form>
             </field>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index d5a9b93f9ea..0be6b8ddf8c 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -257,7 +257,7 @@
                     </notebook>
                 </sheet>
                 <footer>
-                   <field name="message_ids" widget="ThreadView"/>
+                   <field name="message_ids" widget="mail_thread"/>
                 </footer>
                 </form>
             </field>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 2cfde675b77..d8c2d0124b6 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -105,7 +105,7 @@
                 </notebook>
             </sheet>
             <footer>
-                  <field name="message_ids" widget="ThreadView"/>
+                  <field name="message_ids" widget="mail_thread"/>
             </footer> 
             </form>
         </field>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 0ff648db09d..d5d6b5346eb 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -321,7 +321,7 @@
                     </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" widget="ThreadView"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </footer>
                 </form>
             </field>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index b9a55841c0a..55be1fdc267 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -978,7 +978,7 @@
                     </xpath>
                     <xpath expr="/form/sheet" position="after">
                         <footer>
-                            <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                            <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                         </footer>
                     </xpath>
                 </data>
@@ -1090,9 +1090,9 @@
                         <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4" string="Supplier"/>
                     </xpath>
                     <xpath expr="/form/sheet" position="after">
-                        <div class="oe_bottom">
-                            <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                        </div>
+                        <footer>
+                            <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
+                        </footer>
                     </xpath>
                 </data>
             </field>

From e1ce5f153962d7b51a4f9a958b932a114807e969 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 3 Jul 2012 17:14:01 +0200
Subject: [PATCH 61/93] [FIX] correct jsonp. backport of
 revid:chs@openerp.com-20120531132020-ccagkni2dqu6i75u from 6.1 branch

bzr revid: chs@openerp.com-20120703151401-tmb3puk00cigfdpl
---
 addons/web/static/src/js/corelib.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index 5af51fa519a..1ed4c4788e3 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -1307,19 +1307,19 @@ instance.web.JsonRPC = instance.web.CallbackEnabled.extend({
         } else {
             // Indirect jsonp request
             var ifid = _.uniqueId('oe_rpc_iframe');
-            var display = options.openerp.debug ? 'block' : 'none';
+            var display = self.debug ? 'block' : 'none';
             var $iframe = $(_.str.sprintf("<iframe src='javascript:false;' name='%s' id='%s' style='display:%s'></iframe>", ifid, ifid, display));
             var $form = $('<form>')
                         .attr('method', 'POST')
                         .attr('target', ifid)
                         .attr('enctype', "multipart/form-data")
-                        .attr('action', ajax.url + '?' + $.param(data))
+                        .attr('action', ajax.url + '?jsonp=1&' + $.param(data))
                         .append($('<input type="hidden" name="r" />').attr('value', payload_str))
                         .hide()
                         .appendTo($('body'));
             var cleanUp = function() {
                 if ($iframe) {
-                    $iframe.unbind("load").attr("src", "javascript:false;").remove();
+                    $iframe.unbind("load").remove();
                 }
                 $form.remove();
             };

From fa5ef483d5381b683e0cf4f54bfd6e97d69c4d39 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 3 Jul 2012 17:55:40 +0200
Subject: [PATCH 62/93] [IMP] added exception in list view when trying to group
 on a field not declarer in the list view

bzr revid: nicolas.vanhoren@openerp.com-20120703155540-0sp4m80yqa9r4ati
---
 addons/web/static/src/js/view_list.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index b19e483bed9..3033404b387 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -1328,6 +1328,11 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we
                 row_data[group.grouped_on] = group;
                 var group_column = _(self.columns).detect(function (column) {
                     return column.id === group.grouped_on; });
+                if (! group_column) {
+                    throw new Error(_.str.sprintf(
+                        _t("Grouping on field '%s' is not possible because that field does not appear in the list view."),
+                        group.grouped_on));
+                }
                 try {
                     $group_column.html(instance.web.format_cell(
                         row_data, group_column, {

From 66922c7199304ef06b04d2b762bfa824ec957799 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 3 Jul 2012 17:58:43 +0200
Subject: [PATCH 63/93] [IMP] code review

bzr revid: qdp-launchpad@openerp.com-20120703155843-awb230fppn22wbs1
---
 .../report/hr_expense_report_view.xml         |  2 +-
 .../wizard/hr_timesheet_print_users_view.xml  | 29 +++++++++----------
 .../hr_timesheet_analytic_profit_view.xml     |  3 +-
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 8b00e447ab9..7877edf4b3a 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -96,7 +96,7 @@
     </record>
 
     <record id="action_hr_expense_report_all" model="ir.actions.act_window">
-        <field name="name">Expense Analysis</field>
+        <field name="name">Expenses Analysis</field>
         <field name="res_model">hr.expense.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
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 c4ef649f12e..ebce5ca34c4 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -8,26 +8,24 @@
             <field name="model">hr.analytical.timesheet.users</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-				<form string="Monthly Employees Timesheet" version="7.0">
+                <form string="Monthly Employees Timesheet" version="7.0">
                     <header>
-                    	<button string="Print" name="print_report" type="object" class="oe_highlight"/> or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-	                </header>
+                        <button string="Print" name="print_report" type="object" class="oe_highlight"/> or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </header>
                     <sheet>
-                        <group><label for="month" string="Period" />
-             				<div>
-								<field name="month" nolabel="1" class="oe_inline"/>
-								<field name="year" nolabel="1" class="oe_inline"/>
-							</div> 
-                        </group>
                         <group>
-                            <div>
-                                <separator string="Employees" colspan="4"/>
-							    <field name="employee_ids" colspan="4" nolabel="1"/>
+                             <label for="month" string="Period"/>
+                             <div>
+                                <field name="month" class="oe_inline"/>
+                                <field name="year" class="oe_inline"/>
                             </div> 
-                        </group>						
+                        </group>
+                        <group string="Employees"/>
+                            <field name="employee_ids" nolabel="1"/>
+                        </group>
                     </sheet>
-				</form>
+                </form>
             </field>
         </record>
 
@@ -45,6 +43,5 @@
             parent="hr.menu_hr_reporting_timesheet"
             groups="base.group_hr_manager" sequence="2" icon="STOCK_PRINT"/>
 
-
      </data>
 </openerp>
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 d7b6cd1135b..4e4eb7b36d2 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
@@ -13,7 +13,8 @@
                         <button special="cancel" string="Cancel" class="oe_link"/>
                    </header>
                    <sheet>
-                       <group> <label for="date_from" string="Duration" />					
+                       <group> 
+                           <label for="date_from" string="Duration" />					
                            <div>
  						       <field name="date_from" nolabel="1" class="oe_inline" />
                                - <field name="date_to" nolabel="1" class="oe_inline"/>

From f5f8cb037b3bece495c22377ca82538ac0898df6 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 4 Jul 2012 04:39:02 +0000
Subject: [PATCH 64/93] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120704043902-303alcnjek46zrdk
---
 .../i18n/sv.po                                |   81 +-
 addons/stock/i18n/es_DO.po                    | 3984 +++++++++++++++++
 addons/stock_planning/i18n/ja.po              |  186 +-
 3 files changed, 4138 insertions(+), 113 deletions(-)
 create mode 100644 addons/stock/i18n/es_DO.po

diff --git a/addons/account_bank_statement_extensions/i18n/sv.po b/addons/account_bank_statement_extensions/i18n/sv.po
index 55f39080e09..d13c31ac375 100644
--- a/addons/account_bank_statement_extensions/i18n/sv.po
+++ b/addons/account_bank_statement_extensions/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-04-25 10:49+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-07-03 09:17+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-26 04:41+0000\n"
-"X-Generator: Launchpad (build 15149)\n"
+"X-Launchpad-Export-Date: 2012-07-04 04:39+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -42,7 +42,7 @@ msgstr "CODA"
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,parent_id:0
 msgid "Parent Code"
-msgstr "Förälderns kod"
+msgstr "Överliggande kod"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -54,7 +54,7 @@ msgstr "Debet"
 #: model:ir.actions.act_window,name:account_bank_statement_extensions.action_cancel_statement_line
 #: model:ir.model,name:account_bank_statement_extensions.model_cancel_statement_line
 msgid "Cancel selected statement lines"
-msgstr ""
+msgstr "Avbryt valda utdragsrader"
 
 #. module: account_bank_statement_extensions
 #: constraint:res.partner.bank:0
@@ -118,6 +118,8 @@ msgid ""
 "Delete operation not allowed !             Please go to the associated bank "
 "statement in order to delete and/or modify this bank statement line"
 msgstr ""
+"Radering inte tillåten ! Vänligen använd associerat bankuttdrag för att "
+"radera och/eller ändra utdragsrader"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,type:0
@@ -134,27 +136,27 @@ msgstr "Journal"
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Confirmed Statement Lines."
-msgstr ""
+msgstr "Bekräfta utdragsrader"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Credit Transactions."
-msgstr ""
+msgstr "Kredittransaktioner"
 
 #. module: account_bank_statement_extensions
 #: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line
 msgid "cancel selected statement lines."
-msgstr ""
+msgstr "avbryt valda utdragsrader."
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,counterparty_number:0
 msgid "Counterparty Number"
-msgstr ""
+msgstr "Motpartens nummer"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line.global:0
 msgid "Transactions"
-msgstr ""
+msgstr "Transaktioner"
 
 #. module: account_bank_statement_extensions
 #: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
@@ -200,6 +202,9 @@ msgid ""
 "Please define BIC/Swift code on bank for bank type IBAN Account to make "
 "valid payments"
 msgstr ""
+"\n"
+"Vänligen ange BIC/Swift-kod på bank för banktyp IBAN-konto för korrekta "
+"utbetalningar"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,val_date:0
@@ -214,7 +219,7 @@ msgstr "Bekräfta valda rader från kontoutdraget."
 #. module: account_bank_statement_extensions
 #: view:cancel.statement.line:0
 msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
-msgstr ""
+msgstr "Är du säker på att du vill avbryta valda bankutdragsrader ?"
 
 #. module: account_bank_statement_extensions
 #: report:bank.statement.balance.report:0
@@ -234,42 +239,42 @@ msgstr "Anteckningar"
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "Manual"
-msgstr ""
+msgstr "Manuell"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Credit"
-msgstr ""
+msgstr "Kredit"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "Belopp"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Fin.Account"
-msgstr ""
+msgstr "Fin.konto"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,counterparty_currency:0
 msgid "Counterparty Currency"
-msgstr ""
+msgstr "Motpartsvaluta"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,counterparty_bic:0
 msgid "Counterparty BIC"
-msgstr ""
+msgstr "Motpartens BIC"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,child_ids:0
 msgid "Child Codes"
-msgstr ""
+msgstr "Barnkoder"
 
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
-msgstr ""
+msgstr "Är du säker på att du vill bekräfta valda bankutdragsrader?"
 
 #. module: account_bank_statement_extensions
 #: constraint:account.bank.statement.line:0
@@ -277,6 +282,7 @@ msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
 msgstr ""
+"Beloppet på bokföringsordern måste överenstämma med beloppet på kontoutdraget"
 
 #. module: account_bank_statement_extensions
 #: help:account.bank.statement.line,globalisation_id:0
@@ -284,91 +290,92 @@ msgid ""
 "Code to identify transactions belonging to the same globalisation level "
 "within a batch payment"
 msgstr ""
+"Kod för att identifiera transaktioner som tillhör samma batchbetalning"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Draft Statement Lines."
-msgstr ""
+msgstr "Preleminära utdragsrader."
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Glob. Am."
-msgstr ""
+msgstr "Glob. Am."
 
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "Kontoutdragsrad"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,code:0
 msgid "Code"
-msgstr ""
+msgstr "Kod"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,counterparty_name:0
 msgid "Counterparty Name"
-msgstr ""
+msgstr "Motpartsnamn"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,name:0
 msgid "Communication"
-msgstr ""
+msgstr "Kommunikation"
 
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
 msgid "Bank Accounts"
-msgstr ""
+msgstr "Bankkonton"
 
 #. module: account_bank_statement_extensions
 #: constraint:account.bank.statement:0
 msgid "The journal and period chosen have to belong to the same company."
-msgstr ""
+msgstr "Journalen och perioden måste tillhöra samma bolag."
 
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "Bankkontoutdrag"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Statement Line"
-msgstr ""
+msgstr "Utdragsrad"
 
 #. module: account_bank_statement_extensions
 #: sql_constraint:account.bank.statement.line.global:0
 msgid "The code must be unique !"
-msgstr ""
+msgstr "Koden måste vara unik !"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,bank_statement_line_ids:0
 #: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line
 #: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line
 msgid "Bank Statement Lines"
-msgstr ""
+msgstr "Bankutdragsrad"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line.global:0
 msgid "Child Batch Payments"
-msgstr ""
+msgstr "Barnbatchbetalningar"
 
 #. module: account_bank_statement_extensions
 #: view:cancel.statement.line:0
 #: view:confirm.statement.line:0
 msgid "Cancel"
-msgstr ""
+msgstr "Avbryt"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Statement Lines"
-msgstr ""
+msgstr "Utdragsrader"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Total Amount"
-msgstr ""
+msgstr "Totalsumma"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,globalisation_id:0
 msgid "Globalisation ID"
-msgstr ""
+msgstr "Globalt ID"
diff --git a/addons/stock/i18n/es_DO.po b/addons/stock/i18n/es_DO.po
new file mode 100644
index 00000000000..bd0338efbaf
--- /dev/null
+++ b/addons/stock/i18n/es_DO.po
@@ -0,0 +1,3984 @@
+# Spanish (Dominican Republic) 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 <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-07-03 19:52+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Dominican Republic) <es_DO@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-07-04 04:38+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
+
+#. module: stock
+#: field:product.product,track_outgoing:0
+msgid "Track Outgoing Lots"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_split_lines
+msgid "Stock move Split lines"
+msgstr ""
+
+#. module: stock
+#: help:product.category,property_stock_account_input_categ:0
+msgid ""
+"When doing real-time inventory valuation, counterpart journal items for all "
+"incoming stock moves will be posted in this account, unless there is a "
+"specific valuation account set on the source location. This is the default "
+"value for all products in this category. It can also directly be set on each "
+"product"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_location_id:0
+msgid "Chained Location If Fixed"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0 view:stock.move:0 view:stock.picking:0
+msgid "Put in a new pack"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_traceability.py:54
+#: view:stock.production.lot:0
+#, python-format
+msgid "Upstream Traceability"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.todo.category,name:stock.category_stock_management_config
+msgid "Stock Management"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_line_date
+#: model:ir.ui.menu,name:stock.menu_report_stock_line_date
+msgid "Last Product Inventories"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Today"
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot.revision,indice:0
+msgid "Revision Number"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Orders processed Today or planned for Today"
+msgstr ""
+
+#. module: stock
+#: view:stock.partial.move.line:0 view:stock.partial.picking:0
+#: field:stock.partial.picking,move_ids:0 view:stock.partial.picking.line:0
+#: view:stock.return.picking.memory:0
+msgid "Product Moves"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_uom_categ_form_action
+msgid "UoM Categories"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_move_report
+#: model:ir.ui.menu,name:stock.menu_action_stock_move_report
+#: view:report.stock.move:0
+msgid "Moves Analysis"
+msgstr ""
+
+#. module: stock
+#: help:stock.production.lot,ref:0
+msgid ""
+"Internal reference number in case it differs from the manufacturer's serial "
+"number"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:47
+#, python-format
+msgid "You cannot perform this operation on more than one Stock Inventories."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_inventory_form
+msgid ""
+"Periodical Inventories are used to count the number of products available "
+"per location. You can use it once a year when you do the general inventory "
+"or whenever you need it, to correct the current stock level of a product."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_change_product_qty.py:87
+#, python-format
+msgid "Quantity cannot be negative."
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Picking list"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
+#: field:report.stock.inventory,product_qty:0
+#: field:report.stock.move,product_qty:0
+#: field:stock.change.product.qty,new_quantity:0
+#: field:stock.inventory.line,product_qty:0
+#: field:stock.inventory.line.split,qty:0
+#: field:stock.inventory.line.split.lines,quantity:0
+#: report:stock.inventory.move:0 field:stock.move,product_qty:0
+#: field:stock.move.consume,product_qty:0 field:stock.move.scrap,product_qty:0
+#: field:stock.move.split,qty:0 field:stock.move.split.lines,quantity:0
+#: field:stock.partial.move.line,quantity:0
+#: field:stock.partial.picking.line,quantity:0 report:stock.picking.list:0
+#: field:stock.report.prodlots,qty:0 field:stock.report.tracklots,name:0
+#: field:stock.return.picking.memory,quantity:0
+#: field:stock.split.into,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_picking_tree
+msgid ""
+"This is the list of all delivery orders that have to be prepared, according "
+"to your different sales orders and your logistics rules."
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0 field:report.stock.move,day:0
+msgid "Day"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0 field:stock.inventory.line.split,product_uom:0
+#: view:stock.move:0 field:stock.move.split,product_uom:0 view:stock.picking:0
+#: view:stock.production.lot:0
+msgid "UoM"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_inventory_form
+#: model:ir.ui.menu,name:stock.menu_action_inventory_form
+msgid "Physical Inventories"
+msgstr ""
+
+#. module: stock
+#: field:product.category,property_stock_journal:0 view:report.stock.move:0
+#: field:stock.change.standard.price,stock_journal:0
+msgid "Stock journal"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 view:report.stock.move:0
+msgid "Current month"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_move.py:222
+#, python-format
+msgid "Unable to assign all lots to this move!"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2516
+#, python-format
+msgid "Missing partial picking data for move #%s"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.server,name:stock.action_partial_move_server
+msgid "Deliver/Receive Products"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/report/report_stock.py:78
+#: code:addons/stock/report/report_stock.py:135
+#, python-format
+msgid "You cannot delete any record!"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Delivery orders to invoice"
+msgstr "Ordenes de entrega a facturar"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Assigned Delivery Orders"
+msgstr "Ordenes de Entrega Asignadas"
+
+#. module: stock
+#: field:stock.partial.move.line,update_cost:0
+#: field:stock.partial.picking.line,update_cost:0
+msgid "Need cost update"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_splitinto.py:49
+#, python-format
+msgid ""
+"The current move line is already assigned to a pack, please remove it first "
+"if you really want to change it '             #                        'for "
+"this product: \"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking,invoice_state:0
+msgid "Not Applicable"
+msgstr ""
+
+#. module: stock
+#: help:stock.tracking,serial:0
+msgid "Other reference or serial number"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,origin:0 view:stock.picking:0 field:stock.picking,origin:0
+msgid "Origin"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+#: model:ir.actions.act_window,name:stock.action_stock_incoming_product_delay
+msgid "Incoming Products"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.lines.date:0
+msgid "Non Inv"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_traceability.py:54
+#: view:stock.production.lot:0
+#, python-format
+msgid "Downstream Traceability"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 field:stock.move,picking_id:0 field:stock.picking,name:0
+#: view:stock.production.lot:0
+msgid "Reference"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:670 code:addons/stock/stock.py:1516
+#, python-format
+msgid "Products to Process"
+msgstr ""
+
+#. module: stock
+#: help:stock.fill.inventory,set_stock_zero:0
+msgid ""
+"If checked, all product quantities will be set to zero to help ensure a real "
+"physical inventory is done"
+msgstr ""
+
+#. module: stock
+#: view:stock.partial.move:0 view:stock.partial.picking:0
+msgid "_Validate"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1149
+#, python-format
+msgid "You cannot cancel picking because stock move is in done state !"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2337 code:addons/stock/stock.py:2379
+#: code:addons/stock/stock.py:2440
+#: code:addons/stock/wizard/stock_change_product_qty.py:87
+#: code:addons/stock/wizard/stock_fill_inventory.py:53
+#: code:addons/stock/wizard/stock_partial_picking.py:141
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: stock
+#: field:stock.invoice.onshipping,group:0
+msgid "Group by partner"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_res_partner view:report.stock.inventory:0
+#: field:report.stock.inventory,partner_id:0 view:report.stock.move:0
+#: field:report.stock.move,partner_id:0 view:stock.move:0
+#: field:stock.move,partner_id:0 view:stock.picking:0
+#: field:stock.picking,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2119
+#, python-format
+msgid ""
+"Can not create Journal Entry, Input Account defined on this product and "
+"Valuation account on category of this product are same."
+msgstr ""
+
+#. module: stock
+#: selection:stock.return.picking,invoice_state:0
+msgid "No invoicing"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Stock moves that have been processed"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_production_lot
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Production lot"
+msgstr ""
+
+#. module: stock
+#: help:stock.incoterms,code:0
+msgid "Code for Incoterms"
+msgstr ""
+
+#. module: stock
+#: field:stock.tracking,move_ids:0
+msgid "Moves for this pack"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Incoming Shipments Available"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Internal Location"
+msgstr ""
+
+#. module: stock
+#: view:stock.location.product:0
+msgid ""
+"(Keep empty to open the current situation. Adjust HH:MM:SS to 00:00:00 to "
+"filter all resources of the day for the 'From' date and 23:59:59 for the "
+"'To' date)"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 field:report.stock.inventory,state:0
+#: view:report.stock.move:0 field:report.stock.move,state:0
+#: view:stock.inventory:0 field:stock.inventory,state:0
+#: field:stock.inventory.line,state:0 view:stock.move:0
+#: field:stock.move,state:0 view:stock.picking:0 field:stock.picking,state:0
+#: report:stock.picking.list:0
+msgid "State"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Accounting Information"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,stock_real_value:0
+msgid "Real Stock Value"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.move,day_diff2:0
+msgid "Lag (Days)"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_action_traceability
+msgid "Action traceability "
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "UOM"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0 view:stock.move:0
+#: selection:stock.move,state:0 view:stock.picking:0
+#: view:stock.production.lot:0 field:stock.production.lot,stock_available:0
+msgid "Available"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0 field:stock.picking,min_date:0
+msgid "Expected Date"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_warehouse_form
+msgid ""
+"Create and manage your warehouses and assign them a location from here"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.move,product_qty_in:0
+msgid "In Qty"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:116
+#, python-format
+msgid "No product in this location."
+msgstr ""
+
+#. module: stock
+#: field:stock.warehouse,lot_output_id:0
+msgid "Location Output"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.split_into
+#: model:ir.model,name:stock.model_stock_split_into
+msgid "Split into"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Internal Locations"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,price_currency_id:0
+msgid "Currency for average price"
+msgstr ""
+
+#. module: stock
+#: help:product.category,property_stock_valuation_account_id:0
+msgid ""
+"When real-time inventory valuation is enabled on a product, this account "
+"will hold the current value of the products."
+msgstr ""
+
+#. module: stock
+#: field:report.stock.inventory,location_type:0 field:stock.location,usage:0
+msgid "Location Type"
+msgstr ""
+
+#. module: stock
+#: help:report.stock.move,type:0 help:stock.picking,type:0
+msgid "Shipping type specify, goods coming in or going out."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_move_labels
+msgid "Item Labels"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_report_stock_move
+msgid "Moves Statistics"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Product Lots Filter"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0 report:stock.picking.list:0
+msgid "["
+msgstr ""
+
+#. module: stock
+#: help:stock.production.lot,stock_available:0
+msgid ""
+"Current quantity of products with this Production Lot Number available in "
+"company warehouses"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,move_history_ids:0
+msgid "Move History (child moves)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2125
+#, python-format
+msgid ""
+"There is no stock output account defined for this product or its category: "
+"\"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_picking_tree6
+#: model:ir.ui.menu,name:stock.menu_action_picking_tree6
+#: field:stock.picking,move_lines:0
+msgid "Internal Moves"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,location_dest_id:0
+msgid "Destination Location"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_partial_move_line
+msgid "stock.partial.move.line"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:760
+#, python-format
+msgid "You can not process picking without stock moves"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_product_packaging_stock_action
+#: field:stock.move,product_packaging:0
+msgid "Packaging"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Order(Origin)"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
+msgid "Grand Total:"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_out_picking_move
+msgid ""
+"You will find in this list all products you have to deliver to your "
+"customers. You can process the deliveries directly from this list using the "
+"buttons on the right of each line. You can filter the products to deliver by "
+"customer, products or sale order (using the Origin field)."
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_inventory_control
+msgid "Inventory Control"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0 field:stock.location,comment:0
+msgid "Additional Information"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
+msgid "Location / Product"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,address_id:0
+msgid "Destination Address "
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1333
+#, python-format
+msgid "Reception"
+msgstr ""
+
+#. module: stock
+#: field:stock.tracking,serial:0
+msgid "Additional Reference"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot.revision:0
+msgid "Production Lot Revisions"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_stock_journal_form
+msgid ""
+"The stock journal system allows you to assign each stock operation to a "
+"specific journal according to the type of operation to perform or the "
+"worker/team that should perform the operation. Examples of stock journals "
+"may be: quality control, pick lists, packing, etc."
+msgstr ""
+
+#. module: stock
+#: field:stock.location,complete_name:0 field:stock.location,name:0
+msgid "Location Name"
+msgstr ""
+
+#. module: stock
+#: model:res.company,overdue_msg:stock.res_company_shop0
+#: model:res.company,overdue_msg:stock.res_company_tinyshop0
+msgid ""
+"Our records indicate that the following payments are still due. If the "
+"amount\n"
+"has already been paid, please disregard this notice. However, if you have "
+"any\n"
+"queries regarding your account, please contact us.\n"
+"Thank you in advance.\n"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Posted Inventory"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_picking_tree4
+msgid ""
+"The Incoming Shipments is the list of all orders you will receive from your "
+"suppliers. An incoming shipment contains a list of products to be received "
+"according to the original purchase order. You can validate the shipment "
+"totally or partially."
+msgstr ""
+
+#. module: stock
+#: field:stock.move.split.lines,wizard_exist_id:0
+msgid "Parent Wizard (for existing lines)"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
+msgid "Move Information"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2131
+#, python-format
+msgid ""
+"There is no inventory Valuation account defined on the product category: "
+"\"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "August"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_tracking_form
+#: model:ir.model,name:stock.model_stock_tracking
+#: model:ir.ui.menu,name:stock.menu_action_tracking_form view:stock.tracking:0
+msgid "Packs"
+msgstr ""
+
+#. module: stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: stock
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "June"
+msgstr ""
+
+#. module: stock
+#: field:product.template,property_stock_procurement:0
+msgid "Procurement Location"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: field:stock.inventory.line.split,line_exist_ids:0
+#: field:stock.inventory.line.split,line_ids:0
+#: field:stock.move.split,line_exist_ids:0 field:stock.move.split,line_ids:0
+msgid "Production Lots"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Recipient"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.location_refrigerator
+msgid "Refrigerator"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_location_tree
+#: model:ir.ui.menu,name:stock.menu_action_location_tree
+msgid "Location Structure"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "October"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_inventory_line
+msgid "Inventory Line"
+msgstr ""
+
+#. module: stock
+#: help:product.category,property_stock_journal:0
+msgid ""
+"When doing real-time inventory valuation, this is the Accounting Journal in "
+"which entries will be automatically posted when stock moves are processed."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_partial_picking
+msgid "Process Picking"
+msgstr ""
+
+#. module: stock
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:417
+#, python-format
+msgid "Future Receptions"
+msgstr ""
+
+#. module: stock
+#: selection:stock.move,priority:0
+msgid "Urgent"
+msgstr ""
+
+#. module: stock
+#: help:stock.inventory.line.split,use_exist:0
+#: help:stock.move.split,use_exist:0
+msgid ""
+"Check this option to select existing lots in the list below, otherwise you "
+"should enter new ones line by line."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:75
+#, python-format
+msgid "Valuation Account is not specified for Product Category: %s"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,move_dest_id:0
+msgid "Destination Move"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
+msgid "Process Now"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,address_id:0
+msgid "Location Address"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,prodlot_id:0
+msgid "Production lot is used to put a serial number on the production"
+msgstr ""
+
+#. module: stock
+#: field:stock.warehouse,lot_input_id:0
+msgid "Location Input"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,date:0
+msgid "Date of Order"
+msgstr ""
+
+#. module: stock
+#: selection:product.product,valuation:0
+msgid "Periodical (manual)"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.location_procurement
+msgid "Procurements"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_3
+msgid "IT Suppliers"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Transit Location for Inter-Companies Transfers"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_view_change_product_quantity
+#: model:ir.model,name:stock.model_stock_change_product_qty
+#: view:stock.change.product.qty:0
+msgid "Change Product Quantity"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.inventory,month:0
+msgid "unknown"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_inventory_merge
+msgid "Merge Inventory"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:433
+#, python-format
+msgid "Future P&L"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+#: model:ir.actions.act_window,name:stock.action_incoming_product_board
+#: model:ir.actions.act_window,name:stock.action_picking_tree4
+#: model:ir.ui.menu,name:stock.menu_action_picking_tree4 view:stock.picking:0
+msgid "Incoming Shipments"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 view:stock.move:0 view:stock.picking:0
+msgid "Scrap"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,child_ids:0
+msgid "Contains"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Stock Locations"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Incoming"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
+#: field:stock.move,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,date_expected:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: stock
+#: view:stock.tracking:0
+msgid "Pack Search"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Pickings already processed"
+msgstr ""
+
+#. module: stock
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0 report:stock.picking.list:0
+msgid "Journal"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1345
+#, python-format
+msgid "is scheduled %s."
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,location_id:0
+msgid ""
+"Keep empty if you produce at the location where the finished products are "
+"needed.Set a location if you produce at a fixed location. This can be a "
+"partner location if you subcontract the manufacturing operations."
+msgstr ""
+
+#. module: stock
+#: view:res.partner:0
+msgid "Inventory Properties"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.move,day_diff:0
+msgid "Execution Lead Time (Days)"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_partial_move
+msgid "Partial Move Processing Wizard"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_stock_product_location_open
+msgid "Stock by Location"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,address_id:0
+msgid ""
+"Optional address where goods are to be delivered, specifically used for "
+"allotment"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 view:report.stock.move:0
+msgid "Month-1"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,active:0
+msgid ""
+"By unchecking the active field, you may hide a location without deleting it."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_inventory_merge.py:44
+#, python-format
+msgid ""
+"Please select multiple physical inventories to merge in the list view."
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Confirmed Pickings"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,stock_virtual:0
+msgid "Virtual Stock"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "View"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 view:report.stock.move:0
+msgid "Last month"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,parent_left:0
+msgid "Left Parent"
+msgstr ""
+
+#. module: stock
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1349
+#, python-format
+msgid "is waiting."
+msgstr ""
+
+#. module: stock
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:147
+#, python-format
+msgid ""
+"There is no stock output account defined for this product: \"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: field:product.template,property_stock_production:0
+msgid "Production Location"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,address_id:0
+msgid "Address of partner"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.lines.date,date:0
+msgid "Latest Inventory Date"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,usage:0
+msgid ""
+"* Supplier Location: Virtual location representing the source location for "
+"products coming from your suppliers\n"
+"                       \n"
+"* View: Virtual location used to create a hierarchical structures for your "
+"warehouse, aggregating its child locations ; can't directly contain "
+"products\n"
+"                       \n"
+"* Internal Location: Physical locations inside your own warehouses,\n"
+"                       \n"
+"* Customer Location: Virtual location representing the destination location "
+"for products sent to your customers\n"
+"                       \n"
+"* Inventory: Virtual location serving as counterpart for inventory "
+"operations used to correct stock levels (Physical inventories)\n"
+"                       \n"
+"* Procurement: Virtual location serving as temporary counterpart for "
+"procurement operations when the source (supplier or production) is not known "
+"yet. This location should be empty when the procurement scheduler has "
+"finished running.\n"
+"                       \n"
+"* Production: Virtual counterpart location for production operations: this "
+"location consumes the raw material and produces finished products\n"
+"                      "
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot.revision,author_id:0
+msgid "Author"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1332
+#, python-format
+msgid "Delivery Order"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,chained_auto_packing:0
+msgid "Manual Operation"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0 view:stock.move:0
+msgid "Supplier"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2727
+#, python-format
+msgid ""
+"In order to cancel this inventory, you must first unpost related journal "
+"entries."
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,date_done:0
+msgid "Date Done"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:148
+#, python-format
+msgid ""
+"The uom rounding does not allow you to ship \"%s %s\", only roundings of "
+"\"%s %s\" is accepted by the uom."
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Expected Shipping Date"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "March"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_view_stock_inventory_line_split
+#: model:ir.model,name:stock.model_stock_inventory_line_split
+#: view:stock.inventory:0 view:stock.inventory.line:0
+msgid "Split inventory lines"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Physical Inventory"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,chained_company_id:0
+msgid ""
+"The company the Picking List containing the chained move will belong to "
+"(leave empty to use the default company determination rules"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,chained_picking_type:0
+msgid ""
+"Shipping Type of the Picking List that will contain the chained move (leave "
+"empty to automatically detect the type based on the source and destination "
+"locations)."
+msgstr ""
+
+#. module: stock
+#: view:stock.move.split:0
+msgid "Lot number"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory.line,product_uom:0
+#: field:stock.move.consume,product_uom:0 field:stock.move.scrap,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_locations_partner
+msgid "Partner Locations"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 view:report.stock.move:0
+msgid "Current year"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 view:report.stock.move:0
+msgid "Total quantity"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.move_consume
+#: view:stock.move.consume:0
+msgid "Consume Move"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_7
+msgid "European Customers"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,chained_delay:0
+msgid "Delay between original move and chained move in days"
+msgstr ""
+
+#. module: stock
+#: view:stock.fill.inventory:0
+msgid "Import current product inventory from the following location"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,chained_auto_packing:0
+msgid ""
+"This is used only if you select a chained location type.\n"
+"The 'Automatic Move' value will create a stock move after the current one "
+"that will be validated automatically. With 'Manual Operation', the stock "
+"move has to be validated by a worker. With 'Automatic No Step Added', the "
+"location is replaced in the original move."
+msgstr ""
+
+#. module: stock
+#: view:stock.tracking:0
+msgid "Pack Identification"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Packing List:"
+msgstr ""
+
+#. module: stock
+#: selection:stock.move,state:0
+msgid "Waiting Another Move"
+msgstr ""
+
+#. module: stock
+#: help:product.template,property_stock_production:0
+msgid ""
+"For the current product, this stock location will be used, instead of the "
+"default one, as the source location for stock moves generated by production "
+"orders"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,price_unit:0
+msgid ""
+"Technical field used to record the product cost set by the user during a "
+"picking confirmation (when average price costing method is used)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1350
+#, python-format
+msgid "is in draft state."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_tracking_form
+msgid ""
+"This is the list of all your packs. When you select a Pack, you can get the "
+"upstream or downstream traceability of the products contained in the pack."
+msgstr ""
+
+#. module: stock
+#: selection:stock.return.picking,invoice_state:0
+msgid "To be refunded/invoiced"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_shop0
+msgid "Shop 1"
+msgstr ""
+
+#. module: stock
+#: view:stock.change.product.qty:0 view:stock.change.standard.price:0
+#: view:stock.fill.inventory:0 view:stock.inventory.merge:0
+#: view:stock.invoice.onshipping:0 view:stock.location.product:0
+#: view:stock.move:0 view:stock.partial.move:0 view:stock.partial.picking:0
+#: view:stock.picking:0 view:stock.return.picking:0 view:stock.split.into:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
+msgid "Ready"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Calendar View"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Additional Info"
+msgstr ""
+
+#. module: stock
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr ""
+
+#. module: stock
+#: field:stock.location.product,from_date:0
+msgid "From"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Incoming Shipments already processed"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:99
+#, python-format
+msgid "You may only return pickings that are Confirmed, Available or Done!"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0 field:stock.picking,invoice_state:0
+msgid "Invoice Control"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_production_lot_revision
+msgid "Production lot revisions"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Internal Picking List"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0 view:stock.picking:0
+msgid "Waiting"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
+msgid "Split"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Search Stock Picking"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:92
+#, python-format
+msgid "Company is not specified in Location"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Type"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Available Pickings"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_5
+msgid "Generic IT Suppliers"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Stock to be receive"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,valuation_out_account_id:0
+msgid ""
+"Used for real-time inventory valuation. When set on a virtual location (non "
+"internal type), this account will be used to hold the value of products "
+"being moved out of this location and into an internal location, instead of "
+"the generic Stock Output Account set on the product. This has no effect for "
+"internal locations."
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Picking List:"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory,date:0 field:stock.move,create_date:0
+#: field:stock.production.lot,date:0 field:stock.tracking,date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.lines.date,id:0
+msgid "Inventory Line Id"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,address_id:0
+msgid "Address of  customer or supplier."
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0 field:report.stock.move,picking_id:0
+msgid "Packing"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: field:res.partner,property_stock_customer:0
+#: selection:stock.location,usage:0
+msgid "Customer Location"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2312
+#, python-format
+msgid "You can only delete draft moves."
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_inventory_line_split_lines
+msgid "Inventory Split lines"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_location_overview
+#: report:lot.stock.overview:0
+msgid "Location Inventory Overview"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "General Informations"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+msgid "Analysis including future moves (similar to virtual stock)"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action3 view:stock.tracking:0
+msgid "Downstream traceability"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:112
+#, python-format
+msgid "No Invoices were created"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,posy:0
+msgid "Shelves (Y)"
+msgstr ""
+
+#. module: stock
+#: help:stock.incoterms,active:0
+msgid ""
+"By unchecking the active field, you may hide an INCOTERM without deleting it."
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0 field:stock.picking,date:0
+msgid "Order Date"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_change_product_qty.py:88
+#, python-format
+msgid "INV: %s"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0 field:stock.location,location_id:0
+msgid "Parent Location"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,state:0
+msgid ""
+"* Draft: not confirmed yet and will not be scheduled until confirmed\n"
+"* Confirmed: still waiting for the availability of products\n"
+"* Available: products reserved, simply waiting for confirmation.\n"
+"* Waiting: waiting for another move to proceed before it becomes "
+"automatically available (e.g. in Make-To-Order flows)\n"
+"* Done: has been processed, can't be modified or cancelled anymore\n"
+"* Cancelled: has been cancelled, can't be confirmed anymore"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,company_id:0
+msgid "Let this field empty if this location is shared between all companies"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2337
+#, python-format
+msgid "Please provide a positive quantity to scrap!"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_delay:0
+msgid "Chaining Lead Time"
+msgstr ""
+
+#. module: stock
+#: help:product.product,track_outgoing:0
+msgid ""
+"Forces to specify a Production Lot for all moves containing this product and "
+"going to a Customer Location"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_invoice_onshipping
+msgid "Stock Invoice Onshipping"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,state:0
+msgid ""
+"When the stock move is created it is in the 'Draft' state.\n"
+" After that, it is set to 'Not Available' state if the scheduler did not "
+"find the products.\n"
+" When products are reserved it is set to 'Available'.\n"
+" When the picking is done the state is 'Done'.              \n"
+"The state is 'Waiting' if the move is waiting for another one."
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: field:res.partner,property_stock_supplier:0
+#: selection:stock.location,usage:0
+msgid "Supplier Location"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2358
+#, python-format
+msgid "were scrapped"
+msgstr ""
+
+#. module: stock
+#: help:stock.partial.move.line,currency:0
+#: help:stock.partial.picking.line,currency:0
+msgid "Currency in which Unit cost is expressed"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "September"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,backorder_id:0
+msgid ""
+"If this picking was split this field links to the picking that contains the "
+"other part that has been processed already."
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_report_stock_inventory
+msgid "Stock Statistics"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr ""
+
+#. module: stock
+#: field:product.product,track_production:0
+msgid "Track Manufacturing Lots"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Is a Back Order"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,valuation_out_account_id:0
+msgid "Stock Valuation Account (Outgoing)"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_product_stock_move_open
+#: model:ir.actions.act_window,name:stock.action_move_form2
+#: model:ir.ui.menu,name:stock.menu_action_move_form2 view:stock.inventory:0
+#: view:stock.move:0 view:stock.picking:0 view:stock.production.lot:0
+#: view:stock.tracking:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,type:0
+#: selection:stock.location,chained_picking_type:0
+#: selection:stock.picking,type:0
+msgid "Sending Goods"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_product_category_config_stock
+msgid "Product Categories"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Cancel Availability"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,date_expected:0
+msgid "Scheduled date for the processing of this move"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory,move_ids:0
+msgid "Created Moves"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,valuation_in_account_id:0
+msgid "Stock Valuation Account (Incoming)"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_14
+msgid "Shelf 2"
+msgstr ""
+
+#. module: stock
+#: field:stock.report.tracklots,tracking_id:0
+msgid "Tracking lot"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Back Orders"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0 view:product.template:0
+msgid "Counter-Part Locations Properties"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Localization"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:429
+#, python-format
+msgid "Delivered Qty"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.track_line
+#: view:stock.inventory.line.split:0 view:stock.move.split:0
+msgid "Split in lots"
+msgstr ""
+
+#. module: stock
+#: view:stock.move.split:0
+msgid "Production Lot Numbers"
+msgstr ""
+
+#. module: stock
+#: help:product.template,property_stock_account_output:0
+msgid ""
+"When doing real-time inventory valuation, counterpart journal items for all "
+"outgoing stock moves will be posted in this account, unless there is a "
+"specific valuation account set on the destination location. When not set on "
+"the product, the one from the product category is used."
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Day Planned"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 field:report.stock.inventory,date:0
+#: field:report.stock.move,date:0 view:stock.inventory:0
+#: report:stock.inventory.move:0 view:stock.move:0 field:stock.move,date:0
+#: field:stock.partial.move,date:0 field:stock.partial.picking,date:0
+#: view:stock.picking:0
+msgid "Date"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 view:report.stock.move:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: stock
+#: field:stock.warehouse,lot_stock_id:0
+msgid "Location Stock"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_inventory_merge.py:64
+#, python-format
+msgid "Merging is only allowed on draft inventories."
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_dashboard_stock
+msgid "Dashboard"
+msgstr ""
+
+#. module: stock
+#: field:stock.incoterms,code:0
+msgid "Code"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.line.split:0
+msgid "Lots Number"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+msgid "Warehouse Dashboard"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:513
+#, python-format
+msgid "You can not remove a lot line !"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_scrap view:stock.move:0
+#: view:stock.move.scrap:0 view:stock.picking:0
+msgid "Scrap Products"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1157
+#, python-format
+msgid "You cannot remove the picking which is in %s state !"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.line.split:0 view:stock.move.consume:0
+#: view:stock.move.scrap:0 view:stock.move.split:0 view:stock.picking:0
+msgid "Cancel"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_stock_return_picking
+#: model:ir.model,name:stock.model_stock_return_picking
+msgid "Return Picking"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0 view:stock.move:0 view:stock.picking:0
+msgid "Split in production lots"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_location
+#: field:product.product,location_id:0 view:report.stock.inventory:0
+#: field:report.stock.inventory,location_id:0
+#: field:stock.change.product.qty,location_id:0
+#: field:stock.fill.inventory,location_id:0
+#: field:stock.inventory.line,location_id:0 report:stock.inventory.move:0
+#: view:stock.location:0 view:stock.move:0
+#: field:stock.move.consume,location_id:0 field:stock.move.scrap,location_id:0
+#: field:stock.partial.move.line,location_id:0
+#: field:stock.partial.picking.line,location_id:0
+#: field:stock.picking,location_id:0 report:stock.picking.list:0
+#: field:stock.report.prodlots,location_id:0
+#: field:stock.report.tracklots,location_id:0
+msgid "Location"
+msgstr ""
+
+#. module: stock
+#: view:product.template:0
+msgid "Information"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Shipping Address :"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,valuation_in_account_id:0
+msgid ""
+"Used for real-time inventory valuation. When set on a virtual location (non "
+"internal type), this account will be used to hold the value of products "
+"being moved from an internal location into this location, instead of the "
+"generic Stock Output Account set on the product. This has no effect for "
+"internal locations."
+msgstr ""
+
+#. module: stock
+#: view:stock.return.picking:0
+msgid "Provide the quantities of the returned products."
+msgstr ""
+
+#. module: stock
+#: view:stock.change.standard.price:0
+msgid "Cost Price"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0 field:product.product,valuation:0
+msgid "Inventory Valuation"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Orders planned for today"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
+msgid "Process Later"
+msgstr ""
+
+#. module: stock
+#: help:res.partner,property_stock_supplier:0
+msgid ""
+"This stock location will be used, instead of the default one, as the source "
+"location for goods you receive from the current partner"
+msgstr ""
+
+#. module: stock
+#: field:stock.warehouse,partner_address_id:0
+msgid "Owner Address"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_stock_move_report
+msgid ""
+"Moves Analysis allows you to easily check and analyse your company stock "
+"moves. Use this report when you want to analyse the different routes taken "
+"by your products and inventory management performance."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2116
+#, python-format
+msgid ""
+"Can not create Journal Entry, Output Account defined on this product and "
+"Valuation account on category of this product are same."
+msgstr ""
+
+#. module: stock
+#: field:report.stock.move,day_diff1:0
+msgid "Planned Lead Time (Days)"
+msgstr ""
+
+#. module: stock
+#: field:stock.change.standard.price,new_price:0
+msgid "Price"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_return_picking_memory
+msgid "stock.return.picking.memory"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Search Inventory"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_report_tracklots
+msgid "Stock report by tracking lots"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2122
+#, python-format
+msgid ""
+"There is no stock input account defined for this product or its category: "
+"\"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:419
+#, python-format
+msgid "Received Qty"
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot,ref:0
+msgid "Internal Reference"
+msgstr ""
+
+#. module: stock
+#: help:stock.production.lot,prefix:0
+msgid ""
+"Optional prefix to prepend when displaying this serial number: PREFIX/SERIAL "
+"[INT_REF]"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_view_stock_fill_inventory
+#: model:ir.model,name:stock.model_stock_fill_inventory
+#: view:stock.fill.inventory:0
+msgid "Import Inventory"
+msgstr ""
+
+#. module: stock
+#: field:stock.incoterms,name:0 field:stock.move,name:0
+#: field:stock.warehouse,name:0
+msgid "Name"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+msgid "Stocks"
+msgstr ""
+
+#. module: stock
+#: help:stock.partial.move,hide_tracking:0
+#: help:stock.partial.picking,hide_tracking:0
+msgid ""
+"This field is for internal purpose. It is used to decide if the column "
+"prodlot has to be shown on the move_ids field or not"
+msgstr ""
+
+#. module: stock
+#: help:product.template,property_stock_inventory:0
+msgid ""
+"For the current product, this stock location will be used, instead of the "
+"default one, as the source location for stock moves generated when you do an "
+"inventory"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.lines.date:0
+msgid "Stockable"
+msgstr ""
+
+#. module: stock
+#: selection:product.product,valuation:0
+msgid "Real Time (automated)"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,tracking_id:0
+msgid "Logistical shipping unit: pallet, box, pack ..."
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Customer Locations"
+msgstr ""
+
+#. module: stock
+#: view:stock.change.product.qty:0 view:stock.change.standard.price:0
+msgid "_Apply"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0 report:stock.picking.list:0
+msgid "]"
+msgstr ""
+
+#. module: stock
+#: field:product.template,property_stock_inventory:0
+msgid "Inventory Location"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 view:report.stock.move:0
+msgid "Total value"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,chained_journal_id:0
+msgid ""
+"Inventory Journal in which the chained move will be written, if the Chaining "
+"Type is not Transparent (no journal is used if left empty)"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Creation"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+msgid ""
+"Analysis of current inventory (only moves that have already been processed)"
+msgstr ""
+
+#. module: stock
+#: field:stock.partial.move.line,cost:0
+#: field:stock.partial.picking.line,cost:0
+msgid "Cost"
+msgstr ""
+
+#. module: stock
+#: field:product.category,property_stock_account_input_categ:0
+#: field:product.template,property_stock_account_input:0
+#: field:stock.change.standard.price,stock_account_input:0
+msgid "Stock Input Account"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Shipping type specify, goods coming in or going out"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_warehouse_mgmt
+#: model:ir.ui.menu,name:stock.menu_warehouse_config
+msgid "Warehouse Management"
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking,move_type:0
+msgid "Partial Delivery"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic No Step Added"
+msgstr ""
+
+#. module: stock
+#: view:stock.location.product:0
+msgid "Stock Location Analysis"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,date:0
+msgid ""
+"Move date: scheduled date until move is done, then date of actual move "
+"processing"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 view:report.stock.move:0
+#: view:stock.inventory:0 view:stock.move:0 view:stock.picking:0
+#: view:stock.production.lot:0
+msgid "Group By..."
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Chained Locations"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.location_inventory
+msgid "Inventory loss"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1341
+#, python-format
+msgid "Document"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Input Picking List"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,product_uom:0 field:stock.partial.move.line,product_uom:0
+#: field:stock.partial.picking.line,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:175
+#, python-format
+msgid "Products: "
+msgstr ""
+
+#. module: stock
+#: help:product.product,track_production:0
+msgid ""
+"Forces to specify a Production Lot for all moves containing this product and "
+"generated by a Manufacturing Order"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+msgid "Update"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_journal_form
+#: model:ir.ui.menu,name:stock.menu_action_stock_journal_form
+msgid "Stock Journals"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,type:0
+msgid "Others"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:89
+#, python-format
+msgid "Could not find any difference between standard price and new price!"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_scrapped
+#: field:stock.move,scrapped:0
+msgid "Scrapped"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Products "
+msgstr ""
+
+#. module: stock
+#: field:product.product,track_incoming:0
+msgid "Track Incoming Lots"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+msgid "Warehouse board"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:439
+#, python-format
+msgid "Future Qty"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,note:0 view:stock.picking:0 field:stock.picking,note:0
+msgid "Notes"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
+msgid "Value"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.move,type:0 field:stock.location,chained_picking_type:0
+#: field:stock.picking,type:0
+msgid "Shipping Type"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Stock moves that are Confirmed, Available or Waiting"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_product_location_open
+#: model:ir.ui.menu,name:stock.menu_product_in_config_stock
+#: model:ir.ui.menu,name:stock.menu_stock_product
+#: model:ir.ui.menu,name:stock.menu_stock_products_menu view:stock.inventory:0
+#: view:stock.partial.move:0 view:stock.partial.picking:0 view:stock.picking:0
+msgid "Products"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,chained_location_type:0
+msgid "None"
+msgstr ""
+
+#. module: stock
+#: view:stock.change.standard.price:0
+msgid "Change Price"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,move_type:0
+msgid "Delivery Method"
+msgstr ""
+
+#. module: stock
+#: help:report.stock.move,location_dest_id:0
+#: help:stock.move,location_dest_id:0 help:stock.picking,location_dest_id:0
+msgid "Location where the system will stock the finished products."
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Stock to be delivered (Available or not)"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+#: model:ir.actions.act_window,name:stock.action_stock_outgoing_product_delay
+msgid "Outgoing Products"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_reception_picking_move
+msgid ""
+"Here you can receive individual products, no matter what purchase order or "
+"picking order they come from. You will find the list of all products you are "
+"waiting for. Once you receive an order, you can filter based on the name of "
+"the supplier or the purchase order reference. Then you can confirm all "
+"products received using the buttons on the right of each line."
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Delay(Days)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1697
+#, python-format
+msgid "Operation forbidden"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,min_date:0
+msgid "Expected date for the picking to be processed"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:435
+#, python-format
+msgid "P&L Qty"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Internal Pickings to invoice"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0 field:stock.production.lot,revisions:0
+msgid "Revisions"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "This operation will cancel the shipment. Do you want to continue?"
+msgstr ""
+
+#. module: stock
+#: help:product.product,valuation:0
+msgid ""
+"If real-time valuation is enabled for a product, the system will "
+"automatically write journal entries corresponding to stock moves.The "
+"inventory variation account set on the product category will represent the "
+"current inventory value, and the stock input and stock output account will "
+"hold the counterpart moves for incoming and outgoing products."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_stock_inventory_report
+msgid ""
+"Inventory Analysis allows you to easily check and analyse your company stock "
+"levels. Sort and group by selection criteria in order to better analyse and "
+"manage your company  activities."
+msgstr ""
+
+#. module: stock
+#: help:report.stock.move,location_id:0 help:stock.move,location_id:0
+msgid ""
+"Sets a location if you produce at a fixed location. This can be a partner "
+"location if you subcontract the manufacturing operations."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_location_form
+msgid ""
+"Define your locations to reflect your warehouse structure and organization. "
+"OpenERP is able to manage physical locations (warehouses, shelves, bin, "
+"etc), partner locations (customers, suppliers) and virtual locations which "
+"are the counterpart of the stock operations like the manufacturing orders "
+"consumptions, inventories, etc. Every stock operation in OpenERP moves the "
+"products from one location to another one. For instance, if you receive "
+"products from a supplier, OpenERP will move products from the Supplier "
+"location to the Stock location. Each report can be performed on physical, "
+"partner or virtual locations."
+msgstr ""
+
+#. module: stock
+#: view:stock.invoice.onshipping:0
+msgid "Create"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
+msgid "Dates"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Source"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_inventory
+#: selection:report.stock.inventory,location_type:0
+#: field:stock.inventory.line,inventory_id:0 report:stock.inventory.move:0
+#: selection:stock.location,usage:0
+msgid "Inventory"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: stock
+#: sql_constraint:stock.production.lot:0
+msgid ""
+"The combination of serial number and internal reference must be unique !"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Cancel Inventory"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/report/report_stock.py:78
+#: code:addons/stock/report/report_stock.py:135 code:addons/stock/stock.py:760
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_unit_measure_stock
+#: model:ir.ui.menu,name:stock.menu_stock_uom_form_action
+msgid "Units of Measure"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,chained_location_type:0
+msgid "Fixed Location"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2486
+#, python-format
+msgid "Product  '%s' is consumed with '%s' quantity."
+msgstr ""
+
+#. module: stock
+#: model:product.template,description:stock.product_icecream_product_template
+msgid ""
+"Ice cream can be mass-produced and thus is widely available in developed "
+"parts of the world. Ice cream can be purchased in large cartons (vats and "
+"squrounds) from supermarkets and grocery stores, in smaller quantities from "
+"ice cream shops, convenience stores, and milk bars, and in individual "
+"servings from small carts or vans at public events."
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "July"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.lines.date:0
+msgid "Consumable"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_stock_line_date
+msgid ""
+"Display the last inventories done on your products and easily sort them with "
+"specific filtering criteria. If you do frequent and partial inventories, you "
+"need this report in order to ensure that the stock of each product is "
+"controlled at least once a year."
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.location_opening
+msgid "opening"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_product_history
+msgid "Stock Level Forecast"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_journal
+#: field:report.stock.move,stock_journal:0 view:stock.journal:0
+#: field:stock.journal,name:0 field:stock.picking,stock_journal_id:0
+msgid "Stock Journal"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_4
+msgid "Maxtor Suppliers"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_change_product_qty.py:78
+#: code:addons/stock/wizard/stock_change_standard_price.py:107
+#, python-format
+msgid "Active ID is not set in Context"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Force Availability"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.move_scrap view:stock.move.scrap:0
+msgid "Scrap Move"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_reception_picking_move
+#: model:ir.ui.menu,name:stock.menu_action_pdct_in view:stock.move:0
+msgid "Receive Products"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_out_picking_move
+#: model:ir.ui.menu,name:stock.menu_action_pdct_out
+msgid "Deliver Products"
+msgstr ""
+
+#. module: stock
+#: view:stock.location.product:0
+msgid "View Stock of Products"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 view:report.stock.move:0
+#: field:report.stock.move,month:0
+msgid "Month"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,date_done:0
+msgid "Date of Completion"
+msgstr ""
+
+#. module: stock
+#: help:stock.production.lot,name:0
+msgid "Unique production lot, will be displayed as: PREFIX/SERIAL [INT_REF]"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_company
+msgid "Your Company"
+msgstr ""
+
+#. module: stock
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: stock
+#: help:stock.tracking,active:0
+msgid ""
+"By unchecking the active field, you may hide a pack without deleting it."
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.merge:0
+msgid "Yes"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory,inventory_line_id:0
+msgid "Inventories"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Todo"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 field:report.stock.inventory,company_id:0
+#: view:report.stock.move:0 field:report.stock.move,company_id:0
+#: field:stock.inventory,company_id:0 field:stock.inventory.line,company_id:0
+#: field:stock.location,company_id:0 field:stock.move,company_id:0
+#: field:stock.picking,company_id:0 field:stock.production.lot,company_id:0
+#: field:stock.production.lot.revision,company_id:0
+#: field:stock.warehouse,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
+msgid "Unit Of Measure"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:121
+#, python-format
+msgid ""
+"There is no stock input account defined for this product: \"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2445
+#, python-format
+msgid "Can not consume a move with negative or zero quantity !"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,stock_real:0
+msgid "Real Stock"
+msgstr ""
+
+#. module: stock
+#: view:stock.fill.inventory:0
+msgid "Fill Inventory"
+msgstr ""
+
+#. module: stock
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.location_delivery_counter
+msgid "Delivery Counter"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 field:report.stock.inventory,prodlot_id:0
+#: view:stock.move:0 report:stock.picking.list:0
+msgid "Lot"
+msgstr ""
+
+#. module: stock
+#: view:stock.move.split:0
+msgid "Production Lot Number"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2697
+#, python-format
+msgid "Inventory '%s' is done."
+msgstr ""
+
+#. module: stock
+#: field:stock.move,product_uos_qty:0
+msgid "Quantity (UOS)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1743
+#, python-format
+msgid ""
+"You are moving %.2f %s products but only %.2f %s available in this lot."
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Set Available"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Contact Address :"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,backorder_id:0
+msgid "Back Order"
+msgstr ""
+
+#. module: stock
+#: field:stock.incoterms,active:0 field:stock.location,active:0
+#: field:stock.tracking,active:0
+msgid "Active"
+msgstr ""
+
+#. module: stock
+#: view:product.template:0
+msgid "Properties"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1082
+#, python-format
+msgid "Error, no partner !"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory.line.split.lines,wizard_exist_id:0
+#: field:stock.inventory.line.split.lines,wizard_id:0
+#: field:stock.move.split.lines,wizard_id:0
+msgid "Parent Wizard"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_incoterms_tree
+#: model:ir.model,name:stock.model_stock_incoterms
+#: model:ir.ui.menu,name:stock.menu_action_incoterm_open
+#: view:stock.incoterms:0
+msgid "Incoterms"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_partial_picking_line
+msgid "stock.partial.picking.line"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0
+msgid "Total:"
+msgstr ""
+
+#. module: stock
+#: help:stock.incoterms,name:0
+msgid ""
+"Incoterms are series of sales terms.They are used to divide transaction "
+"costs and responsibilities between buyer and seller and reflect state-of-the-"
+"art transportation practices."
+msgstr ""
+
+#. module: stock
+#: help:stock.fill.inventory,recursive:0
+msgid ""
+"If checked, products contained in child locations of selected location will "
+"be included as well."
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory,name:0
+msgid "Inventory Reference"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1334
+#, python-format
+msgid "Internal picking"
+msgstr ""
+
+#. module: stock
+#: view:stock.location.product:0
+msgid "Open Product"
+msgstr ""
+
+#. module: stock
+#: field:stock.location.product,to_date:0
+msgid "To"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
+msgid "Process"
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot.revision,name:0
+msgid "Revision Name"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: field:product.product,warehouse_id:0 view:stock.warehouse:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Confirm Inventory"
+msgstr ""
+
+#. module: stock
+#: view:product.category:0
+msgid "Accounting Stock Properties"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_picking_tree_out
+msgid "Customers Packings"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,state:0 view:report.stock.move:0
+#: selection:report.stock.move,state:0 selection:stock.inventory,state:0
+#: view:stock.move:0 selection:stock.move,state:0 view:stock.picking:0
+#: selection:stock.picking,state:0
+msgid "Done"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_view_change_standard_price
+#: model:ir.model,name:stock.model_stock_change_standard_price
+#: view:stock.change.standard.price:0
+msgid "Change Standard Price"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_locations_virtual
+msgid "Virtual Locations"
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking,invoice_state:0
+msgid "To Be Invoiced"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory,date_done:0
+msgid "Date done"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1083
+#, python-format
+msgid ""
+"Please put a partner on the picking list if you want to generate invoice."
+msgstr ""
+
+#. module: stock
+#: selection:stock.move,priority:0
+msgid "Not urgent"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_warehouse_form
+#: model:ir.ui.menu,name:stock.menu_action_warehouse_form
+msgid "Warehouses"
+msgstr ""
+
+#. module: stock
+#: field:stock.journal,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_inventory_report
+#: model:ir.ui.menu,name:stock.menu_action_stock_inventory_report
+#: view:report.stock.inventory:0
+msgid "Inventory Analysis"
+msgstr ""
+
+#. module: stock
+#: field:stock.invoice.onshipping,journal_id:0
+msgid "Destination Journal"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_stock_tracking_lot_2_stock_report_tracklots
+#: model:stock.location,name:stock.stock_location_stock
+msgid "Stock"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_product_product
+#: view:report.stock.inventory:0 field:report.stock.inventory,product_id:0
+#: field:report.stock.lines.date,product_id:0 view:report.stock.move:0
+#: field:report.stock.move,product_id:0
+#: field:stock.change.product.qty,product_id:0
+#: field:stock.inventory.line,product_id:0
+#: field:stock.inventory.line.split,product_id:0 report:stock.inventory.move:0
+#: view:stock.move:0 field:stock.move,product_id:0
+#: field:stock.move.consume,product_id:0 field:stock.move.scrap,product_id:0
+#: field:stock.move.split,product_id:0
+#: field:stock.partial.move.line,product_id:0
+#: field:stock.partial.picking.line,product_id:0 view:stock.production.lot:0
+#: field:stock.production.lot,product_id:0
+#: field:stock.report.prodlots,product_id:0
+#: field:stock.report.tracklots,product_id:0
+#: field:stock.return.picking.memory,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: stock
+#: view:stock.return.picking:0
+msgid "Return"
+msgstr ""
+
+#. module: stock
+#: field:stock.return.picking,invoice_state:0
+msgid "Invoicing"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Assigned Internal Moves"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2379 code:addons/stock/stock.py:2440
+#: code:addons/stock/wizard/stock_partial_picking.py:141
+#, python-format
+msgid "Please provide Proper Quantity !"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,product_uos:0
+msgid "Product UOS"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,posz:0
+msgid "Height (Z)"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_consume
+#: view:stock.move.consume:0
+msgid "Consume Products"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1742
+#, python-format
+msgid "Insufficient Stock in Lot !"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,parent_right:0
+msgid "Right Parent"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,address_id:0
+msgid "Address"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
+msgid "Variants"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,posx:0
+msgid "Corridor (X)"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_suppliers
+msgid "Suppliers"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.inventory,value:0 field:report.stock.move,value:0
+msgid "Total Value"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_product_by_category_stock_form
+msgid "Products by Category"
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking,state:0
+msgid "Waiting Another Operation"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Supplier Locations"
+msgstr ""
+
+#. module: stock
+#: field:stock.partial.move.line,wizard_id:0
+#: field:stock.partial.picking.line,wizard_id:0
+#: field:stock.return.picking.memory,wizard_id:0
+msgid "Wizard"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Completed Stock-Moves"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_view_stock_location_product
+#: model:ir.model,name:stock.model_stock_location_product
+msgid "Products by Location"
+msgstr ""
+
+#. module: stock
+#: field:stock.fill.inventory,recursive:0
+msgid "Include children"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_components
+msgid "Shelf 1"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_picking_tree6
+msgid ""
+"Internal Moves display all inventory operations you have to perform in your "
+"warehouse. All operations can be categorized into stock journals, so that "
+"each worker has his own list of operations to perform in his own journal. "
+"Most operations are prepared automatically by OpenERP according to your "
+"preconfigured logistics rules, but you can also record manual stock "
+"operations."
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Order"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+msgid "Cost Price :"
+msgstr ""
+
+#. module: stock
+#: field:stock.tracking,name:0
+msgid "Pack Reference"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0 field:report.stock.move,location_id:0
+#: field:stock.inventory.line.split,location_id:0
+#: field:stock.move,location_id:0 field:stock.move.split,location_id:0
+msgid "Source Location"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid " Waiting"
+msgstr ""
+
+#. module: stock
+#: view:product.template:0
+msgid "Accounting Entries"
+msgstr ""
+
+#. module: stock
+#: model:res.groups,name:stock.group_stock_manager
+msgid "Manager"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Total"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_intermediatelocation0
+msgid "Internal Shippings"
+msgstr ""
+
+#. module: stock
+#: field:stock.change.standard.price,enable_stock_in_out_acc:0
+msgid "Enable Related Account"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,stock_virtual_value:0
+msgid "Virtual Stock Value"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0 view:stock.inventory.line.split:0
+#: view:stock.move.split:0
+msgid "Lots"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
+msgid "New Pack"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Destination"
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking,move_type:0
+msgid "All at once"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1698
+#, python-format
+msgid ""
+"Quantities, UoMs, Products and Locations cannot be modified on stock moves "
+"that have already been processed (except by the Administrator)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:445
+#, python-format
+msgid "Future Productions"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "To Invoice"
+msgstr ""
+
+#. module: stock
+#: view:stock.return.picking:0
+msgid "Return lines"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_report_stock_lines_date
+#: view:report.stock.lines.date:0
+msgid "Dates of Inventories"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Total incoming quantity"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.move,product_qty_out:0
+msgid "Out Qty"
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot,move_ids:0
+msgid "Moves for this production lot"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
+msgid "Put in current pack"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Lot Inventory"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Reason"
+msgstr ""
+
+#. module: stock
+#: model:product.template,name:stock.product_icecream_product_template
+msgid "Ice Cream"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_partial_picking
+msgid "Partial Picking Processing Wizard"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_production_lot_form
+msgid ""
+"This is the list of all the production lots (serial numbers) you recorded. "
+"When you select a lot, you can get the upstream or downstream traceability "
+"of the products contained in lot. By default, the list is filtred on the "
+"serial numbers that are available in your warehouse but you can uncheck the "
+"'Available' button to get all the lots you produced, received or delivered "
+"to customers."
+msgstr ""
+
+#. module: stock
+#: field:stock.location,icon:0
+msgid "Icon"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2311 code:addons/stock/stock.py:2726
+#, python-format
+msgid "UserError"
+msgstr ""
+
+#. module: stock
+#: field:stock.partial.move,hide_tracking:0
+#: field:stock.partial.move.line,tracking:0
+#: field:stock.partial.picking,hide_tracking:0
+#: field:stock.partial.picking.line,tracking:0
+msgid "Tracking"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.line.split:0 view:stock.move.consume:0
+#: view:stock.move.scrap:0 view:stock.move.split:0 view:stock.split.into:0
+msgid "Ok"
+msgstr ""
+
+#. module: stock
+#: help:product.category,property_stock_account_output_categ:0
+msgid ""
+"When doing real-time inventory valuation, counterpart journal items for all "
+"outgoing stock moves will be posted in this account, unless there is a "
+"specific valuation account set on the destination location. This is the "
+"default value for all products in this category. It can also directly be set "
+"on each product"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_8
+msgid "Non European Customers"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:75 code:addons/stock/product.py:89
+#: code:addons/stock/product.py:92 code:addons/stock/product.py:99
+#: code:addons/stock/product.py:120 code:addons/stock/product.py:146
+#: code:addons/stock/stock.py:2116 code:addons/stock/stock.py:2119
+#: code:addons/stock/stock.py:2122 code:addons/stock/stock.py:2125
+#: code:addons/stock/stock.py:2128 code:addons/stock/stock.py:2131
+#: code:addons/stock/stock.py:2445
+#: code:addons/stock/wizard/stock_fill_inventory.py:47
+#: code:addons/stock/wizard/stock_splitinto.py:49
+#: code:addons/stock/wizard/stock_splitinto.py:53
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.merge:0
+msgid "Do you want to merge theses inventories?"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0 selection:stock.inventory,state:0
+#: selection:stock.move,state:0 selection:stock.picking,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Confirmed Delivery Orders"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,move_type:0
+msgid "It specifies goods to be delivered all at once or by direct delivery"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:96
+#, python-format
+msgid "This picking list does not require invoicing."
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,type:0
+#: selection:stock.location,chained_picking_type:0
+#: selection:stock.picking,type:0
+msgid "Getting Goods"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,chained_location_type:0
+msgid ""
+"Determines whether this location is chained to another location, i.e. any "
+"incoming product in this location \n"
+"should next go to the chained location. The chained location is determined "
+"according to the type :\n"
+"* None: No chaining at all\n"
+"* Customer: The chained location will be taken from the Customer Location "
+"field on the Partner form of the Partner that is specified in the Picking "
+"list of the incoming products.\n"
+"* Fixed Location: The chained location is taken from the next field: Chained "
+"Location if Fixed."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_inventory_merge.py:43
+#: code:addons/stock/wizard/stock_inventory_merge.py:63
+#: code:addons/stock/wizard/stock_partial_picking.py:148
+#: code:addons/stock/wizard/stock_partial_picking.py:159
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1348
+#, python-format
+msgid "is done."
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot.revision,date:0
+msgid "Revision Date"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+#: model:ir.actions.act_window,name:stock.action_outgoing_product_board
+#: model:ir.actions.act_window,name:stock.action_picking_tree
+#: model:ir.ui.menu,name:stock.menu_action_picking_tree view:stock.picking:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Delivery orders already processed"
+msgstr ""
+
+#. module: stock
+#: help:res.partner,property_stock_customer:0
+msgid ""
+"This stock location will be used, instead of the default one, as the "
+"destination location for goods you send to this partner"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0 selection:stock.inventory,state:0
+#: view:stock.picking:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Confirm"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Check Availability"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_view_stock_merge_inventories
+#: view:stock.inventory.merge:0
+msgid "Merge Inventories"
+msgstr ""
+
+#. module: stock
+#: help:stock.change.product.qty,new_quantity:0
+msgid "This quantity is expressed in the Default UoM of the product."
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Reception:"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,scrap_location:0
+msgid ""
+"Check this box to allow using this location to put scrapped/damaged goods."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_relate_picking
+msgid "Related Picking"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Year Planned"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Total outgoing quantity"
+msgstr ""
+
+#. module: stock
+#: selection:stock.move,state:0 selection:stock.picking,state:0
+msgid "New"
+msgstr ""
+
+#. module: stock
+#: help:stock.partial.move.line,cost:0 help:stock.partial.picking.line,cost:0
+msgid "Unit Cost for this product line"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_product_category
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,product_categ_id:0 view:report.stock.move:0
+#: field:report.stock.move,categ_id:0
+msgid "Product Category"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.next_id_61
+msgid "Reporting"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1343
+#, python-format
+msgid " for the "
+msgstr ""
+
+#. module: stock
+#: view:stock.split.into:0
+msgid "Quantity to Leave in the Current Pack"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Stock available to be delivered"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
+#: view:stock.invoice.onshipping:0
+msgid "Create invoice"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Confirmed Internal Moves"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory.line.split,use_exist:0
+#: field:stock.move.split,use_exist:0
+msgid "Existing Lots"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Stock Location"
+msgstr ""
+
+#. module: stock
+#: help:stock.change.standard.price,new_price:0
+msgid ""
+"If cost price is increased, stock variation account will be debited and "
+"stock output account will be credited with the value = (difference of amount "
+"* quantity available).\n"
+"If cost price is decreased, stock variation account will be creadited and "
+"stock input account will be debited."
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_journal_id:0
+msgid "Chaining Journal"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_picking_list
+msgid "Packing list"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:738
+#, python-format
+msgid "Not enough stock, unable to reserve the products."
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_customers
+msgid "Customers"
+msgstr ""
+
+#. module: stock
+#: selection:stock.move,state:0 selection:stock.picking,state:0
+msgid "Waiting Availability"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1347
+#, python-format
+msgid "is cancelled."
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.line:0
+msgid "Stock Inventory Lines"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Waiting "
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:427
+#, python-format
+msgid "Future Deliveries"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Additional info"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 field:stock.move,tracking_id:0
+msgid "Pack"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
+msgid "Date Expected"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,auto_validate:0
+msgid "Auto Validate"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Weight"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "December"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_move_form2
+msgid ""
+"This menu gives you the full traceability of inventory operations on a "
+"specific product. You can filter on the product to see all the past or "
+"future movements for the product."
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Return Products"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Validate Inventory"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,price_currency_id:0
+msgid ""
+"Technical field used to record the currency chosen by the user during a "
+"picking confirmation (when average price costing method is used)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:53
+#, python-format
+msgid "Stock Inventory is already Validated."
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_products_moves
+msgid "Products Moves"
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking,invoice_state:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,max_date:0
+msgid "Max. Expected Date"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,auto_picking:0
+msgid "Auto-Picking"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_shop1
+msgid "Shop 2"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_auto_packing:0
+msgid "Chaining Type"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 view:report.stock.move:0
+#: selection:report.stock.move,type:0 view:stock.location:0
+#: selection:stock.location,chained_picking_type:0
+#: selection:stock.picking,type:0
+msgid "Internal"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0 selection:stock.inventory,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
+#: report:stock.inventory.move:0
+msgid "Stock Inventory"
+msgstr ""
+
+#. module: stock
+#: help:report.stock.inventory,state:0
+msgid ""
+"When the stock move is created it is in the 'Draft' state.\n"
+" After that it is set to 'Confirmed' state.\n"
+" If stock is available state is set to 'Avaiable'.\n"
+" When the picking it done the state is 'Done'.              \n"
+"The state is 'Waiting' if the move is waiting for another one."
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:189
+#, python-format
+msgid "Please specify at least one non-zero quantity!"
+msgstr ""
+
+#. module: stock
+#: help:product.template,property_stock_procurement:0
+msgid ""
+"For the current product, this stock location will be used, instead of the "
+"default one, as the source location for stock moves generated by procurements"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1346
+#, python-format
+msgid "is ready to process."
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,origin:0
+msgid "Reference of the document that produced this picking."
+msgstr ""
+
+#. module: stock
+#: field:stock.fill.inventory,set_stock_zero:0
+msgid "Set to zero"
+msgstr ""
+
+#. module: stock
+#: model:res.groups,name:stock.group_stock_user
+msgid "User"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:98
+#, python-format
+msgid "None of these picking lists require invoicing."
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "November"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:100 code:addons/stock/stock.py:2128
+#, python-format
+msgid "There is no journal defined on the product category: \"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:441
+#, python-format
+msgid "Unplanned Qty"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_company_id:0
+msgid "Chained Company"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,icon:0
+msgid "Icon show in  hierarchical tree view"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "January"
+msgstr ""
+
+#. module: stock
+#: help:product.product,track_incoming:0
+msgid ""
+"Forces to specify a Production Lot for all moves containing this product and "
+"coming from a Supplier Location"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_product_stock_move_futur_open
+msgid "Future Stock Moves"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,move_history_ids2:0
+msgid "Move History (parent moves)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:423
+#, python-format
+msgid "Future Stock"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:513 code:addons/stock/stock.py:1149
+#: code:addons/stock/stock.py:1157
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:112
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: stock
+#: view:stock.change.product.qty:0
+msgid "Select Quantity"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_location_tree
+msgid ""
+"This is the structure of your company's warehouses and locations. You can "
+"click on a location to get the list of the products and their stock level in "
+"this particular location and all its children."
+msgstr ""
+
+#. module: stock
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: report:stock.inventory.move:0 field:stock.move,prodlot_id:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0 view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+msgid "Production Lot"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_traceability view:stock.move:0
+#: view:stock.picking:0 view:stock.production.lot:0 view:stock.tracking:0
+msgid "Traceability"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "To invoice"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_location_form
+#: model:ir.ui.menu,name:stock.menu_action_location_form view:stock.picking:0
+msgid "Locations"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "General Information"
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot,prefix:0
+msgid "Prefix"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_splitinto.py:53
+#, python-format
+msgid ""
+"Total quantity after split exceeds the quantity to split for this product: "
+"\"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: help:product.template,property_stock_account_input:0
+msgid ""
+"When doing real-time inventory valuation, counterpart journal items for all "
+"incoming stock moves will be posted in this account, unless there is a "
+"specific valuation account set on the source location. When not set on the "
+"product, the one from the product category is used."
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 field:stock.partial.move,move_ids:0
+#: field:stock.return.picking,product_return_moves:0
+msgid "Moves"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0 field:report.stock.move,location_dest_id:0
+#: field:stock.partial.move.line,location_dest_id:0
+#: field:stock.partial.picking.line,location_dest_id:0
+#: field:stock.picking,location_dest_id:0
+msgid "Dest. Location"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,product_packaging:0
+msgid ""
+"It specifies attributes of packaging like type, quantity of packaging,etc."
+msgstr ""
+
+#. module: stock
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Expected"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: model:stock.location,name:stock.location_production
+#: selection:stock.location,usage:0
+msgid "Production"
+msgstr ""
+
+#. module: stock
+#: view:stock.split.into:0
+msgid "Split Move"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,backorder_id:0
+msgid "Back Order of"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:106
+#, python-format
+msgid ""
+"There are no products to return (only lines in Done state and not fully "
+"returned yet can be returned)!"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Future Stock-Moves"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_split
+msgid "Split in Production lots"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_move.py:213
+#, python-format
+msgid "Processing Error"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+msgid "Real"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0 view:stock.production.lot.revision:0
+#: field:stock.production.lot.revision,description:0
+msgid "Description"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "May"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action5 view:stock.tracking:0
+msgid "Upstream traceability"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_location_overview_all
+#: report:lot.stock.overview_all:0
+msgid "Location Content"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:447
+#, python-format
+msgid "Produced Qty"
+msgstr ""
+
+#. module: stock
+#: field:product.category,property_stock_account_output_categ:0
+#: field:product.template,property_stock_account_output:0
+#: field:stock.change.standard.price,stock_account_output:0
+msgid "Stock Output Account"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_location_type:0
+msgid "Chained Location Type"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_report_prodlots
+msgid "Stock report by production lots"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0 selection:stock.location,chained_location_type:0
+#: view:stock.move:0
+msgid "Customer"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "February"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Production Lot Identification"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.location_refrigerator_small
+msgid "Small Refrigerator"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.location_convenience_shop
+msgid "Convenient Store"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,scrap_location:0 view:stock.move.scrap:0
+msgid "Scrap Location"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "April"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 view:stock.move:0
+msgid "Future"
+msgstr ""
+
+#. module: stock
+#: field:stock.invoice.onshipping,invoice_date:0
+msgid "Invoiced date"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:738
+#: code:addons/stock/wizard/stock_fill_inventory.py:116
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:96
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:98
+#: code:addons/stock/wizard/stock_return_picking.py:99
+#: code:addons/stock/wizard/stock_return_picking.py:106
+#: code:addons/stock/wizard/stock_return_picking.py:189
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_output
+msgid "Output"
+msgstr ""
+
+#. module: stock
+#: help:stock.tracking,name:0
+msgid ""
+"By default, the pack reference is generated following the sscc standard. "
+"(Serial number + 1 check digit)"
+msgstr ""
+
+#. module: stock
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:159
+#, python-format
+msgid ""
+"The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
+"would let a quantity of \"%s %s\" to ship and only roundings of \"%s %s\" is "
+"accepted by the uom."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_move.py:213
+#, python-format
+msgid ""
+"Production lot quantity %d of %s is larger than available quantity (%d) !"
+msgstr ""
+
+#. module: stock
+#: constraint:product.category:0
+msgid "Error ! You cannot create recursive categories."
+msgstr ""
+
+#. module: stock
+#: help:stock.move,move_dest_id:0
+msgid "Optional: next stock move when chaining them"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 field:report.stock.inventory,year:0
+#: view:report.stock.move:0 field:report.stock.move,year:0
+msgid "Year"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_locations
+msgid "Physical Locations"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0 selection:stock.picking,state:0
+msgid "Ready to Process"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,posx:0 help:stock.location,posy:0
+#: help:stock.location,posz:0
+msgid "Optional localization details, for information purpose only"
+msgstr ""
diff --git a/addons/stock_planning/i18n/ja.po b/addons/stock_planning/i18n/ja.po
index 25acc17968d..974a89fc4d5 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 <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-07-03 03:46+0000\n"
+"PO-Revision-Date: 2012-07-04 02:25+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-03 05:36+0000\n"
-"X-Generator: Launchpad (build 15531)\n"
+"X-Launchpad-Export-Date: 2012-07-04 04:38+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: stock_planning
 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
@@ -69,7 +69,7 @@ msgstr "計算される前に期間内で計画された出荷です。現在の
 msgid ""
 "Warehouse which forecasts will concern. If during stock planning you will "
 "need sales forecast for all warehouses choose any warehouse now."
-msgstr "予測値が関連する倉庫。在庫計画の期間中に全ての倉庫の販売予測を必要とするなら、今、倉庫を選択して下さい。"
+msgstr "予測値が関係する倉庫です。在庫計画の期間に全ての倉庫の受注予測を必要とするなら、今、倉庫を選択して下さい。"
 
 #. module: stock_planning
 #: field:stock.planning,outgoing_left:0
@@ -116,7 +116,7 @@ msgstr "会社"
 msgid ""
 "All sales forecasts for selected Warehouse of selected Product during "
 "selected Period."
-msgstr "選択された期間の間で、選択された製品の倉庫を選択するための全ての販売予測"
+msgstr "選択した期間中に選択した製品の選択した倉庫のための全ての受注予測です。"
 
 #. module: stock_planning
 #: view:stock.planning:0
@@ -172,7 +172,7 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.planning,outgoing_before:0
 msgid "Planned Out Before"
-msgstr "以前計画された出荷"
+msgstr "先行計画出荷"
 
 #. module: stock_planning
 #: field:stock.planning.createlines,forecasted_products:0
@@ -211,7 +211,7 @@ msgstr "選択された分類の中に製品がありません。"
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Stock and Sales Forecast"
-msgstr "在庫と販売予測"
+msgstr "在庫と受注予測"
 
 #. module: stock_planning
 #: model:ir.model,name:stock_planning.model_stock_sale_forecast
@@ -244,7 +244,7 @@ msgstr "計算する前に期間内で確認された入庫（既に入庫分を
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Search  Sales Forecast"
-msgstr "販売予測の検索"
+msgstr "受注予測の検索"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period5_per_user:0
@@ -261,7 +261,7 @@ msgstr "この計画行の調達、または内部供給の履歴"
 msgid ""
 "All sales forecasts for whole company (for all Warehouses) of selected "
 "Product during selected Period."
-msgstr "選択した期間中に選択した商品の会社全体（全ての倉庫）ための全ての販売予測です。"
+msgstr "選択した期間中に選択した製品の会社全体（全ての倉庫）ための全ての受注予測です。"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period1_per_user:0
@@ -313,17 +313,17 @@ msgstr "過去 / 将来"
 #: field:stock.planning,state:0
 #: field:stock.sale.forecast,state:0
 msgid "State"
-msgstr ""
+msgstr "状態"
 
 #. module: stock_planning
 #: help:stock.sale.forecast.createlines,product_categ_id:0
 msgid "Product Category of products which created forecasts will concern."
-msgstr ""
+msgstr "作成された予測が関係するであろう製品の製品分類です。"
 
 #. module: stock_planning
 #: model:ir.model,name:stock_planning.model_stock_period
 msgid "stock period"
-msgstr ""
+msgstr "在庫期間"
 
 #. module: stock_planning
 #: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
@@ -336,7 +336,7 @@ msgstr ""
 #: field:stock.sale.forecast,warehouse_id:0
 #: field:stock.sale.forecast.createlines,warehouse_id:0
 msgid "Warehouse"
-msgstr ""
+msgstr "倉庫"
 
 #. module: stock_planning
 #: help:stock.planning,stock_simulation:0
@@ -348,21 +348,26 @@ msgid ""
 "Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
 "In."
 msgstr ""
+"選択された期間終了時の在庫シミュレーション\n"
+"　現在の期間のため：\n"
+"初期在庫 - 既出庫 + 既入庫 - 期待出庫 + 入庫残\n"
+"　その先の期間のため：\n"
+"初期在庫 - 先行計画出庫 + 先行入庫 - 計画出庫 + 計画入庫"
 
 #. module: stock_planning
 #: help:stock.sale.forecast,analyze_company:0
 msgid "Check this box to see the sales for whole company."
-msgstr ""
+msgstr "会社の全体のための受注を見るためにこのボックスをチェックして下さい。"
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Per Department :"
-msgstr ""
+msgstr "部署毎："
 
 #. module: stock_planning
 #: field:stock.planning,incoming_before:0
 msgid "Incoming Before"
-msgstr ""
+msgstr "先行入庫"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:641
@@ -384,6 +389,17 @@ msgid ""
 "  \n"
 " Stock Simulation: %s    Minimum stock: %s"
 msgstr ""
+" MPSによりユーザのために作成された調達：%s　作成日：%s　\n"
+" 期間：%s　\n"
+" 状態に応じて：　\n"
+" 倉庫予測：%s　\n"
+" 初期在庫：%s　\n"
+" 計画出庫：%s　計画入庫：%s　\n"
+" 既出庫：%s　既入庫：%s　\n"
+" 確認済出庫：%s　確認済入庫：%s　\n"
+" 先行計画出庫：%s　先行確認済入庫：%s　\n"
+" 期待出庫：%s　入庫残：%s　\n"
+" 在庫シミュレーション：%s　最小在庫：%s"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:626
@@ -394,55 +410,55 @@ msgstr ""
 #: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "エラー"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_user_id:0
 msgid "This User"
-msgstr ""
+msgstr "このユーザ"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Forecasts"
-msgstr ""
+msgstr "予測"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Supply from Another Warehouse"
-msgstr ""
+msgstr "他の倉庫からの供給"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Calculate Planning"
-msgstr ""
+msgstr "計画の計算"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:146
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "無効なアクションです。"
 
 #. module: stock_planning
 #: help:stock.planning,stock_start:0
 msgid "Stock quantity one day before current period."
-msgstr ""
+msgstr "現在の期間前の1日の在庫数量"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Procurement history"
-msgstr ""
+msgstr "調達履歴"
 
 #. module: stock_planning
 #: help:stock.planning,product_uom:0
 msgid ""
 "Unit of Measure used to show the quantities of stock calculation.You can use "
 "units from default category or from second category (UoS category)."
-msgstr ""
+msgstr "在庫計算の数量を表示するため使用する単位。デフォルト分類から、または第2分類（単位分類）から単位を使うことができます。"
 
 #. module: stock_planning
 #: view:stock.period.createlines:0
 msgid "Create Weekly Periods"
-msgstr ""
+msgstr "週毎の期間を作成"
 
 #. module: stock_planning
 #: model:ir.actions.act_window,help:stock_planning.action_stock_period_form
@@ -451,56 +467,57 @@ msgid ""
 "account periods. You can use wizard for creating periods and review them "
 "here."
 msgstr ""
+"在庫期間は在庫計画のために使用されます。在庫期間はアカウント期間から独立しています。ここからウィザードを使用して期間の作成やレビューができます。"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Calculated Period Simulation"
-msgstr ""
+msgstr "計算済期間シミュレーション"
 
 #. module: stock_planning
 #: view:stock.period.createlines:0
 msgid "Cancel"
-msgstr ""
+msgstr "キャンセル"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_per_user:0
 msgid "This User Period4"
-msgstr ""
+msgstr "このユーザの期間4"
 
 #. module: stock_planning
 #: view:stock.period:0
 msgid "Stock and Sales Period"
-msgstr ""
+msgstr "在庫と受注の期間"
 
 #. module: stock_planning
 #: field:stock.planning,company_forecast:0
 msgid "Company Forecast"
-msgstr ""
+msgstr "会社の予測"
 
 #. module: stock_planning
 #: help:stock.planning,minimum_op:0
 msgid "Minimum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
+msgstr "最小数量はこの倉庫のために最小在庫ルールで設定します。"
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Per User :"
-msgstr ""
+msgstr "ユーザ毎："
 
 #. module: stock_planning
 #: help:stock.planning.createlines,warehouse_id:0
 msgid "Warehouse which planning will concern."
-msgstr ""
+msgstr "計画が関連する倉庫"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,user_id:0
 msgid "Created/Validated by"
-msgstr ""
+msgstr "作成者 / 検証者"
 
 #. module: stock_planning
 #: field:stock.planning,warehouse_forecast:0
 msgid "Warehouse Forecast"
-msgstr ""
+msgstr "倉庫予測"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:674
@@ -508,18 +525,18 @@ msgstr ""
 msgid ""
 "You must specify a Source Warehouse different than calculated (destination) "
 "Warehouse !"
-msgstr ""
+msgstr "計算された（到着先）倉庫と異なる、元の倉庫を指定する必要があります。"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:146
 #, python-format
 msgid "Cannot delete a validated sales forecast!"
-msgstr ""
+msgstr "検証済受注予測は削除できません。"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period5_per_company:0
 msgid "This Company Period5"
-msgstr ""
+msgstr "この会社の期間5"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,product_uom:0
@@ -529,85 +546,85 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period1_per_company:0
 msgid "This Company Period1"
-msgstr ""
+msgstr "この会社の期間1"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period2_per_company:0
 msgid "This Company Period2"
-msgstr ""
+msgstr "この会社の期間2"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period3_per_company:0
 msgid "This Company Period3"
-msgstr ""
+msgstr "この会社の期間3"
 
 #. module: stock_planning
 #: field:stock.period,date_start:0
 #: field:stock.period.createlines,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "開始日"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period2_per_user:0
 msgid "This User Period2"
-msgstr ""
+msgstr "このユーザの期間2"
 
 #. module: stock_planning
 #: field:stock.planning,confirmed_forecasts_only:0
 msgid "Validated Forecasts"
-msgstr ""
+msgstr "検証済予測"
 
 #. module: stock_planning
 #: help:stock.planning.createlines,product_categ_id:0
 msgid ""
 "Planning will be created for products from Product Category selected by this "
 "field. This field is ignored when you check \"All Forecasted Product\" box."
-msgstr ""
+msgstr "計画はこの項目により選択した製品分類の製品のために作成されます。全ての製品予測をチェックした場合、この項目は無視されます。"
 
 #. module: stock_planning
 #: field:stock.planning,planned_outgoing:0
 msgid "Planned Out"
-msgstr ""
+msgstr "計画出庫"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,product_qty:0
 msgid "Forecast Quantity"
-msgstr ""
+msgstr "予測数量"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Forecast"
-msgstr ""
+msgstr "予測"
 
 #. module: stock_planning
 #: selection:stock.period,state:0
 #: selection:stock.planning,state:0
 #: selection:stock.sale.forecast,state:0
 msgid "Draft"
-msgstr ""
+msgstr "ドラフト"
 
 #. module: stock_planning
 #: view:stock.period:0
 msgid "Closed"
-msgstr ""
+msgstr "閉じた"
 
 #. module: stock_planning
 #: view:stock.planning:0
 #: view:stock.sale.forecast:0
 msgid "Warehouse "
-msgstr ""
+msgstr "倉庫 "
 
 #. module: stock_planning
 #: help:stock.sale.forecast,product_uom:0
 msgid ""
 "Unit of Measure used to show the quantities of stock calculation.You can use "
 "units form default category or from second category (UoS category)."
-msgstr ""
+msgstr "在庫計算の数量を示すために使用される単位。デフォルト分類から、または第2分類（単位の分類）から単位を使用することができます。"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Planning and Situation for Calculated Period"
-msgstr ""
+msgstr "計算された期間のための計画と状況"
 
 #. module: stock_planning
 #: help:stock.planning,planned_outgoing:0
@@ -616,54 +633,56 @@ msgid ""
 "Period of selected Product. To plan this value look at Confirmed Out or "
 "Sales Forecasts. This value should be equal or greater than Confirmed Out."
 msgstr ""
+"選択した製品の選択した期間中の選択した倉庫からの計画出荷数量を入力します。出荷確認や受注予測ではこの値を見て計画します。この値は確認出荷以上である必要があ"
+"ります。"
 
 #. module: stock_planning
 #: view:stock.period:0
 msgid "Current Periods"
-msgstr ""
+msgstr "現在期間"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Internal Supply"
-msgstr ""
+msgstr "内部供給"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:724
 #, python-format
 msgid "%s Pick List %s (%s,  %s) %s %s \n"
-msgstr ""
+msgstr "%s 集荷リスト %s (%s, %s) %s %s \n"
 
 #. module: stock_planning
 #: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
 #: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
 msgid "Create Sales Forecasts"
-msgstr ""
+msgstr "受注予測の作成"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_id:0
 msgid "Period4"
-msgstr ""
+msgstr "期間4"
 
 #. module: stock_planning
 #: field:stock.period,name:0
 #: field:stock.period.createlines,name:0
 msgid "Period Name"
-msgstr ""
+msgstr "期間名"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period2_id:0
 msgid "Period2"
-msgstr ""
+msgstr "期間2"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period3_id:0
 msgid "Period3"
-msgstr ""
+msgstr "期間3"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period1_id:0
 msgid "Period1"
-msgstr ""
+msgstr "期間1"
 
 #. module: stock_planning
 #: model:ir.actions.act_window,help:stock_planning.action_stock_planning_createlines_form
@@ -672,18 +691,20 @@ msgid ""
 "warehouse, so you don't have to create them one by one. The wizard doesn't "
 "duplicate lines if they already exist for this selection."
 msgstr ""
+"このウィザードは所定の選択された期間と倉庫のためにMPS計画行の作成を手助けします。そしてひとつひとつそれを作る必要はありません。それらがこの選択のために"
+"既に存在するなら、ウィザードは重複する行を作成しません。"
 
 #. module: stock_planning
 #: field:stock.planning,outgoing:0
 msgid "Confirmed Out"
-msgstr ""
+msgstr "確認済出庫"
 
 #. module: stock_planning
 #: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
 #: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
 #: view:stock.planning.createlines:0
 msgid "Create Stock Planning Lines"
-msgstr ""
+msgstr "在庫計画行の作成"
 
 #. module: stock_planning
 #: view:stock.planning:0
@@ -693,32 +714,32 @@ msgstr ""
 #. module: stock_planning
 #: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
 msgid "Sales Forecast"
-msgstr ""
+msgstr "受注予測"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
 msgid "This Warehouse Period1"
-msgstr ""
+msgstr "この倉庫の期間1"
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Sales History"
-msgstr ""
+msgstr "受注履歴"
 
 #. module: stock_planning
 #: field:stock.planning,supply_warehouse_id:0
 msgid "Source Warehouse"
-msgstr ""
+msgstr "元の倉庫"
 
 #. module: stock_planning
 #: help:stock.sale.forecast,product_qty:0
 msgid "Forecast Product quantity."
-msgstr ""
+msgstr "製品数量の予測"
 
 #. module: stock_planning
 #: field:stock.planning,stock_supply_location:0
 msgid "Stock Supply Location"
-msgstr ""
+msgstr "在庫供給場所"
 
 #. module: stock_planning
 #: help:stock.period.createlines,date_stop:0
@@ -760,6 +781,8 @@ msgid ""
 "manual procurement with this forecast when some periods are exceptional for "
 "usual minimum stock rules."
 msgstr ""
+"この受注予測数量は在庫計画者が調達を手動で行う、あるいは自動調達を補完するための表示です。幾つかの期間が通常の最小在庫ルールの例外である場合、この予測とと"
+"もに手動の調達を使うことができます。"
 
 #. module: stock_planning
 #: model:ir.actions.act_window,help:stock_planning.action_view_stock_planning_form
@@ -793,6 +816,17 @@ msgid ""
 " Expected Out: %s   Incoming Left: %s                                     \n"
 " Stock Simulation: %s   Minimum stock: %s "
 msgstr ""
+"MPSからユーザにより作成された集荷：%s　作成日：%s　\n"
+" 期間：%s　\n"
+" 状態に応じて：　\n"
+" 倉庫予測：%s　\n"
+" 初期在庫：%s　\n"
+" 計画出庫：%s　計画入庫：%s　\n"
+" 既出庫：%s　既入庫：%s　\n"
+" 確認済出庫：%s　確認済入庫：%s　\n"
+" 先行計画出庫：%s　先行確認済入庫：%s　\n"
+" 期待出庫：%s　入庫残：%s　\n"
+" 在庫シミュレーション：%s　最小在庫：%s "
 
 #. module: stock_planning
 #: field:stock.planning,period_id:0
@@ -855,7 +889,7 @@ msgstr ""
 #: view:stock.sale.forecast:0
 #: selection:stock.sale.forecast,state:0
 msgid "Validated"
-msgstr ""
+msgstr "検証済"
 
 #. module: stock_planning
 #: view:stock.period:0
@@ -953,7 +987,7 @@ msgstr ""
 msgid ""
 "Shows which warehouse this forecast concerns. If during stock planning you "
 "will need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
+msgstr "この予測がどの倉庫に関連するかを表示します。在庫計画の期間に全ての倉庫の受注予測が必要な場合、今、倉庫を選択して下さい。"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:661
@@ -1073,7 +1107,7 @@ msgstr ""
 #: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
 #: view:stock.sale.forecast:0
 msgid "Sales Forecasts"
-msgstr ""
+msgstr "受注予測"
 
 #. module: stock_planning
 #: field:stock.planning.createlines,product_categ_id:0
@@ -1145,7 +1179,7 @@ msgstr "誰がこの予測を作成したのか、検証したのかを示しま
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_team_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "販売チーム"
 
 #. module: stock_planning
 #: help:stock.planning,incoming_left:0
@@ -1166,7 +1200,7 @@ msgstr ""
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Calculate Sales History"
-msgstr ""
+msgstr "受注履歴の計算"
 
 #. module: stock_planning
 #: model:ir.actions.act_window,help:stock_planning.action_stock_sale_forecast_createlines_form

From 42f996d653d88b6fc7935ffd4a38e8ca864cffb1 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 4 Jul 2012 10:00:30 +0200
Subject: [PATCH 65/93] [IMP] hr_timesheet: kept the wizard to print employees
 timesheet instead that the one to print my timesheet only

bzr revid: qdp-launchpad@openerp.com-20120704080030-jtqzvlmrstfs70gm
---
 .../hr_timesheet_print_employee_view.xml      | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

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 0dccf03224e..b4817cffb82 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -2,35 +2,40 @@
 <openerp>
     <data>
 
-	    <!-- Print My Timesheet -->
-      <record id="view_hr_timesheet_my" model="ir.ui.view">
-            <field name="name">hr.analytical.timesheet.my.form</field>
+        <!-- Print Employee Timesheet -->
+        <record id="view_hr_timesheet_employee" model="ir.ui.view">
+            <field name="name">hr.analytical.timesheet.employee.form</field>
             <field name="model">hr.analytical.timesheet.employee</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Print My Timesheet" version="7.0">
+                <form string="Monthly Employee Timesheet" version="7.0">
                     <header>
                         <button string="Print" name="print_report" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group colspan="4">
-                    <separator string="This wizard will print monthly timesheet" colspan="4"/>
                         <field name="month"/>
                         <field name="year"/>
+                        <field name="employee_id" colspan="3"/>
                     </group>
-               </form>
+                </form>
             </field>
         </record>
 
-        <record id="action_hr_timesheet_my" model="ir.actions.act_window">
-            <field name="name">My Timesheet</field>
+        <record id="action_hr_timesheet_employee" model="ir.actions.act_window">
+            <field name="name">Employee Timesheet</field>
             <field name="res_model">hr.analytical.timesheet.employee</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_hr_timesheet_my"/>
+           <field name="view_id" ref="view_hr_timesheet_employee"/>
            <field name="target">new</field>
         </record>
 
+        <menuitem action="action_hr_timesheet_employee"
+            id="menu_hr_timesheet_employee"
+            parent="menu_hr_reporting_timesheet"
+            sequence="2" icon="STOCK_PRINT"/>
+
     </data>
 </openerp>

From f3b26e970f4760bf736b3b1f3353ef8b997fbb96 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 4 Jul 2012 10:27:26 +0200
Subject: [PATCH 66/93] [FIX] fixed runbot

bzr revid: qdp-launchpad@openerp.com-20120704082726-v6b2zrdkatzeytm6
---
 addons/hr_timesheet/test/hr_timesheet_report.yml              | 4 ++--
 .../hr_timesheet/wizard/hr_timesheet_print_employee_view.xml  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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 b4817cffb82..d14646b0249 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -34,7 +34,7 @@
 
         <menuitem action="action_hr_timesheet_employee"
             id="menu_hr_timesheet_employee"
-            parent="menu_hr_reporting_timesheet"
+            parent="hr.menu_hr_reporting"
             sequence="2" icon="STOCK_PRINT"/>
 
     </data>

From f8f85c7cb238bca848ba95c7e7c139c039809e39 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 4 Jul 2012 11:57:14 +0200
Subject: [PATCH 67/93] [FIX] fixed tag mismatch in xml

bzr revid: qdp-launchpad@openerp.com-20120704095714-m6a9vxn4csaxzx9b
---
 addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 ebce5ca34c4..288a51e34cd 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -21,7 +21,7 @@
                                 <field name="year" class="oe_inline"/>
                             </div> 
                         </group>
-                        <group string="Employees"/>
+                        <group string="Employees">
                             <field name="employee_ids" nolabel="1"/>
                         </group>
                     </sheet>

From 7ecc3850d9c1edd6017fe0d83320626458751cf2 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 4 Jul 2012 14:57:41 +0200
Subject: [PATCH 68/93] [FIX] read companies addresses using
 openerp.SUPERUSER_ID instead of uid this will avoid users who don't have the
 right to read partners getting an error while reading companies e.g.: portal
 users, who can only read their own partner

bzr revid: abo@openerp.com-20120704125741-y01o0xi0meflkp8v
---
 openerp/addons/base/res/res_company.py | 27 +++++++++++++-------------
 openerp/addons/base/res/res_partner.py |  2 +-
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 2454f342436..0d20c646114 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -23,6 +23,7 @@ from osv import osv
 from osv import fields
 import os
 import tools
+import openerp
 from tools.translate import _
 from tools.safe_eval import safe_eval as eval
 
@@ -80,9 +81,9 @@ class res_company(osv.osv):
         for company in self.browse(cr, uid, ids, context=context):
             result[company.id] = {}.fromkeys(field_names, False)
             if company.partner_id:
-                address_data = part_obj.address_get(cr, uid, [company.partner_id.id], adr_pref=['default'])
+                address_data = part_obj.address_get(cr, openerp.SUPERUSER_ID, [company.partner_id.id], adr_pref=['default'])
                 if address_data['default']:
-                    address = part_obj.read(cr, uid, address_data['default'], field_names, context=context)
+                    address = part_obj.read(cr, openerp.SUPERUSER_ID, address_data['default'], field_names, context=context)
                     for field in field_names:
                         result[company.id][field] = address[field] or False
         return result
@@ -118,18 +119,18 @@ class res_company(osv.osv):
         'currency_ids': fields.one2many('res.currency', 'company_id', 'Currency'),
         'user_ids': fields.many2many('res.users', 'res_company_users_rel', 'cid', 'user_id', 'Accepted Users'),
         'account_no':fields.char('Account No.', size=64),
-        'street': fields.function(_get_address_data, fnct_inv=_set_address_data, size=128, type='char', string="Street", multi='address'), 
-        'street2': fields.function(_get_address_data, fnct_inv=_set_address_data, size=128, type='char', string="Street2", multi='address'), 
-        'zip': fields.function(_get_address_data, fnct_inv=_set_address_data, size=24, type='char', string="Zip", multi='address'), 
-        'city': fields.function(_get_address_data, fnct_inv=_set_address_data, size=24, type='char', string="City", multi='address'),         
-        'state_id': fields.function(_get_address_data, fnct_inv=_set_address_data, type='many2one', domain="[('country_id', '=', country_id)]", relation='res.country.state', string="Fed. State", multi='address'), 
+        'street': fields.function(_get_address_data, fnct_inv=_set_address_data, size=128, type='char', string="Street", multi='address'),
+        'street2': fields.function(_get_address_data, fnct_inv=_set_address_data, size=128, type='char', string="Street2", multi='address'),
+        'zip': fields.function(_get_address_data, fnct_inv=_set_address_data, size=24, type='char', string="Zip", multi='address'),
+        'city': fields.function(_get_address_data, fnct_inv=_set_address_data, size=24, type='char', string="City", multi='address'),
+        'state_id': fields.function(_get_address_data, fnct_inv=_set_address_data, type='many2one', domain="[('country_id', '=', country_id)]", relation='res.country.state', string="Fed. State", multi='address'),
         'bank_ids': fields.one2many('res.partner.bank','company_id', 'Bank Accounts', help='Bank accounts related to this company'),
-        'country_id': fields.function(_get_address_data, fnct_inv=_set_address_data, type='many2one', relation='res.country', string="Country", multi='address'), 
-        'email': fields.function(_get_address_data, fnct_inv=_set_address_data, size=64, type='char', string="Email", multi='address'), 
-        'phone': fields.function(_get_address_data, fnct_inv=_set_address_data, size=64, type='char', string="Phone", multi='address'), 
-        'fax': fields.function(_get_address_data, fnct_inv=_set_address_data, size=64, type='char', string="Fax", multi='address'), 
-        'website': fields.related('partner_id', 'website', string="Website", type="char", size=64), 
-        'vat': fields.related('partner_id', 'vat', string="Tax ID", type="char", size=32), 
+        'country_id': fields.function(_get_address_data, fnct_inv=_set_address_data, type='many2one', relation='res.country', string="Country", multi='address'),
+        'email': fields.function(_get_address_data, fnct_inv=_set_address_data, size=64, type='char', string="Email", multi='address'),
+        'phone': fields.function(_get_address_data, fnct_inv=_set_address_data, size=64, type='char', string="Phone", multi='address'),
+        'fax': fields.function(_get_address_data, fnct_inv=_set_address_data, size=64, type='char', string="Fax", multi='address'),
+        'website': fields.related('partner_id', 'website', string="Website", type="char", size=64),
+        'vat': fields.related('partner_id', 'vat', string="Tax ID", type="char", size=32),
         'company_registry': fields.char('Company Registry', size=64),
         'paper_format': fields.selection([('a4', 'A4'), ('us_letter', 'US Letter')], "Paper Format", required=True),
     }
diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 9a3661dde0e..2165c8ad16d 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -311,7 +311,7 @@ class res_partner(osv.osv):
             query_args = [name2]
             if limit:
                 limit_str = ' limit %s'
-                query_args += [limit] 
+                query_args += [limit]
             cr.execute('''SELECT partner.id FROM res_partner partner
                           LEFT JOIN res_partner company ON partner.parent_id = company.id
                           WHERE partner.name || ' (' || COALESCE(company.name,'') || ')'

From aed8bf499ea8c1e906c06c9df5fafa9fbfa7ab80 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 5 Jul 2012 04:49:00 +0000
Subject: [PATCH 69/93] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120705044900-c642ga0qgg1bmz7i
---
 openerp/addons/base/i18n/ab.po       |    4 +-
 openerp/addons/base/i18n/af.po       |    4 +-
 openerp/addons/base/i18n/am.po       |    4 +-
 openerp/addons/base/i18n/ar.po       |    4 +-
 openerp/addons/base/i18n/bg.po       |    4 +-
 openerp/addons/base/i18n/bs.po       |    4 +-
 openerp/addons/base/i18n/ca.po       |    4 +-
 openerp/addons/base/i18n/cs.po       |    4 +-
 openerp/addons/base/i18n/da.po       |    4 +-
 openerp/addons/base/i18n/de.po       |    4 +-
 openerp/addons/base/i18n/el.po       |    4 +-
 openerp/addons/base/i18n/en_GB.po    |    4 +-
 openerp/addons/base/i18n/es.po       |    4 +-
 openerp/addons/base/i18n/es_AR.po    |    4 +-
 openerp/addons/base/i18n/es_CL.po    |    6 +-
 openerp/addons/base/i18n/es_CR.po    |    4 +-
 openerp/addons/base/i18n/es_EC.po    |    4 +-
 openerp/addons/base/i18n/et.po       |    4 +-
 openerp/addons/base/i18n/eu.po       |    4 +-
 openerp/addons/base/i18n/fa.po       |    4 +-
 openerp/addons/base/i18n/fa_AF.po    |    4 +-
 openerp/addons/base/i18n/fi.po       |    4 +-
 openerp/addons/base/i18n/fr.po       |    4 +-
 openerp/addons/base/i18n/gl.po       |    4 +-
 openerp/addons/base/i18n/gu.po       |    4 +-
 openerp/addons/base/i18n/he.po       |    4 +-
 openerp/addons/base/i18n/hr.po       |    4 +-
 openerp/addons/base/i18n/hu.po       |    4 +-
 openerp/addons/base/i18n/hy.po       |    4 +-
 openerp/addons/base/i18n/id.po       |    4 +-
 openerp/addons/base/i18n/is.po       |    4 +-
 openerp/addons/base/i18n/it.po       |    4 +-
 openerp/addons/base/i18n/ja.po       |    6 +-
 openerp/addons/base/i18n/ka.po       |    4 +-
 openerp/addons/base/i18n/kk.po       |    4 +-
 openerp/addons/base/i18n/ko.po       |    4 +-
 openerp/addons/base/i18n/lt.po       |    4 +-
 openerp/addons/base/i18n/lv.po       |    4 +-
 openerp/addons/base/i18n/mk.po       |    4 +-
 openerp/addons/base/i18n/mn.po       | 1113 +++++++++++++++++++++++---
 openerp/addons/base/i18n/nb.po       |    4 +-
 openerp/addons/base/i18n/nl.po       |   99 ++-
 openerp/addons/base/i18n/nl_BE.po    |    4 +-
 openerp/addons/base/i18n/pl.po       |    4 +-
 openerp/addons/base/i18n/pt.po       |    4 +-
 openerp/addons/base/i18n/pt_BR.po    |    4 +-
 openerp/addons/base/i18n/ro.po       |    4 +-
 openerp/addons/base/i18n/ru.po       |    4 +-
 openerp/addons/base/i18n/sk.po       |    4 +-
 openerp/addons/base/i18n/sl.po       |    4 +-
 openerp/addons/base/i18n/sq.po       |    4 +-
 openerp/addons/base/i18n/sr.po       |    4 +-
 openerp/addons/base/i18n/sr@latin.po |    4 +-
 openerp/addons/base/i18n/sv.po       |   37 +-
 openerp/addons/base/i18n/th.po       |    4 +-
 openerp/addons/base/i18n/tlh.po      |    4 +-
 openerp/addons/base/i18n/tr.po       |    4 +-
 openerp/addons/base/i18n/uk.po       |    4 +-
 openerp/addons/base/i18n/ur.po       |    4 +-
 openerp/addons/base/i18n/vi.po       |    4 +-
 openerp/addons/base/i18n/zh_CN.po    |    4 +-
 openerp/addons/base/i18n/zh_HK.po    |    4 +-
 openerp/addons/base/i18n/zh_TW.po    |    4 +-
 63 files changed, 1234 insertions(+), 259 deletions(-)

diff --git a/openerp/addons/base/i18n/ab.po b/openerp/addons/base/i18n/ab.po
index f40869c4d59..3863eeeb3e9 100644
--- a/openerp/addons/base/i18n/ab.po
+++ b/openerp/addons/base/i18n/ab.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:18+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:39+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/af.po b/openerp/addons/base/i18n/af.po
index f93fc82bcee..afa156164f2 100644
--- a/openerp/addons/base/i18n/af.po
+++ b/openerp/addons/base/i18n/af.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:19+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:39+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/am.po b/openerp/addons/base/i18n/am.po
index a838cb8cc3b..c7d08cdb7ed 100644
--- a/openerp/addons/base/i18n/am.po
+++ b/openerp/addons/base/i18n/am.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:19+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:40+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/ar.po b/openerp/addons/base/i18n/ar.po
index 6dc873493b9..1b8a8314f6d 100644
--- a/openerp/addons/base/i18n/ar.po
+++ b/openerp/addons/base/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:19+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:40+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/bg.po b/openerp/addons/base/i18n/bg.po
index 3bfdbae8fef..1eb843e2024 100644
--- a/openerp/addons/base/i18n/bg.po
+++ b/openerp/addons/base/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:20+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:40+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/bs.po b/openerp/addons/base/i18n/bs.po
index 8453af58699..bc4ba16f8c8 100644
--- a/openerp/addons/base/i18n/bs.po
+++ b/openerp/addons/base/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:19+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:40+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/ca.po b/openerp/addons/base/i18n/ca.po
index e2205846d0d..c138fdcc5ef 100644
--- a/openerp/addons/base/i18n/ca.po
+++ b/openerp/addons/base/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:20+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:41+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/cs.po b/openerp/addons/base/i18n/cs.po
index 78e29678020..a04a19a13d7 100644
--- a/openerp/addons/base/i18n/cs.po
+++ b/openerp/addons/base/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:20+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:41+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/da.po b/openerp/addons/base/i18n/da.po
index cac3a2498ea..f0b7a105877 100644
--- a/openerp/addons/base/i18n/da.po
+++ b/openerp/addons/base/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:20+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:41+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/de.po b/openerp/addons/base/i18n/de.po
index 6f0d9eac25e..1331257e9f3 100644
--- a/openerp/addons/base/i18n/de.po
+++ b/openerp/addons/base/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:21+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:42+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/el.po b/openerp/addons/base/i18n/el.po
index 27c1a3873b2..97686885d41 100644
--- a/openerp/addons/base/i18n/el.po
+++ b/openerp/addons/base/i18n/el.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:21+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:42+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/openerp/addons/base/i18n/en_GB.po b/openerp/addons/base/i18n/en_GB.po
index 5d959106625..9926427d9d0 100644
--- a/openerp/addons/base/i18n/en_GB.po
+++ b/openerp/addons/base/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:26+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:47+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/es.po b/openerp/addons/base/i18n/es.po
index 99aa41a9e4f..bf6d7b43643 100644
--- a/openerp/addons/base/i18n/es.po
+++ b/openerp/addons/base/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:25+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:46+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/es_AR.po b/openerp/addons/base/i18n/es_AR.po
index 8d4df8260b4..6bfbedefca5 100644
--- a/openerp/addons/base/i18n/es_AR.po
+++ b/openerp/addons/base/i18n/es_AR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:26+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:47+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/es_CL.po b/openerp/addons/base/i18n/es_CL.po
index c24e7162484..b2e08ace3eb 100644
--- a/openerp/addons/base/i18n/es_CL.po
+++ b/openerp/addons/base/i18n/es_CL.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:27+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:48+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -3796,7 +3796,7 @@ msgstr "Verificación EAN"
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
-msgstr "IVA"
+msgstr "RUT"
 
 #. module: base
 #: field:res.users,new_password:0
diff --git a/openerp/addons/base/i18n/es_CR.po b/openerp/addons/base/i18n/es_CR.po
index 15e02416039..3f9f047efd9 100644
--- a/openerp/addons/base/i18n/es_CR.po
+++ b/openerp/addons/base/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:27+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:48+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 "Language: \n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/es_EC.po b/openerp/addons/base/i18n/es_EC.po
index 799c77b8016..104d244a736 100644
--- a/openerp/addons/base/i18n/es_EC.po
+++ b/openerp/addons/base/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:27+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:48+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/et.po b/openerp/addons/base/i18n/et.po
index cca3429d3c8..5fd1fd28561 100644
--- a/openerp/addons/base/i18n/et.po
+++ b/openerp/addons/base/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:20+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:41+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/eu.po b/openerp/addons/base/i18n/eu.po
index a3a1737644b..2a6c8bb8057 100644
--- a/openerp/addons/base/i18n/eu.po
+++ b/openerp/addons/base/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:19+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:40+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/fa.po b/openerp/addons/base/i18n/fa.po
index e9d22eaa9d7..2ef57e23fd9 100644
--- a/openerp/addons/base/i18n/fa.po
+++ b/openerp/addons/base/i18n/fa.po
@@ -9,8 +9,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:23+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:44+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
 "X-Poedit-Language: Persian\n"
 
diff --git a/openerp/addons/base/i18n/fa_AF.po b/openerp/addons/base/i18n/fa_AF.po
index 08cb6287e3e..bd49d236ec2 100644
--- a/openerp/addons/base/i18n/fa_AF.po
+++ b/openerp/addons/base/i18n/fa_AF.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:28+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:48+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/fi.po b/openerp/addons/base/i18n/fi.po
index 2e7d8d1e82d..63d22e5273e 100644
--- a/openerp/addons/base/i18n/fi.po
+++ b/openerp/addons/base/i18n/fi.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:21+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:41+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/fr.po b/openerp/addons/base/i18n/fr.po
index 6586aa9c1dd..4bcc31bc392 100644
--- a/openerp/addons/base/i18n/fr.po
+++ b/openerp/addons/base/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:21+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:42+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/gl.po b/openerp/addons/base/i18n/gl.po
index 18a525932ed..4efb155de8c 100644
--- a/openerp/addons/base/i18n/gl.po
+++ b/openerp/addons/base/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:21+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:42+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/gu.po b/openerp/addons/base/i18n/gu.po
index 541c514f82d..49b43c872f0 100644
--- a/openerp/addons/base/i18n/gu.po
+++ b/openerp/addons/base/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:21+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:42+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/he.po b/openerp/addons/base/i18n/he.po
index 831732af116..4b353ccc8f6 100644
--- a/openerp/addons/base/i18n/he.po
+++ b/openerp/addons/base/i18n/he.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:22+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:42+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/hr.po b/openerp/addons/base/i18n/hr.po
index 724fec0353e..71764eba76d 100644
--- a/openerp/addons/base/i18n/hr.po
+++ b/openerp/addons/base/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:24+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:45+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 "Language: hr\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/hu.po b/openerp/addons/base/i18n/hu.po
index 4e27978cdc3..e32c2abe895 100644
--- a/openerp/addons/base/i18n/hu.po
+++ b/openerp/addons/base/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:22+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:43+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/hy.po b/openerp/addons/base/i18n/hy.po
index e23a9b336f8..d2594e495d4 100644
--- a/openerp/addons/base/i18n/hy.po
+++ b/openerp/addons/base/i18n/hy.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:19+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:40+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/id.po b/openerp/addons/base/i18n/id.po
index f3324130cbf..281c26be5f0 100644
--- a/openerp/addons/base/i18n/id.po
+++ b/openerp/addons/base/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:22+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:43+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/is.po b/openerp/addons/base/i18n/is.po
index 588fdd76ce0..c8663a081eb 100644
--- a/openerp/addons/base/i18n/is.po
+++ b/openerp/addons/base/i18n/is.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:22+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:43+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/it.po b/openerp/addons/base/i18n/it.po
index 351ac7adaa5..70a8e7d3a1a 100644
--- a/openerp/addons/base/i18n/it.po
+++ b/openerp/addons/base/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:22+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:43+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index 9adad97fd8f..85df3886a60 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/addons/base/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:22+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:43+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -3080,7 +3080,7 @@ msgstr "プロジェクトレトロ - 計画"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_stock_planning
 msgid "Master Procurement Schedule"
-msgstr "マスター獲得スケジュール"
+msgstr "マスター調達スケジュール"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_module_category
diff --git a/openerp/addons/base/i18n/ka.po b/openerp/addons/base/i18n/ka.po
index 45333ed6fbe..784c92e5c4c 100644
--- a/openerp/addons/base/i18n/ka.po
+++ b/openerp/addons/base/i18n/ka.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:21+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:42+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/kk.po b/openerp/addons/base/i18n/kk.po
index 86379cc18c2..154e7e179af 100644
--- a/openerp/addons/base/i18n/kk.po
+++ b/openerp/addons/base/i18n/kk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:22+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:43+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/ko.po b/openerp/addons/base/i18n/ko.po
index ab6eb19f88b..0f517691472 100644
--- a/openerp/addons/base/i18n/ko.po
+++ b/openerp/addons/base/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:23+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:43+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/lt.po b/openerp/addons/base/i18n/lt.po
index a823afe8cf8..5a6da9f839a 100644
--- a/openerp/addons/base/i18n/lt.po
+++ b/openerp/addons/base/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:23+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:44+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/lv.po b/openerp/addons/base/i18n/lv.po
index 77e86f72739..a6048b6b687 100644
--- a/openerp/addons/base/i18n/lv.po
+++ b/openerp/addons/base/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:23+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:44+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/mk.po b/openerp/addons/base/i18n/mk.po
index 3cb40c5569c..bc690ab40ca 100644
--- a/openerp/addons/base/i18n/mk.po
+++ b/openerp/addons/base/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:23+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:44+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/mn.po b/openerp/addons/base/i18n/mn.po
index 7f0bbee1452..8559c9084c7 100644
--- a/openerp/addons/base/i18n/mn.po
+++ b/openerp/addons/base/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:23+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:44+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -106,7 +106,7 @@ msgstr "Ажлын урсгал"
 #. module: base
 #: selection:ir.sequence,implementation:0
 msgid "No gap"
-msgstr "Зөрүүгүй"
+msgstr "Цоорхой үгүй"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -141,7 +141,7 @@ msgstr "Метод дуудагдах моделийн нэр. Тухайлба
 #. module: base
 #: view:ir.module.module:0
 msgid "Created Views"
-msgstr "Үүссэн"
+msgstr "Үүссэн Харагдац"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:532
@@ -4243,8 +4243,8 @@ msgid ""
 "Operation prohibited by access rules, or performed on an already deleted "
 "document (Operation: read, Document type: %s)."
 msgstr ""
-"Устгасан баримт дээр хийгдсэн эсвэл үйлдэл хандах дүрэмээс зөвшөөрөгдөөгүй "
-"(Үйлдэл: унших, Баримтын төрөл: %s)."
+"Та хандах эрхгүй мэдээлэл рүү эсвэл аль хэдий нь устгагдсан мэдээлэл рүү "
+"хандах оролдлог хийж байна (Үйлдэл: унших, Баримтын төрөл: %s)."
 
 #. module: base
 #: model:res.country,name:base.nr
@@ -4338,6 +4338,8 @@ msgid ""
 "import a language pack from here. Other OpenERP languages than the official "
 "ones can be found on launchpad."
 msgstr ""
+"Хэрэв танд албан ёсны хэлүүдээс өөр хэл хэрэгтэй бол эндээс хэлний багцыг "
+"импорт хийж болно. Албан бус бусад хэлүүд launchpad-с олдоно."
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_accountant
@@ -5580,7 +5582,7 @@ msgstr "Гүйлгээ хийгдэхийн тулд хангагдсан бай
 #. module: base
 #: model:ir.model,name:base.model_publisher_warranty_contract_wizard
 msgid "publisher_warranty.contract.wizard"
-msgstr ""
+msgstr "publisher_warranty.contract.wizard"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -6167,7 +6169,7 @@ msgstr "Англи хэл (CA)"
 #. module: base
 #: model:ir.model,name:base.model_publisher_warranty_contract
 msgid "publisher_warranty.contract"
-msgstr ""
+msgstr "publisher_warranty.contract"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_coda
@@ -9275,6 +9277,35 @@ msgid ""
 "                Administration / Users / Users\n"
 "                for example, you maybe will do it for the user 'admin'.\n"
 msgstr ""
+"\n"
+"Энэ модуль нь чөлөө болон чөлөөний хүсэлтийг менеж хийх боломжийг олгодог.\n"
+"=============================================================\n"
+"\n"
+"Хүний нөөцийн хянах самбарт чөлөөг нэмдэг.\n"
+"\n"
+"Анхаарах нь:\n"
+"    - Дотоод хөтөлбөрийн (CRM модулийг ашиглаж) ижилтгэл боломжтой: чөлөөний "
+"хүсэлт зөвшөөрөгдмөгц автоматаар хэрэгийг үүсгэхийн тулд хэрэг хэсэгт "
+"чөлөөний төлөвийг холбож өгөх хэрэгтэй. Үүнийг болон өнгөний тохиргоог "
+"дараах менютгээр хийнэ.\n"
+"                Хүний Нөөц/Тохиргоо/Чөлөө/Чөлөөний төрөл\n"
+"    - Ажилтан өшөө чөлөөг шинэ хуваарилалт үүсгэн хүсч болох бөгөөд энэ нь "
+"боломжит чөлөөний хэмжээг нь төрөлөөр нь нэмэгдүүлнэ. (хүсэлт зөвшөөрөгдсөн "
+"тохиолдолд).\n"
+"    - Ажилтны чөлөөг хэвлэх хоёр арга байдаг:\n"
+"        * Нэгдүгээрх нь ажилтныг хэлтсээр нь сонгож хэвлэх\n"
+"                Хүний нөөц/Тайлан/Чөлөө/Чөлөө хэлтсээр\n"
+"        * Хоёр дугаархнь сонгосон ажилтны чөлөө, амралтын тайлангаас. "
+"Жагсаалт руу очино\n"
+"                Хүний нөөц/Хүний нөөц/Ажилчид\n"
+"                хүссэн ажилтнаа сонгоод дарна. Хэвлэх даруулыг дарна.\n"
+"                'Ажилтны Чөлөө, амралт'-г сонгоно.\n"
+"    - Харилцах цонх нь Батлагдсан бөгөөд Шалгагдсан эсвэл зөвхөн Шалгагдсанг "
+"хэвлэх боломжийг олгоно. Эдгээр төлөв нь 'HR' группын хэрэглэгчээр "
+"тохируулагдсан байх ёстой. Үүнийг хэрэглэгчийн өгөгдлийн Нууцлал хавтаст "
+"тохируулах боломжтой.\n"
+"                Удирдлага / Хэрэглэгчид / Хэрэглэгчид\n"
+"                жишээлбэл, үүнийг 'admin' хэрэглэгчид олгож болох юм.\n"
 
 #. module: base
 #: field:ir.actions.report.xml,report_xsl:0
@@ -9294,7 +9325,7 @@ msgstr "Сайжруулсан Маршрут"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_pad
 msgid "Collaborative Pads"
-msgstr ""
+msgstr "Хамтын Хавчуулгууд"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_anglo_saxon
@@ -9600,6 +9631,61 @@ msgid ""
 "\n"
 "                    "
 msgstr ""
+"\n"
+"Энэ модуль нь Webkit (wkhtmltopdf) сан дээр тулгуурласан HTML + CSS "
+"зохиомжийг дэмждэг Тайлангийн Хөдөлгүүрийг нэмдэг.\n"
+"============================================================================="
+"========================================\n"
+"\n"
+"Модулийн бүтэц болон зарим код нь report_openoffice модулиас санаа авсан.\n"
+"\n"
+"Боломж:\n"
+"\n"
+"    - HTML тайлангийн тодорхойлолт\n"
+"    - Олон толгой дэмждэг\n"
+"    - Олон лого\n"
+"    - Олон компани дэмждэг\n"
+"    - HTML болон CSS-3 дэмждэг (WebKIT хувилбарын боломжоор хязгаарлагдана)\n"
+"    - JavaScript дэмжинэ\n"
+"    - HTML-н түүхий задлагч\n"
+"    - Ном хэвлэх боломжтой\n"
+"    - Захлалтын тодорхойлолт\n"
+"    - Цаасны хэмжээний тодорхойлолт\n"
+"\n"
+"... гэх мэт олон боломж\n"
+"\n"
+"Олон толгой болон лого нь компаниудаар тодорхойлогдоно.\n"
+"CSS style, толгой, хөл, бие нь компаниудаар тодорхойлогдоно.\n"
+"\n"
+"Жишээ болгож webkit_report_sample модулийг үзнэ үү. Мөн энэ дүрс бичлэгийг "
+"үз:\n"
+"    http://files.me.com/nbessi/06n92k.mov\n"
+"\n"
+"Шаардлага болон Суулгалт\n"
+"-----------------------------\n"
+"Энэ модуль нь ``wkthtmltopdf`` сангийн 0.9.9 буюу түүнээс хойш хувилбарыг "
+"суулгасан байхыг шаардана. Энэ нь HTML-г PDF баримт болгож дүрслэхэд "
+"хэрэглэгдэнэ. Дараах хаягаас суулгацыг олох боломжтой. "
+"http://code.google.com/p/wkhtmltopdf/\n"
+"Linux, Mac OS X (i386), Windows (32bits) хөрсүүд дээр суух боломжтой.\n"
+"\n"
+"Санг OpenERP сервер машин дээр суулгасан дараа компани бүр дээр "
+"``wkthtmltopdf``-н биелэх файлуудын замын тохиргоог хийнэ.\n"
+"\n"
+"Линуксын хувьд толгой/хөл дээр асуудал гарч байвал сангийн \"статик\" "
+"хувилбарыг суулгасан эсэхийг шалгах хэрэгтэй. Анхны байдлаараа Ubuntu дээр "
+"энэ асуудал гардаг.\n"
+"\n"
+"\n"
+"ЦААШИД ХИЙХ\n"
+"----\n"
+"\n"
+" * JavaScript идэвхжүүлэх, болих дэмжлэг\n"
+" * Номны нугалсан хуудсын формат\n"
+" * Салгасан PDF-үүдийн zip архив буцаах\n"
+" * WYSIWYG төслийн веб клиент\n"
+"\n"
+"                    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_gt
@@ -9805,7 +9891,7 @@ msgstr "Мөрөн дунд"
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field_bic
 msgid "bank_bic"
-msgstr ""
+msgstr "bank_bic"
 
 #. module: base
 #: code:addons/orm.py:3988
@@ -10173,6 +10259,259 @@ msgid ""
 "product, warehouse and company because results\n"
 "   can be unpredictable. The same applies to Forecasts lines.\n"
 msgstr ""
+"\n"
+"MPS нь зохистой нөөцийн үлдэгдэл суурилан ажилладаг MRP товлолтын хэсэгт гар "
+"бэлтгэн нийлүүлэх төлөвлөгөөг үүсгэх боломж олгодог. \n"
+"\n"
+"============================================================================="
+"============================================================\n"
+"\n"
+"Товч Нэр Томъёо\n"
+"--------------\n"
+"- Бараа Материалын Мөчлөг - Борлуулалт, бараа материалын төлөвлөлтийн "
+"урьдчилсан таамаг гаргахад хэрэглэх мөчлөг (Эхлэх, Дуусах Огноо) \n"
+"- Борлуулалтын Урьдчилсан Таамаг - Бараа Материалын Мөчлөгт зарахаар "
+"төлөвлөж байгаа барааны тоо хэмжээ.\n"
+"- Бараа Материалын Төлөвлөлт - Бараа Материалын мөчлөгт хугацаанд худалдаж "
+"авахаар юмуу үйлдвэрлэхээр төлөвлөж байгаа бараа материалын тоо хэмжээ.\n"
+"\n"
+"``sale_forecast`` модульд хэрэглэгдэж байгаа нэр томъёотой будилахгүй байхын "
+"тулд \"Бараа, материал болон Борлуулалтын Урьдчилсан Таамаг\" ба \"Бараа, "
+"материалын Төлөвлөлт\" гэсэн тоо, хэмжээг голлосон нэр томъёонуудыг "
+"ашиглана. Харин ``sale_forecast`` модуль дахь \"Борлуулалтын Урьдчилсан "
+"Таамаг\", \"Төлөвлөлт\" нь үнийн дүн юм.\n"
+"\n"
+"Хаанаас эхлэх вэ?\n"
+"--------------\n"
+"Энэ модулийг хэрэглэх явдал нь гурван алхамаар хийгдэнэ:\n"
+"\n"
+" * Агуулах>Тохиргоо>Бараа, материалын мөчлөг менюгээр Бараа, материалын "
+"мөчлөгийг тодорхойлно. (Заавал хийх алхам)\n"
+" * Борлуулалт>Борлуулалт менюгээр орж Борлуулалтын Урьдчилсан таамагийг "
+"бөглөнө. (Заавал биш алхам боловч цаашдын төлөвлөлтөд чухал хэрэгтэй)\n"
+" * MPS төлөвлөгөө үүсгэнэ. Үлдэгдлийг шалгаж шаардлагатай бэлтгэн "
+"нийлүүлэлтийг өдөөнө. Жинхэн бэлтгэн нийлүүлэлт нь Бараа, материалын "
+"мөчлөгийн эцсийн алхам юм.\n"
+"\n"
+"\n"
+"Бараа, материалын мөчлөгийн тохиргоо\n"
+"--------------------------\n"
+"Мөчлөгтэй холбоотой менюны хоёр зүйл \"Агуулах > Тохиргоо > Бараа, "
+"материалын мөчлөг\" менюд бий:\n"
+"\n"
+" * \"Бараа, материалын мөчлөг үүсгэх\" - автоматаар өдөр тутамын, "
+"долооногийн, сарын мөчлөгүүдийг үүсгэж болно.\n"
+" * \"Бараа, материалын мөчлөгүүд\" - дурын мөчлөгийг үүсгэж, төлөвийг "
+"өөрчилж, огноонуудыг тааруулж болно.\n"
+"\n"
+"Мөчлөгүүдийг үүсгэх нь эхний алхам. \"Бараа, материалын мөчлөгүүд\" менюгээр "
+"орж Шинэ даруулын дарж өөрийн мөчлөгүүдийг үүсгэх боломжтой боловч \"Бараа, "
+"материалын мөчлөг үүсгэх\" менюгээр орж автомат туслагчийг ашиглах нь илүү "
+"зохимжтой.\n"
+"\n"
+"Санаж байх нь:\n"
+"\n"
+" - Эдгээр мөчлөгүүд (Бараа материалын мөчлөг) нь Санхүүгийн мөчлөг болон "
+"системийн бусад хэсэгт байгаа мөчлөгүүдээс бүрэн тусдаа ойлголт юм.\n"
+" - Мөчлөгүүд нь олон компани ашиглаж байх үед аль нэг компанид "
+"харъяалагдахгүй бөгөөд бүх компаниудад ерөнхий байна. Олон компанид "
+"хэрэглэхээр бол хэд ч хамаагүй олон мөчлөг тодорхойлон хэрэглэж болно. Зарим "
+"мөчлөгүүд нь давхардаж байж болно. Энэ текстийн төгсгөлд давхцсан "
+"мөчлөгүүдийг хэрхэн хэрэглэх талаар дурьдсан болно.\n"
+" - Мөчлөгүүд нь автоматаар тодорхойлогдсон тохиолдолд эхлэх цаг нь 00:00:00 "
+"бөгөөд дуусах цаг нь 23:59:00 байдаг. Хэрэв өдөр тутамын мөчлөг үүсгэвэл "
+"31.01.2010 00:00:00 цагт эхлэж 31.01.2010 23:59:00 цагт дуусна. Энэ нь "
+"мөчлөгийн автомат үүсгэх үед л ингэ тохируулагддаг. Харин гараараа үүсгэж "
+"байгаа тохиолдолд цагийг өөрөө анхаарах хэрэгтэй. \n"
+" - Хэрэв ижил бараа, агуулах, компани дээр давхцсан мөчлөгийг хэрэглэвэл үр "
+"дүнг таах аргагүй.\n"
+" - Хэрэв тухайн огноо нь ямар нэгт мөчлөгт хамаардаггүй болон мөчлөг хооронд "
+"цоорхойнууд байдаг бол үр дүнг мөн таах аргагүй.\n"
+"\n"
+"Борлуулалтын урьдчилсан таамагийн тохиргоо\n"
+"-----------------------------\n"
+"\"Борлуулалт > Борлуулалтын Уридчилсан таамаг\" менюд хэдэн комманд байдаг:\n"
+"\n"
+" - \"Борлуулалтын урьдчилсан Таамаг Үүсгэх\" - таны шаардлагын дагуу "
+"борлуулалтын урьдчилсан таамагийн мөрүүдийг үүсгэнэ.\n"
+" - \"Борлуулалтын Урьдчилсан таамаг\" - Борлуулалтын урьдчилсан таамагийг "
+"менеж хийнэ.\n"
+"\n"
+"Menu \"Create Sales Forecasts\" creates Forecasts for products from selected "
+"Category, for selected Period and for selected Warehouse.\n"
+"It is also possible to copy the previous forecast.\n"
+"\n"
+"Remarks:\n"
+"\n"
+" - This tool doesn't duplicate lines if you already have an entry for the "
+"same Product, Period, Warehouse, created or validated by the same user. If "
+"you wish to create another forecast, if relevant lines exists you have to do "
+"it manually as described below.\n"
+" - When created lines are validated by someone else you can use this tool to "
+"create another line for the same Period, Product and Warehouse.\n"
+" - When you choose \"Copy Last Forecast\", created line take quantity and "
+"other settings from your (validated by you or created by you if not "
+"validated yet) forecast which is for last period before period of created "
+"forecast.\n"
+"\n"
+"On \"Sales Forecast\" form mainly you have to enter a forecast quantity in "
+"\"Product Quantity\".\n"
+"Further calculation can work for draft forecasts. But validation can save "
+"your data against any accidental changes.\n"
+"You can click \"Validate\" button but it is not mandatory.\n"
+"\n"
+"Instead of forecast quantity you may enter the amount of forecast sales via "
+"the \"Product Amount\" field.\n"
+"The system will count quantity from amount according to Sale price of the "
+"Product.\n"
+"\n"
+"All values on the form are expressed in unit of measure selected on form.\n"
+"You can select a unit of measure from the default category or from secondary "
+"category.\n"
+"When you change unit of measure the forecast product quantity will be re-"
+"computed according to new UoM.\n"
+"\n"
+"To work out your Sale Forecast you can use the \"Sales History\" of the "
+"product.\n"
+"You have to enter parameters to the top and left of this table and system "
+"will count sale quantities according to these parameters.\n"
+"So you can get results for a given sales team or period.\n"
+"\n"
+"\n"
+"MPS or Procurement Planning\n"
+"---------------------------\n"
+"An MPS planning consists in Stock Planning lines, used to analyze and "
+"possibly drive the procurement of \n"
+"products for each relevant Stock Period and Warehouse.\n"
+"The menu is located in \"Warehouse > Schedulers > Master Procurement "
+"Schedule\":\n"
+"\n"
+" - \"Create Stock Planning Lines\" - a wizard to help automatically create "
+"many planning lines\n"
+" - \"Master Procurement Schedule\" - management of your planning lines\n"
+"\n"
+"Similarly to the way Sales forecast serves to define your sales planning, "
+"the MPS lets you plan your procurements (Purchase/Manufacturing).\n"
+"You can quickly populate the MPS with the \"Create Stock Planning Lines\" "
+"wizard, and then proceed to review them via the \"Master Procurement "
+"Schedule\" menu.\n"
+"\n"
+"The \"Create Stock Planning Lines\" wizard lets you to quickly create all "
+"MPS lines for a given Product Category, and a given Period and Warehouse.\n"
+"When you enable the \"All Products with Forecast\" option of the wizard, the "
+"system creates lines for all products having sales forecast for selected\n"
+"Period and Warehouse (the selected Category will be ignored in this case).\n"
+"\n"
+"Under menu \"Master Procurement Schedule\" you will usually change the "
+"\"Planned Out\" and \"Planned In\" quantities and observe the resulting "
+"\"Stock Simulation\" value\n"
+"to decide if you need to procure more products for the given Period.\n"
+"\"Planned Out\" will be initially based on \"Warehouse Forecast\" which is "
+"the sum of all outgoing stock moves already planned for the Period and "
+"Warehouse.\n"
+"Of course you can alter this value to provide your own quantities. It is not "
+"necessary to have any forecast.\n"
+"\"Planned In\" quantity is used to calculate field \"Incoming Left\" which "
+"is the quantity to be procured to reach the \"Stock Simulation\" at the end "
+"of Period.\n"
+"You can compare \"Stock Simulation\" quantity to minimum stock rules visible "
+"on the form.\n"
+"And you can plan different quantity than in Minimum Stock Rules. "
+"Calculations are done for whole Warehouse by default,\n"
+"if you want to see values for Stock location of calculated warehouse you can "
+"check \"Stock Location Only\".\n"
+"\n"
+"When you are satisfied with the \"Planned Out\", \"Planned In\" and end of "
+"period \"Stock Simulation\",\n"
+"you can click on \"Procure Incoming Left\" to create a procurement for the "
+"\"Incoming Left\" quantity.\n"
+"You can decide if procurement will go to the to Stock or Input location of "
+"the Warehouse.\n"
+"\n"
+"If you don't want to Produce or Buy the product but just transfer the "
+"calculated quantity from another warehouse\n"
+"you can click \"Supply from Another Warehouse\" (instead of \"Procure "
+"Incoming Left\") and the system will\n"
+"create the appropriate picking list (stock moves).\n"
+"You can choose to take the goods from the Stock or the Output location of "
+"the source warehouse.\n"
+"Destination location (Stock or Input) in the destination warehouse will be "
+"taken as for the procurement case.\n"
+"\n"
+"To see update the quantities of \"Confirmed In\", \"Confirmed Out\", "
+"\"Confirmed In Before\", \"Planned Out Before\"\n"
+"and \"Stock Simulation\" you can press \"Calculate Planning\".\n"
+"\n"
+"All values on the form are expressed in unit of measure selected on form.\n"
+"You can select one of unit of measure from default category or from "
+"secondary category.\n"
+"When you change unit of measure the editable quantities will be re-computed "
+"according to new UoM. The others will be updated after pressing \"Calculate "
+"Planning\".\n"
+"\n"
+"Computation of Stock Simulation quantities\n"
+"------------------------------------------\n"
+"The Stock Simulation value is the estimated stock quantity at the end of the "
+"period.\n"
+"The calculation always starts with the real stock on hand at the beginning "
+"of the current period, then\n"
+"adds or subtracts the computed quantities.\n"
+"When you are in the same period (current period is the same as calculated) "
+"Stock Simulation is calculated as follows:\n"
+"\n"
+"Stock Simulation =\n"
+"\tStock of beginning of current Period\n"
+"\t- Planned Out\n"
+"\t+ Planned In\n"
+"\n"
+"When you calculate period next to current:\n"
+"\n"
+"Stock Simulation =\n"
+"\tStock of beginning of current Period\n"
+"\t- Planned Out of current Period\n"
+"\t+ Confirmed In of current Period  (incl. Already In)\n"
+"\t- Planned Out of calculated Period\n"
+"\t+ Planned In of calculated Period .\n"
+"\n"
+"As you see the calculated Period is taken the same way as in previous case, "
+"but the calculation in the current\n"
+"Period is a little bit different. First you should note that system takes "
+"for only Confirmed moves for the\n"
+"current period. This means that you should complete the planning and "
+"procurement of the current Period before\n"
+"going to the next one.\n"
+"\n"
+"When you plan for future Periods:\n"
+"\n"
+"Stock Simulation =\n"
+"\tStock of beginning of current Period\n"
+"\t- Sum of Planned Out of Periods before calculated\n"
+"\t+ Sum of Confirmed In of Periods before calculated (incl. Already In)\n"
+"\t- Planned Out of calculated Period\n"
+"\t+ Planned In of calculated Period.\n"
+"\n"
+"Here \"Periods before calculated\" designates all periods starting with the "
+"current until the period before the one being calculated.\n"
+"\n"
+"Remarks:\n"
+"\n"
+" - Remember to make the proceed with the planning of each period in "
+"chronological order, otherwise the numbers will not reflect the\n"
+"   reality\n"
+" - If you planned for future periods and find that real Confirmed Out is "
+"larger than Planned Out in some periods before,\n"
+"   you can repeat Planning and make another procurement. You should do it in "
+"the same planning line.\n"
+"   If you create another planning line the suggestions can be wrong.\n"
+" - When you wish to work with different periods for some products, define "
+"two kinds of periods (e.g. Weekly and Monthly) and use\n"
+"   them for different products. Example: If you use always Weekly periods "
+"for Product A, and Monthly periods for Product B\n"
+"   all calculations will work correctly. You can also use different kind of "
+"periods for the same product from different warehouse\n"
+"   or companies. But you cannot use overlapping periods for the same "
+"product, warehouse and company because results\n"
+"   can be unpredictable. The same applies to Forecasts lines.\n"
 
 #. module: base
 #: model:res.country,name:base.mp
@@ -10523,7 +10862,7 @@ msgstr "Зохиомол товчлол"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Vietnamese / Tiếng Việt"
-msgstr ""
+msgstr "Виетнам / Tiếng Việt"
 
 #. module: base
 #: model:res.country,name:base.dz
@@ -10667,7 +11006,7 @@ msgstr "Бүх суулгалтад хэрэгтэй OpenERP цөм."
 #. module: base
 #: model:ir.model,name:base.model_osv_memory_autovacuum
 msgid "osv_memory.autovacuum"
-msgstr ""
+msgstr "osv_memory.autovacuum"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_us
@@ -10724,6 +11063,16 @@ msgid ""
 "fund status.\n"
 "    "
 msgstr ""
+"\n"
+"Сан өсгөх.\n"
+"============\n"
+"\n"
+"Та ямар нэг арга хэмжээ, компанит ажил зохион байгуулж цугларсан мөнгийг "
+"хөтлөхийг хүсч болно.\n"
+"Менюгээс сангийн жагсаалтыг гаргаж сангийн тодорхойлолт, имэйл, түүх, "
+"амжилтын магадлал зэрэгийг олж болно. Хэд хэдэн даруулын тусламжтайгаар "
+"сангийн төлөвийг хялбараар өөрчилж хэрэглэх боломж олгоно.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_margin
@@ -10858,6 +11207,9 @@ msgid ""
 "same values as for the condition field.\n"
 "Example: object.invoice_address_id.email, or 'me@example.com'"
 msgstr ""
+"Хааш илгээгдсэн имэйл хаягийг буцаадаг илэрхийлэл. Нөхцөл бичдэг талбар "
+"дээрхтэй ижил утга дээр суурилж болно.\n"
+"Жишээлбэл: object.invoice_address_id.email, эсвэл 'me@example.com'"
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_hello
@@ -10866,6 +11218,9 @@ msgid ""
 "        OpenERP Web example module.\n"
 "        "
 msgstr ""
+"\n"
+"        OpenERP Вебийн жишээ модуль\n"
+"        "
 
 #. module: base
 #: model:res.country,name:base.gy
@@ -10909,6 +11264,33 @@ msgid ""
 "module named account_voucher.\n"
 "    "
 msgstr ""
+"\n"
+"Санхүү, НББ-н менежмент.\n"
+"====================================\n"
+"\n"
+"Санхүү, НББ-н модулийн хамрах зүйлс:\n"
+"--------------------------------------------\n"
+"Ерөнхий НББ\n"
+"Өртөг / Шинжилгээний НББ\n"
+"Гуравдагч этгээдийн НББ\n"
+"Татварын менежмент\n"
+"Төслүүд\n"
+"Захиалагч болон Нийлүүлэгчийн Нэхэмжлэл\n"
+"Банкны гүйлгээнүүд\n"
+"Харилцагчдын тулган гүйцээлт\n"
+"\n"
+"Нягтлангуудад зориулсан хянах самбарын зүйлс:\n"
+"--------------------------------------------------\n"
+"* Батлах шаардлагатай захиалагчийн нэхэмжлэлүүд\n"
+"* Компаний шинжилгээ\n"
+"* Авлагын Насжилтийн График\n"
+"* Мөнгөн Сангийн График\n"
+"\n"
+"Ерөнхий дэвтэр нь тодорхойлсон санхүүгийн журналуудаар хийгддэг (мөр "
+"оруулах, бүлэглэх зэрэг нь бүгд журналуудаар хийгдэнэ) Журналууд нь "
+"санхүүгийн жилүүдтэйгээ холбогдоно. Ваучер бэлдэх зориулагдсан "
+"account_voucher гэсэн тусдаа модуль байдаг.\n"
+"    "
 
 #. module: base
 #: help:ir.actions.act_window,view_type:0
@@ -10977,6 +11359,12 @@ msgid ""
 "- SSL/TLS: SMTP sessions are encrypted with SSL/TLS through a dedicated port "
 "(default: 465)"
 msgstr ""
+"Холболтын шифрлэлтийн схемийг сонгоно уу:\n"
+"- Байхгүй: SMTP харилцаа нь цэвэр энгийн текстээр явагдана.\n"
+"- TLS (STARTTLS): SMTP харилцаа үүсмэхдээ эхлэлд нь TLS шифрлэлтийг шаарддаг "
+" (Зохимжтой)\n"
+"- SSL/TLS: SMTP харилцаа нь SSL/TLS-р шифрлэгддэг. Өөрийн порттой (анхны "
+"утга нь: 465)"
 
 #. module: base
 #: view:ir.model:0
@@ -10995,6 +11383,14 @@ msgid ""
 "modules like base_report_designer and base_report_creator.\n"
 "    "
 msgstr ""
+"\n"
+"Тайлангийн Нуугдмалыг суулгагч.\n"
+"==============================\n"
+"\n"
+"Тайлангийн Нуугдмалын Тохиргоог ил болгодог. Ингэснээр эндээс "
+"base_report_designer, base_report_creator гэх мэт модулийг суулгах боломжтой "
+"болдог.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_synchro
@@ -11055,7 +11451,7 @@ msgstr "Дэлгэц"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_wiki_sale_faq
 msgid "Wiki: Sale FAQ"
-msgstr ""
+msgstr "Вики: Борлуулалтын Түгээмэл Асуултууд"
 
 #. module: base
 #: selection:ir.module.module,state:0
@@ -11068,7 +11464,7 @@ msgstr "Суулгагдах"
 msgid ""
 "It gives the status if the tip has to be displayed or not when a user "
 "executes an action"
-msgstr ""
+msgstr "Хэрэглэгч үйлдлийг ажиллуулахад зөвлөмж харагдах, үгүйг өгдөг төлөв."
 
 #. module: base
 #: view:ir.model:0
@@ -11099,6 +11495,13 @@ msgid ""
 "outlook, Sunbird, ical, ...\n"
 "    "
 msgstr ""
+"\n"
+"Цаглабарыг бусад хэрэглээний програмтай ижилтгэх боломжийг өгдөг.\n"
+"=========================================================\n"
+"\n"
+"Өөрийн ухаалаг утас, outlook, имэйлийн програмууд, ical зэрэгтэй цаглабарыг "
+"ижилтгэдэг.\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.lr
@@ -11219,11 +11622,25 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Сонгосон данс дээр сонгосон журналын хувьд нэхэмжлэлийн ханшны анхны утгыг "
+"тодорхойлох боломжийг олгодог.\n"
+"============================================================================="
+"=================================\n"
+"\n"
+"Энэ нь хэрэглэгч өөрийн цагийн хуудсыг бөглөхөд түгээмэл хэрэглэгддэг: утга "
+"нь автоматаар авагдаж талбарууд нь автоматаар бөглөгддөг. Гэхдээ эдгээр "
+"утгуудыг өөрчлөх боломж нь байдаг.\n"
+"\n"
+"Мэдээжээр утга тохируулагдаагүй бол анхны утга нь дансны анхны утгаар "
+"тохируулагддаг болохоор энэ модуль нь хуучин тохигоотой бүрэн нийцтэй юм.\n"
+"\n"
+"    "
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_fundrising
 msgid "Fund Raising"
-msgstr ""
+msgstr "Сан Өсгөх"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_type
@@ -11234,7 +11651,7 @@ msgstr "Дарааллын төрөл"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CO) / Español (CO)"
-msgstr ""
+msgstr "Испани (CO) / Español (CO)"
 
 #. module: base
 #: view:base.module.configuration:0
@@ -11298,12 +11715,12 @@ msgstr "Алдаа !"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_marketing_campaign_crm_demo
 msgid "Marketing Campaign - Demo"
-msgstr ""
+msgstr "Маркетенгийн Компанит ажил - Үзүүлэн"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_fetchmail_hr_recruitment
 msgid "eMail Gateway for Applicants"
-msgstr ""
+msgstr "Өргөдөл гаргагчийн иМэйл Үүд"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_coda
@@ -11497,7 +11914,7 @@ msgstr "Төвөгтэй импортод зориулсан хөрс"
 #. module: base
 #: view:ir.actions.todo.category:0
 msgid "Wizard Category"
-msgstr ""
+msgstr "Харилцах Цонхны Ангилал"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -11550,6 +11967,11 @@ msgid ""
 "\n"
 "Adds a Claim link to the delivery order.\n"
 msgstr ""
+"\n"
+"Хүргэлтийн захиалгад гомдол үүсгэх.\n"
+"=====================================\n"
+"\n"
+"Хүргэлтийн захиалгад гомдол гэсэн холбоосыг үүсгэдэг.\n"
 
 #. module: base
 #: view:ir.model:0
@@ -11721,6 +12143,11 @@ msgid ""
 "\n"
 "Using this you can directly open Google Map from the URL widget."
 msgstr ""
+"\n"
+"Энэ модуль нь харилцагчийн хаягт Google газрын зурагийн талбарыг нэмдэг.\n"
+"====================================================\n"
+"\n"
+"Үүнийг ашиглан Google газрын зурагийг шууд URL виджетээс нээх боломжтой."
 
 #. module: base
 #: field:workflow.activity,action:0
@@ -11742,6 +12169,18 @@ msgid ""
 "    http://files.me.com/nbessi/06n92k.mov\n"
 "                    "
 msgstr ""
+"\n"
+"Webkit Тайлангийн Хөдөлгүүрийн Жишээнүүд (report_webkit module).\n"
+"========================================================\n"
+"\n"
+"Энэ нэхэмжлэлийн жишээ тайлан агуулагдсан байгаа. Түүнчлэн Вебкит тайлангийн "
+"нэгж зүйлсийг системийн дурын баримтанд оруулах харилцах цонхны жишээ "
+"байгаа.\n"
+"\n"
+"Харилцах цонхыг дуудах замаар хэвлэх даруулыг үүсгэх шаардлагатай. Илүү "
+"дэлгэрэнгүйг:\n"
+"    http://files.me.com/nbessi/06n92k.mov\n"
+"                    "
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -11785,6 +12224,9 @@ msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
 "But the latter module is not available in your system."
 msgstr ""
+"Та '%s' гэсэн модулийг суулгах гэж байгаа энэ нь '%s' модулиас хамаарсан "
+"байна.\n"
+"Гэвч сүүлийн модуль нь бэлэн байхгүй байна."
 
 #. module: base
 #: field:ir.module.module,latest_version:0
@@ -11820,6 +12262,16 @@ msgid ""
 "    * Product Attributes\n"
 "    "
 msgstr ""
+"\n"
+"Барааны форм дээр үйлдвэрлэгч болон үзүүлэлтыг нэмдэг модуль.\n"
+"====================================================================\n"
+"\n"
+"Бараанд дараах зүйлсийг тодорхойлох боломжтой болно:\n"
+"    * Үйлдвэрлэгч\n"
+"    * Үйлдвэрлэгчийн Барааны Нэр\n"
+"    * Үйлдвэрлэгчийн Барааны Код\n"
+"    * Барааны үзүүлэлтүүд\n"
+"    "
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_todo_category
@@ -11950,6 +12402,14 @@ msgid ""
 "    * Company Contribution Management\n"
 "    "
 msgstr ""
+"\n"
+"Санхүүтэй уялдсан ерөнхий цалингийн систем.\n"
+"===================================================\n"
+"\n"
+"    * Зардлыг боловсруулах\n"
+"    * Төлбөрийг боловсруулах\n"
+"    * Компаний Хандивийн Менежмент\n"
+"    "
 
 #. module: base
 #: code:addons/base/res/res_currency.py:190
@@ -11981,6 +12441,21 @@ msgid ""
 "    * Allow to refund former sales.\n"
 "    "
 msgstr ""
+"\n"
+"Энэ модуль нь хурдан бөгөөд хялбар борлуулалтын процесс хийх боломж "
+"олгодог.\n"
+"===================================================\n"
+"\n"
+"Үндсэн онцлог :\n"
+"---------------\n"
+"    * Борлуулалтыг хурдан оруулж илгээх.\n"
+"    * Зөвхөн нэг төлбөрийн арга сонгох боломж (хурдан арга) эсвэл төлбөрийг "
+"хэд хэдэн төлбөрийн горимд хуваах.\n"
+"    * Буцааж өгөх мөнгөний дүнг бодох.\n"
+"    * Бэлтгэх баримтыг автоматаар үүсгэж батлах.\n"
+"    * Нэхэмжлэлийгн автоматаар үүсгэх.\n"
+"    * Борлуулалтын буцаалт.\n"
+"    "
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view_custom
@@ -12009,6 +12484,8 @@ msgid ""
 "Object in which you want to create / write the object. If it is empty then "
 "refer to the Object field."
 msgstr ""
+"Обьект үүсгэж буюу бичих гэж байгаа Обьект. Хэрэв энэ нь хоосон бол Обьект "
+"талбар руу холбоно уу."
 
 #. module: base
 #: view:ir.module.module:0
@@ -12034,6 +12511,8 @@ msgid ""
 "Helps you manage your human resources by encoding your employees structure, "
 "generating work sheets, tracking attendance and more."
 msgstr ""
+"Ажилчдын бүтэц, ажлын цагийн хуудас, ирц зэрэг олон зүйлсийг хянаж хөтлөн "
+"хүний нөөцөө менеж хийхэд тусладаг."
 
 #. module: base
 #: help:ir.model.fields,model_id:0
@@ -12056,6 +12535,13 @@ msgid ""
 "for Wiki Sale FAQ.\n"
 "    "
 msgstr ""
+"\n"
+"Энэ модуль нь Борлууалтын Түгээмэл Асуултын Вики үлгэрийг өгдөг.\n"
+"===============================================\n"
+"\n"
+"Энэ нь жишээ өгөгдөл, Вики групп, Вики хуудас зэрэгийг Борлуулалтын Түгээмэл "
+"Асуултын Викид зориулан үүсгэдэг.\n"
+"    "
 
 #. module: base
 #: view:ir.sequence.type:0
@@ -12078,6 +12564,17 @@ msgid ""
 "trigger an automatic reminder email.\n"
 "    "
 msgstr ""
+"\n"
+"Энэ модуль нь үйлдлийн дүрмийг дурын обьект дээр үүсгэх боломжийг олгодог.\n"
+"============================================================\n"
+"\n"
+"Төрөл бүрийн дэлгэцүүдэд үйлдлүүдийг автоматаар ажиллуулахдаа автомат "
+"үйлдлүүдийг ашигла.\n"
+"\n"
+"Жишээ: тодорхой хэрэглэгчийн үүсгэсэн сэжим нь тодорхой борлуулалтын багт "
+"хуваарилагддаг, эсвэл 14 хоносон боломжийн хувьд автоматаар сануулга имэйл "
+"илгээдэг зэрэг үйлдлийг автоматжуулж болох юм.\n"
+"    "
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_request-act
@@ -12100,7 +12597,7 @@ msgstr "Эсвэл"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_br
 msgid "Brazilian - Accounting"
-msgstr ""
+msgstr "Бразили - Санхүү"
 
 #. module: base
 #: model:res.country,name:base.pk
@@ -12119,6 +12616,14 @@ msgid ""
 "The wizard to launch the report has several options to help you get the data "
 "you need.\n"
 msgstr ""
+"\n"
+"Бараанд борлуулалт, худалдан авалт, тохируулалт зэрэг олон сонирхолтой "
+"үзүүлэлтийг тооцолох тайлангийн менюг нэмдэг.\n"
+"============================================================================="
+"================================================\n"
+"\n"
+"Энэ харилцах цонх нь танд шаардлагатай өгөгдлийг авах нэлээд олон "
+"сонголттой.\n"
 
 #. module: base
 #: model:res.country,name:base.al
@@ -12151,6 +12656,8 @@ msgid ""
 "Please be patient, this operation may take a few minutes (depending on the "
 "number of modules currently installed)..."
 msgstr ""
+"Тэвчээртэй байгаарай, энэ үйлдэл нэлээд хэдэн минут болж магадгүй (одоо "
+"хэдэн модуль суулгасан байгаагаас хамаарна)..."
 
 #. module: base
 #: field:ir.ui.menu,child_id:0
@@ -12188,11 +12695,17 @@ msgid ""
 "Price and Cost Price.\n"
 "    "
 msgstr ""
+"\n"
+"Энэ модуль нь 'Бохир Ашиг' талбарыг борлуулалтын захиалга дээр нэмдэг.\n"
+"=============================================\n"
+"\n"
+"Энэ нь Нэгж үнэ, Өртөг үнэ дээр суурилан ашигийг бодож гаргадаг.\n"
+"    "
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_res_bank_form
 msgid "Manage bank records you want to be used in the system."
-msgstr ""
+msgstr "Системд хэрэглэгдэх банкны бичилтүүдийг менеж хийнэ."
 
 #. module: base
 #: view:base.module.import:0
@@ -12210,6 +12723,8 @@ msgid ""
 "The path to the main report file (depending on Report Type) or NULL if the "
 "content is in another field"
 msgstr ""
+"Үндсэн тайлангийн файлын зам (Тайлангийн Төрөлөөс хамаарна) эсвэл NULL хэрэв "
+"агуулга нь ондоо талбарт байгаа бол"
 
 #. module: base
 #: model:res.country,name:base.la
@@ -12241,6 +12756,8 @@ msgid ""
 "The sum of the data (2nd field) is null.\n"
 "We can't draw a pie chart !"
 msgstr ""
+"The sum of the (2-р таблар) is null.\n"
+"Бялуу диаграмыг зурах боломжгүй !"
 
 #. module: base
 #: view:partner.clear.ids:0
@@ -12373,6 +12890,8 @@ msgid ""
 "Lets you install addons geared towards sharing knowledge with and between "
 "your employees."
 msgstr ""
+"Мэдлэгийг ажилчидтайгаа болон ажилчид хоорондоо хуваалцахад туслах "
+"багажуудыг суулгах боломжийг олгоно."
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -12468,6 +12987,14 @@ msgid ""
 "handle an issue.\n"
 "                "
 msgstr ""
+"\n"
+"Энэ модуль нь Төслийн Асуудал/Бугийн менежментэд цагийн хуудасын дэмжлэгийг "
+"нэмдэг.\n"
+"============================================================================="
+"====\n"
+"\n"
+"Ажлын хөтлөлт нь асуудлыг шийдвэрлэхэд зарцуулсан ажлын цагийг илэрхийлнэ.\n"
+"                "
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -12503,6 +13030,7 @@ msgstr "OpenERP харилцагчид"
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
 msgstr ""
+"\"%s\" модулийг суулгах боломжгүй учир нь гадаад хамаарал биелэхгүй байна: %s"
 
 #. module: base
 #: view:ir.module.module:0
@@ -12546,7 +13074,7 @@ msgstr "Хэвийн"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_purchase_double_validation
 msgid "Double Validation on Purchases"
-msgstr ""
+msgstr "Худалдан авалт дээр Давхар Хяналт, Батлалт"
 
 #. module: base
 #: field:res.bank,street2:0
@@ -12564,7 +13092,7 @@ msgstr "Модул шинэчлэлт"
 #: code:addons/base/module/wizard/base_module_upgrade.py:95
 #, python-format
 msgid "Following modules are not installed or unknown: %s"
-msgstr ""
+msgstr "Дараах модулиуд суулгагдаагүй эсвэл яасан нь мэдэгдэхгүй байна: %s"
 
 #. module: base
 #: view:ir.cron:0
@@ -12613,6 +13141,9 @@ msgid ""
 "importing a new module you can install it by clicking on the button "
 "\"Install\" from the form view."
 msgstr ""
+"Энэ харилцах цонх нь OpenERP шинэ модуль оруулж ирэхэд тусладаг. Шинэ "
+"модулийг оруулж ирсэн дараагаараа форм харагдацаас \"Суулгах\" даруулыг дарж "
+"суулгана."
 
 #. module: base
 #: model:res.country,name:base.ch
@@ -12646,6 +13177,14 @@ msgid ""
 "picking and invoice. The message is triggered by the form's onchange event.\n"
 "    "
 msgstr ""
+"\n"
+"OpenERP обьектуудад санамжийг өдөөх модуль.\n"
+"==============================================\n"
+"\n"
+"Санамжийн мессежүүд нь борлуулалтын захиалга, худалдан авалтын захиалга, "
+"бэлтгэх баримт, нэхэмжлэл зэрэгт харагдаж болно. Мессеж нь формын onchange "
+"буюу өөрчлөлт явагдах үзэгдлээр өдөөгдөнө.\n"
+"    "
 
 #. module: base
 #: code:addons/osv.py:150
@@ -12678,12 +13217,12 @@ msgstr "Сомали"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_mrp_operations
 msgid "Manufacturing Operations"
-msgstr ""
+msgstr "Үйлдвэрлэлийн Үйлдлүүд"
 
 #. module: base
 #: selection:publisher_warranty.contract,state:0
 msgid "Terminated"
-msgstr ""
+msgstr "Таслагдсан"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_13
@@ -12706,6 +13245,13 @@ msgid ""
 "it to all the users.\n"
 "    "
 msgstr ""
+"\n"
+"Энэ модуль нь төсөл дотороо мессеж илгээх функционалийг нэмдэг.\n"
+"=========================================================================\n"
+"\n"
+"Хэрэглэгч нь мессежийг бусад хэн нэг рүү эсвэл бүгд рүү мессеж явуулах "
+"боломжтой.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr
@@ -12722,7 +13268,7 @@ msgstr "Аргумент"
 #: code:addons/orm.py:1260
 #, python-format
 msgid "Database ID doesn't exist: %s : %s"
-msgstr ""
+msgstr "Өгөгдлийн Бааз ID байхгүй байна: %s : %s"
 
 #. module: base
 #: selection:ir.module.module,license:0
@@ -12756,12 +13302,19 @@ msgid ""
 "the invoicing wizard if the delivery is to be invoiced.\n"
 "    "
 msgstr ""
+"\n"
+"Хүргэлтийн Нэхэмжлэлийн Харилцах Цонх.\n"
+"============================\n"
+"\n"
+"Барааг илгээх юмуу хүргэхэд энэ модуль нь автоматаар нэхэмжлэл үүсгэх "
+"харилцах цонхыг дуудаж хүргэлтийг нэхэмжлэх эсэхийг асуудаг.\n"
+"    "
 
 #. module: base
 #: code:addons/orm.py:1388
 #, python-format
 msgid "key '%s' not found in selection field '%s'"
-msgstr ""
+msgstr "'%s' гэсэн түлхүүр '%s' гэсэн сонгох талбар дотор олдсонгүй"
 
 #. module: base
 #: selection:ir.values,key:0
@@ -12777,7 +13330,7 @@ msgstr "Зөв зур.код"
 #. module: base
 #: selection:res.company,paper_format:0
 msgid "A4"
-msgstr ""
+msgstr "A4"
 
 #. module: base
 #: field:publisher_warranty.contract,check_support:0
@@ -12795,7 +13348,7 @@ msgstr "Үйлчлүүлэгч"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (NI) / Español (NI)"
-msgstr ""
+msgstr "Испани (NI) / Español (NI)"
 
 #. module: base
 #: model:ir.module.module,description:base.module_product_visible_discount
@@ -12818,6 +13371,23 @@ msgid ""
 "lines: Unit price=225, Discount=0,00, Net price=225\n"
 "    "
 msgstr ""
+"\n"
+"Харилцагчийн үнийн хүснэгт дээр суурилан Борлуулалтын захиалгын мөрүүд болон "
+"нэхэмжлэлийн мөрүүдийн хөнгөлөлтийг бодох боломжийг олгодог.\n"
+"============================================================================="
+"==================================\n"
+"\n"
+"Нөгөө талд \"Харагдах Хөнгөлөлт\" гэсэн чагт үзүүлэлт үнийн хүснэгтэд "
+"нэмэгддэг.\n"
+"\n"
+"Жишээ:\n"
+"    PC1 бааа болон \"Asustek\" харилцагчийн хувьд: Хэрэв нэгж үнэ=450, "
+"Asustek-н үнийн хүснэгтийн үнэн нь 225\n"
+"    Хэрэв чагт үзүүлэлт нь тэмдэглэгдсэн бол бид борлуулалтын захиалга дээр: "
+"Нэгж үнэ=450, Хөнгөлөлт=50,00%, Цэвэр үнэ=225\n"
+"    Хэрэв чагт үзүүлэлт нь тэмдэглэгдээгүй бол бид борлуулалтын захиалга, "
+"нэхэмжлэл дээр дээр: Нэгж үнэ=225, Хөнгөлөлт=0,00%, Цэвэр үнэ=225\n"
+"    "
 
 #. module: base
 #: field:ir.module.module,shortdesc:0
@@ -12887,13 +13457,13 @@ msgstr "Тунис"
 #. module: base
 #: view:ir.actions.todo:0
 msgid "Wizards to be Launched"
-msgstr ""
+msgstr "Дуудагдах харилцах цонхууд"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_manufacturing
 #: model:ir.ui.menu,name:base.menu_mrp_root
 msgid "Manufacturing"
-msgstr ""
+msgstr "Үйлдвэрлэл"
 
 #. module: base
 #: model:res.country,name:base.km
@@ -12903,7 +13473,7 @@ msgstr "Коморск"
 #. module: base
 #: view:res.request:0
 msgid "Draft and Active"
-msgstr ""
+msgstr "Ноорог болон Идэвхтэй"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_server_action
@@ -12915,22 +13485,22 @@ msgstr "Сервер үйлдлүүд"
 #. module: base
 #: field:res.partner.bank.type,format_layout:0
 msgid "Format Layout"
-msgstr ""
+msgstr "Форматын Зохиомж"
 
 #. module: base
 #: field:ir.model.fields,selection:0
 msgid "Selection Options"
-msgstr ""
+msgstr "Сонгох Сонголтууд"
 
 #. module: base
 #: field:res.partner.category,parent_right:0
 msgid "Right parent"
-msgstr ""
+msgstr "Баруун эцэг"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_auth_openid
 msgid "OpenID Authentification"
-msgstr ""
+msgstr "OpenID Нэвтрэлт"
 
 #. module: base
 #: model:ir.module.module,description:base.module_plugin_thunderbird
@@ -12946,6 +13516,16 @@ msgid ""
 "HR Applicant and Project Issue from selected mails.\n"
 "      "
 msgstr ""
+"\n"
+"Thuderbird залгаас зөв ажиллахад энэ модуль шаардагддаг.\n"
+"====================================================================\n"
+"\n"
+"Энэ залгаас нь имэйл болон түүний хавсралтуудыг OpenERP-н сонгосон обьектруу "
+"архивлах боломжийг олгодог. Харилцагч, даалгавар, төсөл, шинжилгээний данс "
+"болон өөр ямар ч обьекыг сонгон түүнд имэйлийг хавсралт болгон .eml байдлаар "
+"хадгалж болдог. Энэхүү имэйлээс CRM сэжим, хүний нөөцийн горилогч, төслийн "
+"асууудал зэрэгийг үүсгэх боломжтой.\n"
+"      "
 
 #. module: base
 #: view:res.lang:0
@@ -12960,12 +13540,12 @@ msgstr "Хувилах Обьект"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_mail
 msgid "Emails Management"
-msgstr ""
+msgstr "Имэйл Менежемент"
 
 #. module: base
 #: field:ir.actions.server,trigger_name:0
 msgid "Trigger Signal"
-msgstr ""
+msgstr "Сигналыг Өдөөх"
 
 #. module: base
 #: code:addons/base/res/res_users.py:119
@@ -12973,6 +13553,8 @@ msgstr ""
 msgid ""
 "Group(s) cannot be deleted, because some user(s) still belong to them: %s !"
 msgstr ""
+"Групп устгагдах боломжгүй, учир нь зарим хэрэглэгчид одоо ч хамрагдаж байна: "
+"%s !"
 
 #. module: base
 #: model:ir.module.module,description:base.module_mrp_repair
@@ -12990,6 +13572,18 @@ msgid ""
 "    * Repair quotation report\n"
 "    * Notes for the technician and for the final customer\n"
 msgstr ""
+"\n"
+"Барааны засварыг менеж хийх зорилго бүхий модуль. Энэ модуль дараах "
+"сэдэвүүдийг хамрана:\n"
+"============================================================================="
+"==============================================\n"
+"\n"
+"    * Засварт барааг нэмэх/хасах\n"
+"    * Үлдэгдэл хэрхэн нөлөөлөх\n"
+"    * Нэхэмжлэх (Бараа буюу үйлчилгээ)\n"
+"    * Баталгаат засварын зарчим\n"
+"    * Засварын үнийн саналын тайлан\n"
+"    * Техникч болон захиалагчдад зориулсан санамж, тэмдэглэл\n"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_country_state
@@ -13015,6 +13609,13 @@ msgid ""
 "document and Wiki based Hidden.\n"
 "    "
 msgstr ""
+"\n"
+"Мэдлэгийн-сангийн нуугдмалуудыг суулгагч.\n"
+"====================================\n"
+"\n"
+"Мэдлэгийн Хэрэглээний Програмын Тохиргоог нэмдэг бөгөөд эндээс барим, вики "
+"зэрэг ил биш байдаг зүйлсийг суулгах боломжтой болгодог.\n"
+"    "
 
 #. module: base
 #: field:res.groups,trans_implied_ids:0
@@ -13030,7 +13631,7 @@ msgstr "Хүснэгт дугаар."
 #: code:addons/base/ir/ir_mail_server.py:443
 #, python-format
 msgid "Mail delivery failed"
-msgstr ""
+msgstr "Имэйл хүргэлт бүтэлгүйтлээ"
 
 #. module: base
 #: field:ir.actions.act_window,res_model:0
@@ -13070,7 +13671,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_analytic_plans
 msgid "Multiple Analytic Plans"
-msgstr ""
+msgstr "Олон Шинжилгээний Төлөвлөгөө"
 
 #. module: base
 #: model:ir.module.module,description:base.module_project_timesheet
@@ -13110,7 +13711,7 @@ msgstr "Төлөвлөгч"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_tools
 msgid "Base Tools"
-msgstr ""
+msgstr "Суур багажууд"
 
 #. module: base
 #: help:res.country,address_format:0
@@ -13129,6 +13730,18 @@ msgid ""
 "            \n"
 "%(country_code)s: the code of the country"
 msgstr ""
+"Энэ улсад харъяалагдах хаягны түгээмэл форматыг энд томъёолж болно.\n"
+"\n"
+"Та python стилийн хэвийг хаягийн бүх талбаруудыг ашиглан бичиж болно "
+"(жишээлбэл, '%(street)s'-г гудамжийг буюу 'street' талбарыг бичихдээ) \n"
+"            \n"
+"%(state_name)s: мужийн нэр\n"
+"            \n"
+"%(state_code)s: мужийн код\n"
+"            \n"
+"%(country_name)s: улсын нэр\n"
+"            \n"
+"%(country_code)s: улсын код"
 
 #. module: base
 #: model:ir.module.module,description:base.module_pad
@@ -13146,7 +13759,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_uk
 msgid "UK - Accounting"
-msgstr ""
+msgstr "UK - Санхүү"
 
 #. module: base
 #: model:ir.module.module,description:base.module_project_scrum
@@ -13210,6 +13823,8 @@ msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
 "create it again!"
 msgstr ""
+"Баганы төрөлийг солих одоогоор дэмжигдээгүй. Баганыг устгаад шинээр үүсгэнэ "
+"үү!"
 
 #. module: base
 #: field:ir.ui.view_sc,user_id:0
@@ -13225,7 +13840,7 @@ msgstr "Сануулга !"
 #. module: base
 #: model:res.widget,title:base.google_maps_widget
 msgid "Google Maps"
-msgstr ""
+msgstr "Google Газрын Зураг"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_base_config
@@ -13242,7 +13857,7 @@ msgstr "Тохиргоо"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_in
 msgid "India - Accounting"
-msgstr ""
+msgstr "Энэтхэг - Санхүү"
 
 #. module: base
 #: field:ir.actions.server,expression:0
@@ -13257,12 +13872,12 @@ msgstr "Эхлэл Огноо"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_gt
 msgid "Guatemala - Accounting"
-msgstr ""
+msgstr "Гватимал - Санхүү"
 
 #. module: base
 #: help:ir.cron,args:0
 msgid "Arguments to be passed to the method, e.g. (uid,)."
-msgstr ""
+msgstr "Метод руу дамжуулагдсан аргументууд, ө.х. (uid,)."
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_5
@@ -13335,6 +13950,17 @@ msgid ""
 "in the form of pdf file. Implements a dashboard for My Current Evaluations\n"
 "         "
 msgstr ""
+"\n"
+"Ажилчинд үнэлгээ үүсгэх боломж.\n"
+"=======================================\n"
+"\n"
+"Ажилтны үнэлгээ нь зохион байгуулагч, ахлагч, менежер нараар хийгдэж болно. "
+"Үнэлгээ нь төлөвлөгөөнүүдэд тодорхойлогдсон асуулгуудаар хийгдэж болно. "
+"Асуулга нь ажилчдын мөчирийн түвшингүүдээр тодорхойлогдох боломжтой. Эцсийн "
+"үзлэг, үнэлгээ нь менежерээр хийгдэж болно. Ажилчдын бөглөсөн асуулга нь PDF "
+"файл хэлбэрээр харагдаж болно. Миний одоогийн үнэлгээ гэсэн хянах самбарыг "
+"мөн хэрэгжүүлдэг.\n"
+"         "
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -13391,7 +14017,7 @@ msgstr "workflow.triggers"
 #: code:addons/base/ir/ir_model.py:74
 #, python-format
 msgid "Invalid search criterions"
-msgstr ""
+msgstr "Хайлтын буруу шалгуур"
 
 #. module: base
 #: view:ir.mail_server:0
@@ -13409,6 +14035,8 @@ msgid ""
 "If set to true, the wizard will not be displayed on the right toolbar of a "
 "form view."
 msgstr ""
+"Хэрэв тэмдэглэгдсэн бол харилцах цонх нь форм харагдац дахь баруун талын "
+"багажууд дотор харагдахгүй."
 
 #. module: base
 #: view:base.language.import:0
@@ -13535,7 +14163,7 @@ msgstr "Үнийн санал, борлуулалтын захиалга, нэх
 #. module: base
 #: field:res.groups,implied_ids:0
 msgid "Inherits"
-msgstr ""
+msgstr "Удамшсан"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -13545,7 +14173,7 @@ msgstr "Сонголт"
 #. module: base
 #: field:ir.module.module,icon:0
 msgid "Icon URL"
-msgstr ""
+msgstr "Таних Тэмдэг URL"
 
 #. module: base
 #: field:ir.actions.act_window,type:0
@@ -13621,7 +14249,7 @@ msgstr "Коста Рика"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_module_doc_rst
 msgid "Generate Docs of Modules"
-msgstr ""
+msgstr "Модулиудын баримтыг үүсгэдэг"
 
 #. module: base
 #: model:res.company,overdue_msg:base.main_company
@@ -13637,7 +14265,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_users_ldap
 msgid "Authentication via LDAP"
-msgstr ""
+msgstr "LDAP-р нэвтрэх"
 
 #. module: base
 #: view:workflow.activity:0
@@ -13697,7 +14325,7 @@ msgstr "Харьцах хүнийг нуухын тулд идэвхитэй ч
 #. module: base
 #: model:ir.model,name:base.model_res_widget_wizard
 msgid "Add a widget for User"
-msgstr ""
+msgstr "Хэрэглэгчид виджет нэмэх"
 
 #. module: base
 #: model:res.country,name:base.dk
@@ -13720,6 +14348,18 @@ msgid ""
 "If you need to manage your meetings, you should install the CRM module.\n"
 "    "
 msgstr ""
+"\n"
+"Энэ нь бүрэн боломжууд бүхий цаглабарын систем.\n"
+"========================================\n"
+"\n"
+"Дэмжих нь:\n"
+"    - Үйл явдлын цаглабар\n"
+"    - Сэрүүлэг (хүсэлт үүсгэх)\n"
+"    - Давтагдах үйл явдлууд\n"
+"    - Хүмүүст урилга явуулах\n"
+"\n"
+"Уулзалтуудыг удирдахыг хүсвэл CRM модулийг суулгах хэрэгтэй.\n"
+"    "
 
 #. module: base
 #: view:ir.rule:0
@@ -13735,7 +14375,7 @@ msgstr "workflow.instance"
 #: code:addons/orm.py:471
 #, python-format
 msgid "Unknown attribute %s in %s "
-msgstr ""
+msgstr "Үл мэдэгдэх %s аттрибут %s-д байна "
 
 #. module: base
 #: view:res.lang:0
@@ -13746,7 +14386,7 @@ msgstr "10. %S ==> 20"
 #: code:addons/fields.py:122
 #, python-format
 msgid "undefined get method !"
-msgstr ""
+msgstr "тодорхойлогдоогүй get метод !"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -13772,7 +14412,7 @@ msgstr "Хянах самбар"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_procurement
 msgid "Procurements"
-msgstr ""
+msgstr "Бэлтгэн нийлүүлэлт"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_payroll_account
@@ -13787,12 +14427,12 @@ msgstr "Бинари файл буюу гадаад URL"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_order_dates
 msgid "Dates on Sales Order"
-msgstr ""
+msgstr "Борлуулалтын захиалга дээрх Огноонууд"
 
 #. module: base
 #: view:ir.attachment:0
 msgid "Creation Month"
-msgstr ""
+msgstr "Үүсгэсэн сар"
 
 #. module: base
 #: model:res.country,name:base.nl
@@ -13823,12 +14463,12 @@ msgstr "Доод түвшний объектууд"
 #. module: base
 #: help:ir.values,model:0
 msgid "Model to which this entry applies"
-msgstr ""
+msgstr "Энэ бичлэгийн хэрэглэгдэх модель"
 
 #. module: base
 #: field:res.country,address_format:0
 msgid "Address Format"
-msgstr ""
+msgstr "Хаягийн формат"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_values
@@ -13863,7 +14503,7 @@ msgstr "Гадаад Хувийн Дугаарууд"
 #. module: base
 #: model:res.groups,name:base.group_sale_salesman
 msgid "User - Own Leads Only"
-msgstr ""
+msgstr "Хэрэлэгч - Зөвхөн Өөрийн Сэжимүүд"
 
 #. module: base
 #: model:res.country,name:base.cd
@@ -13907,7 +14547,7 @@ msgstr "Дуудлагын тоо"
 #: code:addons/base/res/res_bank.py:189
 #, python-format
 msgid "BANK"
-msgstr ""
+msgstr "БАНК"
 
 #. module: base
 #: view:base.module.upgrade:0
@@ -13921,6 +14561,8 @@ msgid ""
 "Important when you deal with multiple actions, the execution order will be "
 "decided based on this, low number is higher priority."
 msgstr ""
+"Олон үйлдэлтэй ажиллаж байхад чухал, биелэгдэх дараалал үүн дээр суурилж "
+"шийдэгддэг, бага тоо нь өндөр урьтамжтай."
 
 #. module: base
 #: field:ir.actions.report.xml,header:0
@@ -13944,7 +14586,7 @@ msgstr ""
 #. module: base
 #: view:res.config:0
 msgid "Apply"
-msgstr ""
+msgstr "Хэрэглэх"
 
 #. module: base
 #: field:res.request,trigger_date:0
@@ -13968,11 +14610,14 @@ msgid ""
 "        OpenERP Web kanban view.\n"
 "        "
 msgstr ""
+"\n"
+"        OpenERP Веб канбан харагдац.\n"
+"        "
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_project_management_time_tracking
 msgid "Time Tracking"
-msgstr ""
+msgstr "Цагийн хяналт"
 
 #. module: base
 #: view:res.partner.category:0
@@ -13991,6 +14636,8 @@ msgid ""
 "Helps you manage your inventory and main stock operations: delivery orders, "
 "receptions, etc."
 msgstr ""
+"Бараа материал болон агуулахын үндсэн үйлдлүүдийг менеж хийхэд тусладаг: "
+"хүргэх захиалгууд, хүлээн авалтууд, гм."
 
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
@@ -14105,7 +14752,7 @@ msgstr "Бие"
 #: code:addons/base/ir/ir_mail_server.py:199
 #, python-format
 msgid "Connection test succeeded!"
-msgstr ""
+msgstr "Холболтын шалгалт амжилттай!"
 
 #. module: base
 #: view:partner.massmail.wizard:0
@@ -14124,6 +14771,9 @@ msgid ""
 "defining a list of (key, label) pairs. For example: "
 "[('blue','Blue'),('yellow','Yellow')]"
 msgstr ""
+"Сонгох талбарын сонголтын жагсаалт, Python илэрхийлэл байдлаар (түлхүүр, "
+"шошго) хосуудын жагсаалтаар тодорхойлогддог. Жишбээлбэл: "
+"[('blue','Blue'),('yellow','Yellow')]"
 
 #. module: base
 #: selection:base.language.export,state:0
@@ -14146,11 +14796,13 @@ msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
 "explicitly."
 msgstr ""
+"Дор хаяж нэг SMTP сервер тодорхойлно ууr, эсвэл SMTP параметрүүдийг тодорхой "
+"зааж өг."
 
 #. module: base
 #: view:ir.attachment:0
 msgid "Filter on my documents"
-msgstr ""
+msgstr "Миний баримтуудыг шүүх"
 
 #. module: base
 #: help:ir.actions.server,code:0
@@ -14158,6 +14810,8 @@ msgid ""
 "Python code to be executed if condition is met.\n"
 "It is a Python block that can use the same values as for the condition field"
 msgstr ""
+"Хэрэв нөхцөл биелбэл ажиллах Python код.\n"
+"Нөхцлийн талбар дээрхтэй ижил утгуудыг ашиглаж чадах Python кодын блок юм"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_supplier_form
@@ -14208,7 +14862,7 @@ msgstr "Греенланд"
 #. module: base
 #: model:res.groups,name:base.group_sale_salesman_all_leads
 msgid "User - All Leads"
-msgstr ""
+msgstr "Хэрэглэгч - Бүх Сэжимүүд"
 
 #. module: base
 #: field:res.partner.bank,acc_number:0
@@ -14227,7 +14881,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_th
 msgid "Thailand - Accounting"
-msgstr ""
+msgstr "Тайланд - Санхүү"
 
 #. module: base
 #: view:res.lang:0
@@ -14259,6 +14913,23 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Энэ модуль нь бэлтгэн нийлүүлэх захиалгуудын Яг Хугацаандаа тооцооллыг хийх "
+"боломжийг олгоно.\n"
+"==================================================================\n"
+"\n"
+"Хэрэв энэ модулийг суулгавал бэлтгэн нийлүүлэлтийн товлогчийг тогтмол "
+"хугацаагаар давтан ажиллуулах шаардлагагүй болно. (гэхдээ зохистой "
+"үлдэгдлийн товлогдсон үйлдлийг бол ажиллуулах шаардлагатай. Тухайлбал өдөр "
+"тутам)\n"
+"Бэлтгэн нийлүүлэх захиалга нь тэр дариудаа боловсруулагдана. Энэ нь "
+"системийн биелэлтийг удаашруулах нөлөөлөлттэй байж болзошгүй.\n"
+"\n"
+"Мөн энэ нь барааны үлдэгдлийг ихэсгэх талтай байж болно. Учир нь товлогдсон "
+"үйлдлийн ажиллах хугацааны интервалыг тооцдоггүй. Энэ тохиолдолд бэлтгэх "
+"дээр урьтамжыг сонгох боломжгүй болно.\n"
+"\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.cy
@@ -14275,13 +14946,13 @@ msgstr "Сэдэв"
 #. module: base
 #: selection:res.currency,position:0
 msgid "Before Amount"
-msgstr ""
+msgstr "Дүнгийн Өмнө"
 
 #. module: base
 #: field:res.request,act_from:0
 #: field:res.request.history,act_from:0
 msgid "From"
-msgstr ""
+msgstr "Хаанаас"
 
 #. module: base
 #: view:res.users:0
@@ -14291,7 +14962,7 @@ msgstr "Тохируулах"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_consumers0
 msgid "Consumers"
-msgstr ""
+msgstr "Хангамжийн"
 
 #. module: base
 #: view:res.company:0
@@ -14301,7 +14972,7 @@ msgstr "Банкны Дансдыг Тохируулах"
 #. module: base
 #: field:ir.actions.client,tag:0
 msgid "Client action tag"
-msgstr ""
+msgstr "Клиентийн үйлдлийн тааг"
 
 #. module: base
 #: code:addons/base/res/res_lang.py:189
@@ -14325,12 +14996,19 @@ msgid ""
 "marketing_campaign.\n"
 "    "
 msgstr ""
+"\n"
+"marketing_campaign-ий жишээ өгөгдөл.\n"
+"============================================\n"
+"\n"
+"Сэжим, компанит ажил, сегментчлэл зэрэг өгөгдлийг marketing_campaign модуль "
+"үүсгэдэг.\n"
+"    "
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
 #: selection:ir.ui.view,type:0
 msgid "Kanban"
-msgstr ""
+msgstr "Канбан"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:251
@@ -14373,6 +15051,8 @@ msgid ""
 "The object that should receive the workflow signal (must have an associated "
 "workflow)"
 msgstr ""
+"Энэ обьект нь ажлын урсгалын сигнэлийг хүлээж авах ёстой (холбогдсон ажлын "
+"урсгалтай байх ёстой)"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_account_voucher
@@ -14380,6 +15060,8 @@ msgid ""
 "Allows you to create your invoices and track the payments. It is an easier "
 "version of the accounting module for managers who are not accountants."
 msgstr ""
+"Нэхэмжлэл болон төлбөрийн хяналтыг үүсгэх боломжийг олгоно. Нягтлан биш "
+"менежерүүдэд зориулагдсан санхүүгийн модулийн хялбар хувилбартай ижил юм."
 
 #. module: base
 #: model:res.country,name:base.eh
@@ -14389,7 +15071,7 @@ msgstr "Баруун сахар"
 #. module: base
 #: model:ir.module.category,name:base.module_category_account_voucher
 msgid "Invoicing & Payments"
-msgstr ""
+msgstr "Нэхэмжлэл ба Төлбөр"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_res_company_form
@@ -14412,6 +15094,9 @@ msgid ""
 "you can then add translations manually or perform a complete export (as a "
 "template for a new language example)."
 msgstr ""
+"Энэ харилцах цонх нь програм дахь орчуулбал зохих нэр томъёог олдог, тиймээс "
+"орчуулгыг гараараа нэмэх боломжтой эсвэл бүтнээр экспорт хийж болно (шинэ "
+"хэлний жишээний үлгэр болгож)"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_ch
@@ -14466,6 +15151,8 @@ msgid ""
 "Expression, must be True to match\n"
 "use context.get or user (browse)"
 msgstr ""
+"context.get эсвэл user (browse)-г хэрэглэхийн тулд \n"
+"илэрхийлэл True буюу үнэн байх ёстой."
 
 #. module: base
 #: model:res.country,name:base.bg
@@ -14591,7 +15278,7 @@ msgstr ""
 #. module: base
 #: field:res.partner.bank,bank_name:0
 msgid "Bank Name"
-msgstr ""
+msgstr "Банкны Нэр"
 
 #. module: base
 #: model:res.country,name:base.ki
@@ -14607,7 +15294,7 @@ msgstr "Ирак"
 #: model:ir.module.category,name:base.module_category_association
 #: model:ir.ui.menu,name:base.menu_association
 msgid "Association"
-msgstr ""
+msgstr "Холбоо"
 
 #. module: base
 #: model:ir.module.module,description:base.module_stock_no_autopicking
@@ -14624,6 +15311,17 @@ msgid ""
 "supplier in the routing of the assembly operation.\n"
 "    "
 msgstr ""
+"\n"
+"Энэ модуль нь үйлдвэрлэлийн захиалгад түүхий эдийг нийлүүлэхийн тулд бэлтгэх "
+"процессыг шууд эхлэхэд зориулсан модуль юм.\n"
+"============================================================================="
+"====================\n"
+"\n"
+"Үүний нэг жишээ хэрэглээ нь гэвэл таны нийлүүлэгч (дэд гэрээтэй) -н "
+"үйлдвэрлэлийг менеж хийх зориулалтаар хэрэглэж болно. Ингэхийн тулд угсрах "
+"ажилд дэд гэрээт барааг \"Автомат Бэлтгэл үгүй\" төлөвт тавиад нийлүүлэгч "
+"байрлалд байрлуулна.\n"
+"    "
 
 #. module: base
 #: view:ir.actions.server:0
@@ -14670,7 +15368,7 @@ msgstr "CSV Файл"
 #: code:addons/base/res/res_company.py:154
 #, python-format
 msgid "Phone: "
-msgstr ""
+msgstr "Утас: "
 
 #. module: base
 #: field:res.company,account_no:0
@@ -14705,6 +15403,14 @@ msgid ""
 "plans.\n"
 "    "
 msgstr ""
+"\n"
+"Шинжилгээний түгээлт болон худалдан авах захиалгын суурь модуль.\n"
+"====================================================================\n"
+"\n"
+"Олон шинжилгээний төлөвлөгөө үүсгэх боломжийг өгдөг. Нийлүүлэгчээсх худалдан "
+"авалтын захиалгын мөрүүдийг олон данс болон олон шинжилгээний төлөвлөгөөнд "
+"хуваах боломжийг олгоно.\n"
+"    "
 
 #. module: base
 #: field:res.company,vat:0
@@ -14722,6 +15428,8 @@ msgid ""
 "The path to the main report file (depending on Report Type) or NULL if the "
 "content is in another data field"
 msgstr ""
+"Үндсэн тайлангийн файл зам(Тайлангийн Төрөлөөс хамаарна) эсвэл NULL хэрэв "
+"агуулга нь ондоо талбарт байгаа бол"
 
 #. module: base
 #: model:res.country,name:base.dj
@@ -14745,6 +15453,8 @@ msgid ""
 "Operation prohibited by access rules, or performed on an already deleted "
 "document (Operation: %s, Document type: %s)."
 msgstr ""
+"Та хандах эрхгүй мэдээлэл рүү эсвэл аль хэдий нь устгагдсан мэдээлэл рүү "
+"хандах оролдлог хийж байна (Үйлдэл: %s, Баримтын төрөл: %s)."
 
 #. module: base
 #: model:res.country,name:base.zr
@@ -14849,7 +15559,7 @@ msgstr "Үйл ажиллагаа"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_product
 msgid "Products & Pricelists"
-msgstr ""
+msgstr "Бараа & Үнийн хүснэгтүүд"
 
 #. module: base
 #: field:ir.actions.act_window,auto_refresh:0
@@ -14860,7 +15570,7 @@ msgstr "Автомат-Шинэчлэл"
 #: code:addons/base/ir/ir_model.py:74
 #, python-format
 msgid "The osv_memory field can only be compared with = and != operator."
-msgstr ""
+msgstr "osv_memory талбарыг зөвхөн = эсвэл != оператороор жиших боломжтой."
 
 #. module: base
 #: selection:ir.ui.view,type:0
@@ -14870,12 +15580,12 @@ msgstr "Диаграм"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_es
 msgid "Spanish - Accounting (PGCE 2008)"
-msgstr ""
+msgstr "Испани - Санхүү (PGCE 2008)"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_stock_no_autopicking
 msgid "Picking Before Manufacturing"
-msgstr ""
+msgstr "Үйлдвэрлэхээсээ өмнө бэлдэх"
 
 #. module: base
 #: model:res.country,name:base.wf
@@ -14885,7 +15595,7 @@ msgstr "Wallis and Futuna Islands"
 #. module: base
 #: help:multi_company.default,name:0
 msgid "Name it to easily find a record"
-msgstr ""
+msgstr "Бичлэгийн олохын тулд хялбар нэрлэнэ үү"
 
 #. module: base
 #: model:res.country,name:base.gr
@@ -14895,7 +15605,7 @@ msgstr "Грек"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_calendar
 msgid "web calendar"
-msgstr ""
+msgstr "веб цагалбар"
 
 #. module: base
 #: field:ir.model.data,name:0
@@ -14931,7 +15641,7 @@ msgstr "Үйлдлүүд"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_delivery
 msgid "Delivery Costs"
-msgstr ""
+msgstr "Хүргэлтийн өртөг"
 
 #. module: base
 #: code:addons/base/ir/ir_cron.py:293
@@ -14940,6 +15650,8 @@ msgid ""
 "This cron task is currently being executed and may not be modified, please "
 "try again in a few minutes"
 msgstr ""
+"Энэ cron task нь одоогоор ажиллаж байна, засварлаж болохгүй, хэдэн минутын "
+"дараа дахиж үзээрэй"
 
 #. module: base
 #: model:ir.module.module,description:base.module_product_expiry
@@ -14956,6 +15668,17 @@ msgid ""
 "\n"
 "Used, for example, in food industries."
 msgstr ""
+"\n"
+"Бараанууд болон үйлдвэрлэлийн lot-н ялгаатай огноонуудыг хөтлөнө.\n"
+"======================================================\n"
+"\n"
+"Дараах огноонууд хөтлөгдөнө:\n"
+"    - төгсгөл огноо\n"
+"    - амжиж хэрэлэх огноо\n"
+"    - устгалын огноо\n"
+"    - сэрүүлэгийн огноо\n"
+"\n"
+"Тухайлбал хүсний зах зээлд хэрэглэгдэн."
 
 #. module: base
 #: field:ir.exports.line,export_id:0
@@ -14965,13 +15688,13 @@ msgstr "Экспорт"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_nl
 msgid "Netherlands - Accounting"
-msgstr ""
+msgstr "Недерланд - Санхүү"
 
 #. module: base
 #: field:res.bank,bic:0
 #: field:res.partner.bank,bank_bic:0
 msgid "Bank Identifier Code"
-msgstr ""
+msgstr "Банкны Хувийн Код"
 
 #. module: base
 #: model:res.country,name:base.tm
@@ -14985,6 +15708,9 @@ msgid ""
 "        OpenERP Web process view.\n"
 "        "
 msgstr ""
+"\n"
+"        OpenERP Вебийн процесс харагдац.\n"
+"        "
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_chart
@@ -14995,6 +15721,11 @@ msgid ""
 "\n"
 "Deactivates minimal chart of accounts.\n"
 msgstr ""
+"\n"
+"Минимал дансны мөчирийг устгах.\n"
+"=============================\n"
+"\n"
+"Минимал санхүүгийн мөчрийг идэвхгүй болгоно.\n"
 
 #. module: base
 #: code:addons/base/ir/ir_actions.py:653
@@ -15032,17 +15763,17 @@ msgstr "Алдаа"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_crypt
 msgid "DB Password Encryption"
-msgstr ""
+msgstr "DB нууц үгийн шифрлэлт"
 
 #. module: base
 #: help:workflow.transition,act_to:0
 msgid "The destination activity."
-msgstr ""
+msgstr "Зорилтат үйл ажиллагаа."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_check_writing
 msgid "Check writing"
-msgstr ""
+msgstr "Чек бичих"
 
 #. module: base
 #: model:ir.module.module,description:base.module_sale_layout
@@ -15058,6 +15789,16 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Борлуулалтын захиалгын зохиомжийг сайжруулах боломж олгодог модуль.\n"
+"=======================================================================\n"
+"\n"
+"Дараах боломжийг олгоно\n"
+"    * борлуулалтын захиалгын мөрүүдийг эрэмбэлнэ\n"
+"    * гарчиг, мөрийн тэмдэглэл, дэд дүнгийн мөрүүдийг нэмдэг\n"
+"    * хөндлөн шугамууд зурна, хуудас таслана\n"
+"\n"
+"    "
 
 #. module: base
 #: view:base.module.update:0
@@ -15074,7 +15815,7 @@ msgstr "Техник баримт"
 #. module: base
 #: view:res.company:0
 msgid "Address Information"
-msgstr ""
+msgstr "Хаягийн Мэдээлэл"
 
 #. module: base
 #: model:res.country,name:base.tz
@@ -15089,7 +15830,7 @@ msgstr "Дани хэл/ Данск"
 #. module: base
 #: selection:ir.model.fields,select_level:0
 msgid "Advanced Search (deprecated)"
-msgstr ""
+msgstr "Шилдэг Хайлт (хуучирсан)"
 
 #. module: base
 #: model:res.country,name:base.cx
@@ -15099,7 +15840,7 @@ msgstr "Зул сарын арал"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_livechat
 msgid "Live Chat Support"
-msgstr ""
+msgstr "Дэмжлэгийн Амьд Чаат"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -15118,11 +15859,14 @@ msgid ""
 "        OpenERP Web dashboard view.\n"
 "        "
 msgstr ""
+"\n"
+"        OpenERP Вебийн Хянах Самбар Харагдац\n"
+"        "
 
 #. module: base
 #: view:res.partner:0
 msgid "Supplier Partners"
-msgstr ""
+msgstr "Нийлүүлэгч Харилцагчид"
 
 #. module: base
 #: view:res.config.installer:0
@@ -15161,7 +15905,7 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 msgid "Customer Partners"
-msgstr ""
+msgstr "Захиалагч Харилцагчид"
 
 #. module: base
 #: sql_constraint:res.users:0
@@ -15197,6 +15941,16 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Сонгосон модулиуд дахь үндсэн процесс, тохиолдох дараалалыг харуулдаг модуль "
+"юм.\n"
+"============================================================================="
+"=========================\n"
+"\n"
+"Санамж: Энэ нь modulename_process_xml-г агуулдаг модулиудад хэрэглэгдэнэ.\n"
+"Ө.Х product/process/product_process_xml\n"
+"\n"
+"    "
 
 #. module: base
 #: field:res.users,menu_tips:0
@@ -15226,7 +15980,7 @@ msgstr "Дотоод Толгой/Хөл"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm
 msgid "CRM"
-msgstr ""
+msgstr "CRM"
 
 #. module: base
 #: code:addons/base/module/wizard/base_export_language.py:59
@@ -15251,7 +16005,7 @@ msgstr "_Экспорт"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_followup
 msgid "Followup Management"
-msgstr ""
+msgstr "Дагаж хийх Менежемент"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_fr
@@ -15281,7 +16035,7 @@ msgstr "Доминик ард улс"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Serbian (Cyrillic) / српски"
-msgstr ""
+msgstr "Серби (Cyrillic) / српски"
 
 #. module: base
 #: code:addons/orm.py:2527
@@ -15290,16 +16044,18 @@ msgid ""
 "Invalid group_by specification: \"%s\".\n"
 "A group_by specification must be a list of valid fields."
 msgstr ""
+"Буруу group_by заалт: \"%s\".\n"
+"group_by заалт нь талбаруудын жагсаалт байх ёстой."
 
 #. module: base
 #: selection:ir.mail_server,smtp_encryption:0
 msgid "TLS (STARTTLS)"
-msgstr ""
+msgstr "TLS (STARTTLS)"
 
 #. module: base
 #: help:ir.actions.act_window,usage:0
 msgid "Used to filter menu and home actions from the user form."
-msgstr ""
+msgstr "Хэрэглэгчийн формоос меню, home action-г шүүхэд хэрэглэгдэнэ."
 
 #. module: base
 #: model:res.country,name:base.sa
@@ -15315,7 +16071,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_fetchmail_crm_claim
 msgid "eMail Gateway for CRM Claim"
-msgstr ""
+msgstr "CRM гомдлын иМэйл Үүд"
 
 #. module: base
 #: help:res.partner,supplier:0
@@ -15418,12 +16174,12 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,description:base.module_auth_openid
 msgid "Allow users to login through OpenID."
-msgstr ""
+msgstr "Хэрэглэгчдийг OpenID-р нэвтрэхийг зөвшөөрдөг."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_payment
 msgid "Suppliers Payment Management"
-msgstr ""
+msgstr "Нийлүүлэгчийн төлбөрийн менежмент"
 
 #. module: base
 #: model:res.country,name:base.sv
@@ -15461,11 +16217,19 @@ msgid ""
 "After installing the module, it adds a menu to define a custom report in\n"
 "the Administration / Customization / Reporting menu.\n"
 msgstr ""
+"\n"
+"Энэ модуль нь хэд хэдэн обьектоос дурын статистик тайлан үүсгэж боломжийг "
+"олгодог.\n"
+"=========================================================================\n"
+"\n"
+"Энэ нь эцсийн хэрэглэгчид зориулсан SQL асуулга үүсгэгч болон тольдогч юм.\n"
+"\n"
+"Суулгасны дараа Удирдлага / Өөриймшүүлэлт / Тайлан гэсэн менюг нэмдэг.\n"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_report_designer
 msgid "Report Designer"
-msgstr ""
+msgstr "Тайлангийн Зохиомжлогч"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_address_book
@@ -15495,6 +16259,9 @@ msgid ""
 "        OpenERP Web calendar view.\n"
 "        "
 msgstr ""
+"\n"
+"        OpenERP Вебийн цагалбар харагдац\n"
+"        "
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_crm_config_lead
@@ -15504,12 +16271,12 @@ msgstr "Судалгаа ба Боломжууд"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Romanian / română"
-msgstr ""
+msgstr "Румынь / română"
 
 #. module: base
 #: view:res.log:0
 msgid "System Logs"
-msgstr ""
+msgstr "Системийн лог"
 
 #. module: base
 #: selection:workflow.activity,join_mode:0
@@ -15522,6 +16289,7 @@ msgstr "Ба"
 msgid ""
 "Database identifier of the record to which this applies. 0 = for all records"
 msgstr ""
+"Энэ хэрэглэгдэх өгөгдлийн баазын бичлэгийн хувийн дугаар. 0 = бүх бичлэг"
 
 #. module: base
 #: field:ir.model.fields,relation:0
@@ -15579,7 +16347,7 @@ msgstr "Нөөц объект"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_helpdesk
 msgid "Helpdesk"
-msgstr ""
+msgstr "Туслах Төв"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.grant_menu_access
@@ -15624,7 +16392,7 @@ msgstr "workflow.workitem"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_profile_tools
 msgid "Miscellaneous Tools"
-msgstr ""
+msgstr "Бусад Багажууд"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_tools
@@ -15664,6 +16432,26 @@ msgid ""
 "Print product labels with barcode.\n"
 "    "
 msgstr ""
+"\n"
+"Энэ модуль нь OpenERP-д үнийн хүснэгт болон барааг менеж хийх модуль юм.\n"
+"========================================================================\n"
+"\n"
+"Бараа нь хувилбарууд, ялгаатай үнийн аргууд, нийлүүлэгчийн мэдээлэл, "
+"захиалуулах, хадгалуулах, ялгаатай хэмжих нэгжүүд, савлалт, үзүүлэлтүүд гэх "
+"мэт олон зүйлийг дэмждэг.\n"
+"\n"
+"Үнийн хүснэгт нь дараах зүйлсийг дэмждэг:\n"
+"    * Олон түвшний хөнгөлөлт (бараагаар, ангилалаар, тоо ширхэгээр)\n"
+"    * Ялгаатай шалгууруудаар үнэ бодогдох\n"
+"        * Өөр үнийн хүснэгт,\n"
+"        * Өртөг үнэ,\n"
+"        * Суурь үнэ,\n"
+"        * Нийлүүлэгчийн үнэ, ...\n"
+"\n"
+"Үнийн хүснэгтийн бараагаар болон/эсвэл харилцагчаарх тохиргоо.\n"
+"\n"
+"Барааны шошгыг зураасан кодтой хэвлэх.\n"
+"    "
 
 #. module: base
 #: report:ir.module.reference.graph:0
@@ -15673,7 +16461,7 @@ msgstr "Дэлгэц :"
 #. module: base
 #: field:ir.model.fields,view_load:0
 msgid "View Auto-Load"
-msgstr ""
+msgstr "Автомат-Ачааг Харах"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:264
@@ -15684,7 +16472,7 @@ msgstr "Энэ талбрыг та устгаж болохгүй '%s' !"
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
-msgstr ""
+msgstr "Зөвшөөрөгдсөн Компаниуд"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_de
@@ -15694,7 +16482,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_auction
 msgid "Auction Houses"
-msgstr ""
+msgstr "Үнэ хаялцах худалдаа"
 
 #. module: base
 #: field:ir.ui.menu,web_icon:0
@@ -15710,7 +16498,7 @@ msgstr "Товлосон шинэчлэлтийг эхлүүлэх"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_journal
 msgid "Invoicing Journals"
-msgstr ""
+msgstr "Нэхэмжлэлийн Журналууд"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -15726,7 +16514,7 @@ msgstr "Дэлгэц эрэмблэлт"
 #: code:addons/base/module/wizard/base_module_upgrade.py:95
 #, python-format
 msgid "Unmet dependency !"
-msgstr ""
+msgstr "Биелээгүй хамаарал !"
 
 #. module: base
 #: view:base.language.import:0
@@ -15734,6 +16522,8 @@ msgid ""
 "Supported file formats: *.csv (Comma-separated values) or *.po (GetText "
 "Portable Objects)"
 msgstr ""
+"Дэмжигдэх файлын форматууд: *.csv (Comma-separated values) эсвэл *.po "
+"(GetText Portable Objects)"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:534
@@ -15742,6 +16532,8 @@ msgid ""
 "You can not delete this document (%s) ! Be sure your user belongs to one of "
 "these groups: %s."
 msgstr ""
+"Та энэ (%s) баримтыг устгах боломжгүй ! Дараах группүүдэд харъяалагдаж "
+"байгаа эсэхээ магадлана уу: %s."
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_livechat
@@ -15753,6 +16545,12 @@ msgid ""
 "Add \"Support\" button in header from where you can access OpenERP Support.\n"
 "    "
 msgstr ""
+"\n"
+"Маллагааны гэрээтэй бол амьд дэмжлэгийн чаатыг нэмдэг.\n"
+"===================================================================\n"
+"\n"
+"Толгой дахь \"Дэмжлэг\" даруулыг дарж OpenERP дэмжлэг рүү хандах боломжтой.\n"
+"    "
 
 #. module: base
 #: model:ir.model,name:base.model_base_module_configuration
@@ -15767,6 +16565,10 @@ msgid ""
 "        This module provides the core of the OpenERP web client.\n"
 "        "
 msgstr ""
+"\n"
+"        OpenERP Вебийн цөм модуль.\n"
+"        OpenERP веб клиентийн цөмийг энэ модуль өгдөг.\n"
+"        "
 
 #. module: base
 #: sql_constraint:res.country:0
@@ -15804,7 +16606,7 @@ msgstr "Аруб"
 #: code:addons/base/module/wizard/base_module_import.py:60
 #, python-format
 msgid "File is not a zip file!"
-msgstr ""
+msgstr "zip файл биш байна!"
 
 #. module: base
 #: model:res.country,name:base.ar
@@ -15824,6 +16626,15 @@ msgid ""
 "and decide on their status as they evolve.\n"
 "    "
 msgstr ""
+"\n"
+"Энэ модуль нь Асуудал/Бугийн менежментийг төсөлд нэмдэг.\n"
+"=======================================================\n"
+"\n"
+"OpenERP нь төсөлд учирч болох системийн буг, үйлчлүүлэгчийн гомдол, "
+"материалын эвдрэл гэх мэт асуудлыг менеж хийх боломжийг олгодог. Асуудлын "
+"жагсаалтыг менежер харж хурдтайгаар шалгах, хариуцагчийг томилох, төлөвийн "
+"явцаар нь шийдвэр гаргах зэрэг боломжийг олгоно.\n"
+"    "
 
 #. module: base
 #: field:res.groups,full_name:0
@@ -15838,7 +16649,7 @@ msgstr "Бахрейн"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web
 msgid "web"
-msgstr ""
+msgstr "веб"
 
 #. module: base
 #: field:res.bank,fax:0
@@ -15912,7 +16723,7 @@ msgstr "Компани"
 #. module: base
 #: model:ir.module.category,name:base.module_category_report_designer
 msgid "Advanced Reporting"
-msgstr ""
+msgstr "Дээд түвшний тайлан"
 
 #. module: base
 #: selection:ir.actions.act_window,target:0
@@ -15933,17 +16744,17 @@ msgstr "Нийтлэгчийн Баталгааны Гэрээ"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Bulgarian / български език"
-msgstr ""
+msgstr "Болгария / български език"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_aftersale
 msgid "After-Sale Services"
-msgstr ""
+msgstr "Борлуулалтын дараах үйлчилгээ"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_fr
 msgid "France - Accounting"
-msgstr ""
+msgstr "Франц - Санхүү"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -15953,7 +16764,7 @@ msgstr "Санаачлага"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_caldav
 msgid "Share Calendar using CalDAV"
-msgstr ""
+msgstr "CalDAV-г ашиглан цагалбарыг хуваалцах"
 
 #. module: base
 #: field:ir.actions.act_window,limit:0
@@ -15970,7 +16781,7 @@ msgstr ""
 #: code:addons/orm.py:791
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
-msgstr ""
+msgstr "Сериалчлах талбар `%s` олдсонгүй. Хувааж таслах талбар `%s`!"
 
 #. module: base
 #: model:res.country,name:base.jm
@@ -15981,7 +16792,7 @@ msgstr "Ямайка"
 #: field:res.partner,color:0
 #: field:res.partner.address,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Өнгөний Индекс"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_partner_category_form
@@ -15991,6 +16802,9 @@ msgid ""
 "categories have a hierarchy structure: a partner belonging to a category "
 "also belong to his parent category."
 msgstr ""
+"Илүү сайн хянах, шинжлэх зорилгоор харилцагчдын ангилалыг менеж хийдэг. "
+"Харилцагч нь нэг юмуу хэд хэдэн ангилалд харъяалагдаж болно. Ангилал нь "
+"мөчирлөсөн бүтэцтэй бөгөөд эцэг ангилалуудад харилцагч нь мөн харъяалагдана."
 
 #. module: base
 #: model:res.country,name:base.az
@@ -16012,7 +16826,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.category,name:base.module_category_tools
 msgid "Extra Tools"
-msgstr ""
+msgstr "Нэмэлт багаж"
 
 #. module: base
 #: model:res.country,name:base.vg
@@ -16085,7 +16899,7 @@ msgstr "Чех / Čeština"
 #. module: base
 #: model:ir.module.category,name:base.module_category_generic_modules
 msgid "Generic Modules"
-msgstr ""
+msgstr "Ерөнхий Модулиуд"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_partner_supplier_form
@@ -16095,6 +16909,10 @@ msgid ""
 "uncheck the 'Suppliers' filter button in order to search in all your "
 "partners, including customers and prospects."
 msgstr ""
+"Нийлүүлэгчийн формоос өөрийн нийлүүлэгчийн бүх мэдээлэл рүү хандана: "
+"санхүүгийн өгөгдөл, имэйлийн түүх, уулзалтууд, худалдан авалтууд, гм. "
+"'Нийлүүлэгч' шүүлтүүрийн товчийг арилгаж бүх харилцагч буюу захиалагч, "
+"нийлүүлэгчдийг бүгдийг харах боломжтой."
 
 #. module: base
 #: model:res.country,name:base.rw
@@ -16120,11 +16938,26 @@ msgid ""
 "to set up a management by affair.\n"
 "    "
 msgstr ""
+"\n"
+"Энэ модуль нь цагийн хуудсын системийг хэрэгжүүлдэг.\n"
+"==========================================\n"
+"\n"
+"Ажилтан бүр төслүүд дээр зарцуулсан цагаа бөглөж, хөтлөх боломжтой.\n"
+"Төсөл гэдэг нь шинжилгээний данс бөгөөд төсөл дээр зарцуулсан цаг нь "
+"шинжилгээний дансын өртөг болно.\n"
+"\n"
+"Цаг, ажилтны бүртгэл хяналтаас маш олон тайланг харах боломжтой.\n"
+"\n"
+"Энэ нь өртөгийн дансны модультай бүрэн уялдсан. Энэ үйл ажиллагааны "
+"менежментийг зохицуулах боломжийг олгоно.\n"
+"    "
 
 #. module: base
 #: help:ir.mail_server,smtp_port:0
 msgid "SMTP Port. Usually 465 for SSL, and 25 or 587 for other cases."
 msgstr ""
+"SMTP Порт. Ихэнх тохиолдолд SSL бол 465, бөгөөд 25 эсвэл 587 нь бусадт "
+"тохиолдолд."
 
 #. module: base
 #: view:ir.sequence:0
@@ -16192,6 +17025,32 @@ msgid ""
 "    * Opportunities by Stage (graph)\n"
 "    * Planned Revenue by Stage and User (graph)\n"
 msgstr ""
+"\n"
+"OpenERP-н Захиалагчийн Харилцааны Менежментийн ерөнхий модуль.\n"
+"=====================================================\n"
+"\n"
+"Энэ систем нь сэжим, боломж, уулзалт, утасны дуудлага зэрэгийг ухаалаг, "
+"оновчтой менеж хийх боломж олгох систем юм.\n"
+"Энэ нь харилцаа, олж таних, урьтамж тогтоох, оноож хариуцуулах, шийдвэрлэх, "
+"мэдээлэх зэрэг түлхүүр даалгавруудыг менеж хийдэг.\n"
+"\n"
+"OpenERP нь бүх хэрэгүүд хэрэглэгч, захиалагч, нийлүүлэгчээр бүрэн хөтлөгдөх "
+"баталгааг хангадаг. Энэ нь автоматаар санамж илгээх, асуудлыг томруулж "
+"дэвшүүлэх, тусгай аргыг өдөөх гэх зэрэг байгууллагын дүрэмээс хамаарсан олон "
+"ажлыг хийх боломжтой.\n"
+"\n"
+"Хамгийн гайхамшигтай нь хэрэглэгч ямар нэг онцгой зүйл үйлдэх ямар ч "
+"шаардлага байхгүй. Ердөө л шаардсан зүйлд имэйл илгээх байдлаар ажиллаж "
+"болох юм. OpenERP автоматаар талархал илэрхийлэх, холбогдох имэйлийг "
+"холбогдох ажилтанд нь хүргэх зэрэгийг бүгдийг хийдэг.\n"
+"\n"
+"CRM модуль нь имэйл үүдтэй бөгөөд OpenERP болон имэйл серверийн хооронд "
+"ижилтгэлийг явуулдаг.\n"
+"\n"
+"CRM хянах самбарт:\n"
+"    * Боломж ангилалаар (график)\n"
+"    * Боломж үеээр (график)\n"
+"    * Төлөвлөсөн Орлого Үеээр болон Хэрэглэгчээр (график)\n"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_accounting_and_finance
@@ -16221,7 +17080,7 @@ msgstr "Улс"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_messages
 msgid "In-Project Messaging System"
-msgstr ""
+msgstr "Төслийн дотоод Мессежийн Систем"
 
 #. module: base
 #: model:res.country,name:base.pn
@@ -16357,7 +17216,7 @@ msgstr "ir.actions.server"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ca
 msgid "Canada - Accounting"
-msgstr ""
+msgstr "Канад - Санхүү"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
@@ -16396,7 +17255,7 @@ msgstr "Хэрэгжүүлэлт"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ve
 msgid "Venezuela - Accounting"
-msgstr ""
+msgstr "Венесүэл - Санхүү"
 
 #. module: base
 #: model:res.country,name:base.cl
@@ -16428,12 +17287,12 @@ msgstr "Дэлгэцийн нэр"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_document_ftp
 msgid "Shared Repositories (FTP)"
-msgstr ""
+msgstr "Дундын агуулах  (FTP)"
 
 #. module: base
 #: model:ir.model,name:base.model_res_groups
 msgid "Access Groups"
-msgstr ""
+msgstr "Хандалтын Группүүд"
 
 #. module: base
 #: selection:base.language.install,lang:0
diff --git a/openerp/addons/base/i18n/nb.po b/openerp/addons/base/i18n/nb.po
index 6ab5d04ac5b..298c6ce0676 100644
--- a/openerp/addons/base/i18n/nb.po
+++ b/openerp/addons/base/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:23+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:44+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/nl.po b/openerp/addons/base/i18n/nl.po
index fb880f4b380..71a8dee3e68 100644
--- a/openerp/addons/base/i18n/nl.po
+++ b/openerp/addons/base/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:20+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:41+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -71,6 +71,18 @@ msgid ""
 "    * Graph of My Remaining Hours by Project\n"
 "    "
 msgstr ""
+"\n"
+"Projectmanagement module voor het beheren van muti-level projecten, taken, "
+"gewerkte tijd op taken, etc.\n"
+"\n"
+"Het is mogelijk om planningen en taakopdrachten te genereren\n"
+"\n"
+"Dashboard voor projectmedewerkers, welke bevat:\n"
+"* Lijst van open taken\n"
+"* Lijst van gedeligeerde taken\n"
+"* Grafiek  van mijn projecten, geplande en totale uren\n"
+"* Grafiek van mijn resterende uren per project\n"
+"    "
 
 #. module: base
 #: field:base.language.import,code:0
@@ -121,6 +133,7 @@ msgstr "Toon menu tips"
 msgid ""
 "Model name on which the method to be called is located, e.g. 'res.partner'."
 msgstr ""
+"Modelnaam van the methode welke wordt aangeroepen, bijv. 'res.partner'."
 
 #. module: base
 #: view:ir.module.module:0
@@ -146,6 +159,8 @@ msgid ""
 "\n"
 "This module allows you to create retro planning for managing your events.\n"
 msgstr ""
+"\n"
+"Organisatie en beheer van evenementen.\n"
 
 #. module: base
 #: help:ir.model.fields,domain:0
@@ -220,7 +235,7 @@ msgstr "ir.ui.view.custom"
 #: code:addons/base/ir/ir_model.py:313
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
-msgstr ""
+msgstr "Hiernoenen sparse field \"%s\" is niet toegestaan"
 
 #. module: base
 #: model:res.country,name:base.sz
@@ -362,6 +377,10 @@ msgid ""
 "        complex data from other software\n"
 "    "
 msgstr ""
+"\n"
+"        Deze module stelt een import klasse beschikbaar welke gebruikt\n"
+"        kan worden om complex data van andere software te importeren\n"
+"    "
 
 #. module: base
 #: field:ir.actions.wizard,wiz_name:0
@@ -820,6 +839,10 @@ msgid ""
 "Launch Manually Once: after hacing been launched manually, it sets "
 "automatically to Done."
 msgstr ""
+"Handmatig: Start handmatig.\n"
+"Automatisch: Start wanneer het systeem is geconfigureerd.\n"
+"Start eenmalig handmatig: Nadat handmatig gestart, wordt deze automatisch op "
+"klaar gezet."
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -898,6 +921,8 @@ msgid ""
 "The module adds google contact in partner address and add google calendar "
 "events details in Meeting"
 msgstr ""
+"Deze module voegt Google contact[ersonen in relatie adressen en voegt Google "
+"agenda items details in OpenERP agenda."
 
 #. module: base
 #: view:res.users:0
@@ -1177,6 +1202,20 @@ msgid ""
 "At the end of the month, the planning manager can also check if the encoded "
 "timesheets are respecting the planned time on each analytic account.\n"
 msgstr ""
+"Met deze module kunt u, uw planningen beheren.\n"
+"========================================\n"
+"\n"
+"Deze module is gebaseerd op kostenplaatsen en is geheel geïntegreerd met:\n"
+"* Urenstaten\n"
+"* Vakantiedagen\n"
+"* projectmanagement\n"
+"\n"
+"Op deze wijze kan iedere afdelingsmanager zien of iemand van zijn team nog "
+"niet verwerkte uren heeft voor een bepaalde planning (rekening houdende met "
+"geaccordeerde afwezigheid) of nog uren moet indienen.\n"
+"\n"
+"Aan het einde van de maand kan de planningsmanager de ingediende uren en de "
+"geplande uren controleren op de kostenplaats.\n"
 
 #. module: base
 #: selection:ir.property,type:0
@@ -1373,6 +1412,11 @@ msgid ""
 "use the accounting application of OpenERP, journals and accounts will be "
 "created automatically based on these data."
 msgstr ""
+"Stel uw bankrekeningnummers van uw bedrijf in en selecteer degene welke op "
+"uw rapportvoet moeten worden afgedrukt. U kunt de bankrekeningnummers "
+"sorteren in de lijst. Indien u gebruik maakt van de boekhouding in OpenERP, "
+"dan worden dagboeken en rekeningen automatisch aangemaakt op basis van deze "
+"gegevens."
 
 #. module: base
 #: view:ir.module.module:0
@@ -1392,6 +1436,14 @@ msgid ""
 "    * Commitment Date\n"
 "    * Effective Date\n"
 msgstr ""
+"\n"
+"deze module voegt extra informatie toe aan een verkooporder.\n"
+"===================================================\n"
+"\n"
+"U kunt de navolgende extra data toevoegen aan een verkooporder:\n"
+"* Aanvraagdatum\n"
+"* Bevestigde datum\n"
+"* Effectieve datum\n"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_sequence
@@ -1433,6 +1485,25 @@ msgid ""
 "database,\n"
 "      but in the servers rootpad like /server/bin/filestore.\n"
 msgstr ""
+"\n"
+"deze module voegt een compleet Document Management Systeem (DMS) toe.\n"
+"================================================================\n"
+"* Gebruikerstoegang\n"
+"* Document indexeren. Opmerking: .pptx en docx bestanden worden niet "
+"ondersteund\n"
+"* Dashboard voor documenten, met:\n"
+"  * Nieuwe bestanden (lijst)\n"
+"  * Bestanden per resource type (grafiek)\n"
+"  * Bestanden per relatie (grafiek)\n"
+"  * Bestandgrootte per maand (grafiek)\n"
+"\n"
+"Opmerking:\n"
+"* Wanneer u deze module installeert in een bedrijf wat al gebruik maakt van "
+"OpenERP, zullen bestaande PDF bestanden, welke zijn opgeslagen in de "
+"database verloren gaan.\n"
+"* Na installatie van deze module worden PDF bestanden niet langer opgeslagen "
+"in de database, maar in een map van de server, zoals bijv.: "
+"server/bin/filestore.\n"
 
 #. module: base
 #: view:res.lang:0
@@ -1597,6 +1668,9 @@ msgid ""
 "    - You can define new types of events in\n"
 "        Association / Configuration / Types of Events\n"
 msgstr ""
+"\n"
+"Organisatie en beheer van evenementen.\n"
+"=================================\n"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_tools
@@ -1715,6 +1789,10 @@ msgid ""
 "    Apply Different Category for the product.\n"
 "    "
 msgstr ""
+"\n"
+"    Met deze module kunt u lunches beheren.\n"
+"==================================\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.kg
@@ -2078,7 +2156,7 @@ msgstr "Boomstructuur"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_analytic_multicurrency
 msgid "Multi-Currency in Analytic"
-msgstr ""
+msgstr "Meerdere valuta in kostenplaatsen"
 
 #. module: base
 #: view:base.language.export:0
@@ -2197,6 +2275,10 @@ msgid ""
 "re-invoice your customer's expenses if your work by project.\n"
 "    "
 msgstr ""
+"\n"
+"Beheer van personeel declaraties.\n"
+"============================\n"
+"    "
 
 #. module: base
 #: field:ir.values,action_id:0
@@ -7764,6 +7846,9 @@ msgid ""
 "    Module for the Check writing and check printing  \n"
 "    "
 msgstr ""
+"\n"
+"    Module voor het aanmaken en afdrukken van cheques  \n"
+"    "
 
 #. module: base
 #: model:res.partner.bank.type,name:base.bank_normal
@@ -8095,6 +8180,8 @@ msgid ""
 "\n"
 "    *  Share meeting with other calendar clients like sunbird\n"
 msgstr ""
+"\n"
+"Deel uw CRM afspraken door gebruik te maken van CalDAV\n"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_iban
@@ -8373,7 +8460,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account
 msgid "eInvoicing"
-msgstr "eFactureren"
+msgstr "Boekhouding"
 
 #. module: base
 #: model:ir.module.module,description:base.module_association
@@ -13964,7 +14051,7 @@ msgstr "De doel activiteit"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_check_writing
 msgid "Check writing"
-msgstr ""
+msgstr "Cheques maken"
 
 #. module: base
 #: model:ir.module.module,description:base.module_sale_layout
diff --git a/openerp/addons/base/i18n/nl_BE.po b/openerp/addons/base/i18n/nl_BE.po
index 1a85aad5ee9..6165893d26d 100644
--- a/openerp/addons/base/i18n/nl_BE.po
+++ b/openerp/addons/base/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:27+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:48+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/pl.po b/openerp/addons/base/i18n/pl.po
index b05f4647b56..f67d9c46d85 100644
--- a/openerp/addons/base/i18n/pl.po
+++ b/openerp/addons/base/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:24+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:44+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/pt.po b/openerp/addons/base/i18n/pt.po
index 7990763c352..983990df5b3 100644
--- a/openerp/addons/base/i18n/pt.po
+++ b/openerp/addons/base/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:24+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:45+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/pt_BR.po b/openerp/addons/base/i18n/pt_BR.po
index c65660d80a0..73c9f249850 100644
--- a/openerp/addons/base/i18n/pt_BR.po
+++ b/openerp/addons/base/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:26+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:47+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/ro.po b/openerp/addons/base/i18n/ro.po
index 45b2af390e3..6111d2ed4e8 100644
--- a/openerp/addons/base/i18n/ro.po
+++ b/openerp/addons/base/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:24+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:45+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/ru.po b/openerp/addons/base/i18n/ru.po
index 5530cadbb77..6cbed7a24fa 100644
--- a/openerp/addons/base/i18n/ru.po
+++ b/openerp/addons/base/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:24+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:45+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/sk.po b/openerp/addons/base/i18n/sk.po
index b6439aeff57..71b3a748aa7 100644
--- a/openerp/addons/base/i18n/sk.po
+++ b/openerp/addons/base/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:25+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:45+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/sl.po b/openerp/addons/base/i18n/sl.po
index eeb36876631..066ab3e47c0 100644
--- a/openerp/addons/base/i18n/sl.po
+++ b/openerp/addons/base/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:25+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:46+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/sq.po b/openerp/addons/base/i18n/sq.po
index 537ac4b113f..69d4b2c36fc 100644
--- a/openerp/addons/base/i18n/sq.po
+++ b/openerp/addons/base/i18n/sq.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:19+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:39+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/sr.po b/openerp/addons/base/i18n/sr.po
index 4149fe63acf..a0ec7a1a497 100644
--- a/openerp/addons/base/i18n/sr.po
+++ b/openerp/addons/base/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:24+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:45+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/sr@latin.po b/openerp/addons/base/i18n/sr@latin.po
index 254eaf01b54..49af1e2bc1a 100644
--- a/openerp/addons/base/i18n/sr@latin.po
+++ b/openerp/addons/base/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:28+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:48+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/sv.po b/openerp/addons/base/i18n/sv.po
index c510adb4558..a2b2f917674 100644
--- a/openerp/addons/base/i18n/sv.po
+++ b/openerp/addons/base/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:25+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:46+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -3484,7 +3484,7 @@ msgstr "Fältmappning"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_dashboard
 msgid "web Dashboard"
-msgstr ""
+msgstr "Webbinfopanel"
 
 #. module: base
 #: model:ir.module.module,description:base.module_sale
@@ -9967,6 +9967,35 @@ msgid ""
 "module named account_voucher.\n"
 "    "
 msgstr ""
+"\n"
+"Redovisning och ekonomisk förvaltning.\n"
+"===============================\n"
+"\n"
+"Ekonomi och redovisning modul som omfattar:\n"
+"----------------------------------------------------------------\n"
+"allmänna Redovisningen\n"
+"Kostnad / Analytisk redovisning\n"
+"Tredjepart redovisning\n"
+"skattehantering\n"
+"budgetar\n"
+"Kund-och leverantörsfakturor\n"
+"kontoutdrag\n"
+"Avstämning av företag\n"
+"\n"
+"Skapar en instrumentpanel för revisorer som innehåller:\n"
+"-----------------------------------------------------------------------------"
+"\n"
+"* Lista över kundfakturor att godkänna\n"
+"* Företagsanalys\n"
+"* Graf över kassaflödet\n"
+"* Graf över finanserna\n"
+"\n"
+"De processer som upprätthåller huvudboken sker genom de definierade "
+"finansiella journal (bokföringsregler eller\n"
+"gruppering upprätthålls genom journalen) för ett visst budgetår och för "
+"beredning av bokföringsorder finns \n"
+"modulen account_voucher.\n"
+"    "
 
 #. module: base
 #: help:ir.actions.act_window,view_type:0
@@ -12825,7 +12854,7 @@ msgstr "Estland"
 #: model:ir.module.module,shortdesc:base.module_board
 #: model:ir.ui.menu,name:base.menu_dashboard
 msgid "Dashboards"
-msgstr "Startsidor"
+msgstr "Infopaneler"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_procurement
diff --git a/openerp/addons/base/i18n/th.po b/openerp/addons/base/i18n/th.po
index a42d2bdadaa..3e6b0a379cf 100644
--- a/openerp/addons/base/i18n/th.po
+++ b/openerp/addons/base/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:25+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:46+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/tlh.po b/openerp/addons/base/i18n/tlh.po
index 9fe9acbf130..047047b7e5b 100644
--- a/openerp/addons/base/i18n/tlh.po
+++ b/openerp/addons/base/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:25+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:46+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/tr.po b/openerp/addons/base/i18n/tr.po
index 15bedf9f2cc..c1823796f8b 100644
--- a/openerp/addons/base/i18n/tr.po
+++ b/openerp/addons/base/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:25+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:46+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/uk.po b/openerp/addons/base/i18n/uk.po
index edd0b92b3e5..ba2f93242dd 100644
--- a/openerp/addons/base/i18n/uk.po
+++ b/openerp/addons/base/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:26+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:47+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/ur.po b/openerp/addons/base/i18n/ur.po
index 54e96a067ee..9ecaa19aeb9 100644
--- a/openerp/addons/base/i18n/ur.po
+++ b/openerp/addons/base/i18n/ur.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:26+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:47+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/vi.po b/openerp/addons/base/i18n/vi.po
index b09a6872146..742c4aedd8a 100644
--- a/openerp/addons/base/i18n/vi.po
+++ b/openerp/addons/base/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:26+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:47+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/zh_CN.po b/openerp/addons/base/i18n/zh_CN.po
index cbf4909ad4e..bc0591e9c93 100644
--- a/openerp/addons/base/i18n/zh_CN.po
+++ b/openerp/addons/base/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:27+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:48+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/zh_HK.po b/openerp/addons/base/i18n/zh_HK.po
index 234e2a828ce..d86d8de9592 100644
--- a/openerp/addons/base/i18n/zh_HK.po
+++ b/openerp/addons/base/i18n/zh_HK.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:26+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:47+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/zh_TW.po b/openerp/addons/base/i18n/zh_TW.po
index 33bdcdf8471..72f0f0a0faf 100644
--- a/openerp/addons/base/i18n/zh_TW.po
+++ b/openerp/addons/base/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-27 05:27+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:48+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. module: base
 #: model:res.country,name:base.sh

From 1af912b22017a512d0a2325f9570ffa35ed7f668 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 5 Jul 2012 04:49:18 +0000
Subject: [PATCH 70/93] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120705044918-ss453rzpy099bl0j
---
 addons/stock_planning/i18n/ja.po |  129 +--
 addons/survey/i18n/ja.po         | 1710 ++++++++++++++++++++++++++++++
 2 files changed, 1779 insertions(+), 60 deletions(-)
 create mode 100644 addons/survey/i18n/ja.po

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

From f42aa96abe595fd224efff0e90f7a53933656189 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 4 Jul 2012 17:33:18 +0200
Subject: [PATCH 71/93] [IMP] category of link modules for contract management
 should be 'Hidden'

bzr revid: qdp-launchpad@openerp.com-20120704153318-9bke9qu2iwu39ikv
---
 addons/analytic_contract_expense_project/__openerp__.py | 2 +-
 addons/analytic_contract_hr_expense/__openerp__.py      | 2 +-
 addons/analytic_contract_project/__openerp__.py         | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

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": """

From 6867bc1375aeea3c291c6b9193da9c6b62d4762d Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 4 Jul 2012 18:29:10 +0200
Subject: [PATCH 72/93] [IMP] review of some hr form view

bzr revid: qdp-launchpad@openerp.com-20120704162910-zatsmoxyu2reaab2
---
 addons/hr/hr_view.xml                         | 14 ++---
 addons/hr_attendance/hr_attendance_view.xml   |  5 +-
 addons/hr_contract/hr_contract.py             |  2 +-
 addons/hr_contract/hr_contract_view.xml       | 58 +++++++++++--------
 addons/hr_holidays/hr_holidays_view.xml       |  4 +-
 addons/hr_payroll/hr_payroll_view.xml         |  6 +-
 addons/hr_recruitment/hr_recruitment_view.xml |  2 +-
 .../l10n_be_hr_payroll_view.xml               | 16 ++---
 8 files changed, 56 insertions(+), 51 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 44c65daf895..750b83d6700 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -48,20 +48,18 @@
                             <page string="Information">
                                 <group>
                                     <group>
+                                        <field name="user_id" on_change="onchange_user(user_id)"/>
                                         <field name="parent_id" />
                                         <field name="coach_id"/>
                                     </group>
                                     <group>
-                                        <!--<field name="identification_id" groups="base.group_hr_user"/>-->
+                                        <field name="identification_id" groups="base.group_hr_user"/>
                                         <field name="passport_id" groups="base.group_hr_user"/>
                                         <field name="otherid" groups="base.group_hr_user"/>
                                     </group>
                                     <group name="active_group">
                                         <field name="active"/>
                                     </group>
-                                <!-- <group string="General">
-                                    <field name="user_id" on_change="onchange_user(user_id)"/>
-                                </group> -->
                                 </group>
                                 <field name="notes" placeholder="Other Information ..." colspan="4"/>
                             </page>
@@ -376,15 +374,15 @@
                         <h2>
                             <field name="employee_ids" widget="many2many_tags" mode="tree,form"/>
                         </h2>
-                        <group col="4">
-                            <group>
-                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                            </group>
+                        <group>
                             <group>
                                 <field name="no_of_employee"/>
                                 <field name="expected_employees"/>
                                 <field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/>
                             </group>
+                            <group>
+                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                            </group>
                         </group>
                         <notebook>
                             <page string="Description">
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index ff707d3453a..aaee5ed33bf 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -137,9 +137,8 @@
 					<label for="state"/>
 					<div>
 						<field name="state" class="oe_inline"/>
-						<label/>
-						<button class="oe_inline" name="attendance_action_change" states="present" string="Sign Out" type="object" icon="gtk-go-forward" context="{'type':'sign_out'}" groups="base.group_hr_user"/>
-						<button class="oe_inline" name="attendance_action_change" states="absent" string="Sign In" type="object" icon="gtk-go-back" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
+						<button class="oe_inline oe_right" name="attendance_action_change" states="present" string="Sign Out" type="object" icon="gtk-go-forward" context="{'type':'sign_out'}" groups="base.group_hr_user"/>
+						<button class="oe_inline oe_right" name="attendance_action_change" states="absent" string="Sign In" type="object" icon="gtk-go-back" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
 					</div>
                 </field>
             </field>
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 89ec9faa288..37354045d8f 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -8,18 +8,18 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-				<data>
+                <data>
                     <xpath expr="//field[@name='parent_id']" position="before">
                         <field name="manager"/>
                     </xpath>
-					<xpath expr="//group[@name='active_group']" position="before">
+                    <xpath expr="//group[@name='active_group']" position="before">
                         <group>
-							<field name="vehicle"/>
-							<field name="vehicle_distance"/>
-						</group>
+                            <field name="vehicle"/>
+                            <field name="vehicle_distance"/>
+                        </group>
                     </xpath>
                     <field name="active" position="before">
-                        <field name="medic_exam" string="Medical Examination"/>
+                        <field name="medic_exam" string="Medical Exam"/>
                     </field>
                     <field name="birthday" position="before">
                         <field name="children"/>
@@ -30,7 +30,7 @@
                     <field name="bank_account_id" position="replace">
                         <field name="bank_account_id" context="{'display_partner':True, 'partner_id':partner_id}"/>
                     </field>
-				</data>
+                </data>
             </field>
         </record>
 
@@ -69,26 +69,38 @@
             <field name="arch" type="xml">
                 <form string="Contract" version="7.0">
                     <sheet>
-                    <group col="4">
-                        <field name="name" />
-                        <field name="employee_id" />
-                        <field name="job_id"/>
-                        <field name="wage"/>
-                        <field name="type_id"/>
-                    </group>
+                    <div class="oe_title">
+                        <h1>
+                            <field name="name" class="oe_inline"/>, <field name="employee_id" class="oe_inline"/>
+                        </h1>
+                        <h2>
+                            <div>
+                                <label for="job_id" class="oe_edit_only"/>
+                                <field name="job_id"/>
+                            </div>
+                            <div>
+                                <label for="type_id" class="oe_edit_only"/>
+                                <field name="type_id"/>
+                            </div>
+                        </h2>
+                    </div>
                     <notebook>
                         <page string="Information" name="information">
                             <group>
-                                <group name="left_column" string="Duration">
-                                    <field name="date_start" />
-                                    <field name="date_end" />
-                                    <field name="working_hours"/>
+                                <group name="salary_and_advantages" string="Salary and Advantages">
+                                    <field name="wage"/>
+                                    <field name="advantages" nolabel="1" placeholder="Advantages..." colspan="2"/>
                                 </group>
-                                <group name="trail" string="Trial Period">
-                                    <field name="trial_date_start" />
-                                    <field name="trial_date_end" />
-                                    <separator string="Advantages" colspan="2"/>
-                                    <field name="advantages" nolabel="1"/>
+                                <group name="left_column" string="Duration">
+                                    <label for="trial_date_start" string="Trial Period Duration"/>
+                                    <div>
+                                        <field name="trial_date_start" class="oe_inline"/> - <field name="trial_date_end" class="oe_inline"/>
+                                    </div>
+                                    <label for="date_start" string="Duration"/>
+                                    <div>
+                                        <field name="date_start" class="oe_inline"/> - <field name="date_end" class="oe_inline"/>
+                                    </div>
+                                    <field name="working_hours"/>
                                 </group>
                             </group>
                             <separator string="Notes"/>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 197b19316d6..01d066b62f4 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -115,6 +115,7 @@
                             <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
                             <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_user"/>
                             <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')],'invisible':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
+                            <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'invisible':[('holiday_type','=','employee')], 'readonly':[('state','!=','draft'), ('state','!=','confirm')]}"/>
                             <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
                         </group>
                         <group>
@@ -173,6 +174,7 @@
                             <field name="name"/>
                             <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Mode" groups="base.group_hr_manager"/>
                             <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')], 'invisible':[('holiday_type','=','category')]}"/>
+                            <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')], 'invisible':[('holiday_type','=','employee')]}"/>
                             <field name="department_id" attrs="{'readonly':['|', ('holiday_type','=','category'), ('state','not in' ,('draft', 'confirm'))]}"/>
                         </group>
                         <group>
@@ -541,7 +543,7 @@
                     <div>
                         <field name="remaining_leaves" class="oe_inline"/>
                         <label/>
-                        <button name="%(act_hr_employee_holiday_request)d" string="Leaves" type="action" class="oe_inline"/>
+                        <button name="%(act_hr_employee_holiday_request)d" string="Leaves" type="action" class="oe_inline oe_right"/>
                     </div>
                 </field>
             </field>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 78ef1c9d0b8..5f38b845872 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -45,10 +45,8 @@
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="//group[@name='trail']" position="after">
-                    <group string="Payslip Info">
-                        <field name="struct_id" required="1"/>
-                    </group>
+                <xpath expr="//field[@name='wage']" position="after">
+                    <field name="struct_id" required="1"/>
                 </xpath>
                  <xpath expr="//field[@name='working_hours']" position="after">
                     <field name="schedule_pay"/>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index a3dc5036afa..3cb29348089 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -174,7 +174,7 @@
                         <field name="survey" invisible="1"/>
                         <field name="response" invisible="1"/>
                         <field name="department_id" on_change="onchange_department_id(department_id)"/>
-                        <div><field name="state" groups="base.group_no_one"/></div>
+                        <field name="state" groups="base.group_no_one"/>
                     </group>
                 </group>
                 <notebook>
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 c40ddbc3a78..d295888d8b5 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
@@ -16,16 +16,12 @@
                     <field name="meal_voucher_amount"/>
                     <field name="misc_advantage_amount"/>
                  </xpath>
-                 <xpath expr="//group[@name='trail']" position="after">
-                     <group string="Miscellaneous">
-                         <field name="additional_net_amount"/>
-                         <field name="retained_net_amount"/>
-                     </group>
-                    <group string="By Worker">
-                        <field name="insurance_employee_deduction"/>
-                        <field name="meal_voucher_employee_deduction"/>
-                        <field name="car_employee_deduction"/>
-                    </group>
+                 <xpath expr="//field[@name='advantages']" position="before">
+                    <field name="additional_net_amount"/>
+                    <field name="retained_net_amount"/>
+                    <field name="insurance_employee_deduction"/>
+                    <field name="meal_voucher_employee_deduction"/>
+                    <field name="car_employee_deduction"/>
                  </xpath>
             </data>
             </field>

From 535f2350ce6bf88fd07d6cae352a72a14d75c379 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 5 Jul 2012 04:57:35 +0000
Subject: [PATCH 73/93] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120705045735-cr2i52twdi6vdvku
---
 addons/web_gantt/i18n/pl.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/web_gantt/i18n/pl.po b/addons/web_gantt/i18n/pl.po
index ae7d549d8d4..65c5d5a6d92 100644
--- a/addons/web_gantt/i18n/pl.po
+++ b/addons/web_gantt/i18n/pl.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-02-28 11:09+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-07-04 17:56+0000\n"
+"Last-Translator: Piotr Łęgosz <legosz.piotr@gmail.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-03 05:55+0000\n"
-"X-Generator: Launchpad (build 15531)\n"
+"X-Launchpad-Export-Date: 2012-07-05 04:57+0000\n"
+"X-Generator: Launchpad (build 15544)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
 msgid "Gantt"
-msgstr ""
+msgstr "Wykres Gantta"
 
 #. openerp-web
 #: addons/web_gantt/static/src/xml/web_gantt.xml:10

From d761f9ef09be61b87ee300bccb42b7a1fbceb84f Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 5 Jul 2012 12:28:45 +0530
Subject: [PATCH 74/93] [IMP]:removed tabs

bzr revid: apa@tinyerp.com-20120705065845-bb0lgzwdd93ph2ql
---
 addons/hr_attendance/hr_attendance_view.xml | 12 ++++++------
 addons/hr_payroll/hr_payroll_view.xml       |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index aaee5ed33bf..448e6401cbd 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -134,12 +134,12 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
                 <field name="active" position="before">
-					<label for="state"/>
-					<div>
-						<field name="state" class="oe_inline"/>
-						<button class="oe_inline oe_right" name="attendance_action_change" states="present" string="Sign Out" type="object" icon="gtk-go-forward" context="{'type':'sign_out'}" groups="base.group_hr_user"/>
-						<button class="oe_inline oe_right" name="attendance_action_change" states="absent" string="Sign In" type="object" icon="gtk-go-back" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
-					</div>
+                    <label for="state"/>
+                    <div>
+                        <field name="state" class="oe_inline"/>
+                        <button class="oe_inline oe_right" name="attendance_action_change" states="present" string="Sign Out" type="object" icon="gtk-go-forward" context="{'type':'sign_out'}" groups="base.group_hr_user"/>
+                        <button class="oe_inline oe_right" name="attendance_action_change" states="absent" string="Sign In" type="object" icon="gtk-go-back" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
+                    </div>
                 </field>
             </field>
         </record>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 5f38b845872..a6674e01bac 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -449,9 +449,9 @@
                     </xpath>
                     <xpath expr="//group[@name='active_group']" position="before">
                         <group>
-							<field name="vehicle"/>
-							<field name="vehicle_distance"/>
-						</group>
+                            <field name="vehicle"/>
+                            <field name="vehicle_distance"/>
+                        </group>
                     </xpath>
                     <field name="active" position="before">
                         <field name="medic_exam" string="Medical Examination"/>

From e6ef77b047dda7fa74fb984ecad078978e0d6ad6 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 5 Jul 2012 11:29:21 +0200
Subject: [PATCH 75/93] [MERGE] hr review of form views

bzr revid: qdp-launchpad@openerp.com-20120705092921-0edv4n7z0392ia83
---
 addons/hr_contract/hr_contract_view.xml       |  2 +-
 addons/hr_evaluation/hr_evaluation_view.xml   | 72 +++++++++----------
 addons/hr_expense/hr_expense.py               |  2 +-
 addons/hr_expense/hr_expense_view.xml         | 33 ++++-----
 addons/hr_expense/report/expense.rml          |  4 +-
 addons/hr_holidays/hr_holidays_view.xml       | 32 +++++----
 addons/hr_payroll/hr_payroll_view.xml         | 63 +++-------------
 .../hr_payroll_account_view.xml               | 21 +++---
 addons/hr_recruitment/hr_recruitment_view.xml |  3 +-
 addons/hr_timesheet/hr_timesheet_view.xml     |  7 +-
 .../hr_timesheet_sheet_view.xml               |  4 +-
 .../l10n_be_hr_payroll_view.xml               |  6 +-
 12 files changed, 97 insertions(+), 152 deletions(-)

diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 37354045d8f..66f486dc9cc 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -91,7 +91,7 @@
                                     <field name="wage"/>
                                     <field name="advantages" nolabel="1" placeholder="Advantages..." colspan="2"/>
                                 </group>
-                                <group name="left_column" string="Duration">
+                                <group name="duration_group" string="Duration">
                                     <label for="trial_date_start" string="Trial Period Duration"/>
                                     <div>
                                         <field name="trial_date_start" class="oe_inline"/> - <field name="trial_date_end" class="oe_inline"/>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 9988c39ae66..a5efaf42347 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -164,55 +164,49 @@
                 </header>
                 <sheet>
                     <label for="employee_id" class="oe_edit_only"/>
-                    <h1><field name="employee_id" on_change="onchange_employee_id(employee_id)"/></h1>
+                    <h1><field name="employee_id" on_change="onchange_employee_id(employee_id)" class="oe_inline"/>, <field name="date" class="oe_inline"/></h1>
                     <label for="plan_id" class="oe_edit_only"/>
                     <h2><field name="plan_id"/></h2>
                     <group>
-                        <group>
-                            <field name="date"/>
-                        </group>
-                        <group attrs="{'invisible':['|', ('state','=','draft'), ('state', '=', 'wait')]}">
+                        <group colspan="4" attrs="{'invisible':['|', ('state','=','draft'), ('state', '=', 'wait')]}">
                             <field name="rating" attrs="{'readonly':[('state','&lt;&gt;','progress')]}"/>
                             <field name="date_close" readonly="1"/>
                         </group>
                     </group>
-                    <notebook>
-                        <page string="Appraisal" attrs="{'invisible':[('state','=','draft')]}">
-                            <field name="survey_request_ids">
-                                <form string="Interview Appraisal" version="7.0">
-                                    <div class="oe_right oe_button_box">
-                                        <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
-                                        <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="done" icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0,}" attrs="{'readonly':[('response','=',False)]}" />
-                                    </div>
+                    <group string="Appraisal Forms" attrs="{'invisible':[('state','=','draft')]}">
+                        <field nolabel="1" name="survey_request_ids">
+                            <form string="Interview Appraisal" version="7.0">
+                                <div class="oe_right oe_button_box">
+                                    <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
+                                    <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="done" icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0,}" attrs="{'readonly':[('response','=',False)]}" />
+                                </div>
+                                <group>
                                     <group>
-                                        <group>
-                                            <field name="survey_id"/>
-                                            <field name="user_to_review_id"/>
-                                            <field name="user_id" string="Interviewer"/>
-                                        </group>
-                                        <group>
-                                            
-                                            <field name="date_deadline"/>
-                                            <field name="response" readonly="1"/>
-                                        </group>
+                                        <field name="survey_id"/>
+                                        <field name="user_to_review_id"/>
+                                        <field name="user_id" string="Interviewer"/>
                                     </group>
-                                    <group col="4" string="Status" invisible="1">
-                                         <field name="state"/>
-                                         <div>
-                                             <button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" />
-                                         </div>
+                                    <group>              
+                                        <field name="date_deadline"/>
+                                        <field name="response" readonly="1"/>
                                     </group>
-                                </form>
-                            </field>
-                        </page>
-                        <page string="Internal Notes" attrs="{'invisible':[('state','=','draft')]}">
-                            <field name="note_action"
-                                groups="base.group_hr_manager"/>
-                        </page>
-                        <page string="Public Notes" attrs="{'invisible':[('state','=','draft')]}">
-                            <field name="note_summary"/>
-                        </page>
-                    </notebook>
+                                </group>
+                                <group col="4" string="Status" invisible="1">
+                                     <field name="state"/>
+                                     <div>
+                                         <button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" />
+                                     </div>
+                                </group>
+                            </form>
+                        </field>
+                    </group>
+                    <group string="Internal Notes" attrs="{'invisible':[('state','=','draft')]}">
+                        <field nolabel="1" name="note_action"
+                            groups="base.group_hr_manager" placeholder="Appraisal Summary..."/>
+                    </group>
+                    <group string="Public Notes" attrs="{'invisible':[('state','=','draft')]}">
+                        <field nolabel="1" name="note_summary" placeholder="Action Plan..."/>
+                    </group>
               </sheet>
               </form>
             </field>
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 ec2ff849ecb..b8868c3319f 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -49,7 +49,6 @@
                     <field name="employee_id"/>
                     <field name="date"/>
                     <field name="department_id"/>
-                    <field name="ref"/>
                     <field name="name"/>
                     <field name="amount"/>
                     <field name="state"/>
@@ -74,14 +73,18 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
                 </header>
                 <sheet>
-                    <group col="4">
-                        <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
-                        <field name="name"/>
-                        <field name="ref"/>
-                        <field name="date"/>
-                        <field name="currency_id"/>
-                        <field name="department_id"/>
-                        <field name="company_id" groups="base.group_multi_company"/>
+                    <group>
+                        <group>
+                            <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
+                            <field name="date"/>
+                            <field name="department_id"/>
+                            <field name="company_id" groups="base.group_multi_company"/>
+                        </group>
+                        <group>
+                            <field name="name"/>
+                            <field name="user_valid"/>
+                            <field name="currency_id"/>
+                        </group>
                     </group>
                     <notebook>
                         <page string="Description">
@@ -106,6 +109,8 @@
                                     </group>
                                 </form>
                             </field>
+                            <separator string="Notes"/>
+                            <field name="note" placeholder="Free Notes"/>
                         </page>
                         <page string="Other Info">
                             <group>
@@ -113,17 +118,13 @@
                                     <field name="journal_id"/>
                                     <field name="invoice_id" context="{'type':'in_invoice', 'journal_type': 'purchase'}"/>
                                 </group>
-                                <group groups="base.group_no_one" string="Validation">
-                                    <field name="date_confirm" readonly="1"/>
-                                    <field name="date_valid" readonly="1"/>
-                                    <field name="user_valid"/>
-                                </group>
                             </group>
-                            <separator string="Notes"/>
-                            <field name="note"/>
                         </page>
                     </notebook>
                 </sheet>
+                <footer>
+                    <field name="message_ids" widget="mail_thread"/>
+                </footer>
                 </form>
             </field>
         </record>
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 @@
           <para style="terp_tblheader_General_Centre">Date</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Reference</para>
+          <para style="terp_tblheader_General_Centre">Description</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Validated By</para>
@@ -176,7 +176,7 @@
           <para style="terp_default_Centre_8">[[ formatLang(o.date,date=True) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ o.ref ]]</para>
+          <para style="terp_default_Centre_8">[[ o.name ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ o.user_valid.name ]]</para>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 01d066b62f4..1237cdb14f4 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -420,20 +420,24 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Leave Type" version="7.0">
-                    <sheet>
-                        <group>
-                            <group>
-                                <field name="name"/>
-                                <field name="categ_id"/>
-                                <field name="color_name"/>
-                                <field name="active"/>
-                            </group>
-                            <group>
-                                <field name="double_validation"/>
-                                <field name="limit"/>
-                            </group>
-                        </group>
-                    </sheet>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="categ_id"/>
+                    </group>
+                    <notebook>
+                      <page string="Details">
+                          <group>
+                              <group name="selection" string="Validation">
+                                  <field name="double_validation"/>
+                                  <field name="limit"/>
+                              </group>
+                              <group name="second" string="Misc">
+                                  <field name="color_name"/>
+                                  <field name="active"/>
+                              </group>
+                          </group>
+                      </page>
+                    </notebook>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index a6674e01bac..bae89ed215b 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -7,36 +7,6 @@
         <menuitem id="menu_hr_root_payroll" parent="hr.menu_hr_root" name="Payroll" sequence="30"/>
         <menuitem id="menu_hr_payroll_reporting" parent="hr.menu_hr_reporting" name="Payroll" groups="base.group_hr_manager"/>
 
-        <!-- Employee View -->
-        <record id="hr_contract.hr_hr_employee_view_form2" model="ir.ui.view">
-            <field name="name">hr.hr.employee.view.form2</field>
-            <field name="model">hr.employee</field>
-            <field name="inherit_id" ref="hr.view_employee_form"/>
-            <field name="arch" type="xml">
-            <data>
-                <xpath expr="//page[@string='Personal Information']" position="after">
-                    <page string="Miscellaneous" groups="base.group_hr_user">
-                        <group colspan="2" col="2">
-                            <separator string="Personal Info" colspan="2"/>
-                            <field name="bank_account_id" context="{'display_partner':True, 'partner_id':partner_id}"/>
-                            <field name="place_of_birth"/>
-                            <field name="children"/>
-                            <!-- <field name="basic" invisible="0"/> -->
-                        </group>
-                        <group colspan="2" col="2">
-                            <separator string="Job Info" colspan="2"/>
-                            <field name="manager" />
-                            <field name="vehicle" />
-                            <field name="vehicle_distance" />
-                            <field name="medic_exam"  string="Medical Examination"/>
-                        </group>
-                    </page>
-                </xpath>
-            </data>
-            </field>
-        </record>
-        <!-- End Employee View -->
-
         <!-- Contract View -->
         <record id="hr_contract_form_inherit" model="ir.ui.view">
             <field name="name">hr.contract.view.form.inherit</field>
@@ -291,6 +261,7 @@
                     </group>
                     <notebook>
                         <page string="Worked Days &amp; Inputs">
+                            <separator string="Worked Days"/>
                             <field name="worked_days_line_ids">
                                 <tree string="Worked Days" editable="bottom">
                                     <field name="name"/>
@@ -312,6 +283,7 @@
                                     </group>
                                 </form>
                             </field>
+                            <separator string="Other Inputs"/>
                             <field name="input_line_ids" colspan="4" nolabel="1">
                                 <tree string="Input Data" editable="bottom">
                                     <field name="name"/>
@@ -371,12 +343,13 @@
                        </page>
                        <page string="Other Information">
                             <group>
-                                <group>
+                                <group string="Miscellaneous">
                                     <field name="company_id" groups="base.group_multi_company"/>
                                     <field name="payslip_run_id" domain="[('state','=','draft')]"/>
+                                </group>
+                                <group name="accounting" string="Accounting">
                                     <field name="paid" readonly="1"/>
                                 </group>
-                                <group/>
                             </group>
                             <div colspan="4">
                                 <field name="note" Placeholder="Add an internal note..."/>
@@ -435,8 +408,8 @@
                     groups="base.group_hr_manager"/>
 
         <!-- Employee View -->
-        <record id="hr_contract.hr_hr_employee_view_form2" model="ir.ui.view">
-            <field name="name">hr.hr.employee.view.form2</field>
+        <record id="payroll_hr_employee_view_form" model="ir.ui.view">
+            <field name="name">payroll.hr.employee.view.form</field>
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
@@ -444,27 +417,6 @@
                     <xpath expr="//div[@name='button_box']" position="inside">
                         <button name="%(act_hr_employee_payslip_list)d" string="Payslips" type="action"/>
                     </xpath>
-                    <xpath expr="//field[@name='parent_id']" position="before">
-                        <field name="manager"/>
-                    </xpath>
-                    <xpath expr="//group[@name='active_group']" position="before">
-                        <group>
-                            <field name="vehicle"/>
-                            <field name="vehicle_distance"/>
-                        </group>
-                    </xpath>
-                    <field name="active" position="before">
-                        <field name="medic_exam" string="Medical Examination"/>
-                    </field>
-                    <field name="birthday" position="before">
-                        <field name="children"/>
-                    </field>
-                    <field name="birthday" position="after">
-                        <field name="place_of_birth"/>
-                    </field>
-                    <field name="bank_account_id" position="replace">
-                        <field name="bank_account_id" context="{'display_partner':True, 'partner_id':partner_id}"/>
-                    </field>
                 </data>
             </field>
         </record>
@@ -797,6 +749,7 @@
                     <group col="4">
                         <field name="credit_note"/>
                     </group>
+                    <separator string="Payslips"/>
                     <field name="slip_ids"/>
                 </sheet>
                 </form>
diff --git a/addons/hr_payroll_account/hr_payroll_account_view.xml b/addons/hr_payroll_account/hr_payroll_account_view.xml
index 03c625e054a..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 @@
 <openerp>
     <data>
 
-
-
         <record model="ir.ui.view" id="view_hr_payslip_inherit_form">
             <field name="name">hr.payslip.inherit.form</field>
             <field name="model">hr.payslip</field>
@@ -27,10 +25,12 @@
             <field name="arch" type="xml">
               <xpath expr="/form/notebook/page[@string='Child Rules']" position="after">
                     <page string="Accounting">
-                        <field name="account_debit" />
-                        <field name="account_credit"/>
-                        <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
-                        <field name="account_tax_id"/>
+                        <group colspan="4">
+                            <field name="account_debit" />
+                            <field name="account_credit"/>
+                            <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
+                            <field name="account_tax_id"/>
+                        </group>
                     </page>
                 </xpath>
             </field>
@@ -44,7 +44,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='trail']" position="after">
+                <xpath expr="//group[@name='duration_group']" position="after">
                    <group string="Accounting">
                         <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                         <field name="journal_id"/>
@@ -52,7 +52,7 @@
                 </xpath>
             </field>
         </record>
-        
+
     <!-- Payslip Run View -->
 
         <record id="hr_payslip_run_search_inherit" model="ir.ui.view">
@@ -86,12 +86,11 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr_payroll.hr_payslip_run_form"/>
             <field name="arch" type="xml">
-                <field name="date_end" position="after">
-                    <newline/>
+                <field name="credit_note" position="before">
                     <field name="journal_id"/>
                 </field>
             </field>
         </record>
-        
+
     </data>
 </openerp>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 3cb29348089..c8230787cfe 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -145,8 +145,7 @@
                     <button name="action_print_survey" type="object"
                         string="Print Interview" icon="gtk-print" help="Print interview report"
                         attrs="{'invisible':[('survey','=',False)]}"/>
-                </div>
-                
+                </div>             
                 <div class="oe_title">
                     <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 399c31c148b..7875aff12a0 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -42,7 +42,7 @@
                         <group>
                             <group string="Product">
                                 <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" required="1" domain="[('type','=','service')]"/>
-                                <label string="Quantity" for="unit_amount" align="1.0"/>
+                                <label string="Quantity" for="unit_amount"/>
                                 <div>
                                     <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" class="oe_inline"/>
                                     <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" class="oe_inline"/>
@@ -123,10 +123,7 @@
             <field name="arch" type="xml">
                 <page string="Personal Information" position="after">
                     <page string="Timesheets" groups="base.group_hr_user">
-                        <div class="oe_right oe_button_box" name="button_timesheet">
-                            <!-- Put here related buttons -->
-                        </div>
-                        <group col="4">
+                        <group>
                             <group col="2">
                                 <field name="product_id" domain="[('type','=','service')]"/>
                                 <field name="journal_id"/>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 649b5334c50..6635c38b909 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -348,7 +348,7 @@
                 </tree>
             </field>
         </record>
-        
+
   <!-- Timesheet Button on Employee Form -->
   <act_window
            context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
@@ -359,7 +359,7 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_employee_extd_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//div[@name='button_timesheet']" position="inside">
+                <xpath expr="//div[@name='button_box']" position="inside">
                     <button name="%(act_hr_employee_2_hr_timesheet)d" string="Timesheets" type="action"/>
                 </xpath>
             </field>
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 d295888d8b5..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
@@ -12,16 +12,14 @@
                  <xpath expr="//field[@name='struct_id']" position="after">
                     <field name="travel_reimbursement_amount"/>
                     <field name="car_company_amount"/>
+                    <field name="car_employee_deduction"/>
                     <field name="misc_onss_deduction"/>
                     <field name="meal_voucher_amount"/>
+                    <field name="meal_voucher_employee_deduction"/>
                     <field name="misc_advantage_amount"/>
-                 </xpath>
-                 <xpath expr="//field[@name='advantages']" position="before">
                     <field name="additional_net_amount"/>
                     <field name="retained_net_amount"/>
                     <field name="insurance_employee_deduction"/>
-                    <field name="meal_voucher_employee_deduction"/>
-                    <field name="car_employee_deduction"/>
                  </xpath>
             </data>
             </field>

From 9d908a38faa05716bb45c379ce63d6fe028982e6 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Thu, 5 Jul 2012 13:58:47 +0200
Subject: [PATCH 76/93] various improvements to design

bzr revid: mit@openerp.com-20120705115847-5oncw7ynqxs5m9ig
---
 addons/web/static/src/css/base.css          | 25 ++++++++++++++++-----
 addons/web/static/src/css/base.sass         | 21 +++++++++++++----
 addons/web_kanban/static/src/css/kanban.css | 13 -----------
 3 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 39dc2fa86f8..443563a096b 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1,4 +1,4 @@
-@charset "utf-8";
+@charset "UTF-8";
 @font-face {
   font-family: "mnmliconsRegular";
   src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@@ -34,7 +34,7 @@
   background: white;
   /* http://www.quirksmode.org/dom/inputfile.html
    * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
-   */ */
+   */
 }
 .openerp a {
   text-decoration: none;
@@ -352,6 +352,19 @@
 .openerp .oe_button.oe_link span:hover {
   text-decoration: underline;
 }
+.openerp .oe_star_on, .openerp .oe_star_off {
+  color: #cccccc;
+  text-shadow: 0 0 2px black;
+  vertical-align: top;
+  position: relative;
+  top: -5px;
+}
+.openerp .oe_star_on:hover, .openerp .oe_star_off:hover {
+  text-decoration: none;
+}
+.openerp .oe_star_on {
+  color: gold;
+}
 .openerp.oe_tooltip {
   font-size: 12px;
 }
@@ -446,12 +459,12 @@
 .openerp .oe_dropdown_menu {
   display: none;
   position: absolute;
-  top: 28px;
+  top: 32px;
   z-index: 1;
   border: 1px solid #afafb6;
   background: white;
-  padding: 8px;
-  min-width: 120px;
+  padding: 6px 0;
+  min-width: 140px;
   text-align: left;
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
@@ -481,7 +494,7 @@
 .openerp .oe_dropdown_menu > li > a {
   white-space: nowrap;
   display: block;
-  padding: 3px 6px;
+  padding: 4px 15px;
   color: #4c4c4c;
   text-decoration: none;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 0612d8dd3a0..61b7d267551 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -287,6 +287,18 @@ $colour4: #8a89ba
             font-weight: bold
             &:hover
                 text-decoration: underline
+    .oe_star_on, .oe_star_off
+        color: #cccccc
+        text-shadow: 0 0 2px black
+        vertical-align: top
+        position: relative
+        top: -5px
+
+    .oe_star_on:hover, .oe_star_off:hover
+        text-decoration: none
+
+    .oe_star_on
+        color: gold
 
     //.oe_edit_only 
     // }}}
@@ -363,12 +375,12 @@ $colour4: #8a89ba
     .oe_dropdown_menu
         display: none
         position: absolute
-        top: 28px
+        top: 32px
         z-index: 1
         border: 1px solid #afafb6
         background: white
-        padding: 8px
-        min-width: 120px
+        padding: 6px 0
+        min-width: 140px
         text-align: left
         @include radius(3px)
         @include box-shadow(0 1px 4px rgba(0,0,0,0.3))
@@ -383,7 +395,7 @@ $colour4: #8a89ba
             > a
                 white-space: nowrap
                 display: block
-                padding: 3px 6px
+                padding: 4px 15px
                 color: #4c4c4c
                 text-decoration: none
                 &:hover
@@ -637,6 +649,7 @@ $colour4: #8a89ba
                     &:hover
                         @include vertical-gradient(#292929, #191919)
                         @include box-shadow(none)
+
     // }}}
     // Webclient.leftbar {{{
     .oe_leftbar
diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index ba6eaa6ac92..6919947b093 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -15,19 +15,6 @@
 .openerp .oe_kanban_view .oe_kanban_clear {
   clear: both;
 }
-.openerp .oe_kanban_view .oe_kanban_content .oe_star_on, .openerp .oe_kanban_view .oe_kanban_content .oe_star_off {
-  color: #cccccc;
-  text-shadow: 0 0 2px black;
-  vertical-align: top;
-  position: relative;
-  top: -5px;
-}
-.openerp .oe_kanban_view .oe_kanban_content .oe_star_on:hover, .openerp .oe_kanban_view .oe_kanban_content .oe_star_off:hover {
-  text-decoration: none;
-}
-.openerp .oe_kanban_view .oe_kanban_content .oe_star_on {
-  color: gold;
-}
 .openerp .oe_kanban_view .oe_kanban_content div:first-child {
   margin-right: 12px;
 }

From 12e747349f5f37c8c136830afb4d17ecf7271439 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Thu, 5 Jul 2012 13:59:32 +0200
Subject: [PATCH 77/93] improved icon in the topbar for web_shortcut

bzr revid: mit@openerp.com-20120705115932-3bas217zqzccvfah
---
 addons/web_shortcuts/static/src/xml/web_shortcuts.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 @@
 -->
 <templates id="template" xml:space="preserve">
 <t t-name="Systray.Shortcuts">
-    <div class="oe_systray_shortcuts oe_dropdown_toggle">
-        <a href="#"><img src="/web_shortcuts/static/src/img/icon.png" width="22" height="22" border="0"/></a>
+    <div class="oe_systray_shortcuts oe_topbar_item oe_dropdown_toggle">
+        <span class="oe_e oe_star_off">7</span>
         <ul class="oe_systray_shortcuts_items oe_dropdown_menu"/>
     </div>
 </t>

From 02f85effd09dc2449299d8fa0a86e1aa0e83095d Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 5 Jul 2012 14:10:36 +0200
Subject: [PATCH 78/93] [IMP] small usability fix opporutnity

bzr revid: fp@tinyerp.com-20120705121036-tgr9sbauwywt50gg
---
 addons/crm/crm_lead_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 2579fa75cda..24ef8f4ec08 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -471,7 +471,7 @@
                         <label for="planned_revenue" class="oe_edit_only"/>
                         <h2>
                             <field name="planned_revenue" class="oe_inline"/>
-                            <field name="company_currency" class="oe_edit_only oe_inline"/> at 
+                            <field name="company_currency" class="oe_inline"/> at 
                             <field name="probability" class="oe_inline"/> %% success rate
                         </h2>
                     </div>

From 3ea22ec3d1e15d927a3409d035a26b025fc8b660 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 5 Jul 2012 14:56:17 +0200
Subject: [PATCH 79/93] [IMP] user preference form view

bzr revid: fp@tinyerp.com-20120705125617-vvv8ml3vax3gw7rl
---
 openerp/addons/base/res/res_users_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index 82093dadd4b..89b1416fc50 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -200,8 +200,8 @@
                     </div>
                     <div class="oe_title">
                         <h1>
-                            <field name="name" readonly="1" class="oe_edit_only"/>
-                            (<field name="login" readonly="1" class="oe_edit_only"/>)
+                            <field name="name" readonly="1" class="oe_edit_only oe_inline"/>
+                            (<field name="login" readonly="1" class="oe_edit_only oe_inline"/>)
                         </h1>
                         <label for="company_id" class="oe_edit_only"/>
                         <h2>

From d879e71beb11e2f1f384b43c8360a907c98a7ed7 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 5 Jul 2012 15:11:35 +0200
Subject: [PATCH 80/93] [IMP] marketing: usability, review of form views

bzr revid: qdp-launchpad@openerp.com-20120705131135-qp2j89quk3gpj60l
---
 .../marketing_campaign_view.xml               | 46 +++++++++----------
 .../marketing_campaign/res_partner_view.xml   |  2 +-
 2 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index e4dfd3da924..6a06cb33f1d 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -33,39 +33,35 @@
         <field name="arch" type="xml">
             <form version="7.0">
             <header>
-                <button name="state_running_set" string="Run" states="draft"/>
-                <button name="state_done_set" string="Done" states="running"/>
+                <button name="state_running_set" string="Run" states="draft" class="oe_highlight"/>
+                <button name="state_done_set" string="Done" states="running" class="oe_highlight"/>
                 <button name="state_draft_set" string="Set to Draft" states="done,cancelled"/>
                 <button name="state_cancel_set" string="Cancel" states="running"/>
                 <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
             </header>
             <sheet string="Campaign">
-                <group col="5">
-                    
-                    <group colspan="2">
-                        <field name="name"/>
-                        <field name="mode"/>
-                        <field name="fixed_cost"/>
-                        
-                        
-                    
-                    </group>
-                    <group colspan="2">
-                        <field name="object_id"/>
-                        <field name="partner_field_id"/>
-                        <field name="unique_field_id"/>
-                    </group>
-                    <group col="1">
-                    <div class="oe_right">
+                <div class="oe_right oe_button_box" name="button_box">
                         <button type="action"
                         name="%(act_marketing_campaing_followup)d"
                         string="Follow-Up" />
                         <button type="action"
                         name="%(act_marketing_campaing_segment_opened)d"
                         string="Segments" />
-                    </div>
+                </div>
+                <div class="oe_title">
+                    <label for="name" class="oe_edit_only"/>
+                    <h1><field name="name" class="oe_inline"/></h1>
+                </div>
+                <group>
+                    <group>
+                        <field name="mode"/>
+                        <field name="fixed_cost"/>
                     </group>
-                    
+                    <group>
+                        <field name="object_id"/>
+                        <field name="partner_field_id"/>
+                        <field name="unique_field_id"/>
+                    </group>     
                 </group>
                 <separator string="Activities"/>
                 <field name="activity_ids" context="{'default_object_id': object_id, 'default_campaign_id': active_id}" />
@@ -165,13 +161,13 @@
         <field name="arch" type="xml">
             <form version="7.0">
             <header>
-                <button name="state_running_set" string="Run" states="draft"/>
-                <button name="state_done_set" string="Close" states="running"/>
+                <button name="state_running_set" string="Run" states="draft" class="oe_highlight"/>
+                <button name="state_done_set" string="Close" states="running" class="oe_highlight"/>
                 <button name="state_draft_set" string="Set to Draft" states="done,cancelled"/>
                 <button name="state_cancel_set" string="Cancel" states="running"/>
                 <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
             </header>
-            <sheet string="Segments" layout="auto">
+            <sheet string="Segments" >
                 <group>
                     <group>
                         <field name="name"/>
@@ -313,7 +309,7 @@
                     </form>
                 </field>
                 <separator string="Next Activities"/>
-                <field name="to_ids" nolabel="1" mode="tree" context="{'default_activity_from_id': active_id}" colspan="2">
+                <field name="to_ids" mode="tree" context="{'default_activity_from_id': active_id}">
                     <tree string="Outgoing Transitions" editable="bottom">
                         <field name="activity_to_id" domain="[('campaign_id', '=', parent.campaign_id)]"/>
                         <field name='trigger'/>
diff --git a/addons/marketing_campaign/res_partner_view.xml b/addons/marketing_campaign/res_partner_view.xml
index b5fb2a31f1a..ebbefeeb1f4 100644
--- a/addons/marketing_campaign/res_partner_view.xml
+++ b/addons/marketing_campaign/res_partner_view.xml
@@ -13,7 +13,7 @@
                    <attribute name="invisible">False</attribute>
                 </xpath>
            </field>
-          </record>	
+          </record>    
         <record id="view_workitem_partner_info_form" model="ir.ui.view">
             <field name="name">res.partner.workitem.info.inherit</field>
             <field name="model">res.partner</field>

From 8eac49ea96e4140ec319affb55c75e96e19e4978 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 5 Jul 2012 15:20:03 +0200
Subject: [PATCH 81/93] [IMP] white background

bzr revid: fp@tinyerp.com-20120705132003-palqn02yh8gq6535
---
 addons/web/static/src/css/base.css  | 5 ++---
 addons/web/static/src/css/base.sass | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 443563a096b..416d92672c6 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1,4 +1,4 @@
-@charset "UTF-8";
+@charset "utf-8";
 @font-face {
   font-family: "mnmliconsRegular";
   src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@@ -34,7 +34,7 @@
   background: white;
   /* http://www.quirksmode.org/dom/inputfile.html
    * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
-   */
+   */ */
 }
 .openerp a {
   text-decoration: none;
@@ -2126,7 +2126,6 @@
 }
 .openerp .oe_list_content > tbody {
   cursor: pointer;
-  background: white;
 }
 .openerp .oe_list_content > tbody > tr {
   border-top: 1px solid #dddddd;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 61b7d267551..586bdd7eece 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1683,7 +1683,6 @@ $colour4: #8a89ba
             @include opacity(0.6)
         > tbody
             cursor: pointer
-            background: white
             > tr
                 border-top: 1px solid #ddd
                 > td.oe_list_field_cell

From ed6b131fea2db85fb2363dcaa5d20111aa3449de Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 5 Jul 2012 15:31:03 +0200
Subject: [PATCH 82/93] [IMP] user pref view

bzr revid: fp@tinyerp.com-20120705133103-o4yi8ztuyq90xsgx
---
 openerp/addons/base/res/res_users_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index 89b1416fc50..1d934b5d390 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -203,7 +203,7 @@
                             <field name="name" readonly="1" class="oe_edit_only oe_inline"/>
                             (<field name="login" readonly="1" class="oe_edit_only oe_inline"/>)
                         </h1>
-                        <label for="company_id" class="oe_edit_only"/>
+                        <label for="company_id" class="oe_edit_only" groups="base.group_multi_company"/>
                         <h2>
                             <field name="company_id" widget="selection" readonly="0"
                                 groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>

From edf61ae586625906a15c6708d4561cb6c51590e8 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 5 Jul 2012 15:41:53 +0200
Subject: [PATCH 83/93] [IMP] original width of minh mockup

bzr revid: fp@tinyerp.com-20120705134153-mxz87km72zos9idd
---
 addons/web/static/src/css/base.css  | 2 +-
 addons/web/static/src/css/base.sass | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 416d92672c6..ac767243e75 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1743,7 +1743,7 @@
 }
 .openerp .oe_application .oe_form_sheet_width {
   min-width: 650px;
-  max-width: 960px;
+  max-width: 860px;
   margin: 0 auto;
 }
 .openerp .oe_application .oe_form_sheet {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 586bdd7eece..cdb14123666 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1362,7 +1362,7 @@ $colour4: #8a89ba
             border-bottom: 1px solid #ddd 
         .oe_form_sheet_width
             min-width: 650px
-            max-width: 960px
+            max-width: 860px
             margin: 0 auto
         .oe_form_sheet
             background: white

From 855a858bdcd2eccbbf47ab93c6ac433c68c1f101 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 5 Jul 2012 15:44:03 +0200
Subject: [PATCH 84/93] [IMP] delete web livechat module

bzr revid: fp@tinyerp.com-20120705134403-w9g9cl01l2gu6g13
---
 addons/web_livechat/LICENSE                   |  15 ---
 addons/web_livechat/__init__.py               |  22 ---
 addons/web_livechat/__openerp__.py            |  50 -------
 addons/web_livechat/i18n/ar.po                |  34 -----
 addons/web_livechat/i18n/bg.po                |  34 -----
 addons/web_livechat/i18n/ca.po                |  35 -----
 addons/web_livechat/i18n/cs.po                |  28 ----
 addons/web_livechat/i18n/da.po                |  28 ----
 addons/web_livechat/i18n/de.po                |  34 -----
 addons/web_livechat/i18n/es.po                |  36 -----
 addons/web_livechat/i18n/es_CR.po             |  38 ------
 addons/web_livechat/i18n/es_MX.po             |  41 ------
 addons/web_livechat/i18n/es_VE.po             |  41 ------
 addons/web_livechat/i18n/fi.po                |  34 -----
 addons/web_livechat/i18n/fr.po                |  36 -----
 addons/web_livechat/i18n/gl.po                |  35 -----
 addons/web_livechat/i18n/hr.po                |  34 -----
 addons/web_livechat/i18n/it.po                |  35 -----
 addons/web_livechat/i18n/ja.po                |  28 ----
 addons/web_livechat/i18n/nl.po                |  35 -----
 addons/web_livechat/i18n/oc.po                |  36 -----
 addons/web_livechat/i18n/pt.po                |  36 -----
 addons/web_livechat/i18n/pt_BR.po             |  35 -----
 addons/web_livechat/i18n/ro.po                |  36 -----
 addons/web_livechat/i18n/ru.po                |  36 -----
 addons/web_livechat/i18n/sk.po                |  34 -----
 addons/web_livechat/i18n/sl.po                |  34 -----
 addons/web_livechat/i18n/sr@latin.po          |  34 -----
 addons/web_livechat/i18n/sv.po                |  28 ----
 addons/web_livechat/i18n/tr.po                |  34 -----
 addons/web_livechat/i18n/web_livechat.pot     |  46 -------
 addons/web_livechat/i18n/zh_CN.po             |  34 -----
 addons/web_livechat/publisher_warranty.py     |  48 -------
 addons/web_livechat/static/src/css/lc.css     |   7 -
 .../web_livechat/static/src/img/available.png | Bin 1153 -> 0 bytes
 addons/web_livechat/static/src/img/away.png   | Bin 1398 -> 0 bytes
 addons/web_livechat/static/src/img/busy.png   | Bin 1145 -> 0 bytes
 .../static/src/js/web_livechat.js             | 127 ------------------
 .../static/src/xml/web_livechat.xml           |  10 --
 39 files changed, 1288 deletions(-)
 delete mode 100644 addons/web_livechat/LICENSE
 delete mode 100644 addons/web_livechat/__init__.py
 delete mode 100644 addons/web_livechat/__openerp__.py
 delete mode 100644 addons/web_livechat/i18n/ar.po
 delete mode 100644 addons/web_livechat/i18n/bg.po
 delete mode 100644 addons/web_livechat/i18n/ca.po
 delete mode 100644 addons/web_livechat/i18n/cs.po
 delete mode 100644 addons/web_livechat/i18n/da.po
 delete mode 100644 addons/web_livechat/i18n/de.po
 delete mode 100644 addons/web_livechat/i18n/es.po
 delete mode 100644 addons/web_livechat/i18n/es_CR.po
 delete mode 100644 addons/web_livechat/i18n/es_MX.po
 delete mode 100644 addons/web_livechat/i18n/es_VE.po
 delete mode 100644 addons/web_livechat/i18n/fi.po
 delete mode 100644 addons/web_livechat/i18n/fr.po
 delete mode 100644 addons/web_livechat/i18n/gl.po
 delete mode 100644 addons/web_livechat/i18n/hr.po
 delete mode 100644 addons/web_livechat/i18n/it.po
 delete mode 100644 addons/web_livechat/i18n/ja.po
 delete mode 100644 addons/web_livechat/i18n/nl.po
 delete mode 100644 addons/web_livechat/i18n/oc.po
 delete mode 100644 addons/web_livechat/i18n/pt.po
 delete mode 100644 addons/web_livechat/i18n/pt_BR.po
 delete mode 100644 addons/web_livechat/i18n/ro.po
 delete mode 100644 addons/web_livechat/i18n/ru.po
 delete mode 100644 addons/web_livechat/i18n/sk.po
 delete mode 100644 addons/web_livechat/i18n/sl.po
 delete mode 100644 addons/web_livechat/i18n/sr@latin.po
 delete mode 100644 addons/web_livechat/i18n/sv.po
 delete mode 100644 addons/web_livechat/i18n/tr.po
 delete mode 100644 addons/web_livechat/i18n/web_livechat.pot
 delete mode 100644 addons/web_livechat/i18n/zh_CN.po
 delete mode 100644 addons/web_livechat/publisher_warranty.py
 delete mode 100644 addons/web_livechat/static/src/css/lc.css
 delete mode 100644 addons/web_livechat/static/src/img/available.png
 delete mode 100644 addons/web_livechat/static/src/img/away.png
 delete mode 100644 addons/web_livechat/static/src/img/busy.png
 delete mode 100644 addons/web_livechat/static/src/js/web_livechat.js
 delete mode 100644 addons/web_livechat/static/src/xml/web_livechat.xml

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 (<http://openerp.com>).
-
-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 <http://www.gnu.org/licenses/>.
diff --git a/addons/web_livechat/__init__.py b/addons/web_livechat/__init__.py
deleted file mode 100644
index 761db42923c..00000000000
--- a/addons/web_livechat/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010 OpenERP s.a. (<http://openerp.com>).
-#
-#    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 <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-import publisher_warranty
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
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. (<http://openerp.com>).
-#
-#    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 <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-{
-    '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 <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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 <EMAIL@ADDRESS>\n"
-"Language-Team: Arabic <ar@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-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 <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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 <dimitar.markov@gmail.com>\n"
-"Language-Team: Bulgarian <bg@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-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 <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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 <EMAIL@ADDRESS>\n"
-"Language-Team: Catalan <ca@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-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 <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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 <robie@centrum.cz>\n"
-"Language-Team: Czech <cs@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-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 <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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 <EMAIL@ADDRESS>\n"
-"Language-Team: Danish <da@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-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 <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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 <Unknown>\n"
-"Language-Team: German <de@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-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 <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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 <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-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 <EMAIL@ADDRESS>, 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) "
-"<carlos.vasquez@clearcorp.co.cr>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-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 <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-02-15 15:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-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 <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-02-15 15:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-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 <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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 <EMAIL@ADDRESS>\n"
-"Language-Team: Finnish <fi@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 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 <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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 <EMAIL@ADDRESS>\n"
-"Language-Team: French <fr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-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 <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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 <EMAIL@ADDRESS>\n"
-"Language-Team: Galician <gl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-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 <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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 <gkliska@gmail.com>\n"
-"Language-Team: Croatian <hr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-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 <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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 <EMAIL@ADDRESS>\n"
-"Language-Team: Italian <it@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-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 <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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 <Unknown>\n"
-"Language-Team: Japanese <ja@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-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/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 <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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) <Unknown>\n"
-"Language-Team: Dutch <nl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-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 <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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 <EMAIL@ADDRESS>\n"
-"Language-Team: Occitan (post 1500) <oc@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-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 <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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 <EMAIL@ADDRESS>\n"
-"Language-Team: Portuguese <pt@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-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 <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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 <Unknown>\n"
-"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-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 <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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 <EMAIL@ADDRESS>\n"
-"Language-Team: Romanian <ro@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-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 <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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 <EMAIL@ADDRESS>\n"
-"Language-Team: Russian <ru@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-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 <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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 <EMAIL@ADDRESS>\n"
-"Language-Team: Slovak <sk@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-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 <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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 <EMAIL@ADDRESS>\n"
-"Language-Team: Slovenian <sl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-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 <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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 <Unknown>\n"
-"Language-Team: Serbian Latin <sr@latin@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-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/sv.po b/addons/web_livechat/i18n/sv.po
deleted file mode 100644
index dd3ae799443..00000000000
--- a/addons/web_livechat/i18n/sv.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# Swedish 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 <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-06-04 15:38+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Swedish <sv@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-05 04:54+0000\n"
-"X-Generator: Launchpad (build 15353)\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."
-
-#. 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/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 <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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 <EMAIL@ADDRESS>\n"
-"Language-Team: Turkish <tr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-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 <EMAIL@ADDRESS>, 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 <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\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 <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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 <EMAIL@ADDRESS>\n"
-"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-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. (<http://openerp.com>).
-#
-#    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 <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-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 e9eea88ae5ff7702f51f8308efeb35962c675460..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1153
zcmV-{1b+L8P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2ign}
z3j{IKe+8%j00aR^L_t(o!|j(%Xk1kk$A9O(H<@H+l7`d?&CG}`wnoK>wM{0iSQMcP
zD?$-;(Y<XlRj~NAaiuFi3u#hX5M1c0hzeRns1#JFX^XWe+J&IDRg)%7+R0=xnRoAT
zk&c<kWNJQlJ#gTDy?g%m+;jf#TwwvSzi(TI_1qKSc8Z#HimnCfQN~ns#31LK@_8&j
z_0`)iozJldk(*8S_NRBM@;ahj3*2u4k%Qqv;hlpooEu*<fc<?BC9Ela2s~Oo-W&_l
z91Rg^s3YVFlLgB}zR2+SB-U#A(lJ2~3}jA!uxJ2#`?|Io!>2$JAmkhF+t9+sWD{$m
zb@Of#SjXj&NzVT^%FtMTc0ze~r1g%Mk3D_N)&k&{cX|fW-Kd@bA^`2TuVG7joN&kh
zV4a))6auMugj77j#o-*^{WL_r5P)!C?Ug^;Q1&3`eBXMd#=gVd>t)7xvj}wG8|Q(I
zEqDf0b-~&c39)`%jDN1?$xmAZIywgva_0D7C+7oTZn#RsxsQNWfUdjaY)mv_ty_}T
zhYXKBxQ@n1sN|y8dIq{4t_h%bpmR5{9bi+ckvrR>IOmq7Ay3%R5yvw!6Kl#_Xm!jP
z6j9_2fN-5h$NDC$vn!&p29LW^jU`*@On>^xDgc@O?#;kG0PV>b#>@oUN@;s4hVRcD
z+==d~0^p2$s+5n(c>S_nKUa-W5-s&5d%K=JvL!Mn4Rt#RO;MjZzjmrEM_QZf_;WZ9
z5b>;kKX7UmfJzb|TJK@)${PoWgv~5xD5<$b)CLgt&8nP!hD~SNPF-SNCRA12Dgi*X
zocu#`0sIYYnkoiZXII7k)U+!np3zDGqL)$Gl$&y^=7DRu*@Ib?3v)bRz6E_Gn|I_2
zmimyaIDpY?vDD0K$o^Qt1IEcGrOwb;amoB&OQ(yDE916w|0j;_Jv&(epg(i!2jCZg
zOCtf(#g!$Zq49vg-3UU*&(;3|K@s!nOkn}P4;NRIikl)3^8U+!7km3VpQ)+`&U|s{
zLg(Yj9S9q81@Mj15MEpzP)m&{jSa$BR#7k@ySMI2UOjXC@?b?tw(sz^q_|)ZB!NJx
z1>$RTNkQiv<O-Ez*-2sOT6r0zANxVjQxWo+L)~d7?(0%X)*Mw5EpFC@3y|x1xHM`g
z2LGQ;f^M!_)iaRZg6e0bqErmr7IQR59bvzQM-(QegwY9)?9_tOc;s;JU~BEN+$$bI
zd7^y0&R4>|!}kPZl)wssh5WSOv|_8Qs=gw|4A!!4ZIC<q+}U4m3O948bB7ao6G$)g
z1{B^m=z9a1(-)WhGOBu-scus=DM%X-1I>b5MfgUYo(wtjW#9APU+0$Gl10eB;X-v`
T=8lUv00000NkvXXu0mjfR4yER

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 f0a0847059f9104a5aa1b2a9302380200a87b469..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1398
zcmV-+1&R8JP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2ign}
z3kC-+^YXI*00j0)L_t(o!|j({XcSiz$A9<E?96U9o909FWl|b#tXTSi)cR17YKxx;
z#Xbl=s4smH`cz7Vv?XYQg%+fxP}&MD6nyZZEoh~P8e`vzg_csNjkZutqb8edlFjby
z?94rV$Zq1gF}u-M|8QZ3d*+<~J@?%Ixud887mq}qL#tg%)K(NNK$8MjU_wC>xMGAK
zX2RV0-MwU30@PxY14rHMXmtdU^;P<t1o<c%_@C_TW$J+mT<D9furMbDHUZd<OZ~D=
z>YF-<)ix4|#?e}n_dWb<nyK+&QlmGRnNAiwNKzDsw)FU?mQ3K{k=O>M&38bX9dT%V
z;u)G(tU+t5;%d^VJKVhf3+c&G08yx8mjds--d;>q1TOSNUexGIKrGSFO4r(r*b$ed
zVr+Pbe}}FB22p&rr6+f&B7woaSf>&5Gm6%x)|GU2uScmxON21Uqb++uyY%EJ*MA?x
zm;m6-&F|(uUC4(95J4HtNffPh4J~x6S_fhf6D~Tu%p@bX?qI^8Y%ZQ?<nh%n6yqEp
z=#M;qUjhUD&K_W+6>;e7UXO^un6Tmy6VkTfFk_PeVc?g|*EP1&)Vd15M)ZgGC7@9K
z04*JB(3XWrSmiKSPJ*uOUof5q6Z&N~%^j=Jb_C$n3rC|{$_Nxv^HjufsbAhv)yn6F
zgaFuX9bMbMWFoE0GNCPtrj{-MEG2u(2#B%v03;e(L8RiomyY?<WxI8B?KnXyV`Bop
z#ICNPxoGy<sZ*4kXIm-R2oSGrM9l1pj0y3xGZl|pE>~(}yLEJJ`<%aje1kgIo6`=*
zt-*Gp1ish2{F>7Z{-1N-0G+dH7sV6^c$p~@&%Q&v`RR%z+(diHdnDG#s-0hP{mcPs
zoh;g#CE>a;0^dW4>I6y%v;nilS0Et9;3nFM)pzkAu-!VI-2DyL&Kw{vQ)q2r+0LwQ
zQ6-G+;)9qFDF})bitC}F^sL{z6;Bblm%x8OcaZl`DmIsaO!8_~F>02r!HU$BDx{xg
z==6SKDhbNMn2;dM7k!W4OW-EZ?PoLCg)~JRm-HVWldcfl_cC;B{hCDEy3*ih4ic3+
zC^f&W#iBOW{QegdN?k_D=9%<3(RgBR!m{j&t1lK<5&7&m*UlUy$`~j;SJZ*;k<aG<
zQkL)kRjPzK{2m~iP9YL3K?Oq)b5HOCxN;ki61(ZCvDxhxb#`+vK?#A)J^5dOt3i-w
zYGQPWLKMygA3D7sCmbmgGZO}+Q?mp_ac<#mi1YwVCT|fe&{Xa(#fHF3F?4!Akzg1R
zDQ{R}h}P5=&)NrrN26V3_W=>qrGED^urV5o)70Dn748B6e$FGXn~A9uO6&XDi3rKt
zH^_MzfMGFa*OvG5zs+|;g=q9XV8qMLFflfQF+s%)Xl>z25<wPk+hV9+)`sIo0aj?O
ze;Vj>_AYuQi#Smlnp(;#y&7aQ)1;?TD3Q`kC<ue#uJp^k1uv!AGT(~OuC*p!`xvo!
zqT=-oAn*IkOsB}@vQ-h)B5N1)dak#oJz|F^fE@r@YaBO<<3_P<2W{zs%o@TlAfNN_
zeUH5F7uPnSgtr2l!Nmx?a@hN)!jDPxWsp7;FI6f26C!fL*4FV&J(-b*{xd4#{ITdt
z+sNx8YywsQtqS4-(+ZLTmlbk3=lW;2z0C}d@CZx5|9u66JX!ImeE<Le07*qoM6N<$
Ef@htW#{d8T

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 ddb24377f0f90a80a13dc53a1f03993359d96d19..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1145
zcmV-<1cv*GP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2ign}
z3kL#6f;W8t00a3+L_t(o!|j(%Y*bYg$A9O(H|<P^GD!JoOIl*%6cmIKTaYjkiP30?
ziNO#PcP`wJ=!T7nF%V-=BgRBb+^{y0g_;;ysL|SJLV+sQG_(`}BVTPg{eX6ucJ95$
zg;4uyE&X`z_$PPs-hJo(&d0syK4A{JkZatGn%!RYDG^o!RX{l~gpwEZG$LOmi%Y((
z?dT{l56NsV&*#=XEy|lf%N(tZC>++3`!L&n{>Fj<dbT&NF=9Re-3efl<s=)bNj20E
zuF4QpRv^aU3q{<>7{yEd+`4#`Qs3|$6M2Mv*`Ioj%^RTW(d;%O=5v%9lT1+A)X0*J
zYmp$ht2YzZ2N`ZZ%f$6T00n(}{fTpL2>3YxbZu|kiZ`tasq*UOROKGVlqHz2Mtd(a
z+|dJG5tWZOoIJblt^mKaY^?LxlM2=8`qeDk`~V`tLN%TrVc<j;>O3f~G@b7L=sy7z
zq@(%4HXxT=zLXW4vMgflNfr8s$ah@;uwG2d)>B<)rq2lh+PAFVgC`e+A(^^b+|43!
zs4STxxw4AUzI+J&J>bb1Bk*I>hHlVx_f@Z?vMNKIa?WwB_Yb`Dh?ggJbas6giNN<w
z8=9=@x*!ZmXDac|#|j__70Z?~JTMHRF8~n$;~aae7s@Lt@Xq0F{3Dr8VZC6zJa=sG
z-pGCqtx67{JXwyn@p?bGhzTJGvDU51ba!Wg?tcJ0bpW9lymgZwWxxDpQH%CI8?849
zLhOV?RO=!DPNnAWTxqNkm~P96!Kr{sZ8Qb9=UM9sOpMh(4ZwS_9#A4jYgqDfRUliM
zut*rh7y%bO8Lh{9L6N}-fKx65*<0g|a7t_Fd@L7hA&!kZtb$^?r=`HOf$kbASkiIk
zV5;{{DU=kD;rjZ_InGZ3@SZQcaA2tDs7X2Ge*nlAELK5OkMC-2wUOd{>C%}q)=SSV
z3;kmjZ+)!8TF>=@V!cqpd_5h`08BV}-Fo=5;3<{jJq59jv{9@F>-3!?Yd76LV>>>w
zrl}2)Tqb~Q(#O({CwBzUTNG|sLEwriyI;NX%de3O$@{e}b%JXLYN|q|zD#4S2dD7+
zxG?Gk;HJXM`>+1|X=IIetDCoq_*Nj55}_sx2p2$c!z+W<qoR@Ls)A+8Gtn3SW&Y6W
zN45c<0ksBLViKfHVouSRP|v6@QB*f4(7@<JGul14VoR+NISTU3ot~Z`K_CeN0?ch3
z1w0O`7K_C(xx<DO-LEG2VK#sReWxzY>e#^*&5wI{3)nHo>&Fo2QHy?XXrSZTqW_HU
z=(S8sgE9KN7}*KBMwMzH4SEwKuS%N{Z5vONjvwyp9OItuX&(9uDr{l-Hk<Nj00000
LNkvXXu0mjfQGpWg

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 (<http://openerp.com>).
-#
-#    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 <http://www.gnu.org/licenses/>.
-#
-############################################################################*/
-
-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: '<img src="/web_livechat/static/src/img/available.png"/>',
-                    offline: '<img src="/web_livechat/static/src/img/away.png"/>',
-                }
-            });
-        });
-    }
-});
-
-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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vim:fdl=1:
--->
-<templates id="template" xml:space="preserve">
-<t t-name="Systray.LiveChat">
-    <div class="oe_systray_livechat" title="Support">
-        <a href="#"><img src="/web_livechat/static/src/img/busy.png"/></a>
-    </div>
-</t>
-</templates>

From be58e60bb7944bc9d5763b8c25bc22252874772e Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 5 Jul 2012 17:00:10 +0200
Subject: [PATCH 85/93] [IMP] properties as m2m_tags

bzr revid: fp@tinyerp.com-20120705150010-79nnaos25o45wdcy
---
 addons/mrp/mrp_view.xml   | 5 ++---
 addons/sale/sale_view.xml | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

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 @@
                 </xpath>
                 <xpath expr="//field[@name='close_move']" position="after">
                     <group colspan="4"  groups="product.group_mrp_properties">
-                    <separator colspan="4" string="Properties" />
-                    <field colspan="4" name="property_ids" nolabel="1"/>
-                     </group>
+                        <field colspan="4" name="property_ids" widget="many2many_tags"/>
+                    </group>
                 </xpath>
                </data>
             </field>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index d5d6b5346eb..b840fd3b2d3 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -235,9 +235,8 @@
                                             <field name="delay"/>
                                             <field name="th_weight"/>
                                             <field name="address_allotment_id"/>
+                                            <field name="property_ids" widget="many2many_tags"/>
                                         </group>
-                                        <separator string="Properties" colspan="2"/>
-                                        <field name="property_ids" colspan="4" nolabel="1"/>
                                         <field name="notes" groups="base.group_sale_notes_subtotal" placeholder="Add a note on order line..."/>
                                         <div groups="base.group_no_one">
                                             <separator colspan="4" string="Invoice Lines"/>

From 8d4a1a9bd9ae804b00a943fe610e1cce5d1112e3 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 5 Jul 2012 17:02:15 +0200
Subject: [PATCH 86/93] [IMP] delivery message

bzr revid: fp@tinyerp.com-20120705150215-ew11xhtqx26g96pi
---
 addons/delivery/delivery_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 5e54f74f7f1..ca453f31632 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -263,7 +263,8 @@
                             <field name="carrier_id" context="{'order_id':active_id or False}" class="oe_inline"/>
                             <button name="delivery_set" states="draft" string="Add to Sale Order" type="object"/>
                         </div>
-                        <label string="If you do not 'Add to Sale Order', the delivery charges will be added based on the delivery order."/>
+                        <label string="If you do not 'Add to Sale Order', the delivery charges will be added based on the delivery order." colspan="2"
+                             attrs="{'invisible':[('carried_id','&lt;&gt;',False)]}"/>
                     </group>
                 </xpath>
             </field>

From 62b51553c2194fc08ce53327229f31db7ef0316b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 5 Jul 2012 17:03:43 +0200
Subject: [PATCH 87/93] [IMP] delivery message

bzr revid: fp@tinyerp.com-20120705150343-id4ehrhkwytxvv37
---
 addons/delivery/delivery_view.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index ca453f31632..7a17ff16ac1 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -261,9 +261,10 @@
                         <label for="carrier_id"/>
                         <div>
                             <field name="carrier_id" context="{'order_id':active_id or False}" class="oe_inline"/>
-                            <button name="delivery_set" states="draft" string="Add to Sale Order" type="object"/>
+                            <button name="delivery_set" states="draft" string="Add to Sale Order" type="object"
+                                attrs="{'invisible':[('carried_id','&lt;&gt;',False)]}"/>
                         </div>
-                        <label string="If you do not 'Add to Sale Order', the delivery charges will be added based on the delivery order." colspan="2"
+                        <label string="If you do not 'Add to Sale Order', the delivery charges will be added based on the delivery order(s)." colspan="2"
                              attrs="{'invisible':[('carried_id','&lt;&gt;',False)]}"/>
                     </group>
                 </xpath>

From 83079a7f1e44ca4287734ffacc3ad15044f08900 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 5 Jul 2012 17:09:47 +0200
Subject: [PATCH 88/93] [IMP] delvery form view

bzr revid: fp@tinyerp.com-20120705150947-ointtx2og2a4m3kg
---
 addons/delivery/delivery_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 7a17ff16ac1..f7053f1da1d 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -257,15 +257,15 @@
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//group[@name='sale_total']" position="after">
-                    <group>
+                    <group width="50%%">
                         <label for="carrier_id"/>
                         <div>
                             <field name="carrier_id" context="{'order_id':active_id or False}" class="oe_inline"/>
-                            <button name="delivery_set" states="draft" string="Add to Sale Order" type="object"
-                                attrs="{'invisible':[('carried_id','&lt;&gt;',False)]}"/>
+                            <button name="delivery_set" states="draft" string="Charge in Sale Order" type="object"
+                                attrs="{'invisible':[('carrier_id','=',False)]}"/>
                         </div>
                         <label string="If you do not 'Add to Sale Order', the delivery charges will be added based on the delivery order(s)." colspan="2"
-                             attrs="{'invisible':[('carried_id','&lt;&gt;',False)]}"/>
+                             attrs="{'invisible':[('carrier_id','=',False)]}"/>
                     </group>
                 </xpath>
             </field>

From d456ebd717202add6a9d2438f9160188300b1780 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Thu, 5 Jul 2012 17:17:40 +0200
Subject: [PATCH 89/93] Fixed the height of systray

bzr revid: mit@openerp.com-20120705151740-bfvq6wvh316d352c
---
 addons/web_shortcuts/static/src/css/web_shortcuts.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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;

From e389d1a22b6201d4d7936849075210583934fc5c Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 5 Jul 2012 17:49:41 +0200
Subject: [PATCH 90/93] [IMP] hr_application: review form view

bzr revid: qdp-launchpad@openerp.com-20120705154941-0hw1twcifybz7r21
---
 addons/hr_recruitment/hr_recruitment.py       |  4 +-
 addons/hr_recruitment/hr_recruitment_view.xml | 79 +++++++++----------
 2 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 0fc5bc3b94b..26eeca1aedc 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -200,7 +200,7 @@ class hr_applicant(base_stage, osv.Model):
                       If the case needs to be reviewed then the state is \
                       set to \'Pending\'.'),
         'company_id': fields.many2one('res.company', 'Company'),
-        'user_id': fields.many2one('res.users', 'HR Manager'),
+        'user_id': fields.many2one('res.users', 'Responsible'),
         # Applicant Columns
         'date_closed': fields.datetime('Closed', readonly=True, select=True),
         'date_open': fields.datetime('Opened', readonly=True, select=True),
@@ -213,7 +213,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),
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index c8230787cfe..7c2b5260364 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -145,66 +145,65 @@
                     <button name="action_print_survey" type="object"
                         string="Print Interview" icon="gtk-print" help="Print interview report"
                         attrs="{'invisible':[('survey','=',False)]}"/>
-                </div>             
+                </div>
                 <div class="oe_title">
                     <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
                     <label for="partner_name" class="oe_edit_only"/>
                     <h2>
                         <field name="partner_name" class="oe_inline"/>
-                        <label class="oe_inline" string="(" attrs="{'invisible': [('type_id', '=', False)]}"/>
-                        <field name="type_id" placeholder="Degree" class="oe_inline"/>
-                        <label class="oe_inline" string=")" attrs="{'invisible': [('type_id', '=', False)]}"/>
-                        <label class="oe_inline" string="apply for " attrs="{'invisible': [('job_id', '=', False)]}"/>
-                        <field name="job_id" on_change="onchange_job(job_id)" class="oe_inline"/>
                     </h2>
                 </div>
                 <group>
-                    <group>
-                        <field name="user_id"/>
+                    <group string="Application Followup">
+                        <field name="priority" string="Appreciation"/>
+                        <field name="user_id" string="responsible"/>
                         <label for="title_action"/>
                         <div>
                             <field name="date_action"/> -
                             <field name="title_action" class="oe_inline" placeholder="Call for proposal"/>
                         </div>
+                        <field name="state" invisible="1"/>
                     </group>
-                    <group>
-                        <field name="priority" string="Appreciation"/>
+                    <group string="Job">
                         <field name="survey" invisible="1"/>
                         <field name="response" invisible="1"/>
+                        <field name="job_id" on_change="onchange_job(job_id)" class="oe_inline"/>
                         <field name="department_id" on_change="onchange_department_id(department_id)"/>
-                        <field name="state" groups="base.group_no_one"/>
+                        <label for="availability"/>
+                        <div>
+                            <field name="availability" class="oe_inline"/> <label string="Day(s)" class="oe_inline"/>
+                        </div>
                     </group>
                 </group>
-                <notebook>
-                    <page string="Application">
-                        <group>
-                            <group string="Contact">
-                                <label for="partner_id"/>
-                                <div>
-                                    <field name="partner_id" class="oe_inline"
-                                        on_change="onchange_partner_id(partner_id, email_from)"/>
-                                </div>
-                                <field name="email_from" widget="email"/>
-                                <field name="partner_phone"/>
-                                <field name="partner_mobile"/>
-                            </group>
-                            <group string="Reference">
-                                <field name="source_id"/>
-                                <field name="reference"/>
-                            </group>
-                            <group string="Contract">
-                                <field name="salary_expected"/>
-                                <field name="salary_expected_extra"/>
-                                <field name="salary_proposed"/>
-                                <field name="salary_proposed_extra"/>
-                                <field name="availability"/>
-                            </group>
-                        </group>
-                        <separator string="Details"/>
-                        <field name="description"/>
-                   </page>
-                </notebook>
+                <group>
+                    <group string="Contact Details">
+                        <field name="partner_id"
+                                on_change="onchange_partner_id(partner_id, email_from)"/>
+                        <field name="type_id" placeholder="Degree" class="oe_inline"/>
+                        <field name="email_from" widget="email"/>
+                        <field name="partner_phone"/>
+                        <field name="partner_mobile"/>
+                    </group>
+                    <group string="Reference">
+                        <field name="source_id"/>
+                        <field name="reference"/>
+                    </group>
+                    <group string="Contract">
+                        <label for="salary_expected"/>
+                        <div>
+                            <field name="salary_expected" class="oe_inline"/>, 
+                            <field name="salary_expected_extra" class="oe_inline" placeholder="Extra advantages..."/>
+                        </div>
+                        <label for="salary_proposed"/>
+                        <div>
+                            <field name="salary_proposed" class="oe_inline"/>, 
+                            <field name="salary_proposed_extra" class="oe_inline" placeholder="Extra advantages..."/>
+                        </div>
+                    </group>
+                </group>
+                <separator string="Application Summary"/>
+                <field name="description" placeholder="Feedback of interviews..."/>
             </sheet>
             <footer>
                 <field name="message_ids" widget="mail_thread"/>

From a3a9594ae59e92adab841ff4dc53ea18edacea51 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 5 Jul 2012 18:11:18 +0200
Subject: [PATCH 91/93] [IMP] hr_application: review form view (again)

bzr revid: qdp-launchpad@openerp.com-20120705161118-dt8xrnn6tzfcob1c
---
 addons/hr_recruitment/hr_recruitment_view.xml | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 7c2b5260364..285ab13f8d2 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -155,40 +155,34 @@
                     </h2>
                 </div>
                 <group>
+                    <group string="Contact Details">
+                        <field name="partner_id"
+                                on_change="onchange_partner_id(partner_id, email_from)"/>
+                        <field name="email_from" widget="email"/>
+                        <field name="partner_phone"/>
+                        <field name="partner_mobile"/>
+                        <field name="type_id" placeholder="Degree"/>
+                    </group>
                     <group string="Application Followup">
-                        <field name="priority" string="Appreciation"/>
-                        <field name="user_id" string="responsible"/>
+                        <field name="user_id"/>
                         <label for="title_action"/>
                         <div>
                             <field name="date_action"/> -
                             <field name="title_action" class="oe_inline" placeholder="Call for proposal"/>
                         </div>
+                        <field name="priority"/>
                         <field name="state" invisible="1"/>
                     </group>
                     <group string="Job">
                         <field name="survey" invisible="1"/>
                         <field name="response" invisible="1"/>
-                        <field name="job_id" on_change="onchange_job(job_id)" class="oe_inline"/>
+                        <field name="job_id" on_change="onchange_job(job_id)"/>
                         <field name="department_id" on_change="onchange_department_id(department_id)"/>
                         <label for="availability"/>
                         <div>
                             <field name="availability" class="oe_inline"/> <label string="Day(s)" class="oe_inline"/>
                         </div>
                     </group>
-                </group>
-                <group>
-                    <group string="Contact Details">
-                        <field name="partner_id"
-                                on_change="onchange_partner_id(partner_id, email_from)"/>
-                        <field name="type_id" placeholder="Degree" class="oe_inline"/>
-                        <field name="email_from" widget="email"/>
-                        <field name="partner_phone"/>
-                        <field name="partner_mobile"/>
-                    </group>
-                    <group string="Reference">
-                        <field name="source_id"/>
-                        <field name="reference"/>
-                    </group>
                     <group string="Contract">
                         <label for="salary_expected"/>
                         <div>
@@ -201,6 +195,10 @@
                             <field name="salary_proposed_extra" class="oe_inline" placeholder="Extra advantages..."/>
                         </div>
                     </group>
+                    <group string="Reference">
+                        <field name="source_id"/>
+                        <field name="reference"/>
+                    </group>
                 </group>
                 <separator string="Application Summary"/>
                 <field name="description" placeholder="Feedback of interviews..."/>

From f73f55c2832b59d15e07836c0eceb7d01d00658a Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 6 Jul 2012 04:58:05 +0000
Subject: [PATCH 92/93] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120706045805-mezbu748lg7p8gye
---
 openerp/addons/base/i18n/ja.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index 85df3886a60..0d47ef31298 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/addons/base/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:44+0000\n"
-"PO-Revision-Date: 2012-06-09 01:13+0000\n"
+"PO-Revision-Date: 2012-07-06 04:01+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-05 04:43+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: base
 #: model:res.country,name:base.sh
@@ -10257,7 +10257,7 @@ msgstr ""
 "\n"
 "受注予測の解決のために製品の\"受注履歴\"を使うことができます。\n"
 "あなたはこのテーブルの先頭と左のパラメータを入力しなければなりません。そして、システムはそれらのパラメータにより販売数量を計算します。\n"
-"そして、所定の販売チームや期間のための結果を得ることができます。\n"
+"そして、所定の営業チームや期間のための結果を得ることができます。\n"
 "\n"
 "MPSまたは調達計画\n"
 "---------------------------\n"

From 5babd88330af133b3bc893ed6e30b42eb2b7fa03 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 6 Jul 2012 05:07:51 +0000
Subject: [PATCH 93/93] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120706045835-psdlu6pet8cabwna
bzr revid: launchpad_translations_on_behalf_of_openerp-20120706050751-xzq60elhr5ajn5i6
---
 addons/account/i18n/ja.po            |  10 +-
 addons/crm/i18n/ja.po                |  20 +-
 addons/crm_claim/i18n/ja.po          |  10 +-
 addons/crm_fundraising/i18n/ja.po    |  12 +-
 addons/crm_helpdesk/i18n/ja.po       |  14 +-
 addons/crm_partner_assign/i18n/ja.po |   8 +-
 addons/crm_profiling/i18n/ja.po      |  10 +-
 addons/edi/i18n/ar.po                |  26 +-
 addons/project/i18n/hr.po            |  18 +-
 addons/stock_planning/i18n/ja.po     |   4 +-
 addons/survey/i18n/ja.po             | 358 ++++++++++++++-------------
 addons/web_process/i18n/nl.po        |  10 +-
 12 files changed, 251 insertions(+), 249 deletions(-)

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 <EMAIL@ADDRESS>\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) <Unknown>\n"
+"PO-Revision-Date: 2012-07-06 02:41+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-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/crm/i18n/ja.po b/addons/crm/i18n/ja.po
index f0761c35843..3454896c55a 100644
--- a/addons/crm/i18n/ja.po
+++ b/addons/crm/i18n/ja.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-06-11 07:49+0000\n"
-"Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\n"
+"PO-Revision-Date: 2012-07-06 04:15+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-12 04:55+0000\n"
-"X-Generator: Launchpad (build 15389)\n"
+"X-Launchpad-Export-Date: 2012-07-06 04:58+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Leads"
-msgstr "# リード"
+msgstr "リード番号"
 
 #. module: crm
 #: view:crm.lead:0 selection:crm.lead,type:0 view:crm.lead.report:0
@@ -36,12 +36,12 @@ msgstr "必要なサービス"
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Monthly"
-msgstr "毎月"
+msgstr "月次"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_stage
 msgid "Stage of case"
-msgstr "お問い合わせ対応状況"
+msgstr "案件のステージ"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -82,7 +82,7 @@ msgstr " "
 #. module: crm
 #: view:crm.lead.report:0 field:crm.phonecall.report,delay_close:0
 msgid "Delay to close"
-msgstr ""
+msgstr "閉鎖の遅延"
 
 #. module: crm
 #: view:crm.lead:0
@@ -114,13 +114,13 @@ msgstr "日"
 #. module: crm
 #: sql_constraint:crm.case.section:0
 msgid "The code of the sales team must be unique !"
-msgstr ""
+msgstr "営業チームのコードは固有である必要があります。"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:553
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
-msgstr ""
+msgstr "リード %s はオポチュニティに変換されました。"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:294
diff --git a/addons/crm_claim/i18n/ja.po b/addons/crm_claim/i18n/ja.po
index f76197d8d79..0d6587f3b09 100644
--- a/addons/crm_claim/i18n/ja.po
+++ b/addons/crm_claim/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-06-09 18:59+0000\n"
+"PO-Revision-Date: 2012-07-06 04:04+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-10 04:37+0000\n"
-"X-Generator: Launchpad (build 15376)\n"
+"X-Launchpad-Export-Date: 2012-07-06 04:58+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -249,7 +249,7 @@ msgstr "次のアクション"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "My Sales Team(s)"
-msgstr "私の販売チーム"
+msgstr "私の営業チーム"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim3
@@ -670,7 +670,7 @@ msgstr "クレームを検索する"
 #: field:crm.claim,section_id:0
 #: view:crm.claim.report:0
 msgid "Sales Team"
-msgstr "販売チーム"
+msgstr "営業チーム"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
diff --git a/addons/crm_fundraising/i18n/ja.po b/addons/crm_fundraising/i18n/ja.po
index e094f9ed8d0..0fbac12e0f4 100644
--- a/addons/crm_fundraising/i18n/ja.po
+++ b/addons/crm_fundraising/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-06-09 19:04+0000\n"
+"PO-Revision-Date: 2012-07-06 04:05+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-10 04:37+0000\n"
-"X-Generator: Launchpad (build 15376)\n"
+"X-Launchpad-Export-Date: 2012-07-06 04:58+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,planned_revenue:0
@@ -236,7 +236,7 @@ msgstr "最低"
 #: view:crm.fundraising:0
 #: view:crm.fundraising.report:0
 msgid "My Sales Team(s)"
-msgstr "私の販売チーム"
+msgstr "私の営業チーム"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,create_date:0
@@ -626,7 +626,7 @@ msgstr "責任者"
 msgid ""
 "Sales team to which Case belongs to. Define Responsible user and Email "
 "account for mail gateway."
-msgstr "案件が割当てられた販売チーム。担当ユーザとEメール・アカウントを指定します。"
+msgstr "案件が割当てられた営業チーム。担当ユーザとEメール・アカウントを指定します。"
 
 #. module: crm_fundraising
 #: model:ir.model,name:crm_fundraising.model_crm_fundraising_report
@@ -763,7 +763,7 @@ msgstr "高い"
 #: field:crm.fundraising,section_id:0
 #: view:crm.fundraising.report:0
 msgid "Sales Team"
-msgstr "販売チーム"
+msgstr "営業チーム"
 
 #. module: crm_fundraising
 #: field:crm.fundraising.report,create_date:0
diff --git a/addons/crm_helpdesk/i18n/ja.po b/addons/crm_helpdesk/i18n/ja.po
index 3228f329919..156399a8159 100644
--- a/addons/crm_helpdesk/i18n/ja.po
+++ b/addons/crm_helpdesk/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-28 19:12+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
+"PO-Revision-Date: 2012-07-06 04:05+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-29 04:46+0000\n"
-"X-Generator: Launchpad (build 15316)\n"
+"X-Launchpad-Export-Date: 2012-07-06 04:58+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -207,7 +207,7 @@ msgstr "Eメールの数"
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
 msgid "My Sales Team(s)"
-msgstr "私の販売チーム"
+msgstr "私の営業チーム"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,create_date:0
@@ -533,7 +533,7 @@ msgstr "催促を送る"
 msgid ""
 "Sales team to which Case belongs to.                                 Define "
 "Responsible user and Email account for mail gateway."
-msgstr "事象を割り当てる販売チーム。メールゲートウェイにと担当ユーザとEメールアカウントを作って下さい。"
+msgstr "事象を割り当てる営業チーム。メールゲートウェイにと担当ユーザとEメールアカウントを作って下さい。"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -708,7 +708,7 @@ msgstr "高い"
 #: field:crm.helpdesk,section_id:0
 #: view:crm.helpdesk.report:0
 msgid "Sales Team"
-msgstr "販売チーム"
+msgstr "営業チーム"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,date_action_last:0
diff --git a/addons/crm_partner_assign/i18n/ja.po b/addons/crm_partner_assign/i18n/ja.po
index 043ade7d9cc..b3c1547c154 100644
--- a/addons/crm_partner_assign/i18n/ja.po
+++ b/addons/crm_partner_assign/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-25 04:47+0000\n"
+"PO-Revision-Date: 2012-07-06 04:06+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-06 04:58+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -858,7 +858,7 @@ msgstr "高"
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
-msgstr "販売チーム"
+msgstr "営業チーム"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
diff --git a/addons/crm_profiling/i18n/ja.po b/addons/crm_profiling/i18n/ja.po
index bb07a87bb23..2f8aa5ef26c 100644
--- a/addons/crm_profiling/i18n/ja.po
+++ b/addons/crm_profiling/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:04+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-07-06 04:06+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-07-06 04:58+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -30,7 +30,7 @@ msgid ""
 "segmentation tool allows you to automatically assign a partner to a category "
 "according to his answers to the different questionnaires."
 msgstr ""
-"特定のトピックに関連した質問票を作成して、それを使って販売チームが適切な質問をするように指導できます。区分ツールを使って、質問に対する回答に応じて、パート"
+"特定のトピックに関連した質問票を作成して、それを使って営業チームが適切な質問をするように指導できます。区分ツールを使って、質問に対する回答に応じて、パート"
 "ナを自動的に区分することができます。"
 
 #. module: crm_profiling
diff --git a/addons/edi/i18n/ar.po b/addons/edi/i18n/ar.po
index 486cbbc8533..4a1208670d7 100644
--- a/addons/edi/i18n/ar.po
+++ b/addons/edi/i18n/ar.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-04-06 00:12+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-07-06 02:21+0000\n"
+"Last-Translator: Ahmad Khayyat <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15060)\n"
+"X-Launchpad-Export-Date: 2012-07-06 04:58+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: edi
 #: sql_constraint:res.currency:0
 msgid "The currency code must be unique per company!"
-msgstr ""
+msgstr "يجب  أن يكون رمز العملة فريداً للشركة!"
 
 #. module: edi
 #: model:ir.model,name:edi.model_res_partner_address
@@ -30,12 +30,12 @@ msgstr "عناوين الشريك"
 #. module: edi
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr "اسم الشركة يجب أن يكون فريداً !"
+msgstr "يجب أن يكون اسم الشركة فريداً !"
 
 #. module: edi
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "خطأ ! لا يمكنك إنشاء أعضاء مرتبطين و متداخلين."
 
 #. module: edi
 #: field:edi.document,name:0
@@ -111,12 +111,12 @@ msgstr "مستند"
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:23
 msgid "View/Print"
-msgstr ""
+msgstr "عرض/طباعة"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:28
 msgid "Import this document"
-msgstr ""
+msgstr "إستيراد هذه الوثيقة"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:33
@@ -126,7 +126,7 @@ msgstr ""
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:36
 msgid "OpenERP instance address:"
-msgstr "عنوان مثال أوبنيرب:"
+msgstr "عنوان نسخة أوبن إي آر بي:"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:39
@@ -177,7 +177,7 @@ msgstr ""
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:60
 msgid "OpenERP documentation"
-msgstr "وثائق أوبنيرب"
+msgstr "توثيق أوبن إي آر بي"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:61
@@ -202,12 +202,12 @@ msgstr "تحميل"
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87
 msgid "Powered by"
-msgstr "مدعوم من kifcaliph و"
+msgstr "يتم تشغيل هذا التطبيق بواسطة"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87
 msgid "OpenERP"
-msgstr "أوبنيرب"
+msgstr "أوبن إي آر بي"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:34
diff --git a/addons/project/i18n/hr.po b/addons/project/i18n/hr.po
index ea508ead52c..83182e409ef 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) <Unknown>\n"
+"PO-Revision-Date: 2012-07-05 11:02+0000\n"
+"Last-Translator: Marko Carevic <Unknown>\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-06 04:58+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
@@ -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/stock_planning/i18n/ja.po b/addons/stock_planning/i18n/ja.po
index a9c9426d479..4e21f56fa79 100644
--- a/addons/stock_planning/i18n/ja.po
+++ b/addons/stock_planning/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-05 04:49+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
diff --git a/addons/survey/i18n/ja.po b/addons/survey/i18n/ja.po
index b92f178c95a..b3670aba55e 100644
--- a/addons/survey/i18n/ja.po
+++ b/addons/survey/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-07-05 03:55+0000\n"
+"PO-Revision-Date: 2012-07-06 03:16+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-05 04:49+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: survey
 #: view:survey.print:0
@@ -30,7 +30,7 @@ msgid ""
 "Minimum Required Answer you                                     entered is "
 "greater than the number of answer.                                      "
 "Please use a number that is smaller than %d."
-msgstr "あなたが入力した最低必要な回答数が回答の数よりも多くなっています。%d より小さい数を使って下さい。"
+msgstr "あなたが入力した最小必要回答数が回答の数よりも多くなっています。%d より小さい数を使って下さい。"
 
 #. module: survey
 #: view:survey.question.wiz:0
@@ -50,7 +50,7 @@ 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 より小さい数を使って下さい。"
+msgstr "あなたが入力した最大必要回答数が回答の数よりも多くなっています。%d より小さい数を使って下さい。"
 
 #. module: survey
 #: view:survey:0
@@ -142,7 +142,7 @@ msgstr "コメント項目の許可"
 #: selection:survey.print,paper_size:0
 #: selection:survey.print.answer,paper_size:0
 msgid "A4 (210mm x 297mm)"
-msgstr ""
+msgstr "A4（210mm x 297mm）"
 
 #. module: survey
 #: field:survey.question,comment_maximum_date:0
@@ -163,7 +163,7 @@ msgstr "完了"
 #. module: survey
 #: selection:survey.question,required_type:0
 msgid "Exactly"
-msgstr ""
+msgstr "一致"
 
 #. module: survey
 #: view:survey:0
@@ -212,7 +212,7 @@ msgstr "調査の質問"
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Matrix of Choices (Only One Answers Per Row)"
-msgstr "選択肢（1行に付き1回答）"
+msgstr "選択の行列（1行に付き1回答）"
 
 #. module: survey
 #: code:addons/survey/survey.py:470
@@ -240,7 +240,7 @@ msgstr "質問タイプが評価尺度の場合に使用"
 #: field:survey.print,page_number:0
 #: field:survey.print.answer,page_number:0
 msgid "Include Page Number"
-msgstr ""
+msgstr "ページ番号を含む"
 
 #. module: survey
 #: view:survey.page:0
@@ -305,7 +305,7 @@ msgstr "終了した調査の合計"
 #. module: survey
 #: view:survey.response.answer:0
 msgid "(Use Only Question Type is matrix_of_drop_down_menus)"
-msgstr "（質問タイプがドロップダウンメニューのマトリックスの時のみ使用）"
+msgstr "（質問タイプがドロップダウンメニューの行列の時のみ使用）"
 
 #. module: survey
 #: model:ir.actions.report.xml,name:survey.survey_analysis
@@ -391,7 +391,7 @@ msgstr "既存ユーザに注意喚起を送信"
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Multiple Choice (Multiple Answer)"
-msgstr "複数選択（複数回答）"
+msgstr "複数の選択肢（複数回答）"
 
 #. module: survey
 #: view:survey:0
@@ -411,7 +411,7 @@ msgstr "メニュー選択"
 #. module: survey
 #: selection:survey.question,required_type:0
 msgid "At Most"
-msgstr ""
+msgstr "最大"
 
 #. module: survey
 #: view:survey:0
@@ -431,7 +431,7 @@ msgstr "キャンセル"
 #. module: survey
 #: field:survey.response.line,single_text:0
 msgid "Text"
-msgstr ""
+msgstr "テキスト"
 
 #. module: survey
 #: constraint:res.users:0
@@ -442,7 +442,7 @@ msgstr "選択した会社は、このユーザに許された会社ではあり
 #: selection:survey.print,paper_size:0
 #: selection:survey.print.answer,paper_size:0
 msgid "Letter (8.5\" x 11\")"
-msgstr ""
+msgstr "レター（8.5\" x 11\"）"
 
 #. module: survey
 #: view:survey:0
@@ -492,7 +492,7 @@ msgstr "コメントテキストを検証しない"
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Must Be A Whole Number"
-msgstr "整数にすべきです"
+msgstr "整数が必須"
 
 #. module: survey
 #: field:survey.answer,question_id:0
@@ -530,6 +530,8 @@ msgid ""
 "etc. You can edit survey manually or click on the 'Edit Survey' for a "
 "WYSIWYG interface."
 msgstr ""
+"異なる目的の調査を作成することができます：採用面接、従業員の期間毎の評価、マーケティングキャンペーンなど。調査は複数のタイプの質問を含むページで作成されま"
+"す：テキスト、複数選択など。調査はWYSIWYGインタフェースで手動または調査の編集をクリックすることで編集可能です。"
 
 #. module: survey
 #: view:survey:0
@@ -548,7 +550,7 @@ msgstr "計画段階の評価"
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Between"
-msgstr ""
+msgstr "間"
 
 #. module: survey
 #: view:survey.print:0
@@ -635,7 +637,7 @@ msgstr "調査タイプ"
 #. module: survey
 #: field:survey.page,sequence:0
 msgid "Page Nr"
-msgstr ""
+msgstr "ページ番号"
 
 #. module: survey
 #: view:survey:0
@@ -644,12 +646,12 @@ msgstr ""
 #: field:survey.question,descriptive_text:0
 #: selection:survey.question,type:0
 msgid "Descriptive Text"
-msgstr ""
+msgstr "説明文"
 
 #. module: survey
 #: field:survey.question,minimum_req_ans:0
 msgid "Minimum Required Answer"
-msgstr ""
+msgstr "最小必要回答数"
 
 #. module: survey
 #: code:addons/survey/survey.py:479
@@ -662,7 +664,7 @@ msgstr "列見出しに1つ以上のメニュー選択の入力が必要です
 #. module: survey
 #: field:survey.question,req_error_msg:0
 msgid "Error Message"
-msgstr ""
+msgstr "エラーメッセージ"
 
 #. module: survey
 #: code:addons/survey/survey.py:477
@@ -673,13 +675,13 @@ msgstr "列見出しに1つ以上のメニュー選択の入力が必要です
 #. module: survey
 #: field:survey.request,date_deadline:0
 msgid "Deadline date"
-msgstr ""
+msgstr "締切日"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Must Be A Date"
-msgstr ""
+msgstr "日付が必須"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_print
@@ -695,13 +697,13 @@ msgstr "列見出し"
 #. module: survey
 #: field:survey.question,is_require_answer:0
 msgid "Require Answer to Question"
-msgstr ""
+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 ""
+msgstr "調査要求"
 
 #. module: survey
 #: code:addons/survey/survey.py:370
@@ -715,7 +717,7 @@ msgstr "1つ以上の列見出しの入力が必要です。"
 #: code:addons/survey/wizard/survey_answer.py:940
 #, python-format
 msgid "Please enter an integer value"
-msgstr ""
+msgstr "整数値を入力して下さい。"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_browse_answer
@@ -725,7 +727,7 @@ msgstr ""
 #. module: survey
 #: selection:survey.question,comment_field_type:0
 msgid "Paragraph of Text"
-msgstr ""
+msgstr "テキストの段落"
 
 #. module: survey
 #: code:addons/survey/survey.py:423
@@ -734,37 +736,37 @@ 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 ""
+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 ""
+msgstr "質問に回答されない場合に、このエラーメッセージを表示します。"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Options"
-msgstr ""
+msgstr "オプション"
 
 #. module: survey
 #: view:survey.send.invitation.log:0
 msgid "_Ok"
-msgstr ""
+msgstr "OK"
 
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_browse_survey_response
 msgid "Browse Answers"
-msgstr ""
+msgstr "回答のブラウズ"
 
 #. module: survey
 #: field:survey.response.answer,comment_field:0
 #: view:survey.response.line:0
 msgid "Comment"
-msgstr ""
+msgstr "コメント"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_answer
@@ -774,70 +776,70 @@ msgstr ""
 #: view:survey.response.answer:0
 #: view:survey.response.line:0
 msgid "Survey Answer"
-msgstr ""
+msgstr "調査の回答"
 
 #. module: survey
 #: selection:survey.answer,type:0
 msgid "Selection"
-msgstr ""
+msgstr "選択"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_browse_survey_response
 #: view:survey:0
 msgid "Answer Survey"
-msgstr ""
+msgstr "調査の回答"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Comment Field"
-msgstr ""
+msgstr "コメント項目"
 
 #. module: survey
 #: selection:survey.response,response_type:0
 msgid "Manually"
-msgstr ""
+msgstr "手動"
 
 #. module: survey
 #: view:survey.send.invitation:0
 msgid "_Send"
-msgstr ""
+msgstr "送信"
 
 #. module: survey
 #: help:survey,responsible_id:0
 msgid "User responsible for survey"
-msgstr ""
+msgstr "調査を担当するユーザ"
 
 #. module: survey
 #: field:survey,page_ids:0
 #: view:survey.question:0
 #: field:survey.response.line,page_id:0
 msgid "Page"
-msgstr ""
+msgstr "ページ"
 
 #. module: survey
 #: field:survey.question,comment_column:0
 msgid "Add comment column in matrix"
-msgstr ""
+msgstr "行列でコメント列に追加"
 
 #. module: survey
 #: field:survey.answer,response:0
 msgid "#Answer"
-msgstr ""
+msgstr "回答番号"
 
 #. module: survey
 #: field:survey.print,without_pagebreak:0
 #: field:survey.print.answer,without_pagebreak:0
 msgid "Print Without Page Breaks"
-msgstr ""
+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 ""
+msgstr "コメントが無効なフォーマットの場合、このエラーメッセージを表示します。"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_selection.py:83
@@ -845,85 +847,85 @@ msgstr ""
 msgid ""
 "You can not give more response. Please contact the author of this survey for "
 "further assistance."
-msgstr ""
+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 ""
+msgstr "質問"
 
 #. module: survey
 #: help:survey,response_user:0
 msgid "Set to one if  you require only one Answer per user"
-msgstr ""
+msgstr "1ユーザにつき1回答のみとする場合は、1を設定します。"
 
 #. module: survey
 #: field:survey,users:0
 msgid "Users"
-msgstr ""
+msgstr "ユーザ"
 
 #. module: survey
 #: view:survey.send.invitation:0
 msgid "Message"
-msgstr ""
+msgstr "メッセージ"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.request:0
 msgid "MY"
-msgstr ""
+msgstr "私の"
 
 #. module: survey
 #: field:survey.question,maximum_req_ans:0
 msgid "Maximum Required Answer"
-msgstr ""
+msgstr "最大必要回答数"
 
 #. module: survey
 #: field:survey.name.wiz,page_no:0
 msgid "Page Number"
-msgstr ""
+msgstr "ページ番号"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:87
 #, python-format
 msgid "Cannot locate survey for the question wizard!"
-msgstr ""
+msgstr "質問ウィザードのための調査を見つけることができません。"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "and"
-msgstr ""
+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 ""
+msgstr "調査印刷統計値"
 
 #. module: survey
 #: field:survey.send.invitation.log,note:0
 msgid "Log"
-msgstr ""
+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 ""
+msgstr "選択肢を正しく追加していない場合、このエラーメッセージが表示されます。"
 
 #. module: survey
 #: field:survey,date_close:0
 msgid "Survey Close Date"
-msgstr ""
+msgstr "調査閉鎖日"
 
 #. module: survey
 #: field:survey,date_open:0
 msgid "Survey Open Date"
-msgstr ""
+msgstr "調査開設日"
 
 #. module: survey
 #: field:survey.question.column.heading,in_visible_rating_weight:0
@@ -934,25 +936,25 @@ msgstr "評価尺度は非表示ですか？"
 #: view:survey.browse.answer:0
 #: view:survey.name.wiz:0
 msgid "Start"
-msgstr ""
+msgstr "開始"
 
 #. module: survey
 #: code:addons/survey/survey.py:472
 #, python-format
 msgid "Maximum Required Answer is greater than Minimum Required Answer"
-msgstr ""
+msgstr "最大必要回答数は最小必要回答数よりも大きい。"
 
 #. module: survey
 #: field:survey.question,comment_maximum_no:0
 #: field:survey.question,validation_maximum_no:0
 msgid "Maximum number"
-msgstr ""
+msgstr "最大値"
 
 #. module: survey
 #: selection:survey.request,state:0
 #: selection:survey.response.line,state:0
 msgid "Draft"
-msgstr ""
+msgstr "ドラフト"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_print_statistics
@@ -962,12 +964,12 @@ msgstr ""
 #. module: survey
 #: selection:survey,state:0
 msgid "Closed"
-msgstr ""
+msgstr "閉鎖"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Matrix of Drop-down Menus"
-msgstr ""
+msgstr "ドロップダウンメニューの行列"
 
 #. module: survey
 #: view:survey:0
@@ -989,133 +991,133 @@ msgstr ""
 #: field:survey.send.invitation,partner_ids:0
 #: field:survey.tbl.column.heading,response_table_id:0
 msgid "Answer"
-msgstr ""
+msgstr "回答"
 
 #. module: survey
 #: field:survey,max_response_limit:0
 msgid "Maximum Answer Limit"
-msgstr ""
+msgstr "回答上限最大値"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_act_view_survey_send_invitation
 msgid "Send Invitations"
-msgstr ""
+msgstr "招待の送信"
 
 #. module: survey
 #: field:survey.name.wiz,store_ans:0
 msgid "Store Answer"
-msgstr ""
+msgstr "回答の保存"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Date and Time"
-msgstr ""
+msgstr "日付と時間"
 
 #. module: survey
 #: field:survey,state:0
 #: field:survey.response,state:0
 #: field:survey.response.line,state:0
 msgid "Status"
-msgstr ""
+msgstr "状態"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_print
 msgid "Print Survey"
-msgstr ""
+msgstr "調査の印刷"
 
 #. module: survey
 #: field:survey,send_response:0
 msgid "E-mail Notification on Answer"
-msgstr ""
+msgstr "回答のEメール通知"
 
 #. module: survey
 #: field:survey.response.answer,value_choice:0
 msgid "Value Choice"
-msgstr ""
+msgstr "値の選択"
 
 #. module: survey
 #: view:survey:0
 msgid "Started"
-msgstr ""
+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 ""
+msgstr "回答の印刷"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Multiple Textboxes"
-msgstr ""
+msgstr "複数のテキストボックス"
 
 #. module: survey
 #: selection:survey.print,orientation:0
 #: selection:survey.print.answer,orientation:0
 msgid "Landscape(Horizontal)"
-msgstr ""
+msgstr "横向き"
 
 #. module: survey
 #: field:survey.question,no_of_rows:0
 msgid "No of Rows"
-msgstr ""
+msgstr "行数"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.name.wiz:0
 msgid "Survey Details"
-msgstr ""
+msgstr "調査の詳細"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Multiple Textboxes With Different Type"
-msgstr ""
+msgstr "異なるタイプの複数のテキストボックス"
 
 #. module: survey
 #: view:survey.question.column.heading:0
 msgid "Menu Choices (each choice on separate lines)"
-msgstr ""
+msgstr "メニュー選択（行毎に別の選択）"
 
 #. module: survey
 #: field:survey.response,response_type:0
 msgid "Answer Type"
-msgstr ""
+msgstr "回答タイプ"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Validation"
-msgstr ""
+msgstr "検証"
 
 #. module: survey
 #: view:survey.request:0
 #: selection:survey.request,state:0
 msgid "Waiting Answer"
-msgstr ""
+msgstr "回答待ち"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Must Be A Decimal Number"
-msgstr ""
+msgstr "10進数値が必須"
 
 #. module: survey
 #: field:res.users,survey_id:0
 msgid "Groups"
-msgstr ""
+msgstr "グループ"
 
 #. module: survey
 #: selection:survey.answer,type:0
 #: selection:survey.question,type:0
 msgid "Date"
-msgstr ""
+msgstr "日付"
 
 #. module: survey
 #: view:survey:0
 msgid "All New Survey"
-msgstr ""
+msgstr "新規調査全て"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_send_invitation
@@ -1128,40 +1130,40 @@ msgstr ""
 #: field:survey.request,user_id:0
 #: field:survey.response,user_id:0
 msgid "User"
-msgstr ""
+msgstr "ユーザ"
 
 #. module: survey
 #: field:survey.name.wiz,transfer:0
 msgid "Page Transfer"
-msgstr ""
+msgstr "ページ転送"
 
 #. module: survey
 #: selection:survey.response.line,state:0
 msgid "Skiped"
-msgstr ""
+msgstr "スキップ済"
 
 #. module: survey
 #: field:survey.print,paper_size:0
 #: field:survey.print.answer,paper_size:0
 msgid "Paper Size"
-msgstr ""
+msgstr "用紙サイズ"
 
 #. module: survey
 #: field:survey.response.answer,column_id:0
 #: field:survey.tbl.column.heading,column_id:0
 msgid "Column"
-msgstr ""
+msgstr "列"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_response_line
 msgid "Survey Response Line"
-msgstr ""
+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 ""
+msgstr "この調査には %s 回を超えての応答はできません。"
 
 #. module: survey
 #: model:ir.actions.report.xml,name:survey.report_survey_form
@@ -1182,7 +1184,7 @@ msgstr ""
 #: field:survey.request,survey_id:0
 #: field:survey.response,survey_id:0
 msgid "Survey"
-msgstr ""
+msgstr "調査"
 
 #. module: survey
 #: field:survey.question,in_visible_rating_weight:0
@@ -1192,12 +1194,12 @@ msgstr "評価尺度は非表示ですか？"
 #. module: survey
 #: selection:survey.answer,type:0
 msgid "Integer"
-msgstr ""
+msgstr "整数"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Numerical Textboxes"
-msgstr ""
+msgstr "数値のテキストボックス"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_question_wiz
@@ -1207,17 +1209,17 @@ msgstr ""
 #. module: survey
 #: view:survey:0
 msgid "History"
-msgstr ""
+msgstr "履歴"
 
 #. module: survey
 #: view:survey.request:0
 msgid "Late"
-msgstr ""
+msgstr "遅延"
 
 #. module: survey
 #: field:survey.type,code:0
 msgid "Code"
-msgstr ""
+msgstr "コード"
 
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_print_survey_statistics
@@ -1228,7 +1230,7 @@ msgstr ""
 #: field:survey.print,orientation:0
 #: field:survey.print.answer,orientation:0
 msgid "Orientation"
-msgstr ""
+msgstr "向き"
 
 #. module: survey
 #: view:survey:0
@@ -1236,55 +1238,55 @@ msgstr ""
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Seq"
-msgstr ""
+msgstr "順序"
 
 #. module: survey
 #: field:survey.request,email:0
 msgid "E-mail"
-msgstr ""
+msgstr "Eメール"
 
 #. module: survey
 #: field:survey.question,comment_minimum_no:0
 #: field:survey.question,validation_minimum_no:0
 msgid "Minimum number"
-msgstr ""
+msgstr "最小値"
 
 #. module: survey
 #: field:survey.question,req_ans:0
 msgid "#Required Answer"
-msgstr ""
+msgstr "要求される回答数"
 
 #. module: survey
 #: field:survey.answer,sequence:0
 #: field:survey.question,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "順序"
 
 #. module: survey
 #: field:survey.question,comment_label:0
 msgid "Field Label"
-msgstr ""
+msgstr "項目ラベル"
 
 #. module: survey
 #: view:survey:0
 msgid "Other"
-msgstr ""
+msgstr "その他"
 
 #. module: survey
 #: view:survey.request:0
 #: selection:survey.request,state:0
 msgid "Done"
-msgstr ""
+msgstr "完了"
 
 #. module: survey
 #: view:survey:0
 msgid "Test Survey"
-msgstr ""
+msgstr "テスト調査"
 
 #. module: survey
 #: field:survey.question,rating_allow_one_column_require:0
 msgid "Allow Only One Answer per Column (Forced Ranking)"
-msgstr ""
+msgstr "列毎に1個の回答のみを許可（強制ランキング）"
 
 #. module: survey
 #: view:survey:0
@@ -1294,29 +1296,29 @@ msgstr ""
 #: view:survey.print.answer:0
 #: view:survey.print.statistics:0
 msgid "Cancel"
-msgstr ""
+msgstr "キャンセル"
 
 #. module: survey
 #: view:survey:0
 msgid "Close"
-msgstr ""
+msgstr "閉じる"
 
 #. module: survey
 #: field:survey.question,comment_minimum_float:0
 #: field:survey.question,validation_minimum_float:0
 msgid "Minimum decimal number"
-msgstr ""
+msgstr "最小10進数"
 
 #. module: survey
 #: view:survey:0
 #: selection:survey,state:0
 msgid "Open"
-msgstr ""
+msgstr "開く"
 
 #. module: survey
 #: field:survey,tot_start_survey:0
 msgid "Total Started Survey"
-msgstr ""
+msgstr "開始した調査合計"
 
 #. module: survey
 #: code:addons/survey/survey.py:462
@@ -1324,17 +1326,17 @@ msgstr ""
 msgid ""
 "#Required Answer you entered is greater than the number of answer. Please "
 "use a number that is smaller than %d."
-msgstr ""
+msgstr "入力した要求回答数が回答の数より大きいです。%d より小さな数を使用して下さい。"
 
 #. module: survey
 #: help:survey,max_response_limit:0
 msgid "Set to one if survey is answerable only once"
-msgstr ""
+msgstr "調査が1回のみ回答可能な場合、1を設定します。"
 
 #. module: survey
 #: selection:survey.response,state:0
 msgid "Finished "
-msgstr ""
+msgstr "完了 "
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_question_column_heading
@@ -1344,17 +1346,17 @@ msgstr "調査質問の列見出し"
 #. module: survey
 #: field:survey.answer,average:0
 msgid "#Avg"
-msgstr ""
+msgstr "平均数"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Matrix of Choices (Multiple Answers Per Row)"
-msgstr ""
+msgstr "選択の行列（1行に付き複数回答）"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_name
 msgid "Give Survey Answer"
-msgstr ""
+msgstr "調査の回答を提供"
 
 #. module: survey
 #: model:ir.model,name:survey.model_res_users
@@ -1365,60 +1367,60 @@ msgstr ""
 #: help:survey.browse.answer,response_id:0
 msgid ""
 "If this field is empty, all answers of the selected survey will be print."
-msgstr ""
+msgstr "この項目が空の場合、選択された調査の回答の全てが印刷されます。"
 
 #. module: survey
 #: selection:survey.response.line,state:0
 msgid "Answered"
-msgstr ""
+msgstr "回答済"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:425
 #, python-format
 msgid "Complete Survey Answer"
-msgstr ""
+msgstr "調査の回答の完了"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Comment/Essay Box"
-msgstr ""
+msgstr "コメント / エッセイボックス"
 
 #. module: survey
 #: field:survey.answer,type:0
 msgid "Type of Answer"
-msgstr ""
+msgstr "回答のタイプ"
 
 #. module: survey
 #: field:survey.question,required_type:0
 msgid "Respondent must answer"
-msgstr ""
+msgstr "回答者の回答必須"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_send_invitation
 #: view:survey.send.invitation:0
 msgid "Send Invitation"
-msgstr ""
+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 ""
+msgstr "複数回の同じ回答は選択できません。"
 
 #. module: survey
 #: view:survey.question:0
 msgid "Search Question"
-msgstr ""
+msgstr "質問の検索"
 
 #. module: survey
 #: field:survey,title:0
 msgid "Survey Title"
-msgstr ""
+msgstr "調査タイトル"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Single Textbox"
-msgstr ""
+msgstr "単数テキストボックス"
 
 #. module: survey
 #: view:survey:0
@@ -1428,17 +1430,17 @@ msgstr ""
 #: field:survey.page,note:0
 #: view:survey.response.line:0
 msgid "Description"
-msgstr ""
+msgstr "詳細"
 
 #. module: survey
 #: view:survey.name.wiz:0
 msgid "Select Survey"
-msgstr ""
+msgstr "調査の選択"
 
 #. module: survey
 #: selection:survey.question,required_type:0
 msgid "At Least"
-msgstr ""
+msgstr "最低"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_send_invitation_log
@@ -1450,27 +1452,27 @@ msgstr ""
 #: selection:survey.print,orientation:0
 #: selection:survey.print.answer,orientation:0
 msgid "Portrait(Vertical)"
-msgstr ""
+msgstr "縦向き"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Must Be Specific Length"
-msgstr ""
+msgstr "長さ指定が必須"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: field:survey.question,page_id:0
 msgid "Survey Page"
-msgstr ""
+msgstr "調査ページ"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Required Answer"
-msgstr ""
+msgstr "必要回答数"
 
 #. module: survey
 #: code:addons/survey/survey.py:468
@@ -1478,39 +1480,39 @@ msgstr ""
 msgid ""
 "Minimum Required Answer you entered is greater than the number of answer. "
 "Please use a number that is smaller than %d."
-msgstr ""
+msgstr "入力した最小必要回答数が回答数より大きくなっています。%d より小さな数を使用して下さい。"
 
 #. module: survey
 #: code:addons/survey/survey.py:453
 #, python-format
 msgid "You must enter one or more answer."
-msgstr ""
+msgstr "１個以上の回答の入力が必要です。"
 
 #. module: survey
 #: view:survey:0
 msgid "All Open Survey"
-msgstr ""
+msgstr "開いている調査全て"
 
 #. module: survey
 #: model:ir.actions.report.xml,name:survey.survey_browse_response
 #: field:survey.browse.answer,response_id:0
 msgid "Survey Answers"
-msgstr ""
+msgstr "調査の回答"
 
 #. module: survey
 #: view:survey.browse.answer:0
 msgid "Select Survey and Related Answer"
-msgstr ""
+msgstr "調査と関係する回答を選択"
 
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_print_survey_answer
 msgid "Surveys Answers"
-msgstr ""
+msgstr "調査の回答"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.act_survey_pages
 msgid "Pages"
-msgstr ""
+msgstr "ページ"
 
 #. module: survey
 #: code:addons/survey/survey.py:401
@@ -1519,29 +1521,29 @@ msgid ""
 "#Required Answer you entered is                                     greater "
 "than the number of answer.                                    Please use a "
 "number that is smaller than %d."
-msgstr ""
+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 ""
+msgstr "複数回の同じ回答は選択できません。"
 
 #. module: survey
 #: selection:survey.print,paper_size:0
 #: selection:survey.print.answer,paper_size:0
 msgid "Legal (8.5\" x 14\")"
-msgstr ""
+msgstr "リーガル（8.5\" x 14\"）"
 
 #. module: survey
 #: field:survey.type,name:0
 msgid "Name"
-msgstr ""
+msgstr "名称"
 
 #. module: survey
 #: view:survey.page:0
 msgid "#Questions"
-msgstr ""
+msgstr "質問数"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_response
@@ -1554,19 +1556,19 @@ msgstr ""
 #: field:survey.question,numeric_required_sum_err_msg:0
 #: field:survey.question,validation_valid_err_msg:0
 msgid "Error message"
-msgstr ""
+msgstr "エラーメッセージ"
 
 #. module: survey
 #: view:survey.send.invitation:0
 #: field:survey.send.invitation,send_mail:0
 msgid "Send Mail for New User"
-msgstr ""
+msgstr "新規ユーザのためのメール送信"
 
 #. module: survey
 #: code:addons/survey/survey.py:382
 #, python-format
 msgid "You must enter one or more Answer."
-msgstr ""
+msgstr "1つ以上の回答を入力する必要があります。"
 
 #. module: survey
 #: code:addons/survey/survey.py:411
@@ -1575,12 +1577,12 @@ msgid ""
 "Minimum Required Answer                                     you entered is "
 "greater than the number of answer.                                    Please "
 "use a number that is smaller than %d."
-msgstr ""
+msgstr "入力した最小必要回答数が回答数より大きくなっています。%d より小さな数を使用して下さい。"
 
 #. module: survey
 #: field:survey.answer,menu_choice:0
 msgid "Menu Choices"
-msgstr ""
+msgstr "メニュー選択"
 
 #. module: survey
 #: field:survey,id:0
@@ -1593,28 +1595,28 @@ msgstr ""
 msgid ""
 "Maximum Required Answer is greater                                     than "
 "Minimum Required Answer"
-msgstr ""
+msgstr "最大必要回答数は最小必要回答数よりも大きい。"
 
 #. module: survey
 #: view:survey.send.invitation.log:0
 msgid "User creation"
-msgstr ""
+msgstr "ユーザの作成"
 
 #. module: survey
 #: selection:survey.question,required_type:0
 msgid "All"
-msgstr ""
+msgstr "全て"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Must Be An Email Address"
-msgstr ""
+msgstr "Eメールアドレスが必須"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Multiple Choice (Only One Answer)"
-msgstr ""
+msgstr "複数の選択肢（回答は１つのみ）"
 
 #. module: survey
 #: field:survey.answer,in_visible_answer_type:0
@@ -1629,44 +1631,44 @@ msgstr ""
 #. module: survey
 #: view:survey.answer:0
 msgid "Menu Choices (each choice on separate by lines)"
-msgstr ""
+msgstr "メニュー選択（行毎に別の選択）"
 
 #. module: survey
 #: selection:survey.answer,type:0
 msgid "Float"
-msgstr ""
+msgstr "実数"
 
 #. module: survey
 #: view:survey.response.line:0
 msgid "Single Textboxes"
-msgstr ""
+msgstr "単数テキストボックス"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_send_invitation.py:74
 #, python-format
 msgid "%sSurvey is not in open state"
-msgstr ""
+msgstr "%s 調査は開いた状態ではありません。"
 
 #. module: survey
 #: field:survey.question.column.heading,rating_weight:0
 msgid "Weight"
-msgstr ""
+msgstr "重量"
 
 #. module: survey
 #: selection:survey.answer,type:0
 msgid "Date & Time"
-msgstr ""
+msgstr "日時"
 
 #. module: survey
 #: field:survey.response,date_create:0
 #: field:survey.response.line,date_create:0
 msgid "Create Date"
-msgstr ""
+msgstr "作成日"
 
 #. module: survey
 #: field:survey.question,column_name:0
 msgid "Column Name"
-msgstr ""
+msgstr "カラム名"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_survey_page_form
@@ -1674,24 +1676,24 @@ msgstr ""
 #: model:ir.ui.menu,name:survey.menu_survey_page_form1
 #: view:survey.page:0
 msgid "Survey Pages"
-msgstr ""
+msgstr "調査ページ"
 
 #. module: survey
 #: field:survey.question,numeric_required_sum:0
 msgid "Sum of all choices"
-msgstr ""
+msgstr "全選択の合計"
 
 #. module: survey
 #: selection:survey.question,type:0
 #: view:survey.response.line:0
 msgid "Table"
-msgstr ""
+msgstr "表"
 
 #. module: survey
 #: code:addons/survey/survey.py:630
 #, python-format
 msgid "You cannot duplicate the resource!"
-msgstr ""
+msgstr "リソースの複製はできません。"
 
 #. module: survey
 #: field:survey.question,comment_minimum_date:0
@@ -1702,9 +1704,9 @@ msgstr "最小の日付"
 #. module: survey
 #: field:survey,response_user:0
 msgid "Maximum Answer per User"
-msgstr ""
+msgstr "ユーザ毎の最大回答数"
 
 #. module: survey
 #: field:survey.name.wiz,page:0
 msgid "Page Position"
-msgstr ""
+msgstr "ページ位置"
diff --git a/addons/web_process/i18n/nl.po b/addons/web_process/i18n/nl.po
index 99381ec92fe..9d20ebd412e 100644
--- a/addons/web_process/i18n/nl.po
+++ b/addons/web_process/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-02-11 08:49+0000\n"
-"Last-Translator: Mario Gielissen <Unknown>\n"
+"PO-Revision-Date: 2012-07-05 08:01+0000\n"
+"Last-Translator: Erwin <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-03 05:55+0000\n"
-"X-Generator: Launchpad (build 15531)\n"
+"X-Launchpad-Export-Date: 2012-07-06 05:07+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
@@ -110,7 +110,7 @@ msgstr "Proces selecteren"
 #. openerp-web
 #: addons/web_process/static/src/xml/web_process.xml:98
 msgid "Select"
-msgstr "Selecteer"
+msgstr "Kies"
 
 #. openerp-web
 #: addons/web_process/static/src/xml/web_process.xml:109