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 001/239] 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 4d3944243fbfb88efdb5b5a383a403eedd1bc51f Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Mon, 11 Jun 2012 18:15:18 +0530
Subject: [PATCH 002/239] [IMP]Sale order -preventing from creating invoice
 without invoicing payment terms

bzr revid: dhr@tinyerp.com-20120611124518-oz0nei3qccmpmnwm
---
 addons/sale/security/ir.model.access.csv | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 2e08a025971..30a70a9c127 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -4,8 +4,8 @@ access_sale_order,sale.order,model_sale_order,base.group_sale_salesman,1,1,1,0
 access_sale_order_line,sale.order.line,model_sale_order_line,base.group_sale_salesman,1,1,1,1
 access_sale_order_line_accountant,sale.order.line accountant,model_sale_order_line,account.group_account_user,1,1,0,0
 access_account_invoice_tax_salesman,account_invoice_tax salesman,account.model_account_invoice_tax,base.group_sale_salesman,1,1,1,0
-access_account_invoice_salesman,account_invoice salesman,account.model_account_invoice,base.group_sale_salesman,1,1,1,0
-access_account_invoice_manager,account_invoice manager,account.model_account_invoice,base.group_sale_manager,1,1,1,1
+access_account_invoice_salesman,account_invoice salesman,account.model_account_invoice,base.group_sale_salesman,1,0,0,0
+access_account_invoice_manager,account_invoice manager,account.model_account_invoice,base.group_sale_manager,1,0,0,0
 access_account_invoice_line_salesman,account_invoice.line salesman,account.model_account_invoice_line,base.group_sale_salesman,1,1,1,0
 access_account_payment_term_salesman,account_payment_term salesman,account.model_account_payment_term,base.group_sale_salesman,1,0,0,0
 access_account_analytic_account_salesman,account_analytic_account salesman,analytic.model_account_analytic_account,base.group_sale_salesman,1,1,1,0
@@ -58,4 +58,4 @@ access_product_pricelist_type_sale_manager,product.pricelist.type salemanager,pr
 access_product_pricelist_sale_manager,product.pricelist salemanager,product.model_product_pricelist,base.group_sale_manager,1,1,1,1
 access_product_group_res_partner_sale_manager,res_partner group_sale_manager,base.model_res_partner,base.group_sale_manager,1,1,1,0
 access_product_pricelist_version_sale_manager,product.pricelist.version sale_manager,product.model_product_pricelist_version,base.group_sale_manager,1,1,1,1
-access_account_invoice_report_salesman,account.invoice.report salesman,account.model_account_invoice_report,base.group_sale_salesman,1,0,0,0
\ No newline at end of file
+access_account_invoice_report_salesman,account.invoice.report salesman,account.model_account_invoice_report,base.group_sale_salesman,1,0,0,0

From 921fe3ce3d7836191bc7ff6ad97366e98fe278fb Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Mon, 11 Jun 2012 18:37:30 +0530
Subject: [PATCH 003/239] [IMP]Sales - Open product form by sale user and
 manager

bzr revid: dhr@tinyerp.com-20120611130730-n8eaqa596o2bn67k
---
 addons/sale/security/ir.model.access.csv | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 30a70a9c127..e71c47ad23b 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -59,3 +59,5 @@ access_product_pricelist_sale_manager,product.pricelist salemanager,product.mode
 access_product_group_res_partner_sale_manager,res_partner group_sale_manager,base.model_res_partner,base.group_sale_manager,1,1,1,0
 access_product_pricelist_version_sale_manager,product.pricelist.version sale_manager,product.model_product_pricelist_version,base.group_sale_manager,1,1,1,1
 access_account_invoice_report_salesman,account.invoice.report salesman,account.model_account_invoice_report,base.group_sale_salesman,1,0,0,0
+access_stock_warehouse_orderpoint_salesman,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,base.group_sale_salesman,1,0,0,0
+access_stock_warehouse_orderpoint_sale_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,base.group_sale_manager,1,0,0,0

From 7dbbcc58bd95fe77a49b22a2ddf86e446bb50453 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Mon, 11 Jun 2012 18:41:43 +0530
Subject: [PATCH 004/239] [IMP]Sales-No access to Product form view for sale
 user

bzr revid: dhr@tinyerp.com-20120611131143-rsp590xxiqk1ug52
---
 addons/sale/security/ir.model.access.csv | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index e71c47ad23b..23777b04378 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -59,5 +59,4 @@ access_product_pricelist_sale_manager,product.pricelist salemanager,product.mode
 access_product_group_res_partner_sale_manager,res_partner group_sale_manager,base.model_res_partner,base.group_sale_manager,1,1,1,0
 access_product_pricelist_version_sale_manager,product.pricelist.version sale_manager,product.model_product_pricelist_version,base.group_sale_manager,1,1,1,1
 access_account_invoice_report_salesman,account.invoice.report salesman,account.model_account_invoice_report,base.group_sale_salesman,1,0,0,0
-access_stock_warehouse_orderpoint_salesman,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,base.group_sale_salesman,1,0,0,0
 access_stock_warehouse_orderpoint_sale_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,base.group_sale_manager,1,0,0,0

From 68ed95181f7c91b779e09186a67b845db91901ff Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Mon, 11 Jun 2012 19:02:03 +0530
Subject: [PATCH 005/239] [IMP]Warehouse - all access of physical inventory to
 warehouse manager and readonly access to user

bzr revid: dhr@tinyerp.com-20120611133203-d65rt11vur0yjxwh
---
 addons/stock/security/ir.model.access.csv | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index a391f117393..19d724eb02c 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -18,10 +18,10 @@ access_stock_production_lot_user,stock.production.lot user,model_stock_productio
 access_stock_production_lot_revision,stock.production.lot.revision,model_stock_production_lot_revision,stock.group_stock_user,1,1,1,1
 access_stock_move_manager,stock.move manager,model_stock_move,stock.group_stock_manager,1,1,0,0
 access_stock_move_user,stock.move user,model_stock_move,stock.group_stock_user,1,0,0,0
-access_stock_inventory_user,stock.inventory user,model_stock_inventory,stock.group_stock_user,1,1,1,1
-access_stock_inventory_manager,stock.inventory manager,model_stock_inventory,stock.group_stock_manager,1,0,0,0
-access_stock_inventory_line_user,stock.inventory.line user,model_stock_inventory_line,stock.group_stock_user,1,1,1,1
-access_stock_inventory_line_manager,stock.inventory.line manager,model_stock_inventory_line,stock.group_stock_manager,1,0,0,0
+access_stock_inventory_user,stock.inventory user,model_stock_inventory,stock.group_stock_user,1,0,0,0
+access_stock_inventory_manager,stock.inventory manager,model_stock_inventory,stock.group_stock_manager,1,1,1,1
+access_stock_inventory_line_user,stock.inventory.line user,model_stock_inventory_line,stock.group_stock_user,1,0,0,0
+access_stock_inventory_line_manager,stock.inventory.line manager,model_stock_inventory_line,stock.group_stock_manager,1,1,1,1
 access_stock_report_prodlots,stock.report.prodlots,model_stock_report_prodlots,stock.group_stock_manager,1,0,0,0
 access_stock_location_sale_manager,stock.location sale manager,model_stock_location,base.group_sale_manager,1,0,0,0
 access_stock_location_stock_manager,stock.location stock manager,model_stock_location,stock.group_stock_manager,1,0,0,0

From f34c85369f65eda08999d573f4c300c9424baa6b Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Tue, 12 Jun 2012 15:51:29 +0530
Subject: [PATCH 006/239] [IMP]Event - applying proper access rights for user
 and manager

bzr revid: dhr@tinyerp.com-20120612102129-gqdlz6911b3h1ld6
---
 addons/event/security/ir.model.access.csv | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/event/security/ir.model.access.csv b/addons/event/security/ir.model.access.csv
index cf95d00876e..cb2d5bcbcd9 100644
--- a/addons/event/security/ir.model.access.csv
+++ b/addons/event/security/ir.model.access.csv
@@ -4,5 +4,5 @@ access_event_type_manager,event.type manager,model_event_type,event.group_event_
 access_event_event,event.event,model_event_event,event.group_event_user,1,1,1,0
 access_event_registration,event.registration,model_event_registration,event.group_event_user,1,1,1,0
 access_report_event_registration,report.event.registration,model_report_event_registration,event.group_event_user,1,1,1,1
-access_event_event_manager,event.event manager,model_event_event,event.group_event_manager,1,0,0,0
-access_event_registration_manager,event.registration manager,model_event_registration,event.group_event_manager,1,0,0,0
+access_event_event_manager,event.event manager,model_event_event,event.group_event_manager,1,1,1,1
+access_event_registration_manager,event.registration manager,model_event_registration,event.group_event_manager,1,1,1,1

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 007/239] 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 06e0f2ff53f681ea7ef709b1a7de09ea6b78f07c Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Fri, 15 Jun 2012 11:34:10 +0530
Subject: [PATCH 008/239] [IMP]fixing event rights for sale user and manager to
 view customer form when event is installed

bzr revid: dhr@tinyerp.com-20120615060410-coxn0w8ddt7jhj6x
---
 addons/sale/security/ir.model.access.csv | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 23777b04378..1adf5469a16 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -60,3 +60,8 @@ access_product_group_res_partner_sale_manager,res_partner group_sale_manager,bas
 access_product_pricelist_version_sale_manager,product.pricelist.version sale_manager,product.model_product_pricelist_version,base.group_sale_manager,1,1,1,1
 access_account_invoice_report_salesman,account.invoice.report salesman,account.model_account_invoice_report,base.group_sale_salesman,1,0,0,0
 access_stock_warehouse_orderpoint_sale_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,base.group_sale_manager,1,0,0,0
+access_stock_warehouse_orderpoint_sale_salesman,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,base.group_sale_salesman,1,0,0,0
+access_event_event_sale_salesman,event.event,event.model_event_event,base.group_sale_salesman,1,0,0,0
+access_event_event_sale_manager,event.event,event.model_event_event,base.group_sale_manager,1,0,0,0
+access_event_registration_sale_salesman,event.registration,event.model_event_registration,base.group_sale_salesman,1,0,0,0
+access_event_registration_sale_manager,event.registration,event.model_event_registration,base.group_sale_manager,1,0,0,0

From 053285acd04bf9b292c543fb00abeb54117e6c01 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Fri, 15 Jun 2012 18:13:16 +0530
Subject: [PATCH 009/239] [IMP]Project - fixing access rights for project user
 and manager

bzr revid: dhr@tinyerp.com-20120615124316-m8vx3pq2jmjl4o46
---
 addons/account_analytic_analysis/security/ir.model.access.csv | 4 ++++
 addons/project/security/ir.model.access.csv                   | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/account_analytic_analysis/security/ir.model.access.csv b/addons/account_analytic_analysis/security/ir.model.access.csv
index 74425cea3dd..fdc45d8137e 100644
--- a/addons/account_analytic_analysis/security/ir.model.access.csv
+++ b/addons/account_analytic_analysis/security/ir.model.access.csv
@@ -3,3 +3,7 @@ access_account_analytic_analysis_summary_user_sale,account_analytic_analysis.sum
 access_account_analytic_analysis_summary_month_sale,account_analytic_analysis.summary.month sale,model_account_analytic_analysis_summary_month,base.group_sale_salesman,1,0,0,0
 access_account_analytic_analysis_summary_user,account_analytic_analysis.summary.user,model_account_analytic_analysis_summary_user,account.group_account_manager,1,0,0,0
 access_account_analytic_analysis_summary_month,account_analytic_analysis.summary.month,model_account_analytic_analysis_summary_month,account.group_account_manager,1,0,0,0
+access_account_analytic_analysis_summary_user_project,account_analytic_analysis.summary.user project,model_account_analytic_analysis_summary_user,project.group_project_manager,1,0,0,0
+access_account_analytic_analysis_summary_month_project,account_analytic_analysis.summary.month project,model_account_analytic_analysis_summary_month,project.group_project_manager,1,0,0,0
+access_account_analytic_analysis_summary_user_project_user,account_analytic_analysis.summary.user project,model_account_analytic_analysis_summary_user,project.group_project_user,1,0,0,0
+access_account_analytic_analysis_summary_month_project_user,account_analytic_analysis.summary.month project,model_account_analytic_analysis_summary_month,project.group_project_user,1,0,0,0
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index 5b51dc85e7c..1c7dae3ebb3 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -1,6 +1,6 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_project_project,project.project,model_project_project,project.group_project_user,1,1,1,1
-access_account_analytic_account,account.analytic.account,analytic.model_account_analytic_account,project.group_project_user,1,1,1,1
+access_project_project,project.project,model_project_project,project.group_project_user,1,0,0,0
+access_account_analytic_account,account.analytic.account,analytic.model_account_analytic_account,project.group_project_manager,1,1,1,1
 access_project_task_type_user,project.task.type user,model_project_task_type,project.group_project_user,1,1,1,1
 access_project_task,project.task,model_project_task,project.group_project_user,1,1,1,1
 access_project_task_work,project.task.work,model_project_task_work,project.group_project_user,1,1,1,1

From 4dddcfcb53172981ef2dd659bf60aab3aced5363 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Mon, 18 Jun 2012 12:43:39 +0530
Subject: [PATCH 010/239] [IMP]allocating all accessrights of project to a
 project manager

bzr revid: dhr@tinyerp.com-20120618071339-101ym86uisbxmr2i
---
 addons/project/security/ir.model.access.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index 1c7dae3ebb3..752d21131b9 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -1,5 +1,6 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_project_project,project.project,model_project_project,project.group_project_user,1,0,0,0
+access_project_project_manager,project.project,model_project_project,project.group_project_manager,1,1,1,1
 access_account_analytic_account,account.analytic.account,analytic.model_account_analytic_account,project.group_project_manager,1,1,1,1
 access_project_task_type_user,project.task.type user,model_project_task_type,project.group_project_user,1,1,1,1
 access_project_task,project.task,model_project_task,project.group_project_user,1,1,1,1

From b886574065ab8e621e76dc9ba436a0d3c20954b4 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Mon, 18 Jun 2012 15:26:30 +0530
Subject: [PATCH 011/239] [IMP]allocating read access of events to partner
 manager

bzr revid: dhr@tinyerp.com-20120618095630-svru4lbqlbtpgdr3
---
 addons/event/security/ir.model.access.csv | 2 ++
 addons/sale/security/ir.model.access.csv  | 5 +----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/event/security/ir.model.access.csv b/addons/event/security/ir.model.access.csv
index cb2d5bcbcd9..8c884cfca9d 100644
--- a/addons/event/security/ir.model.access.csv
+++ b/addons/event/security/ir.model.access.csv
@@ -6,3 +6,5 @@ access_event_registration,event.registration,model_event_registration,event.grou
 access_report_event_registration,report.event.registration,model_report_event_registration,event.group_event_user,1,1,1,1
 access_event_event_manager,event.event manager,model_event_event,event.group_event_manager,1,1,1,1
 access_event_registration_manager,event.registration manager,model_event_registration,event.group_event_manager,1,1,1,1
+access_event_event_partner,event.event,model_event_event,base.group_partner_manager,1,0,0,0
+access_event_registration_partner,event.registration,model_event_registration,base.group_partner_manager,1,0,0,0
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 1adf5469a16..6ef377027be 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -61,7 +61,4 @@ access_product_pricelist_version_sale_manager,product.pricelist.version sale_man
 access_account_invoice_report_salesman,account.invoice.report salesman,account.model_account_invoice_report,base.group_sale_salesman,1,0,0,0
 access_stock_warehouse_orderpoint_sale_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,base.group_sale_manager,1,0,0,0
 access_stock_warehouse_orderpoint_sale_salesman,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,base.group_sale_salesman,1,0,0,0
-access_event_event_sale_salesman,event.event,event.model_event_event,base.group_sale_salesman,1,0,0,0
-access_event_event_sale_manager,event.event,event.model_event_event,base.group_sale_manager,1,0,0,0
-access_event_registration_sale_salesman,event.registration,event.model_event_registration,base.group_sale_salesman,1,0,0,0
-access_event_registration_sale_manager,event.registration,event.model_event_registration,base.group_sale_manager,1,0,0,0
+

From 0f20a859ba7f5dfd77d7e03811671a3eb9740948 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Mon, 18 Jun 2012 18:00:34 +0530
Subject: [PATCH 012/239] [IMP]change in project manager's access right for
 calendar attendance

bzr revid: dhr@tinyerp.com-20120618123034-covf7ordsjaux5l0
---
 addons/project_long_term/security/ir.model.access.csv | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/project_long_term/security/ir.model.access.csv b/addons/project_long_term/security/ir.model.access.csv
index 6ca496f691d..2a00088b8f4 100644
--- a/addons/project_long_term/security/ir.model.access.csv
+++ b/addons/project_long_term/security/ir.model.access.csv
@@ -7,3 +7,6 @@ access_resource_resource_user,user.user user,resource.model_resource_resource,pr
 access_resource_calendar_leaves_user,user.calendar.leaves user,resource.model_resource_calendar_leaves,project.group_project_user,1,1,1,1
 access_resource_resource_manager,user.user manager,resource.model_resource_resource,project.group_project_manager,1,1,1,1
 access_project_user_allocation_manager,project.user.allocation.manager,model_project_user_allocation,project.group_project_manager,1,1,1,1
+access_project_resource_calendar_attendance,resource.calendar.attendance,resource.model_resource_calendar_attendance,project.group_project_manager,1,0,0,0
+
+

From ded491ae3ea53fc1c339a2e7c906b4534f450b61 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Mon, 18 Jun 2012 18:13:05 +0530
Subject: [PATCH 013/239] [IMP]project user read access to analytic account

bzr revid: dhr@tinyerp.com-20120618124305-6la3hyl6gz0t27jv
---
 addons/project/security/ir.model.access.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index 752d21131b9..dceafa9fe87 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -1,6 +1,7 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_project_project,project.project,model_project_project,project.group_project_user,1,0,0,0
 access_project_project_manager,project.project,model_project_project,project.group_project_manager,1,1,1,1
+access_account_analytic_account_user,account.analytic.account,analytic.model_account_analytic_account,project.group_project_user,1,0,0,0
 access_account_analytic_account,account.analytic.account,analytic.model_account_analytic_account,project.group_project_manager,1,1,1,1
 access_project_task_type_user,project.task.type user,model_project_task_type,project.group_project_user,1,1,1,1
 access_project_task,project.task,model_project_task,project.group_project_user,1,1,1,1

From b366ef0544e0fcbddd5bf470d42054f069a4e34b Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Thu, 21 Jun 2012 10:46:16 +0530
Subject: [PATCH 014/239] [IMP]Allocating read access of product form to group
 purchase manager

bzr revid: dhr@tinyerp.com-20120621051616-bk606ej84oauqbzn
---
 addons/mrp/security/ir.model.access.csv      | 1 +
 addons/purchase/security/ir.model.access.csv | 1 +
 2 files changed, 2 insertions(+)

diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index cd6b8db2195..5d254f86b4e 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -80,3 +80,4 @@ access_product_pricelist_item_mrp_manager,product.pricelist.item mrp_manager,pro
 access_resource_calendar_manufacturinguser,resource.calendar manufacturing.user,resource.model_resource_calendar,mrp.group_mrp_user,1,0,0,0
 access_account_journal_mrp_manager,account.journal mrp manager,account.model_account_journal,mrp.group_mrp_manager,1,0,0,0
 access_purchase_order_stock_user,purchase.order stock user,purchase.model_purchase_order,stock.group_stock_user,1,1,1,0
+access_mrp_bom_purchase_manager,mrp.bom,model_mrp_bom,purchase.group_purchase_manager,1,0,0,0
diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index b19a62bf5d1..c45b8a9b070 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -64,3 +64,4 @@ access_account_account_purchase_manager,account.account purchase manager,account
 access_account_journal_purchase_manager,account.journal purchase manager,account.model_account_journal,purchase.group_purchase_manager,1,0,0,0
 access_stock_tracking_purchase_user,stock.tracking purchase.user,stock.model_stock_tracking,purchase.group_purchase_user,1,1,1,0
 access_stock_location_purchase_manager,stock.location purchase manager,stock.model_stock_location,purchase.group_purchase_manager,1,0,0,0
+access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,purchase.group_purchase_manager,1,0,0,0

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 015/239] [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 016/239] [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 017/239] [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 018/239] [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 019/239] [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 020/239] [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 021/239] [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 022/239] [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 023/239] [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 024/239] [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 025/239] [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 026/239] [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 027/239] [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 028/239] [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 029/239] [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 030/239] [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 031/239] [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 032/239] [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 033/239] [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 034/239] [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 035/239] [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 036/239] [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 037/239] [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 038/239] [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 039/239] [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 040/239] 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 041/239] 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 042/239] [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 043/239] [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 044/239] [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 145656b555cc61e5d2d9154d3c127c73522c6f3e Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Tue, 26 Jun 2012 15:56:18 +0530
Subject: [PATCH 045/239] [IMP] change form view of registration in event
 module

bzr revid: fka@tinyerp.com-20120626102618-py2cnj472tzofwbw
---
 addons/event/event_view.xml | 86 +++++++++++++++++++------------------
 1 file changed, 45 insertions(+), 41 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index ed539e7bf39..c577c43a2e2 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -362,50 +362,54 @@
                     <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/>
                     <field name="state" select="1" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
                 </header>
-                <sheet string="Registration" layout="auto">
-                    <group col="6" colspan="4">
-                        <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]"/>
-                        <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/>
-                        <field name="nb_register"/>
-                        <field name="user_id" attrs="{'readonly':[('state','!=', 'draft')]}"/>
-                        <field name="origin"/>
+               <sheet string="Registration">
+                    <group colspan="6" col="7">
+                        <group colspan="3">
+                            <h1>
+                                <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]" class="oe_tital"/>
+                            </h1>
+                        </group>
+                        <group colspan="4">
+                            <h1>
+                                ( <field name="event_begin_date" class="oe_inline"/> - <field name="event_end_date" class="oe_inline"/> )
+                            </h1>
+                        </group>  
+                    </group>              
+                    <group colspan="2" col="2">
+                        <h2>
+                            <field name="nb_register"/>Participates
+                        </h2>
                     </group>
-                    <notebook colspan="4">
-                        <page string="Additional Information">
-                            <group colspan="2" col="2">
-                                <separator string="Contact Information" colspan="2"/>
-                                <field name="name"/>
-                                <field name="email"/>
-                                <field name="phone"/>
-                            </group>
-                            <group colspan="2" col="2" groups="base.group_no_one">
-                                <separator string="Dates" colspan="2"/>
-                                <field name="create_date"/>
-                                <field name="date_closed"/>
-                                <field name="event_begin_date" />
-                                <field name="event_end_date" />
-                            </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"
+                    <group colspan="4" col="4">
+                        <group colspan="2">
+                            <field name="name" invisible="1"/>
+                            <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/>
+                        </group>
+                        <group colspan="2">
+                            <field name="user_id" attrs="{'readonly':[('state','!=', 'draft')]}"/>
+                        </group>
+                    </group>
+                    <group colspan="4" col="4">
+                        <group colspan="2">
+                            <label for="email" string="E-Mail"/>
+                            <group colspan="1">
+                                <field name="email" invisible="1"/>
+                                <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"/>
-                           </page>
-
-                    </notebook>
+                            </group>
+                        </group>
+                        <group colspan="2">
+                            <field name="nb_register"/>
+                        </group>
+                    </group>
+                    <group colspan="2" col="2">
+                        <field name="phone"/>
+                    </group>
+                   <group colspan="2" col="2" groups="base.group_no_one">
+                        <field name="create_date"/>
+                        <field name="date_closed"/>
+                    </group>
                     </sheet>
                     <div class="oe_sheet_width">
                         <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>

From 3305e100f0ac0e3b50a2a1f320c0b46d07587c6e Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 26 Jun 2012 15:57:19 +0530
Subject: [PATCH 046/239] [IMP]Lunch: Improve lunch form view

bzr revid: dbr@tinyerp.com-20120626102719-6so8gmu8p2woj8cn
---
 addons/lunch/lunch_view.xml | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 1777fd85da6..53152292f68 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -30,14 +30,18 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirmed"/>
                 </header>
                 <sheet string="Order">
-                    <group col="4">
-                        <field name="user_id"/>
-                        <field name="date"/>
-                        <field name="product" on_change="onchange_product(product)"/>
-                        <field name="category"/>
-                        <field name="descript"/>
-                        <field name="price"/>
-                        <field name="cashmove"/>
+                    <group>
+                        <group>
+                            <field name="product" on_change="onchange_product(product)"/>
+                            <field name="descript"/>
+                            <field name="price"/>
+                            <field name="category"/>
+                        </group>
+                        <group>
+                            <field name="user_id"/>
+                            <field name="date"/>
+                            <field name="cashmove"/>
+                        </group>
                     </group>
                 </sheet>
                 </form>

From 1a897732297859af73a85ede34abb834a6dc2562 Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Tue, 26 Jun 2012 16:15:01 +0530
Subject: [PATCH 047/239] [IMP]event_form

bzr revid: pna@tinyerp.com-20120626104501-2a5gmtvi3ij62d0f
---
 addons/event/event.py       |  3 ++
 addons/event/event_view.xml | 65 ++++++++++++++++++++++++-------------
 2 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index a348e005d06..71c8d3d8c34 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -214,6 +214,9 @@ class event_event(osv.osv):
         'reply_to': fields.char('Reply-To Email', size=64, readonly=False, states={'done': [('readonly', True)]}, help="The email address of the organizer is likely to be put here, with the effect to be in the 'Reply-To' of the mails sent automatically at event or registrations confirmation. You can also put the email address of your mail gateway if you use one."),
         'main_speaker_id': fields.many2one('res.partner','Main Speaker', readonly=False, states={'done': [('readonly', True)]}, help="Speaker who will be giving speech at the event."),
         'address_id': fields.many2one('res.partner','Location Address', readonly=False, states={'done': [('readonly', True)]}),
+        'street': fields.related('address_id','street',type='char',string='Street'),
+        'zip': fields.related('address_id','zip',type='char',string='zip'),
+        'city': fields.related('address_id','city',type='char',string='city'),
         'speaker_confirmed': fields.boolean('Speaker Confirmed', readonly=False, states={'done': [('readonly', True)]}),
         'country_id': fields.related('address_id', 'country_id',
                     type='many2one', relation='res.country', string='Country', readonly=False, states={'done': [('readonly', True)]}),
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index ed539e7bf39..0504fc9cd25 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -61,40 +61,53 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
                 </header>
                 <sheet>
-
-                <div class="oe_right" style="height: 200px"></div>
-                <div class="oe_title">
-                    <h1><field name="name"/></h1>
+                	<div class="oe_right oe_button_box">
+	                    <button name="%(event.act_event_list_register_event)d" type="action" string="Registration" icon="gtk-index" help="Register with this event"/>
+	                </div>
+                <!--div class="oe_right" style="height: 200px"></div-->
+                <div class="oe_title" style="width: 650px" >
+	            	<label for="name" class="oe_edit_only"/>
+		            <group colspan="6" col="6">
+		            	<group colspan="2"><h1><field name="name"/></h1></group>
+	                    <group colspan="4"><h1><label string="(" attrs="{'invisible': [('type', '=', '')]}" /><field name="type" nolabel="1" on_change="onchange_event_type(type,context)" class="oe_inline"/><label string=")" attrs="{'invisible': [('type', '=', '')]}" /></h1></group>
+		            </group>  
+		        </div> 
+                <div>
+                	<h2 class="oe_inline">From <field name="date_begin"/> to <field name="date_end"/></h2>
                     <group>
                         <group>
-                            <field name="type" on_change="onchange_event_type(type,context)"/>
-                            <field name="user_id"/>
-                            <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}"/>
+                            <label for="address_id" string="Address"/>
+                            <div>
+                                <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}"/>
+                            	<field name="street" />                            
+                            	<div>
+                                     <field name="city" class="oe_inline" placeholder="City"/>
+                            	     <field name="zip" class="oe_inline"/>
+                                </div>
+                            </div>
                         </group>
                         <group>
-                            <field name="date_begin"/>
-                            <field name="date_end"/>
-                            <field name="register_min"/>
-                            <field name="register_max"/>
-                        </group>
-                    </group>
+	                      	<field name="register_min"/>
+	                       	<field name="register_max"/>
+	                   	</group>
+                     </group>
                 </div>
-
                 <notebook>
                     <page string="Event Description">
                         <field name="note" colspan="4" nolabel="1"/>
                     </page>
                     <page string="Internal Data">
-                         <group class="oe_group_label_border" colspan="2" col="2">
-                            <field name="register_current"/>
-                            <field name="register_prospect"/>
-                            <field name="register_attended"/>
-                         </group> 
-                         <group class="oe_group_label_border" colspan="2" col="2">
+                      <group>
+                          <group class="oe_group_label_border">
                             <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
                             <field name="speaker_confirmed"/>
-                        </group>
-                        <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
+                          </group>
+                          <group class="oe_group_label_border">
+                            <field name="register_current"/>
+                            <field name="register_prospect"/>
+                          </group> 
+                      </group>
+                      <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
                             <tree string="Registration" editable="top">
                                 <field name="name" />
                                 <field name="email" />
@@ -126,6 +139,12 @@
                                         <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
                                     </group>
                             </form>
+                            <group class="oe_subtotal_footer" colspan="4" style="margin-left:450px" name="regi_total">
+                                <field name="register_current"/>
+                                <field name="register_prospect"/>
+                                <field name="register_attended" class="oe_subtotal_footer_separator" />
+                            </group>
+							<separator string="" class="oe_clear"/>
                             </field>
                     </page>
                     </notebook>
@@ -313,7 +332,7 @@
             name="Registration"
             res_model="event.registration"
             src_model="event.event"
-            view_mode="calendar,tree,form,graph"
+            view_mode="form,calendar,tree,graph"
             context="{'search_default_event_id': [active_id], 'default_event_id': active_id}"
             view_type="form"/>
 

From 8d07971b5398f1df157c9efd1fa93d24315ba38f Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Tue, 26 Jun 2012 16:22:12 +0530
Subject: [PATCH 048/239] [IMP]event_form

bzr revid: pna@tinyerp.com-20120626105212-etyqs0n30vd7ksio
---
 addons/event/event_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 0504fc9cd25..7d7d47c4a60 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -139,13 +139,13 @@
                                         <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
                                     </group>
                             </form>
+                            </field>
                             <group class="oe_subtotal_footer" colspan="4" style="margin-left:450px" name="regi_total">
                                 <field name="register_current"/>
                                 <field name="register_prospect"/>
                                 <field name="register_attended" class="oe_subtotal_footer_separator" />
                             </group>
 							<separator string="" class="oe_clear"/>
-                            </field>
                     </page>
                     </notebook>
                     </sheet>

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 049/239] [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 050/239] [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 051/239] [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 052/239] 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 183b879e5e4e9e03b9c7c426d5f429c1b5f590a1 Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Tue, 26 Jun 2012 18:23:02 +0530
Subject: [PATCH 053/239] [IMP]event_form

bzr revid: pna@tinyerp.com-20120626125302-rvubrzttwsiff292
---
 addons/event/event.py       |  4 ++--
 addons/event/event_view.xml | 22 ++++++++++------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 71c8d3d8c34..5387a64001f 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -192,8 +192,8 @@ class event_event(osv.osv):
         'name': fields.char('Name', size=64, required=True, translate=True, readonly=False, states={'done': [('readonly', True)]}),
         'user_id': fields.many2one('res.users', 'Responsible User', readonly=False, states={'done': [('readonly', True)]}),
         'type': fields.many2one('event.type', 'Type of Event', readonly=False, states={'done': [('readonly', True)]}),
-        'register_max': fields.integer('Maximum Registrations', help="You can for each event define a maximum registration level. If you have too much registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}),
-        'register_min': fields.integer('Minimum Registrations', help="You can for each event define a minimum registration level. If you do not enough registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}),
+        'register_max': fields.integer('Maximum Registration', help="You can for each event define a maximum registration level. If you have too much registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}),
+        'register_min': fields.integer('Minimum Registration', help="You can for each event define a minimum registration level. If you do not enough registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}),
         'register_current': fields.function(_get_register, string='Confirmed Registrations', multi='register_numbers'),
         'register_avail': fields.function(_get_register, string='Available Registrations', multi='register_numbers',type='integer'),
         'register_prospect': fields.function(_get_register, string='Unconfirmed Registrations', multi='register_numbers'),
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 7d7d47c4a60..5caf9ad5369 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-
+      <act_window
+            id="act_event_list_register_event"
+            name="Registration"
+            res_model="event.registration"
+            src_model="event.event"
+            view_mode="calendar,tree,form,graph"
+            context="{'search_default_event_id': [active_id], 'default_event_id': active_id}"
+            view_type="form"/>
         <menuitem  name="Events" id="event_main_menu"/>
         <menuitem name="Events Organisation" id="base.menu_event_main" parent="event_main_menu" />
 
@@ -73,7 +80,7 @@
 		            </group>  
 		        </div> 
                 <div>
-                	<h2 class="oe_inline">From <field name="date_begin"/> to <field name="date_end"/></h2>
+                	<h2>From <field name="date_begin" class="oe_inline" /> to <field name="date_end" class="oe_inline"/></h2>
                     <group>
                         <group>
                             <label for="address_id" string="Address"/>
@@ -140,7 +147,7 @@
                                     </group>
                             </form>
                             </field>
-                            <group class="oe_subtotal_footer" colspan="4" style="margin-left:450px" name="regi_total">
+                            <group class="oe_subtotal_footer oe_right" colspan="2" name="regi_total">
                                 <field name="register_current"/>
                                 <field name="register_prospect"/>
                                 <field name="register_attended" class="oe_subtotal_footer_separator" />
@@ -327,15 +334,6 @@
            <field name="help">Event is the low level object used by meeting and others documents that should be synchronized with mobile devices or calendar applications through caldav. Most of the users should work in the Calendar menu, and not in the list of events.</field>
        </record>
 
-      <act_window
-            id="act_event_list_register_event"
-            name="Registration"
-            res_model="event.registration"
-            src_model="event.event"
-            view_mode="form,calendar,tree,graph"
-            context="{'search_default_event_id': [active_id], 'default_event_id': active_id}"
-            view_type="form"/>
-
       <act_window
             id="act_register_event_partner"
             name="Subscribe"

From f12a3b62aff4b0f1414b77b38b132383499ce665 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 26 Jun 2012 18:31:11 +0530
Subject: [PATCH 054/239] [IMP] survey: Improve view for title

bzr revid: dbr@tinyerp.com-20120626130111-jxhbxan5l3k5tp5q
---
 addons/survey/survey_view.xml | 49 +++++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index c50613f466b..59422e1f51b 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -26,18 +26,36 @@
                     <field name="state" widget="statusbar" statusbar_visible="open,close"/>
                 </header>
                 <sheet>
-                    <group col="6" colspan="6">
-                    <field name="title" select="1"/>
-                        <field name="responsible_id"/>
-                        <field name="id" invisible="1"/>
-                        <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
-                            string="Test Survey" type="action" icon="gtk-new"
-                            context="{'active':True,'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}"/>
-                        <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
-                            string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
-                        <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
-                            string="Edit Survey" type="action" icon="gtk-edit" context="{'active':True,'edit' : True,'survey_id': active_id}"/>
+                
+                <div class="oe_right oe_button_box">
+                    <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
+                        string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}" />
+                    <button name="122" states="open,draft,close,cancel" string="Test Survey" type="action" icon="gtk-new" context="{'active':True,'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}" />
+                    <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
+                        string="Edit Survey" type="action" icon="gtk-edit" context="{'active':True,'edit' : True,'survey_id': active_id}" invisible="1"/>
+                </div>
+                <group class="oe_inline">
+                    <h1>
+                        <field name="title" select="1"/>
+                        <field name="type"/>
+                    </h1>
+                </group>
+
+                    <group>
+                        <group>
+                            <field name="responsible_id"/>
+                            <field name="id" invisible="1"/>
+                            <field name="send_response"/>
+                        </group>
+                        <group>
+
+                        <field name="max_response_limit"
+                            attrs="{'readonly':[('state','in',('open','close'))]}"/>
+                        <field name="response_user"
+                            attrs="{'readonly':[('state','in',('open','close'))]}"/>
+                        </group>
                     </group>
+
                     <notebook>
                         <page string="Survey">
                             <field name="page_ids" colspan="4" nolabel="1" mode="form,tree">
@@ -189,14 +207,7 @@
                             </field>
                         </page>
                         <page string="Other">
-                            <group colspan="6" col='4'>
-                                <field name="max_response_limit"
-                                    attrs="{'readonly':[('state','in',('open','close'))]}"/>
-                                <field name="response_user"
-                                    attrs="{'readonly':[('state','in',('open','close'))]}"/>
-                                <field name="type"/>
-                                <field name="send_response"/>
-                            </group>
+
                             <separator colspan="4" string="Survey Details"/>
                             <field name="note" colspan="4" nolabel="1"/>
                         </page>

From 6878899c42bbea8ebc5683ce412e2b5ea1a75365 Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Tue, 26 Jun 2012 18:31:52 +0530
Subject: [PATCH 055/239] [IMP]event_form

bzr revid: pna@tinyerp.com-20120626130152-kovzkfq2tin2bx1i
---
 addons/event/event.py       | 12 ++++++++++++
 addons/event/event_view.xml |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 5387a64001f..288d2fa330f 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -258,6 +258,18 @@ class event_event(osv.osv):
     _constraints = [
         (_check_closing_date, 'Error ! Closing Date cannot be set before Beginning Date.', ['date_end']),
     ]
+    def onchange_address_id(self, cr, uid, ids, address, context=None):
+        data ={}
+        if not address:
+            return data
+        addr_obj = self.pool.get('res.partner')
+        addr_id =  addr_obj.browse(cr, uid, address, context=context)
+        data = {
+            'street':addr_id.street,
+            'zip':addr_id.zip,
+            'city':addr_id.city,
+            }
+        return {'value': data}
     def onchange_event_type(self, cr, uid, ids, type_event, context=None):
         if type_event:
             type_info =  self.pool.get('event.type').browse(cr,uid,type_event,context)
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 5caf9ad5369..d6f01677ac6 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -85,7 +85,7 @@
                         <group>
                             <label for="address_id" string="Address"/>
                             <div>
-                                <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}"/>
+                                <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}" on_change="onchange_address_id(address_id, context)" />
                             	<field name="street" />                            
                             	<div>
                                      <field name="city" class="oe_inline" placeholder="City"/>

From d2068b9bec1c46023aa25a45fe7c175d4516f125 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Tue, 26 Jun 2012 19:06:23 +0530
Subject: [PATCH 056/239] [IMP]knowledge : view are improved

bzr revid: hsa@tinyerp.com-20120626133623-5p17rdjrqaeim1o4
---
 addons/document/document_view.xml             | 72 +++++++++----------
 .../document_ftp/wizard/ftp_browse_view.xml   |  2 -
 .../wizard/ftp_configuration_view.xml         |  4 +-
 3 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index da4b6c2284d..929fba96de0 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -241,45 +241,45 @@
         <field name="arch" type="xml">
             <form string="Documents" version="7.0">
                 <sheet>
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="parent_id"/>
-                        <field name="user_id"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <group>
+                        <label for="name" string="Attachment Name"/>
+                        <h1>
+                            <field name="name" />
+                        </h1>
                     </group>
-                    <notebook colspan="4">
-                    <page string="Attachment">
+                    <group>
+                        <label for="datas" string="File Content"/>
+                        <h2>
+                            <field name="datas" filename="datas_fname"/>
+                        </h2>
+                    </group>
+                    <group>
                         <group>
-                            <group string="Data">
-                                <field name="type"/>
-                                <newline />
-                                <field name="datas" filename="datas_fname" attrs="{'invisible':[('type','=','url')]}"/>
-                                <field name="datas_fname" attrs="{'invisible':[('type','=','url')]}"/>
-                                <field name="url" widget="url" attrs="{'invisible':[('type','=','binary')]}"/>
-                            </group>
-                            <group>
-                                <field name="res_id" invisible="True"/>
-                                <field name="res_model" readonly="True" invisible="True" attrs="{'invisible': [('res_id','=',0)]}"/>
-                                <field name="res_name" readonly="1" attrs="{'invisible': [('res_id','=',0)]}"/>
-                                <separator string="Related to" colspan="2"/>
-                                <field name="partner_id"/>
-                            </group>
-                            <group groups="base.group_no_one" string="Created">
-                                <field name="create_uid" readonly="1"/>
-                                <field name="create_date" readonly="1"/>
-                            </group>
-                            <group groups="base.group_no_one" string="Modified">
-                                <field name="write_uid" readonly="1"/>
-                                <field name="write_date" readonly="1"/>
-                            </group>
+                            <field name="user_id"/>
+                            <field name="parent_id"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <field name="index_content"/>
                         </group>
-                    </page>
-                    <page string="Indexed Content - experimental" groups="base.group_no_one">
-                        <field name="index_content"/>
-                    </page>
-                    <page string="Notes">
-                        <field name="description"/>
-                    </page>
+                        <group>
+                            <field name="res_id" invisible="True"/>
+                            <field name="res_model" readonly="True" invisible="True" attrs="{'invisible': [('res_id','=',0)]}"/>
+                            <field name="res_name" readonly="1" attrs="{'invisible': [('res_id','=',0)]}"/>
+                            <field name="partner_id"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="History">
+                            <group>
+                                <group groups="base.group_no_one" string="Created">
+                                    <field name="create_uid" readonly="1"/>
+                                    <field name="create_date" readonly="1"/>
+                                </group>
+                                <group groups="base.group_no_one" string="Modified">
+                                    <field name="write_uid" readonly="1"/>
+                                    <field name="write_date" readonly="1"/>
+                                </group>
+                            </group>
+                        </page>
                     </notebook>
                 </sheet>
             </form>
diff --git a/addons/document_ftp/wizard/ftp_browse_view.xml b/addons/document_ftp/wizard/ftp_browse_view.xml
index 8ed31ee2323..4aa86f77612 100644
--- a/addons/document_ftp/wizard/ftp_browse_view.xml
+++ b/addons/document_ftp/wizard/ftp_browse_view.xml
@@ -9,9 +9,7 @@
                 <form string="Browse Document" version="7.0">
                     <header>
                         <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok"/>
-                        <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
                     </header>
-                    <separator string="Browse Document"/>
                     <group>
                         <field name="url" widget="url"/>
                     </group>
diff --git a/addons/document_ftp/wizard/ftp_configuration_view.xml b/addons/document_ftp/wizard/ftp_configuration_view.xml
index 10c8463b02c..e1a87b82358 100644
--- a/addons/document_ftp/wizard/ftp_configuration_view.xml
+++ b/addons/document_ftp/wizard/ftp_configuration_view.xml
@@ -20,7 +20,9 @@
             <group string="res_config_contents" position="replace">
             	<separator string="Configure FTP Server" />
             	<label string="Indicate the network address on which your OpenERP server should be reachable for end-users. This depends on your network topology and configuration, and will only affect the links displayed to the users. The format is HOST:PORT and the default host (localhost) is only suitable for access from the server machine itself.."/>
-                <field name="host"/>
+                <group>
+                    <field name="host"/>
+                </group>
             </group>
            <xpath expr="//button[@name='action_skip']" position="replace"/>
           </data>

From 26635ac3855e2461f19c4d5a89d7ab81a59c871e Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Wed, 27 Jun 2012 10:27:25 +0530
Subject: [PATCH 057/239] [IMP]eventtype-form

bzr revid: pna@tinyerp.com-20120627045725-1gtw8bfi3349rt91
---
 addons/event/event_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index d6f01677ac6..2cdbb280939 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -7,7 +7,7 @@
             res_model="event.registration"
             src_model="event.event"
             view_mode="calendar,tree,form,graph"
-            context="{'search_default_event_id': [active_id], 'default_event_id': active_id}"
+            context="{'search_default_event_id': active_id, 'default_event_id': active_id}"
             view_type="form"/>
         <menuitem  name="Events" id="event_main_menu"/>
         <menuitem name="Events Organisation" id="base.menu_event_main" parent="event_main_menu" />
@@ -24,10 +24,10 @@
                     <group col="4">
                         <field name="name"/>
                         <field name="default_reply_to"/>
-                        <field name="default_email_event" domain="[('model_id.model','=','event.registration')]"/>
-                        <field name="default_email_registration" domain="[('model_id.model','=','event.registration')]"/>
                         <field name="default_registration_min"/>
+                        <field name="default_email_event" domain="[('model_id.model','=','event.registration')]"/>
                         <field name="default_registration_max"/>
+                        <field name="default_email_registration" domain="[('model_id.model','=','event.registration')]"/>
                     </group>
                 </form>
             </field>

From 837029b1391e5eba0baf57e24a67502dd9a89f63 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Wed, 27 Jun 2012 10:58:14 +0530
Subject: [PATCH 058/239] [IMP]knowledge : Document view is improved

bzr revid: hsa@tinyerp.com-20120627052814-wta0a2cxlrc7b1yt
---
 addons/document/document_view.xml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 929fba96de0..57ce299d672 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -241,18 +241,19 @@
         <field name="arch" type="xml">
             <form string="Documents" version="7.0">
                 <sheet>
-                    <group>
-                        <label for="name" string="Attachment Name"/>
+                    <div>
+                        <label for="name" class="oe_edit_only"/>
                         <h1>
-                            <field name="name" />
+                            <field name="name" class="oe_inline"/>
+                            <field name="type" class="oe_inline"/>
                         </h1>
-                    </group>
-                    <group>
-                        <label for="datas" string="File Content"/>
+                    </div>
+                    <div>
+                        <label for="datas" class="oe_edit_only"/>
                         <h2>
                             <field name="datas" filename="datas_fname"/>
                         </h2>
-                    </group>
+                    </div>
                     <group>
                         <group>
                             <field name="user_id"/>

From 11606cb5fb2ace47daaadca3dc6d069700dfa311 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Wed, 27 Jun 2012 11:28:17 +0530
Subject: [PATCH 059/239] [IMP]solving budget_lines access for project and
 sales group

bzr revid: dhr@tinyerp.com-20120627055817-5x7h7xms67b6iyj9
---
 addons/account_budget/security/ir.model.access.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account_budget/security/ir.model.access.csv b/addons/account_budget/security/ir.model.access.csv
index 1298884a856..a073fbd9221 100644
--- a/addons/account_budget/security/ir.model.access.csv
+++ b/addons/account_budget/security/ir.model.access.csv
@@ -4,3 +4,4 @@ access_account_budget_post,account.budget.post,model_account_budget_post,account
 access_account_budget_post_accountant,account.budget.post accountant,model_account_budget_post,account.group_account_user,1,1,1,1
 access_crossovered_budget_accountant,crossovered.budget accountant,model_crossovered_budget,account.group_account_user,1,1,1,1
 access_crossovered_budget_lines_accountant,crossovered.budget.lines accountant,model_crossovered_budget_lines,account.group_account_user,1,1,1,1
+access_budget_partner,crossovered.budget.lines manager,model_crossovered_budget_lines,base.group_partner_manager,1,0,0,0

From 8bf9c634157f83563ef988bc68a3c8b79e753c37 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Wed, 27 Jun 2012 11:37:15 +0530
Subject: [PATCH 060/239] [IMP]knowledge : Shared Repository Document view is
 improved

bzr revid: hsa@tinyerp.com-20120627060715-i92i74vj1e5pbh48
---
 addons/document/document_view.xml | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 57ce299d672..8a25acdce55 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -241,19 +241,18 @@
         <field name="arch" type="xml">
             <form string="Documents" version="7.0">
                 <sheet>
-                    <div>
-                        <label for="name" class="oe_edit_only"/>
-                        <h1>
-                            <field name="name" class="oe_inline"/>
-                            <field name="type" class="oe_inline"/>
-                        </h1>
-                    </div>
-                    <div>
-                        <label for="datas" class="oe_edit_only"/>
-                        <h2>
-                            <field name="datas" filename="datas_fname"/>
-                        </h2>
-                    </div>
+                    <label for="name" class="oe_edit_only"/>
+                    <h1>
+                        <field name="name" class="oe_inline"/>
+                        <field name="type" class="oe_inline oe_right"/>
+                    </h1>
+               
+                    <label for="datas" class="oe_edit_only"/>
+                    <h2>
+                        <field name="datas" filename="datas_fname" attrs="{'invisible':[('type','=','url')]}" class="oe_inline"/>
+                        <field name="datas_fname" attrs="{'invisible':[('type','=','url')]}" class="oe_inline oe_right"/>
+                        <field name="url" widget="url" attrs="{'invisible':[('type','=','binary')]}" class="oe_inline"/>
+                    </h2>
                     <group>
                         <group>
                             <field name="user_id"/>

From 7446950bb7b5f6d6b655fbafa6c6ec2f14b66522 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Wed, 27 Jun 2012 11:59:34 +0530
Subject: [PATCH 061/239] [IMP]access with no group to object:crossovered
 budget lines

bzr revid: dhr@tinyerp.com-20120627062934-p02gwaaa6rhm3zs7
---
 addons/account_budget/security/ir.model.access.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_budget/security/ir.model.access.csv b/addons/account_budget/security/ir.model.access.csv
index a073fbd9221..456b548663e 100644
--- a/addons/account_budget/security/ir.model.access.csv
+++ b/addons/account_budget/security/ir.model.access.csv
@@ -4,4 +4,4 @@ access_account_budget_post,account.budget.post,model_account_budget_post,account
 access_account_budget_post_accountant,account.budget.post accountant,model_account_budget_post,account.group_account_user,1,1,1,1
 access_crossovered_budget_accountant,crossovered.budget accountant,model_crossovered_budget,account.group_account_user,1,1,1,1
 access_crossovered_budget_lines_accountant,crossovered.budget.lines accountant,model_crossovered_budget_lines,account.group_account_user,1,1,1,1
-access_budget_partner,crossovered.budget.lines manager,model_crossovered_budget_lines,base.group_partner_manager,1,0,0,0
+access_budget,crossovered.budget.lines manager,model_crossovered_budget_lines,,1,0,0,0

From 2617ab240be1b6affca7d07f4196cac119539966 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Wed, 27 Jun 2012 12:05:42 +0530
Subject: [PATCH 062/239] [IMP]knowledge : Shared Repository Document attrs are
 add

bzr revid: hsa@tinyerp.com-20120627063542-h40ty28t15576pf5
---
 addons/document/document_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 8a25acdce55..d5eb6908a0d 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -246,8 +246,8 @@
                         <field name="name" class="oe_inline"/>
                         <field name="type" class="oe_inline oe_right"/>
                     </h1>
-               
-                    <label for="datas" class="oe_edit_only"/>
+                    <label for="datas" class="oe_edit_only" attrs="{'invisible':[('type','=','url')]}"/>
+                    <label for="url" class="oe_edit_only" attrs="{'invisible':[('type','=','binary')]}" />
                     <h2>
                         <field name="datas" filename="datas_fname" attrs="{'invisible':[('type','=','url')]}" class="oe_inline"/>
                         <field name="datas_fname" attrs="{'invisible':[('type','=','url')]}" class="oe_inline oe_right"/>

From f09a9f673ac307df3a05278b8070ceaf5c6fb71b Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Wed, 27 Jun 2012 12:56:25 +0530
Subject: [PATCH 063/239] [IMP]knowledge : Shared Repository Document set
 string

bzr revid: hsa@tinyerp.com-20120627072625-40m1x2crhh2e0jmk
---
 addons/document/document_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index d5eb6908a0d..300c874bc2b 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -247,10 +247,10 @@
                         <field name="type" class="oe_inline oe_right"/>
                     </h1>
                     <label for="datas" class="oe_edit_only" attrs="{'invisible':[('type','=','url')]}"/>
-                    <label for="url" class="oe_edit_only" attrs="{'invisible':[('type','=','binary')]}" />
+                    <label for="url" class="oe_edit_only" attrs="{'invisible':[('type','=','binary')]}"/>
                     <h2>
                         <field name="datas" filename="datas_fname" attrs="{'invisible':[('type','=','url')]}" class="oe_inline"/>
-                        <field name="datas_fname" attrs="{'invisible':[('type','=','url')]}" class="oe_inline oe_right"/>
+                        <field name="datas_fname" invisible="1" attrs="{'invisible':[('type','=','url')]}" class="oe_inline oe_right"/>
                         <field name="url" widget="url" attrs="{'invisible':[('type','=','binary')]}" class="oe_inline"/>
                     </h2>
                     <group>
@@ -258,7 +258,7 @@
                             <field name="user_id"/>
                             <field name="parent_id"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            <field name="index_content"/>
+                            <field name="index_content" string="Tab Indexed Content"/>
                         </group>
                         <group>
                             <field name="res_id" invisible="True"/>

From 4b4cb204dd3bf807766d1d431bdb316b1c964866 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 27 Jun 2012 14:21:35 +0530
Subject: [PATCH 064/239] [IMP]survet: Improve Survey form view

bzr revid: dbr@tinyerp.com-20120627085135-q7uloa3thyu131gh
---
 addons/survey/survey_view.xml | 343 ++++++++++++++++++----------------
 1 file changed, 178 insertions(+), 165 deletions(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 59422e1f51b..4001880b92d 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -26,185 +26,191 @@
                     <field name="state" widget="statusbar" statusbar_visible="open,close"/>
                 </header>
                 <sheet>
-                
-                <div class="oe_right oe_button_box">
-                    <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
-                        string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}" />
-                    <button name="122" states="open,draft,close,cancel" string="Test Survey" type="action" icon="gtk-new" context="{'active':True,'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}" />
-                    <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
-                        string="Edit Survey" type="action" icon="gtk-edit" context="{'active':True,'edit' : True,'survey_id': active_id}" invisible="1"/>
-                </div>
-                <group class="oe_inline">
                     <h1>
-                        <field name="title" select="1"/>
-                        <field name="type"/>
+                        <field name="title" select="1" class="oe_inline"/>
+                        <field name="type" class="oe_inline"/>
+                        <button name="122" states="open,draft,close,cancel" string="Test Survey" type="action" icon="gtk-new" context="{'active':True,'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}" class="oe_right"/>
                     </h1>
-                </group>
-
+                    
+                    <div>
+                        <label for="responsible_id"/>
+                        <field name="responsible_id" class="oe_inline"/>
+                        <button name="106" states="open,draft,close,cancel" string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}" class="oe_right"/>
+                        <button name="106" states="open,draft,close,cancel" string="Edit Survey" type="action" icon="gtk-edit" context="{'active':True,'edit' : True,'survey_id': active_id}" invisible="1"/>
+                    </div>
                     <group>
                         <group>
-                            <field name="responsible_id"/>
                             <field name="id" invisible="1"/>
                             <field name="send_response"/>
                         </group>
                         <group>
-
-                        <field name="max_response_limit"
-                            attrs="{'readonly':[('state','in',('open','close'))]}"/>
-                        <field name="response_user"
-                            attrs="{'readonly':[('state','in',('open','close'))]}"/>
+                            <field name="max_response_limit" attrs="{'readonly':[('state','in',('open','close'))]}"/>
+                            <field name="response_user" attrs="{'readonly':[('state','in',('open','close'))]}"/>
                         </group>
-                    </group>
-
-                    <notebook>
+                     </group>
+                     <notebook>
                         <page string="Survey">
                             <field name="page_ids" colspan="4" nolabel="1" mode="form,tree">
                                 <form string="Survey Page">
-                                    <field name="title" select="1"/>
-                                    <field name="sequence" groups="base.group_no_one"/>
-                                    <separator string="Description" colspan="4"/>
-                                    <field name="note" colspan="4" nolabel="1"/>
-                                    <field name="question_ids" height="200" width="200" colspan="4" nolabel="1">
-                                        <form string="Survey Question" >
-                                            <group col="6" colspan="6" height="600" width="200">
-                                            <field name="question" colspan="4" select="1"/>
-                                            <field name="sequence"/>
-                                            <field name="tot_resp"/>
-                                            <field name="type" on_change="on_change_type(type)"/>
-                                            <field name="in_visible_rating_weight" invisible="1"/>
-                                            <field name="in_visible_menu_choice" invisible="1"/>
-                                            <field name="in_visible_answer_type" invisible="1"/>
-                                            <notebook colspan="4">
-                                                <page string="Options">
-                                                    <group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
-                                                      <separator string="Answer" colspan="4"/>
-                                                       <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
-                                                           <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'in_visible_answer_type': in_visible_answer_type}"/>
-                                                       </group>
-                                                       <group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
-                                                           <field name="column_heading_ids" colspan="4" nolabel="1" context="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
-                                                            <group colspan="4" attrs="{'invisible':[('type','!=','table')]}">
-                                                               <field name="no_of_rows"/>
-                                                            </group>
-                                                       </group>
+                                    <group>
+                                        <field name="title" select="1"/>
+                                        <field name="sequence" groups="base.group_no_one"/>
+                                    </group>
+                                    <newline/>
+                                    <group>
+                                        <field name="note" placeholder="Add a description on the survey page" nolabel="1"/>
+                                    </group>
+                                    <newline/>
+                                    <group string="Survey Questions">
+                                        <field name="question_ids" nolabel="1">
+                                            <form string="Survey Question" >
+                                                <group>
+                                                    <group>
+                                                    <field name="question" select="1"/>
+                                                    <field name="type" on_change="on_change_type(type)"/>
                                                     </group>
-                                                    <newline/>
-                                                    <group  attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
-                                                        <separator string="Comment Field" colspan="4"/>
-                                                        <group colspan="4">
-                                                            <field name="is_comment_require"/>
-                                                        </group>
-                                                        <group attrs="{'invisible':[('is_comment_require','=',False)]}">
-                                                            <group col="4" colspan="4">
-                                                                <field name="comment_field_type" colspan="1"/>
-                                                                <group colspan="2" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
-                                                                    <field colspan="2" name="comment_label" />
-                                                                </group>
-                                                            </group>
-                                                            <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
-                                                                <field name="comment_valid_type" colspan="2"/>
-                                                                <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
-                                                                    <field name="comment_minimum_no" string="Between"/>
-                                                                    <field name="comment_maximum_no" string="and"/>
-                                                                </group>
-                                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
-                                                                    <field name="comment_minimum_float" string="Between"/>
-                                                                    <field name="comment_maximum_float" string="and"/>
-                                                                </group>
-                                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
-                                                                    <field name="comment_minimum_date" string="Between"/>
-                                                                    <field name="comment_maximum_date" string="and"/>
-                                                                </group>
-                                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
-                                                                    <label string="When the comment is an invalid format, display this error message" colspan="4"/>
-                                                                    <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
-                                                                </group>
-                                                            </group>
-                                                        </group>
+                                                    <group>
+                                                    <field name="sequence"/>
+                                                    <field name="tot_resp"/>
                                                     </group>
-                                                    <newline/>
-                                                    <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
-                                                        <field name="comment_column"/>
-                                                        <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
-                                                            <field name="column_name" colspan="2"/>
+                                                </group>
+                                                <newline/>
+                                                <group>
+                                                <field name="in_visible_rating_weight" invisible="1"/>
+                                                <field name="in_visible_menu_choice" invisible="1"/>
+                                                <field name="in_visible_answer_type" invisible="1"/>
+                                                <notebook colspan="4">
+                                                    <page string="Options">
+                                                        <group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}" string="Answer">
+                                                           <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
+                                                               <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'in_visible_answer_type': in_visible_answer_type}"/>
+                                                           </group>
+                                                           <group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
+                                                               <field name="column_heading_ids" colspan="4" nolabel="1" context="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
+                                                                <group colspan="4" attrs="{'invisible':[('type','!=','table')]}">
+                                                                   <field name="no_of_rows"/>
+                                                                </group>
+                                                           </group>
                                                         </group>
-                                                    </group>
-                                                    <newline/>
-                                                    <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
-                                                        <separator string="Validation" colspan="4"/>
-                                                        <group colspan="4">
-                                                            <field name="is_validation_require"/>
-                                                        </group>
-                                                        <group col="6" colspan="4" attrs="{'invisible':[('is_validation_require','=',False)]}">
-                                                            <field name="validation_type" colspan="2"/>
-                                                            <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
-                                                                <field name="validation_minimum_no" string="Between"/>
-                                                                <field name="validation_maximum_no" string="and"/>
-                                                            </group>
-                                                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
-                                                                <field name="validation_minimum_float" string="Between"/>
-                                                                <field name="validation_maximum_float" string="and"/>
-                                                            </group>
-                                                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
-                                                                <field name="validation_minimum_date" string="Between"/>
-                                                                <field name="validation_maximum_date" string="and"/>
-                                                            </group>
-                                                        </group>
-                                                        <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
-                                                            <label string="When the comment is an invalid format, display this error message" colspan="4"/>
-                                                            <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
-                                                        </group>
-                                                    </group>
-                                                    <newline/>
-                                                    <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
-                                                        <separator string="Required Answer" colspan="4"/>
                                                         <newline/>
-                                                        <field name="is_require_answer"/>
-                                                        <group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
-                                                            <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
-                                                                <field name="required_type"/>
-                                                                <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
-                                                                    <field name="req_ans" />
-                                                                </group>
-                                                                <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
-                                                                    <field name="minimum_req_ans"/>
-                                                                    <field name="maximum_req_ans"/>
-                                                                </group>
+                                                        <group  attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
+                                                            <separator string="Comment Field" colspan="4"/>
+                                                            <group colspan="4">
+                                                                <field name="is_comment_require"/>
                                                             </group>
-                                                            <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
-                                                                <label string="When the question is not answered, display this error message:"/>
-                                                                <field name="req_error_msg" colspan="4" nolabel="1"/>
-                                                            </group>
-                                                            <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
-                                                                <group colspan="2" >
-                                                                    <field name="numeric_required_sum"/>
+                                                            <group attrs="{'invisible':[('is_comment_require','=',False)]}">
+                                                                <group col="4" colspan="4">
+                                                                    <field name="comment_field_type" colspan="1"/>
+                                                                    <group colspan="2" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                                                        <field colspan="2" name="comment_label" />
+                                                                    </group>
+                                                                </group>
+                                                                <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                                                    <field name="comment_valid_type" colspan="2"/>
+                                                                    <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
+                                                                        <field name="comment_minimum_no" string="Between"/>
+                                                                        <field name="comment_maximum_no" string="and"/>
+                                                                    </group>
+                                                                    <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
+                                                                        <field name="comment_minimum_float" string="Between"/>
+                                                                        <field name="comment_maximum_float" string="and"/>
+                                                                    </group>
+                                                                    <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
+                                                                        <field name="comment_minimum_date" string="Between"/>
+                                                                        <field name="comment_maximum_date" string="and"/>
+                                                                    </group>
+                                                                    <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
+                                                                        <label string="When the comment is an invalid format, display this error message" colspan="4"/>
+                                                                        <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
+                                                                    </group>
                                                                 </group>
-                                                                <newline/>
-                                                                <label string="When the choices do not add up correctly, display this error message"/>
-                                                                <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
-                                                            </group>
-                                                            <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
-                                                                <field name="rating_allow_one_column_require"/>
                                                             </group>
                                                         </group>
-                                                    </group>
-                                                    <newline/>
-                                                    <group attrs="{'invisible':[('type','!=','descriptive_text')]}">
-                                                        <separator string="Descriptive Text" colspan="4"/>
-                                                        <field name="descriptive_text" colspan="4" nolabel="1"/>
-                                                    </group>
-                                                </page>
-                                            </notebook>
-                                            </group>
-                                        </form>
-                                        <tree string="Survey Question">
-                                            <field name="sequence" string="Seq"/>
-                                            <field name="question" colspan="4" select="1"/>
-                                            <field name="answer_choice_ids"/>
-                                        </tree>
-                                    </field>
-                                </form>
-                            </field>
+                                                        <newline/>
+                                                        <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
+                                                            <field name="comment_column"/>
+                                                            <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
+                                                                <field name="column_name" colspan="2"/>
+                                                            </group>
+                                                        </group>
+                                                        <newline/>
+                                                        <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
+                                                            <separator string="Validation" colspan="4"/>
+                                                            <group colspan="4">
+                                                                <field name="is_validation_require"/>
+                                                            </group>
+                                                            <group col="6" colspan="4" attrs="{'invisible':[('is_validation_require','=',False)]}">
+                                                                <field name="validation_type" colspan="2"/>
+                                                                <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
+                                                                    <field name="validation_minimum_no" string="Between"/>
+                                                                    <field name="validation_maximum_no" string="and"/>
+                                                                </group>
+                                                                <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
+                                                                    <field name="validation_minimum_float" string="Between"/>
+                                                                    <field name="validation_maximum_float" string="and"/>
+                                                                </group>
+                                                                <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
+                                                                    <field name="validation_minimum_date" string="Between"/>
+                                                                    <field name="validation_maximum_date" string="and"/>
+                                                                </group>
+                                                            </group>
+                                                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
+                                                                <label string="When the comment is an invalid format, display this error message" colspan="4"/>
+                                                                <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
+                                                            </group>
+                                                        </group>
+                                                        <newline/>
+                                                        <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
+                                                            <separator string="Required Answer" colspan="4"/>
+                                                            <newline/>
+                                                            <field name="is_require_answer"/>
+                                                            <group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
+                                                                <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
+                                                                    <field name="required_type"/>
+                                                                    <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
+                                                                        <field name="req_ans" />
+                                                                    </group>
+                                                                    <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
+                                                                        <field name="minimum_req_ans"/>
+                                                                        <field name="maximum_req_ans"/>
+                                                                    </group>
+                                                                </group>
+                                                                <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
+                                                                    <label string="When the question is not answered, display this error message:"/>
+                                                                    <field name="req_error_msg" colspan="4" nolabel="1"/>
+                                                                </group>
+                                                                <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
+                                                                    <group colspan="2" >
+                                                                        <field name="numeric_required_sum"/>
+                                                                    </group>
+                                                                    <newline/>
+                                                                    <label string="When the choices do not add up correctly, display this error message"/>
+                                                                    <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
+                                                                </group>
+                                                                <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
+                                                                    <field name="rating_allow_one_column_require"/>
+                                                                </group>
+                                                            </group>
+                                                        </group>
+                                                        <newline/>
+                                                        <group attrs="{'invisible':[('type','!=','descriptive_text')]}">
+                                                            <separator string="Descriptive Text" colspan="4"/>
+                                                            <field name="descriptive_text" colspan="4" nolabel="1"/>
+                                                        </group>
+                                                    </page>
+                                                </notebook>
+                                                </group>
+                                            </form>
+                                            <tree string="Survey Question">
+                                                <field name="sequence" string="Seq"/>
+                                                <field name="question" colspan="4" select="1"/>
+                                                <field name="answer_choice_ids"/>
+                                            </tree>
+                                        </field>
+                                    </group>
+                                    </form>
+                                </field>
+
                         </page>
                         <page string="Other">
 
@@ -215,10 +221,16 @@
                             <field name="invited_user_ids" nolabel="1" readonly="1"/>
                         </page>
                         <page string="History">
-                            <field name="date_open" select="1"/>
-                            <field name="date_close"/>
-                            <field name="tot_start_survey" select="1"/>
-                            <field name="tot_comp_survey" select="1"/>
+                            <group>
+                                <group>
+                                    <field name="date_open" select="1"/>
+                                    <field name="date_close"/>
+                                </group>
+                                <group>
+                                    <field name="tot_start_survey" select="1"/>
+                                    <field name="tot_comp_survey" select="1"/>
+                                </group>
+                            </group>
                             <field name="history" colspan="4" nolabel="1">
                                 <tree string="History">
                                     <field name="date"/>
@@ -228,8 +240,9 @@
                                     <field name="date"/>
                                     <field name="user_id"/>
                                 </form>
-                               </field>
-                           </page>
+                           </field>
+
+                        </page>
                     </notebook>
                 </sheet>
                 </form>

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 065/239] [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 903080fbeb3d9cb1f8e58e01acdaca51e9f3bf04 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 27 Jun 2012 14:54:21 +0530
Subject: [PATCH 066/239] [IMP]survet: Improve view for survey page and remove
 sepratore from browse Answer wizard

bzr revid: dbr@tinyerp.com-20120627092421-ckveonxc00yaltfr
---
 addons/survey/survey_view.xml                 | 267 +++++++++---------
 addons/survey/wizard/survey_browse_answer.xml |   3 +-
 2 files changed, 139 insertions(+), 131 deletions(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 4001880b92d..5ef19555511 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -328,149 +328,158 @@
             <field name="arch" type="xml">
                 <form string="Survey Page" version="7.0">
                     <sheet>
-                        <field name="title" colspan="4" select="1"/>
-                        <field name="survey_id" select="1"/>
-                        <field name="sequence"/>
-                        <separator string="Description" colspan="4"/>
-                        <field name="note" colspan="4" nolabel="1"/>
-                        <field name="question_ids" colspan="4" nolabel="1">
-                        <form string="Survey Question">
-                            <field name="question" colspan="4" select="1"/>
+                        <group col="4">
+                            <field name="title" select="1"/>
+                            <field name="survey_id" select="1"/>
                             <field name="sequence"/>
-                            <field name="tot_resp"/>
-                            <field name="type" on_change="on_change_type(type)"/>
-                            <field name="in_visible_rating_weight" invisible="1"/>
-                            <field name="in_visible_menu_choice" invisible="1"/>
-                            <field name="in_visible_answer_type" invisible="1"/>
-                            <notebook colspan="4">
-                                <page string="Options">
-                                    <group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
-                                      <separator string="Answer" colspan="4"/>
-                                       <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
-                                           <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'in_visible_answer_type': in_visible_answer_type}"/>
-                                       </group>
-                                       <group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
-                                           <field name="column_heading_ids" colspan="4" nolabel="1" context="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
-                                            <group colspan="4" attrs="{'invisible':[('type','!=','table')]}">
-                                               <field name="no_of_rows"/>
-                                            </group>
-                                       </group>
+                        </group>
+                        <group string="Description" col="4">
+                            <field name="note" nolabel="1"/>
+                        </group>
+                        <group col="4">
+                            <field name="question_ids" nolabel="1">
+                            <form string="Survey Question">
+                                <group>
+                                    <group>
+                                        <field name="question" select="1"/>
+                                        <field name="type" on_change="on_change_type(type)"/>
+                                    </group>
+                                    <group>
+                                        <field name="sequence"/>
+                                        <field name="tot_resp"/>
+                                        <field name="in_visible_rating_weight" invisible="1"/>
+                                        <field name="in_visible_menu_choice" invisible="1"/>
+                                        <field name="in_visible_answer_type" invisible="1"/>
                                     </group>
                                     <newline/>
-                                    <group  attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
-                                        <separator string="Comment Field" colspan="4"/>
-                                        <group colspan="4">
-                                            <field name="is_comment_require"/>
-                                        </group>
-                                        <group attrs="{'invisible':[('is_comment_require','=',False)]}">
-                                            <group col="4" colspan="4">
-                                                <field name="comment_field_type" colspan="1"/>
-                                                <group colspan="2" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
-                                                    <field colspan="2" name="comment_label" />
+                                    <notebook colspan="4">
+                                        <page string="Options">
+                                            <group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}" string="Answer" col="4">
+                                               <group attrs="{'invisible':[('type','=','table')]}">
+                                                   <field name="answer_choice_ids" nolabel="1" context="{'in_visible_answer_type': in_visible_answer_type}"/>
+                                               </group>
+                                               <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
+                                                   <field name="column_heading_ids" nolabel="1" context="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
+                                                    <group attrs="{'invisible':[('type','!=','table')]}">
+                                                       <field name="no_of_rows"/>
+                                                    </group>
+                                               </group>
+                                            </group>
+                                            <newline/>
+                                            <group  attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}" string="Comment Field" col="4">
+                                                <group>
+                                                    <field name="is_comment_require"/>
+                                                </group>
+                                                <group attrs="{'invisible':[('is_comment_require','=',False)]}">
+                                                    <group>
+                                                        <field name="comment_field_type" colspan="1"/>
+                                                        <group attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                                            <field name="comment_label" />
+                                                        </group>
+                                                    </group>
+                                                    <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                                        <field name="comment_valid_type" colspan="2"/>
+                                                        <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
+                                                            <field name="comment_minimum_no" string="Between"/>
+                                                            <field name="comment_maximum_no" string="and"/>
+                                                        </group>
+                                                        <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
+                                                            <field name="comment_minimum_float" string="Between"/>
+                                                            <field name="comment_maximum_float" string="and"/>
+                                                        </group>
+                                                        <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
+                                                            <field name="comment_minimum_date" string="Between"/>
+                                                            <field name="comment_maximum_date" string="and"/>
+                                                        </group>
+                                                        <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
+                                                            <label string="When the comment is an invalid format, display this error message" colspan="4"/>
+                                                            <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
+                                                        </group>
+                                                    </group>
                                                 </group>
                                             </group>
-                                            <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
-                                                <field name="comment_valid_type" colspan="2"/>
-                                                <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
-                                                    <field name="comment_minimum_no" string="Between"/>
-                                                    <field name="comment_maximum_no" string="and"/>
+                                            <newline/>
+                                            <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
+                                                <field name="comment_column"/>
+                                                <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
+                                                    <field name="column_name" colspan="2"/>
                                                 </group>
-                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
-                                                    <field name="comment_minimum_float" string="Between"/>
-                                                    <field name="comment_maximum_float" string="and"/>
+                                            </group>
+                                            <newline/>
+                                            <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
+                                                <separator string="Validation" colspan="4"/>
+                                                <group colspan="4">
+                                                    <field name="is_validation_require"/>
                                                 </group>
-                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
-                                                    <field name="comment_minimum_date" string="Between"/>
-                                                    <field name="comment_maximum_date" string="and"/>
+                                                <group col="6" colspan="4" attrs="{'invisible':[('is_validation_require','=',False)]}">
+                                                    <field name="validation_type" colspan="2"/>
+                                                    <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
+                                                        <field name="validation_minimum_no" string="Between"/>
+                                                        <field name="validation_maximum_no" string="and"/>
+                                                    </group>
+                                                    <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
+                                                        <field name="validation_minimum_float" string="Between"/>
+                                                        <field name="validation_maximum_float" string="and"/>
+                                                    </group>
+                                                    <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
+                                                        <field name="validation_minimum_date" string="Between"/>
+                                                        <field name="validation_maximum_date" string="and"/>
+                                                    </group>
                                                 </group>
-                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
+                                                <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
                                                     <label string="When the comment is an invalid format, display this error message" colspan="4"/>
-                                                    <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
+                                                    <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
                                                 </group>
                                             </group>
-                                        </group>
-                                    </group>
-                                    <newline/>
-                                    <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
-                                        <field name="comment_column"/>
-                                        <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
-                                            <field name="column_name" colspan="2"/>
-                                        </group>
-                                    </group>
-                                    <newline/>
-                                    <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
-                                        <separator string="Validation" colspan="4"/>
-                                        <group colspan="4">
-                                            <field name="is_validation_require"/>
-                                        </group>
-                                        <group col="6" colspan="4" attrs="{'invisible':[('is_validation_require','=',False)]}">
-                                            <field name="validation_type" colspan="2"/>
-                                            <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
-                                                <field name="validation_minimum_no" string="Between"/>
-                                                <field name="validation_maximum_no" string="and"/>
-                                            </group>
-                                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
-                                                <field name="validation_minimum_float" string="Between"/>
-                                                <field name="validation_maximum_float" string="and"/>
-                                            </group>
-                                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
-                                                <field name="validation_minimum_date" string="Between"/>
-                                                <field name="validation_maximum_date" string="and"/>
-                                            </group>
-                                        </group>
-                                        <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
-                                            <label string="When the comment is an invalid format, display this error message" colspan="4"/>
-                                            <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
-                                        </group>
-                                    </group>
-                                    <newline/>
-                                    <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
-                                        <separator string="Required Answer" colspan="4"/>
-                                        <newline/>
-                                        <field name="is_require_answer"/>
-                                        <group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
-                                            <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
-                                                <field name="required_type"/>
-                                                <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
-                                                    <field name="req_ans" />
-                                                </group>
-                                                <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
-                                                    <field name="minimum_req_ans"/>
-                                                    <field name="maximum_req_ans"/>
-                                                </group>
-                                            </group>
-                                            <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
-                                                <label string="When the question is not answered, display this error message:"/>
-                                                <field name="req_error_msg" colspan="4" nolabel="1"/>
-                                            </group>
-                                            <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
-                                                <group colspan="2" >
-                                                    <field name="numeric_required_sum"/>
-                                                </group>
+                                            <newline/>
+                                            <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
+                                                <separator string="Required Answer" colspan="4"/>
                                                 <newline/>
-                                                <label string="When the choices do not add up correctly, display this error message"/>
-                                                <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
+                                                <field name="is_require_answer"/>
+                                                <group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
+                                                    <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
+                                                        <field name="required_type"/>
+                                                        <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
+                                                            <field name="req_ans" />
+                                                        </group>
+                                                        <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
+                                                            <field name="minimum_req_ans"/>
+                                                            <field name="maximum_req_ans"/>
+                                                        </group>
+                                                    </group>
+                                                    <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
+                                                        <label string="When the question is not answered, display this error message:"/>
+                                                        <field name="req_error_msg" colspan="4" nolabel="1"/>
+                                                    </group>
+                                                    <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
+                                                        <group colspan="2" >
+                                                            <field name="numeric_required_sum"/>
+                                                        </group>
+                                                        <newline/>
+                                                        <label string="When the choices do not add up correctly, display this error message"/>
+                                                        <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
+                                                    </group>
+                                                    <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
+                                                        <field name="rating_allow_one_column_require"/>
+                                                    </group>
+                                                </group>
                                             </group>
-                                            <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
-                                                <field name="rating_allow_one_column_require"/>
+                                            <newline/>
+                                            <group attrs="{'invisible':[('type','!=','descriptive_text')]}">
+                                                <separator string="Descriptive Text" colspan="4"/>
+                                                <field name="descriptive_text" colspan="4" nolabel="1"/>
                                             </group>
-                                        </group>
-                                    </group>
-                                    <newline/>
-                                    <group attrs="{'invisible':[('type','!=','descriptive_text')]}">
-                                        <separator string="Descriptive Text" colspan="4"/>
-                                        <field name="descriptive_text" colspan="4" nolabel="1"/>
-                                    </group>
-                                </page>
-                            </notebook>
-    
-                        </form>
-                        <tree string="Survey Question">
-                            <field name="sequence" string="Seq"/>
-                            <field name="question" colspan="4" select="1"/>
-                            <field name="answer_choice_ids"/>
-                        </tree>
-                        </field>
+                                        </page>
+                                    </notebook>
+                                </group>
+                            </form>
+                            <tree string="Survey Question">
+                                <field name="sequence" string="Seq"/>
+                                <field name="question" colspan="4" select="1"/>
+                                <field name="answer_choice_ids"/>
+                            </tree>
+                            </field>
+                        </group>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/survey/wizard/survey_browse_answer.xml b/addons/survey/wizard/survey_browse_answer.xml
index a2069cfdb9a..bdfbb200237 100644
--- a/addons/survey/wizard/survey_browse_answer.xml
+++ b/addons/survey/wizard/survey_browse_answer.xml
@@ -16,8 +16,7 @@
                         <button icon="gtk-go-forward" name="action_next" string="Start" type="object"/>
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                     </header>
-                    <group col="4">
-                        <separator colspan="4"  string =  "Select Survey and Related Answer"/>
+                    <group col="4" string =  "Select Survey and Related Answer">
                         <field name="survey_id"/>
                         <field name="response_id" domain="[('survey_id','=', survey_id)]"/>
                     </group>

From 51b64aef016f453c96d7b350decdf10f06e252e7 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 27 Jun 2012 16:32:07 +0530
Subject: [PATCH 067/239] [IMP]lunch: Lunch configuration improvemnets

bzr revid: dbr@tinyerp.com-20120627110207-fmhxho2ij95d2jp8
---
 addons/lunch/lunch_view.xml | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 53152292f68..7df87c6cf89 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -109,8 +109,10 @@
             <field name="model">lunch.cashbox</field>
             <field name="arch" type="xml">
                 <form string="Cashboxes" version="7.0">
-                    <field name="name"/>
-                    <field name="manager"/>
+                    <group>
+                        <field name="name"/>
+                        <field name="manager"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -220,8 +222,9 @@
             <field name="model">lunch.category</field>
             <field name="arch" type="xml">
                 <form string="Category" version="7.0">
-                    <separator string="Category Related to Products" colspan="4"/>
+                    <group col="4">
                     <field name="name"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -254,18 +257,18 @@
             <field name="model">lunch.product</field>
             <field name="arch" type="xml">
                 <form string="Products" version="7.0">
-                     <group col="6">
-                          <field name="name"/>
-                          <field name="category_id"/>
-                          <field name="price" />
-                     </group>
-                     <notebook colspan="4">
-                         <page string="General Information">
-                              <field name="active"/>
-                              <separator string="Description" colspan="4" />
-                              <field name="description" nolabel="1" colspan="4" />
-                          </page>
-                     </notebook>
+                    <group>
+                    <group>
+                        <field name="name"/>
+                        <field name="category_id"/>
+                        <field name="price" />
+                    </group>
+                    <group>
+                        <field name="active"/>
+                    </group>
+                    <field name="description" placeholder="Add a description" nolabel="1"/>
+                    </group>
+
                 </form>
             </field>
         </record>

From 744a83bff3dcdfb987e85d6568f0e9eb5ea5c90f Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Wed, 27 Jun 2012 16:38:32 +0530
Subject: [PATCH 068/239] [IMP]adding groups of invoicing to invoice related
 buttons in sale order form

bzr revid: dhr@tinyerp.com-20120627110832-zcvb41x8ar0pmad5
---
 addons/sale/sale_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 0238f28d4da..7cdcdd813e3 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -109,13 +109,13 @@
                         <button name="ship_corrected" states="shipping_except" string="Ignore Exception"/>
                         <button name="action_quotation_send" string="Send by Mail" type="object" states="draft" class="oe_highlight"/>
                         <button name="action_quotation_send" string="Send by Mail" type="object" states="sent"/>
-                        <button name="manual_invoice" states="manual" string="Create Final Invoice" type="object" class="oe_highlight"/>
+                        <button name="manual_invoice" states="manual" string="Create Final Invoice" type="object" class="oe_highlight" groups="account.group_account_invoice,account.group_account_user,account.group_account_manager"/>
                         <button name="print_quotation" string="Send by Post" type="object" states="draft" class="oe_highlight"/>
                         <button name="print_quotation" string="Send by Post" type="object" states="sent"/>
                         <button name="action_button_confirm" states="draft" string="Confirm" type="object"/>
                         <button name="action_button_confirm" states="sent" string="Confirm" class="oe_highlight" type="object"/>
                         <button name="action_view_invoice" string="Open Invoice" type="object" 
-                          attrs="{'invisible': ['|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking')]}"/>
+                          attrs="{'invisible': ['|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking')]}" groups="account.group_account_invoice,account.group_account_user,account.group_account_manager"/>
                         <button name="action_view_delivery" string="Open Delivery Order" type="object" 
                           attrs="{'invisible': ['|','|','|',('picking_ids','=',False),('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}"/>
                         <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" states="manual"/>

From c6516ad816017fa0f0b4954930b96ef0302c73f9 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 27 Jun 2012 16:43:29 +0530
Subject: [PATCH 069/239] [IMP] Idea: View imp

bzr revid: dbr@tinyerp.com-20120627111329-1as4fgtmv67cayu3
---
 addons/idea/idea_view.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 0aabaa42276..7e393bc4f75 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -72,11 +72,14 @@
                     <button name="idea_cancel" string="Refuse" states="open" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,close"/>
                 </header>
+                <sheet>
                     <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
-                    <label for="category_ids"/>
-                    <h2><field name="category_ids"/></h2>
-                    <field name="description"/>
+                    <group>
+                        <field name="category_ids" widget="many2many_tags" string="Tags"/>
+                        <field name="description"/>
+                    </group>
+                </sheet>
                 <footer>
                     <field name="message_ids" widget="ThreadView"/>
                 </footer>

From 3cca343d1a0095d5f54c8f51c23bde6748243922 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Wed, 27 Jun 2012 16:54:51 +0530
Subject: [PATCH 070/239] [IMP]reverting button rights and fixing account move
 line access for invoice form

bzr revid: dhr@tinyerp.com-20120627112451-f0f33low6atzftpt
---
 addons/sale/sale_view.xml                | 4 ++--
 addons/sale/security/ir.model.access.csv | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 7cdcdd813e3..0238f28d4da 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -109,13 +109,13 @@
                         <button name="ship_corrected" states="shipping_except" string="Ignore Exception"/>
                         <button name="action_quotation_send" string="Send by Mail" type="object" states="draft" class="oe_highlight"/>
                         <button name="action_quotation_send" string="Send by Mail" type="object" states="sent"/>
-                        <button name="manual_invoice" states="manual" string="Create Final Invoice" type="object" class="oe_highlight" groups="account.group_account_invoice,account.group_account_user,account.group_account_manager"/>
+                        <button name="manual_invoice" states="manual" string="Create Final Invoice" type="object" class="oe_highlight"/>
                         <button name="print_quotation" string="Send by Post" type="object" states="draft" class="oe_highlight"/>
                         <button name="print_quotation" string="Send by Post" type="object" states="sent"/>
                         <button name="action_button_confirm" states="draft" string="Confirm" type="object"/>
                         <button name="action_button_confirm" states="sent" string="Confirm" class="oe_highlight" type="object"/>
                         <button name="action_view_invoice" string="Open Invoice" type="object" 
-                          attrs="{'invisible': ['|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking')]}" groups="account.group_account_invoice,account.group_account_user,account.group_account_manager"/>
+                          attrs="{'invisible': ['|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking')]}"/>
                         <button name="action_view_delivery" string="Open Delivery Order" type="object" 
                           attrs="{'invisible': ['|','|','|',('picking_ids','=',False),('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}"/>
                         <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" states="manual"/>
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 6ef377027be..a70a8883c14 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -61,4 +61,5 @@ access_product_pricelist_version_sale_manager,product.pricelist.version sale_man
 access_account_invoice_report_salesman,account.invoice.report salesman,account.model_account_invoice_report,base.group_sale_salesman,1,0,0,0
 access_stock_warehouse_orderpoint_sale_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,base.group_sale_manager,1,0,0,0
 access_stock_warehouse_orderpoint_sale_salesman,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,base.group_sale_salesman,1,0,0,0
-
+access_account_move_line_salesman,account.move.line invoice,account.model_account_move_line,base.group_sale_salesman,1,0,0,0
+access_account_move_line_manager,account.move.line invoice,account.model_account_move_line,base.group_sale_manager,1,0,0,0

From 01f97ee265e805739166d1f5bdec09748c125ff5 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Wed, 27 Jun 2012 16:58:52 +0530
Subject: [PATCH 071/239] [IMP]

bzr revid: dhr@tinyerp.com-20120627112852-vld5ahxum58fwwb1
---
 addons/sale/security/ir.model.access.csv | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index a70a8883c14..cee9eadc43d 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -4,8 +4,8 @@ access_sale_order,sale.order,model_sale_order,base.group_sale_salesman,1,1,1,0
 access_sale_order_line,sale.order.line,model_sale_order_line,base.group_sale_salesman,1,1,1,1
 access_sale_order_line_accountant,sale.order.line accountant,model_sale_order_line,account.group_account_user,1,1,0,0
 access_account_invoice_tax_salesman,account_invoice_tax salesman,account.model_account_invoice_tax,base.group_sale_salesman,1,1,1,0
-access_account_invoice_salesman,account_invoice salesman,account.model_account_invoice,base.group_sale_salesman,1,0,0,0
-access_account_invoice_manager,account_invoice manager,account.model_account_invoice,base.group_sale_manager,1,0,0,0
+access_account_invoice_salesman,account_invoice salesman,account.model_account_invoice,base.group_sale_salesman,1,1,1,0
+access_account_invoice_manager,account_invoice manager,account.model_account_invoice,base.group_sale_manager,1,1,1,0
 access_account_invoice_line_salesman,account_invoice.line salesman,account.model_account_invoice_line,base.group_sale_salesman,1,1,1,0
 access_account_payment_term_salesman,account_payment_term salesman,account.model_account_payment_term,base.group_sale_salesman,1,0,0,0
 access_account_analytic_account_salesman,account_analytic_account salesman,analytic.model_account_analytic_account,base.group_sale_salesman,1,1,1,0

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 072/239] [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 073/239] [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 a4c6224892968e8da7b76a4d64ae839aee31c466 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 27 Jun 2012 18:22:15 +0530
Subject: [PATCH 074/239] [IMP]lunch: change field date position

bzr revid: dbr@tinyerp.com-20120627125215-0t40lg17jybyx9zz
---
 addons/lunch/lunch_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 7df87c6cf89..785cc1490f4 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -39,8 +39,8 @@
                         </group>
                         <group>
                             <field name="user_id"/>
-                            <field name="date"/>
                             <field name="cashmove"/>
+                            <field name="date"/>
                         </group>
                     </group>
                 </sheet>

From 32b030c763a0bf7c20da209af3f0f3226838538c Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Wed, 27 Jun 2012 18:31:47 +0530
Subject: [PATCH 075/239] [IMP] set email button and chenge text of user_id
 field

bzr revid: kjo@tinyerp.com-20120627130147-tktvn9b5cdsblzp0
---
 addons/event/event.py       | 2 +-
 addons/event/event_view.xml | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 3fcf63156f6..ba3fedea69e 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -326,7 +326,7 @@ class event_registration(osv.osv):
         'log_ids': fields.one2many('mail.message', 'res_id', 'Logs', domain=[('email_from', '=', False),('model','=',_name)]),
         'event_end_date': fields.related('event_id','date_end', type='datetime', string="Event End Date", readonly=True),
         'event_begin_date': fields.related('event_id', 'date_begin', type='datetime', string="Event Start Date", readonly=True),
-        'user_id': fields.many2one('res.users', 'Attendee (user)', states={'done': [('readonly', True)]}),
+        'user_id': fields.many2one('res.users', 'User', states={'done': [('readonly', True)]}),
         'company_id': fields.related('event_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True, states={'draft':[('readonly',False)]}),
         'state': fields.selection([('draft', 'Unconfirmed'),
                                     ('cancel', 'Cancelled'),
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 223e3cdff5f..8f378af3775 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -71,7 +71,7 @@
                 	<div class="oe_right oe_button_box">
 	                    <button name="%(event.act_event_list_register_event)d" type="action" string="Registration" icon="gtk-index" help="Register with this event"/>
 	                </div>
-                <!--div class="oe_right" style="height: 200px"></div-->
+                
                 <div class="oe_title" style="width: 650px" >
 	            	<label for="name" class="oe_edit_only"/>
 		            <group colspan="6" col="6">
@@ -99,6 +99,7 @@
 	                   	</group>
                      </group>
                 </div>
+                <!-- <div class="oe_right" style="height: 200px"></div> -->
                 <notebook>
                     <page string="Event Description">
                         <field name="note" colspan="4" nolabel="1"/>
@@ -404,11 +405,11 @@
                             <field name="name" invisible="1"/>
                             <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/>
                             <label for="email" string="E-Mail"/>
-                            <group colspan="1">
-                                <field name="email" invisible="1"/>
+                            <group col="2">
+                                <field name="email" nolabel="1" class="oe_inline"/>
                                 <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"/>
+                                icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action" class="oe_inline"/>
                             </group>
                         </group>
                         <group colspan="2">

From 2db7582e6ebe192bcfd9265ebea2cca387733f0a Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 27 Jun 2012 18:41:13 +0530
Subject: [PATCH 076/239] [IMP]survey: Little view improvements

bzr revid: dbr@tinyerp.com-20120627131113-hbgonrlha88nyiz8
---
 addons/survey/survey_view.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 5ef19555511..63fbe5f2834 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -52,10 +52,12 @@
                         <page string="Survey">
                             <field name="page_ids" colspan="4" nolabel="1" mode="form,tree">
                                 <form string="Survey Page">
-                                    <group>
-                                        <field name="title" select="1"/>
-                                        <field name="sequence" groups="base.group_no_one"/>
-                                    </group>
+                                    <h2>
+                                        <label for="title" class="oe_edit_only"/>
+                                        <field name="title" select="1" class="oe_inline"/>
+                                        <label for="sequence" class="oe_edit_only"/>
+                                        (<field name="sequence" groups="base.group_no_one" class="oe_inline"/>)
+                                    </h2>
                                     <newline/>
                                     <group>
                                         <field name="note" placeholder="Add a description on the survey page" nolabel="1"/>

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 077/239] [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 078/239] [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 3c93067d393e5e2f8326eea039c7a69fd13ea8d2 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Thu, 28 Jun 2012 15:11:08 +0530
Subject: [PATCH 079/239] [ADD] Added Icon for the social App

bzr revid: jam@tinyerp.com-20120628094108-7z2hht2hsrb3rlfh
---
 addons/mail/static/img/icon.png | Bin 0 -> 41037 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 addons/mail/static/img/icon.png

diff --git a/addons/mail/static/img/icon.png b/addons/mail/static/img/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..861d806b85588c900bca10e90e06f4538c2ee7e0
GIT binary patch
literal 41037
zcmXt9b690v7f+L>nmpO|&9-ghO_OV~ZQGh`+pfvBX0mO5Xa4x=>A5|(d#khd-fR7I
z!WHEu5aDs)!N9-}r6fg_fyYrWFmPm8Xy7{>KSg!m0oq7LLKN)t-{-Hcl0@JcxSx_*
zj$mL6r2oFa-HHTUfG1&`q~ye4HlXp~$XQI({vrZTVLORwI*HiX*qGWnfr&Vn8akPp
z5V=}7nG;D!$ti01BYg)0BLb5W6;gFuJL_^y(^I?u{9G&9Vt4hBVNOIwg@pqTQY3>=
zMh`<p70Q=XlO7D1D@>dbkVGj9Ac2*J0S5;!6DFDyh9d_Tej!WeZ^>$3zKmsYjL&^R
zVG?}vYREa{O@}#{YBS4y->T?Z)|M94WIWw37<)d<9thyrHd-uKo12{#%2VtWR8mtL
zsx=%ix3y6ccpFtP*%_Q%_)IoaKNYIi|Hz)mapr#9bj_vHs)yQs9BrlUXBuQeU`|Jn
z{-w)+HUdg9MhhXXA`NNSjo~S$t?u;TlUy4A)Z@Ad8)!YP?jVaGacIK}@jGq5ySr0V
zQwv_=2LB2_UeAO8$#_*~ljyIE5^h8{zEewTR_-|cntM;A#rWyE*J|uLR@JgalbxO2
z*wUgxlT3vfxi^Qs!&&V|8bMOOO4n?&>rSAAyb}uU?94_r9;CU;iF8S)-Cx~tF+u9<
zE?WgN>hWBYvaIhe*6n&kOs84vr%Dri+D=sjI}pc&Aaz*3u)N%G-n?E8G9Lb2H<GQm
zdRNo+Q2uru!?W=Ad~15KVRn3ePM$1nxXvE4JF~bbW^ByzbxWskDbS?L>xaX9G{^5w
z_uGZJA{o=62n;7@XA~%Kdt_87p&>iq;)+lce>b0x9UG{q47A$sE)+^7?gf9>S9IO>
zZh7ifkds5S#{;T2WE3w;F`&`&qIRE&>+?9<G^^k<NZ+zSB7__#UxI>?FKL`XA*10^
z`mZjz5pQn+w~s!zlN^`nEM_t2@LwW^NWhwHjIp3e0+w(_8U??G82;fzk}ex7{vJPe
zx$3fG@*VyQuvltpYT>Je#!1p7>hr~NDxZ$CL%B~pmz}%c_s==DDYE5(5;MsqzJyTd
zr+*InA}Uti>)36ks3>rSOAvairqJt%m#OCKGN=G6Xpyn!zy&4>RfH}AlN0T~gj2=V
zeMwo8r;HJupVZGPH@455VmiCBqIt~&EL1)bEQIxXwbw`D*scO!#lwb;nfvp8>gbOK
z^D3=QH&Dk}Yas8#g25-PU%h@}WuU{moi8a+C5~zSS2`v1_)!zs0b~^7#8EKSEVJp`
zuzc77CK{h0D^1RrKvOLY<Z#KM7AAy(n@i+g*?F=UV_<vM(*+O-s@`Y~FkuP!@JhTN
zh01;ocjuZLPd^QB-OPx5Q_|1~HC(IIZi*=Ixf8h;_^#VZKn9$SaV@j#q4Sn)8ktnO
zzWPdO%|#{zuzV_M_DdqojLb}IJ`Yyokr*{x+t$3srlzvBHSH5C%h7#@!ujKfknr6!
zhc?+Z-Gf0ig`~qA&lt|ATD;8OTM%6$6)bI!j-Fn$I1LzG>i8fmA|j&K>-x5O!!+-!
zvA}k!>x#U-?>!sd2zl=G{Nm<hMvhO@zkg_ZOd;k2<#Efi=I-%Pqrbd3JxxprU5O!8
zNxH5N8kgCyAF64bq2qUPrfvCfG_C}DDkLbZ02ZZfvcB>?pR;wc{``H1s-JaIR0j)s
zQ%_IV_x;}CLF-UiLjy*8_Y1gw*`Te#JI$-_sSfY`0@_J%4<DmUDt&QJ58*s3i2m!c
zGe|Cx2=<CM*2@MFhQRF?_j^<W|58H?!73T`cyUR|Hx+Cz!*QvN$KTupI0VW=r!~_b
z+>coeSPg%n=M)WS=_jM-7Bm@g?O4UNGfs<&+VoE>D@-OrNcVq}c8?Ey+ho+st_T;-
zbtoeu0g-?V|7>D@A<o}#9%Fm@+~E{G4I{duN`}{UoLrn+SRlf+Wzx>T%`9xIlPa&c
zakz{1k<If3!$<U)dUQL>gW22LjWsMeZ%J<VQZH|ywy?5E_&bTnoL{6A!oeZA#%^*8
zx4U=U!%IhapFYib?=}ZrKO1Jq++HLVvZy-ldD%&NdgH0xqa_e(b>TQYwv^bMRCy}-
zTC0vdJ4bguplur1jFRAtZ(&)P+|}J3s{6TaWx5|hPJ)_mOt?);{$~b7L~!PsNYF?Q
zPyC1qT>fTT;Hm4>$FXX!-U4`2>cPPeY<BB3;P7yrH_p>gWQ7rNlf*!XhK3;>pK4EL
zw|oe7gYK=EJKKa#ZnS_uN>w1<D6M0a*vPsdEyqAV-`#yEv30bruqH3Q(DM6e$;G0)
zJdw|3(;H~H286nv-rf-lOM5_-l`>9G3#*#M*v)Z?7gwXAZ0!;Qdm03$dEbMaT&s2<
zf1)G9p@d&|q52zqAcKjH+lYXn(6<aJ`AN#6zl06)-W|f2+gKzlrBGPlf@DL!5i(3p
zPCA^Fm8f@XAVVcd7xgjO%i_5wzeXa(bN(qCA&9>uxWix5&Mc%zO|ds-k6Rk%wy2zx
zab_nc)y6ShDl2(gXG^<XHX}FF82z21#9V9>wXn=y2{YR6;OtcSwxK`F$j~O4abjue
z=9q|JWtlX4Zo}N(C3kY8Hn+Ay1mk4|t-ya178V2dmOmIDdh`n-hUp6RCjz+f%mO^*
zCHpK2Hxf2P=pahnB{BEGy*uMPyHQ$WG!{jHc(at1Od>1$()eSKFBwU|p?i`vxpdLo
zHu!Kwn$_&g_5w<`hOpCMq5?0)e2H9g#tDrDaOw2y*+c^wIHsa94XjH`zqdR;Jge$A
z)eVv!mg1Q^Ez(%o*~d5@vKdZ=Zm<m+6nK)$R34J(IWnniNJFGVysH)#)n%OdDWegc
znY}b4t-BV<o-c?)eNMLbd0u_Lj<B0Ld1f}Uv;RJNXeREx%Eo>jomb#x$Tud7xrT=%
z;T9zue1zZe{DM7)^XZF56B7W><b+4@A$3#$NjM9_A5W>@eK1Hup`TP%(IX!SZIbM!
zp=B{60JT0Bp=x8I03A3d70d*diUgFS0d#G3ztUZ(R@ZIkP}vQq&OPO7)&<q^5YqL3
z)!v(Lwr;<Mu77%W{oEfGxXijOsxDU#X=)q`Lm4Ra4m3Qall)K+YnkG<V)uQS&ovoJ
zC`uMh-{pi7@-xIrjx$dZ4FE>!#f9z7Gw-@h3;to2D?b{?wpW$7Haj+t_?GXdw|ESm
zl&`NqnJPTclCiM<Th4a<TRVVc{B-sA?*2YrzQn@Z66o6HmgQ1K^AUY<)_5aWA^xW8
zZu|9x%GAL)Z{^y8P|zYnzu?AAWB6apZM)9dL2{Wu|9ydnv~HMW-*DTFE^jXmp^8W-
zB!yqLhwBF$ae*yBUat?|38RXTY%9y7QrK_Hr|K7+ou3~_PBoZfTh=A*zD%4fw#QH0
z>Xr{++M^sHD462h&1Lc9z~Yh)pqf?pQ9US3^eOgn*|0bj>CFw9$a07JhlKzrGqW<|
zHy4g=sD)W<ff`~+j=r|Nt-z3K9QI+Oh1q>MKR++x=*Ti(qM-3z*K1Uw{Sw!1A{B<P
zH5Vw<;^N{^xmrbGM@QzIpucjNsDuPevrXdkp}<O<HUJ9JWuZsvsZ+<Hgam1l`|a`G
zn0n>gfVKe?n2n7M*m~u|!{RtNIEBT<A$7(h<u5NDC#R>0USXLKMRA-26V+ce44g4a
za(&th=PmF!<m~Ji2iDi!uKHlqPHPR5g9;6?V4?ZC_!gEHP=mmWZ6N<k@KZ$g+8z=7
z+ipt^9xgAh-J^SuZk7{|robCdF0(b_Oot$1$VJiBwJE#p+TQ-KmicM;{;=)qd(rdh
zGpb=qjR~`2G(PEeHfy%v5mzbpe31v^2y6x^_ROO8_KdA9{kdb-ctQZ0yuZI=kZdD=
zFRQMO0ZP%{-VPu;s-jw(4&g_n06#k)tC04aas#!CTVPI)<q~=+(i?Q^>ifPsdu^BW
z^z;bhetMRNhW(fDcGhmIT$nWatEpI%E@AqR8XZ2ZINUUia7Q;B7DtHo$}3luhT8Uq
zuO<QA2`|)%8&Qxyv!JUh8^C*|e+NQYY&SSpJx;3@*X_FcCem4oYHDK3%W0tDzm!*0
zw7p(<rqv!7OQTZ_l!7hQSBegtxG8?~j_bvPh)jX{Q*2>`5I}k5g|{r$D2@$Ho5Ena
zgl*=qtmlh9QYTr24<D?b&uLO&)4UTe!7nS~ejS`@8p?PsY30br#^&C<>LKI2SW{zA
zBefKg<+DcpZ~NAJ+*{({;?lm63@`yDDa22;-yN=7RM#oPcUcjlkk8_DI-&7%XrrT5
zul!Tv`%e20Bi$ZMij?goAq>PRjsQ4WBWta?x*DF(<hSnlj|R;Yu{PadRyp43g7WeR
zBG?&2QT|+@h5}snFq3HO&Cjp*DViF+N`KYUq0^v0ez{2X*N=t^m^dJM!;Cc2G$wJz
zplv0?K9|#ZdwaK5XQpKokG37=jDy4A6((7bkUd7iaPSFYg}`ymIisNCgu$>S8dKb*
zXi|m-401oO=fv8qQx&0BnPf<owms#K?<E-M21$z2*chhu-|UaCx~$u{zm=H@KqcKy
zaVI9q^LTp?d)tidowp<gfBjBEg3(|R=AdL?FuhQwvUqnqZ`yI*tkS&u$CDt185NBr
zToqXiJmnPP>QC+mS*orB98e3=M5%}fypgi32kp~{RrWz+9A*^{PfxV!h5t5(W)9f!
zTXv8$i?z6(5y407KP;FzVvL>8(T>xw@)YURSuw~k{4L{3VFBPB9{BSr2Yl5!g$R~O
z4sH9Erl<)L60)@neRm|*Y@^lQGF8tdK3vC3sHv$bFN#dX4#}ajaVg0=R+c+7&YWYO
ziI!qH4*J<MZp1#ybbT;z!cSKX19roE+1p_QBr(6*6cF-)!-Nj}PV4$n3f||t+tad}
z+?0pblky4^^WCMTrMdNW8LSWlLjEj^`QkFt7*64}wRH@?7_{~lW`w5>iMt3f_mAf`
z-j}0-lWE_N20DXo-s>-3Jx0tRw+JNr!h9;D|NaA;zWr^&j3GdpJI&&8XTIfeN}s}@
zCv9UxKV*a=5K(873G8@GI<H4GyD+m{Z}A-O2QBp~?V_bht$`DuLAA7`E>>u$Fr>~J
zifU+lfA-qZv8a+NnLp~gM1rGgg5BKQ1lkg?zq-rPuXjfp-XGQ#*6l~|KRNApMEBcm
z9Ryn$NKPOf3YejdAv0#afzdoVoIzcQ9H`eHP>g{=9emit;JH7!9v`2G%81e=8{KEH
zc^O91yX_o*|2%FV-15v<_4^y60!&%Z-l@U5%E45&jy;ae`j7pwWS|e$e}24H3?T8y
zvah)rV?6N}Td2#X5~G3r2jI8SNsdqbuBV;I`m3rIxPU>sI-8DsQ27lPupz=p<@EIM
zX*H_<bx<enNdP~O0R(L!)pb>^dDZrH>}%HJ+*f9s6Mf(e)oIFp+<Og2;g4^BJoJ}*
z<TG~v;niw1kN0>zZ`q&Z*dj_C{qqfzyGpAeBqIao<@FWlZ9q>_Z!|PAA_orwI&}R%
zp1J9=F4vsd+2x>;{!QsJ^h7B{mM`d=#V;xZv?~Pex9|c3=y1)eCES~HyK@OMGs<))
zBzhDj#UBlm90z?p6DnX`6}bshMZP&09u+@2Y+Jh$%#lL8Lrj;Z$M!gieeU8d`6NHS
zuikvk90xclt?E@C>>?7+Sue02BfwcJ5j6=_rMX|0mUL2ld41XYc)dJ)?D^!oJ)9o7
zl^z{el>#Yag$&w9owiqMH9&Lh|Cd4WTy6<Wg<IYq6KQ!29VZ#SFPj9dmjqlpR|7OS
zRLRnHMnmu}Yo;0(uk(<($B}%WXREr-`^l(K;Fh&3G|AFxu;GSSJDf-%hN@u^_H-C)
zUdT`ji;J^MOT+R!m*o#>^(EFl?+;^42>DdyGZ%c*19b@`jN6Zi`3wV+vRXy3q=cq8
zX(7^4EVC27`)XWoSEO#Q(Hs`$r6aem;rC!XvN^qQBlx2H%b{|VF{_cLNnz6aqalU@
z1*6FE13yD&nNHR@SEozlX1Ng)PzH30RB7TTf6zX3T)uiec5JIrX8jCUSXd~{o3GTQ
zl4MU+F+{Gt%68q`^1M`Y-E>avydK6)PFUoGrzuVj6Rf08mX6vqM*#XzCb!Xn(#@$=
zwfge=3%68}vZ#`%jLcWYu7_APr(1n5p@;Ntj(vx=ovX*YyQ|6f2bJY*r&}}MG+8{x
z$nT8Bz)U292LzY>x)A~m;1o@GUX$y49FreRq?6*~;{*8OS5m*da<X5q;?F!qs{gpz
z(`7@#(I}a{Uz{FRjK8s2uhfbrB4ntE;CM(z3ZjBo5Fn$aN!;6LW&%&|H)I@s3x&>X
z&Ig|lwwC!RmxXpcuEpizcQ6VaXKSU@d87nN$df-;Vu=w)nB9M|WH0++VVy0iHx37E
zAxX=YSgwOKX*BREwyv%&;FLN14gSt-^WvmNgGrt^Nt3-`D5J(d?RnWfe(Ceb<2-`j
zGJ3LDfr4PYKFpk`XjP^vnJ*kOaP`;5>)lFa@vLF$E%fzUMMa7eL*!DpNSDd}iLV=|
z3b84G8D#x69w5zw91l6wK8^!&xz8TiZf6RuI}x;nMMc5&hj~p0Css8|Dkbt?imoEb
zH)NrA(kOGi5<&@m(t1AbYi=$&B56=Krf+}hrCPH`UZ#eNsxY9>!i&e48{e&f7E~8Y
z6-S^<6@>8<>+zFJX=Jd|<c*s1(bHvPfX+uZKyluxoIGy7@))ByEx@6H#Cx=!)Jbr|
z6&wT2#ER#<N8#l;{1CL&(OMpc>mMUh`(=MENlXP{p0h2w)FwxmqNnD?7l$lW-zhK4
z{h(4B-JGhjV_u%ezVFNT+Ur((coZf%qPnV7MlF(_m&KX|IgU-TU}1r>Mj2o*OPNZw
zVZV5KUU#Azvl9#~>DX0Ow>`9czLs^4njdR+LF3bo`A-*Vd?bh<J@+yYEY6YT#q^El
z;{~$u;h(i!ax6qIfBbdSYCx2TiOb0$D0k3OgeH}U+3OWSQUfM7opvLv-{ZEg0np7=
zX7K>vm8=_k+P=~(hc_bH9h!nQ&srz<6+sM797-uHh81EZ<%{&+<neHE6ygYDJW9}|
z6JEmP59(Ae_<d%Bm$_!%>jg9#cnAWICk2PQ+3kXo@dEzCKjnV9@Kfo0(Na1~s9$78
zH3{<h8e?W@pk+Xc>~+k>M~obxALHZvDsh!6Y!_xZJ~+VS)KdOR4+44%H#hf+RZUm1
zp2u;KZ>5#BDyo<iNrh^HaNa)&tbb9%U~*?DvIszmsx)87l*)`&M;?W{YlkrL?gI<b
zx-TVo{9WGHRPQ%#86_#yhCDC31}f~jwVrjYj1x_4(C`BfB@pgXpND;3%W-Sot=WDr
zYUq<^SMV$Ze&eSCDzvb)gc=NPh<<et5S-;OMy*VRjuoLD4hszRr15>}z%W%BHEKu#
znsw(nYULC$^e=GUl=1;Y)#tzP*sz{uP)k>>n|BU_3}KDp<jj5oTIL7I{e5(65r6Zx
zArFQO_;~b+#o_hIsY*-A>%|9c-FIZ_RJIDQDS^*efD^bb93h5;8+Z`*=#nK$Q{H_?
z)Z!4Un<=Qb%|7}s9cv2q{u57<q5TS??I6R7CR<?UYKrI5{;W<wt-)*>bG#m1r19(c
zPCU@Y^CKAyFE-kM%b`ei5yYc(N9NhT*=O`k=eg*7HD)}RW_<h7E8t~YQPqqInK<+9
zw`m2{1LmsT8vjX%!RL#LR^qb0r`kpPEmD*9F?<T60mFC-eL+J5T2Vq)pbZTQ3J&fm
zT6IQt*4wf5Tsm3qH05(rpEEA}CX%xhcDW-5%;YQ)EET5rM2|6;UwK-WNcaG;(HZjZ
z&c04r^k*m^Q7Jmn^dt{>Dw(?d6rC`OL3ocN{r3nwpWjn=E}dg&-|h{I<TlFbWOyQU
zedkG;Z-48l@t?!e1Y3|Vi6TRVEpawezw6iBK<mfJzK4CbOjN;Kd?udte72O0nZUHE
zOF_T?3Pe%{G&hDZR>Qc*h1FGRf!EdP1-{1((lXT$U4~ErtQWl|OANMq=d;e+sgvSu
zU+$^f6oVCY_0CsJ{j%Q#p6BEAuG=?+x#j>YNXoS9PH)-rkfGOYRpeG@07f8uFhtH_
z9uw_CdLC0{SloEwl{euwBf!~?PcMh+^u~lF8B$3RL;!F>yMPNQltOWNYwqjKz-ZWW
z2qy$6?x-2d7%PIMrDbV(`9Jl&^KMS&1{lH`E6^hTh|{+;f|XTO`{O+4`Sq)oTLzt~
zvg=BG?^dl(J1ndJsS;o?q?*bc?6_Z|xJzd{ZQL_o7BN><P0|^(!4Cv~omvmybR`Hk
z@QQ83*u~1|{W?1)p2h3EPeXnjZF)E8NPF77-SXo%gTYohARL!}CK9;=;AM}t<2+)Q
zGwJJ)^z1ZoC|>@@VgFY+zDr%6WNxmzPRGmc*Nem$fe$z7BC;|KBribC1t!8u^CUyZ
zSwDTt)(0W|g5feB{Z}6DW85RkA~qX2_lGSTTBH>(ll@EibY?MiI`3Hbny&ls3+K_H
z?_(7;-R1wN93ZR@-SPt3wKk>GH~NG${y?rQX>oofSaT`M<;Zu)z{V`*fBj0%wv8GP
zuWf8>SlQUh+S|DS(rW_HeY3YGIE;YZk>qh-`|u5b!~wl74B*k+*%ZmrC?itKDJLhE
z?CaJnF?<hhO`E9{yRXDCR%pRu)*VpwQRFpSv?160&4#xNX!u#aTkm%m7%nuyE@KNz
zy){19^owiAl4s6wb);b=%xyGFcQBl41!3pW<^(Ji^$%)`?$qDEvMw&x4}E7pj7)S@
zEy?CT{X~*vUo(%od$=PaVO?6B2MB&23}Gol>k$cAgranv*R#X(^R#cZZRfQ(pnQwQ
zQ>2d18qocD<u8zkJs3(oc$fIYd3epSU(7=&VU~G>gi*YUit%b*S`P<LyJCF@`|*?*
zOQ`1VGR5L>TGdkee0%s0<Q-pJ6xY<$IN%JxSa0NAP|Xst@yF!Dd#*4c;PF^sCr!1Q
zR~?^T<N<I)I4`%jnBt)8<G{?QMBwLkm&3DZ>h;_0G~gYy=_YvH@qQDyVv-x;=wTCi
zKRVjQV)=mpjiaX@ZCG7w{8wbh(>K!;_iv?_i;9o)q{!Pzd#b%7HMCJIXOM-8WxDqq
z_*0SVC>MEvk%Dj?9D)~4oukf7{VaB}nGN<5&8kzxZ$=b1e*dLH7A`=j9=RUL?Y-!@
z%=@qss^3LQ+`nHopv;{nC8^YH&ico7^n4aEM7v}6+j(ynR2<%}M;iX?gODAm;>-pp
z6F@osi9jFSl;@Q3Dwnym93RhI6S_PV@Bvzjg1^|>8UqcEhG!r-eFO}!w)zJs&)<8t
zPIGwd;yo|l6Ei-S*6Yn@^S`l$I_jmW(umO{0}7c2)tfYR08#JbJNzh9;;14(I{`}!
zi_M{M?dJgEe#r=43D}lat75V2YM^kQ;x#R>voxLir{!N{x3?P{bK-M9?kGE7FFFEw
z*~Hj0iI+^dJ36p?Mh_-<Zvgdj8=FSQRHQbF?NT5>!$VoO<2#&kL%=V?2e=Yl%IQhS
z7796JH)PmU-CB-yh4MZ&o-k>ASddG5`hIq`C3aWtLJX%S_=eYOwnJ}Ak6bs6oE&@h
z)r~T?w0;|^qIs#^&cFT#0HYJ%?~+JdPl6Y%yGUg<H4>sn=jWzt`YMaSETu0?DnM92
z2sy1zTx~F$UtX5r&mEC6J32Y(XF_P+aFF?Un<2H@-`lt|(-^}UMO&2<{Sjk?Tp$}r
z1#hqSbsZKY{jT~d_ORtamx^EOyx*Prw&UggoSeE4$=FTRmHqBieKI&{B3UwzVYI7w
zSx!vpR7%=mkzvA&4V+=X@{mnq5{f1i=!OXKC1;7{&DwsyaGhIOkwk_9Ub5wV`92-p
zZvW5y0U!c4FoB5YP(rZD;nWrWrV4kruV3ii+&V5?{k0%Vn-1Wpp*(fUQc89(OJBI2
z*kH@@c`$Z*g%_v?IrRobBl<W$D@iu~bVy!*j8YaxURH(=l_TIf=5YM@_<+H4V`A*$
z)bQX@r`RPFO{^)aCX1FE_%WHm2ADd4I)vc-uzFbiO2h>i89@7uB+r)Dz?%g`wu`ny
zTR;r2cEYlMST(yHH~3HnEGGjU34j~N?8Z(0c<%e=b46$sOU(6A{eACoda6W54Mhq=
zz8qdgjB4N)vUr#wMH8XFM3aG0>&1SN%!3Bl$mbnab@!VxXcK)^mTlEZZAS&0IPc?^
z#eG}>@7=pZEWzaOc+$lnIJCW^T)f-5T;shfL!)(eeJn+W)aMT+3GcJ-pBBHL4|B)&
zHQto-e^W-VBC1Uy+#vwMSo_j`p^EP>Bz`xECA!Z7D9D<`2oI@Mu118zegppA%L~om
z<T1l_3jgI11>d(X-EGqcY1hhN?HwxR7EdN+TUUj?Z9fF~-(U&658wbu8j<&7Gv!#d
z)hk%oe`!e_05V?13fmG@4Mf<WPPMsXC-NI3EzEBMZ%mo;S%QZdY<TYjgx9G(Z$+p=
za4?wyv3OhwZC2^5t?OJZ<B{(m@d2uK9zI=;U^mELta<zS%3MyP15#$AcMo%T)jQV>
zCG*<n<&mF<BwS`o7JH{SaKeani007JdaYWSx(pH`B9OS&wcu!!^18HBd(;9v{s5X(
zS1v<0B2%h(#H80RDLs5W<5A1;*r7()&TDRu@i!t|yQ2!}!t=PAI-wL;kt)wlKI(pi
ziyYE&Zo-|?Zk$kr`TWzeGvp3$N`>)~UJIxD^TSou*hWfro&rIeA~wtEI4c(2q;==}
zO)uoP+Mj=gxtE<ZA{NK?9fAR0)^19XWApCvR%h6(%g^(yx#EZ^e?>shnIY1E<|fiW
zcOnQbv)1}px%;u}^7?APw~vXAINIUu|5<=W=w-S7NR?t)B}aiT>Nc~nutUAyj3@d$
z)1}p<HJUVrZEY!zP9@qbybxO^+|m3PFIxHX%=0;m6=@9DplwLkx&HhKTo|RyoydPo
zEj=`FliGB7&9<Una{yH92*Wr<iTp4<fY@eNOt#*}crK1J_DHL!eAV0R;=~Tsm1A>`
zj@G?hAKCvi@Z-9_lcBLuMX%wy5~IRnF|7Fq*Uc4m<;l@VeO@`m_^ZsH(VlKnaZ7~v
zA!s(Ed9>W;((S*Y0#D%{e?CGN`@cjk08YHN#iC^f1>ikLVSxe!-u^z$ZSf21d!DOl
znF%@!Q&X~-O=Xd7=rFJ_G4;kv5R^S+f&%x)Qyq`;LT~Qo6*S5}LQvHt@ST&|FIqUf
zq*oWPuE&phDH-kxjBB&d*O(G%gx1OMjz&tSc7q8*iqabG6MlQVc717#wlz!Tb5$wH
zvZs;Z-cp+Gx=U)mIiY=W^%<g!=g{|+15_@xy!f=@(Waj67-uE%#-@tpEpIisb+Zh3
zlH7|ef__1Bo3exV$G;^b8-0AfK3_LLCRQ9tIl{jHfyj}~LOF-%YQ{+U?(bvEWKoM^
z!Lau={DkT$rS?3}MXOAeZkx1R4zD|tp?0Ar-P{s8L=pPBbpzW7q3>C{p)I17CHjax
zz*#>&e1>BQN4g%j#(R6gVDNr|F?PNw?_6;o!^`coEN}Ow3JlHP%v2D@jeLKcF<$zw
zHQFtY<Z67SI=IGLvO^KR7C+N+n{vA+&6QE$&XKFD<dRJ+$Md2Me%kVFaPoszyi(8m
zKKVvKKp<DGVu`7;h+v#*Zh28g1nFVRisy&V=emh9MX>U30|L)@6|?Oi!?wL!Xg)qu
zpQ{1y#j*xF1KMrV>zyHH=Sylj{mxcpGL8j06F{<2(a^V_JS>qaK5Od$VhF&Q<KyE4
zkYTzR1;WO_H-RjUEw?}??&#BYCs$V>G%%D)=(DE+{u?y%(Ry?H__%>o&>Et=3{MAl
zJ!aa-4BPli_ScFCgI&SbY&SjHbf)HW$8~EFcQ}+hMTR;c32?Pd1o&G;m|Y#BHY^r8
z>I~<F3ng{utihZ^iyV9-HJ?|U&gVLF3-utDA9!OiJU-#dqm)qyvde$sM+^+CD4+i|
zQQF&siZYcFz<N<vgODgo8n5y7uF7(ov(Nn|$?!fj#OylNz{<)x1B^zzFL)1KB8z+Y
zu6tJl-wuHzHE5p@Py(#i+WNY?ai4J0HAQA6o8Q~Z+NtSs%{h5hfyCIqAsdSSpa<5B
ztyR*D-9ub}Q*o@*kkM$IC|!bL=U4eP<!0uc*1V><l+Alez`SMJv>@B{BHb+qhOD#f
z;lTx1513E2rX2;|>!6nlS0rUf?|0Q@cH|5-lML;&_gjIR$@ka+xo8R<ffzg4Od*C$
z(lGQiu7jSggiO00o2m@no{qoYvYeOF!^{y#wT1!2=kq)+vp*|A7(czSvF5ZfJO>z4
z0OINC$(5tD?gyH|(CT4Ufe)aDNdcLZU<Zqz#kn2o1#H`VSBn4SU@bsJVgwyGMq+;f
zED13g4b_X=ea8<XJ7)`sl9&|-IPzX4a%CE#vr7_O=(oGxz^CKyxcsTnT<)(nCZqX}
zO43R+$!Q?tkoFyoo`W7G27ybcbnmU{cvW~13@w$6n9G_AuI<yL-RMC@I<u*QzT3WO
zEq;XQ<b}azVux*qcU8^%_5nXFK<>YTmB~f`C|}N*&#tFS(fbDx*K?3@+sDhPX=$Vc
zclN=WmCr!Hm#>_sSq*4E%1lua<+V=E&OTzl@8qo8CDStYWVKEA1Q=$tQYWg85hoOK
zi5`7%BhLkVmfN#PLZ^$TzU=9-0pCmokP{PKXz%IpqA7)4JE&#i?d8zJvZaY#>JOz&
z<jc#8=Df~R4c?<}_}u$}nZwp}O`#PL87%#TY)rSmzRTO3$wlk+w+)}yb3FUI*fQJ7
zk;n1Y;?bKT@7yt#&wc+;lgq9W<>fgr>4tV=3>bW;FdX;@uM;Bdtqmd}<e7y9Q4KT7
ze^Y?v;k6mh`)>B`;StEe9Gx9gWR3%vov{>!l)r7#cgdo}{?vwJJi;^*L>JoLZWxva
z`_4RMMCdY>*TW>J^9p@-vtLt6Titq=n;BZ;B9nKN=z<utTL0|09aWO;1hK5=n*F4o
z4kVCDl?vQWR-HTO6*SXm^`GhcOTUw2=9AJXr->si+dz;`SM@w|eb;lLgfvx5*M^TL
zdycH}jwbyk5Ow)}B;oY<_}{AH*|G6wSI;nG&1)h})l-4_r?V01aIH=4>FAzo|Jyh2
z$~U)zZ*3RFr$u#b;5%W}i&jUB&otqFJ`oOc*CR9Q>*K&a(F7tvi1+trKucskomfRc
z|4LPK<(=!rKmAX~ru_0-Ndj-`pMIlf#a(7oTHIU|W7H-}{Xlj164X5%_J9(#?F9ko
zx)25%mZzW2pxCWS+w3*JSb>jLgxSsUedcxB$027_BJT>qc>k#$qazH-4H+yeBc%oe
zrC6qwn<-&`bw_I!*WoB{%8BxdMLf^B&7)cvmY)`7<p=RF7k$bE>+%`D^&U4R7*dOA
z3esNh4BY;HuwZS?vB@k%XlcJ`>7!2#k7XHNp%+gXtsyF}f3Vd%Ckia#yx*LRyZ@;R
zMeVVxt=RwOd*#j0vs131k!aodmx>yRU8{jE@)$6C{QbcR+^&f0&I?xs0Uto6L;+Bb
zf9{TayuNxF<NUjlK_N-tu%;NITITve>`S7Fat%kN|K=#Z963Yl`82S~X>4K-5Bsws
zH8PB0<*`&|2IrZZz$SB9pn0N}0uo%)B@Lk=-N}zK5p5=c;7y9DL%`iOcEB<_+`GXY
zb7ZVKNSe1R>4A#T6RBGWO?1KL^TE4h&=>YK@K2&H><5(OTj%cQXqWyYzDD$L=P+dp
z(RHfx{L#5XQ`O>jt(!&XJqfQnuSGaY%C1da5pxUcUI&#4&waN0GK&PX*jMU*&P!e%
z`1WI2RaKEH!|fHR)E*IFClq%?+Vr&I6T%SL^}MIxxt@VK-)_bc5D*k~bRtEGh5n#q
zQusgA%_Hg9K7WaM`HSu4_{gY%d2BcSx^GwUqFG=3U8If5z<30tj%TC=f1c*1gs?`m
zL{uESzY<1fBbZD^FVHn3p@m~g?a;=`6NNvOsxy~6Hp~YgeSY&Be5<uJiE0(F82H;F
zv*W74E!5-&lo9w^XE-#$bXa(?DC7VdQX0|zw05s|7RVuRgr(Yh%qqOw-I|{dtFgbL
zAQs!8rIjXVYdR&=Z19^c3djb(wWq&s@OC$Qj?)$OYe{?I$>bS*o8@ob|0@x!_3WhI
z>2SHHFK{ob$S;C3JoO=Yc@W?@{kNs33p~?g%`Z`&0^iq?$o=KGq^P+$g$aRn(a!N;
z0%h6R9#75i!3U4xGKt#r3SjYQNDrfO@IFSBeLqm>>FH%R9W&Z*BCG`N+DL1Bl=U^Q
zkno3Wz1GEfxblDh8ZLw09+?Gcdr9IZbuv@41m@w9pzEWf&_a$&;na}RE89R3s><SF
zwvk<#S63&Tw`2{*x~vA!pHwzM|C8VAjV$jUA6YEs3Z11RoqAkJ4WGUDx%m=Y<Vb3Q
z=1~4CaAx94F-M|7H-$<I2^ET>%F{jSXPrALO-#^G_VjYj4>Fwi@|{l{>rN3#k9m=;
zQh!s-TaPv-2z{Kd^J9rw-4)}9-Hbj5?VYeL3q^#85q?2qY~Fok61LIm1B*~8Me55w
zt<dGyodvH(XIy@3DB9G{P*XBbr^RxlXH`LmSDThGU=DzlR#X%Ku0C*{pn(sw5HdYB
zAIIl?!sAQ1Ty`~muWK<6kM`2)YKlY`TDBFDFA|hF4)xs6Ni6(#Z3b`8_-zkU62F>*
zW2gcxD+?-#Sm%Peg{*&oWTTD!zCWOq^!^s2RvzsBg$P+OEQb4Ij$YJCRs~#G^Fo5U
zwAyYkN;u`tb@qB<{Ox>ynbRegZ!eBsXL;<0e(isNv)rs4+078_z1-;?47J6)kLA6C
z^964}9G4&<k_s2$K5C8`y9h+DSR9NBi4lkuL3Cq32mS*+3+2Rhb=T^gPIs*rvFEa|
zomzqGs#cH1P<4cVjTsBpILG~i&4REEG4EnHj3g<KDZ%G$B}QoUlq9(V0-w*g0v-Qy
zi?zbLLW=M>{lwBz^F?2jA-6Bqh`{U5hXQ5#)2V@;T3I9R9AH!A&0*QzpDdoWpH|Ce
zbD#TeN^bK!5s61*F(~letBR?F!4@f(&4pS$oUL|t{ps=rgY9i<5r|rdGLe!(QD;+e
zD5p->5>}3@Dk7tXFFcxO=ic_SE284Tj&Ok%&<W0+QdYzyrz7DBl;4M)WX=0)wAB3H
zVdl|2-HR6t3lG9*V{N_p&;6=zwUyhSvDsZ_hrFa#OO<6&!N7{?m&jK2_pT?>cMw(M
zqJ@a@`huC78(|b63h59Vy-u6c3RZ+sVFpl%Yq7^e&o^I<L++I?(9IuF#C*SgPxq{!
ze1L`=vXw4kD8Hrlsu3&{VP@l6y6fwFzC^{fU}ewqV@`Y)6GAski<4hn5tl{3+u<bl
zvU|3M!}KkDG{mNWRvk7Z8;Icl;(ouVF>1oRck3=)gldRI5k6=HPMJ+&pfjNNxb?^g
z&V0I%xMKY_d=o0LK^6ku<^*44+-U??qiM8Is-)|@sMg7Q>3qLi5c^)@YxX#Ai_uda
zOh6i4ZZX_4pA?8phb#L<2~0eSnRRRi$`CsVnl%GUF6x(5yUoaGk?{;pe_AUt>O*L&
zQbv+i;6p=@P>ho;S;aWCK>I=WryIUq>t7Gkb#|f3a3$;Ref3iWLFjfuG<rS9IPjpj
zq|D)ZynZTiI$|bX;ey=XXA)7&@$j?oNq_%58`f70^)k`D3B%!INUeU+ElJ$<ZI87q
z^^Zc_>ZQ3^MX$C&6D5|%Ibgif?95ldmdBBmqarX8OREkf49K&VhBTe44jd#`wlGld
zbexp%sIFG4_=!h*EQBcr>?d0*LNZD`U+drmURKLVXFWg&uBxi4)T~P&{Cpbuyt!Ss
zWs$1xypeVXXe&0GCAuM&dIl1Z*LDON;qBYk+XZl#537W~WBI@HeR6H<j+UWK5kWLu
z4iEy^x$Llhg%%z`W#CmrP=lg_U`oG)Ec#{w=5R!rlB9;^6P+D?*$8ioM$xU6=1+4_
zWxA^)4Srs0cR#FI?X=q#U0wi2T-VeS>5%`SVtH#9Gf6Me5@x(+*zqqA^fCuDMj&c0
zSe=k8-TV-%wXCTj%~u(OO3k=mL2jGYtlW$e(;EaDy_k6m>ybz#WbBIY?Hzx*Ts6Li
z@Nu@2;NkgL2DX~lDFxajB%we;njgQK6CLa7rMD>S=!`=baHv}0lg0AhgaM(qej=jO
zaS#)e;_-bW;IcPwy5Pp}e3*S+)qmst&lgD1nm*s`uTZBhp$q_OdXX*zi}ecZk11a1
zNzZpV=exSkZj$SE4fQ!=thn)fe3r6UcJyisic6UhA{^7f(IWH^s<YqyVRT{h$R$KB
zAR`!-dc``B8+DR;a){j+Q<(n@Q<!dMzQrz&niIm)#+~+vuZaWThSZ{F0kjoOf!lO5
z+%njkXbW$ChKQn0)4Wcwjfi4+rbsTy1!VkPqyq>-UjJ!@u3~Bmm$R%dm|wAn=0OeE
zBKO*tL0j<-6)#6$;KtsdimqzF;ufnTJm_ggACWZ#3yA?W`lG@GvTF1E;)fL=1?Q%D
zd-YlniIvV%ES*RPG)<T#=05xV2#k8`Rc7VtNQ(?0&j}>9XtP;?c$|jbyI~W@<$mhk
zR~>5#!2IlK4a~(o!L!Stcs*-~^)UUwJxOBu;q4Ua0EA=wW|W^q2jdm?JS8iYlu(mI
zsRtF!*$SBw5~pV5i$)vB;Z+g>XTm}oW984b`)2KnE%NCC6^%&9&6g=0<`9Bv&DEwU
z^~W>qKDtB$H)#f#O!j^|)817KpoS!z%MF0lA=@BF_A}8TfE11Xv;3;UgS94Z!D7EQ
zBq$TKgrW^0N`eq*MmImGj+vsY>ETCH(o4L(royHnqIlA;4C00mDH0k8Xh}i)GP;eI
zvB~M=K_P(a7aj(|nm^$CDx0eB1s7us1Q3<b>t@AqtGwf~e)ii-Tgd_RuA(9mNY)jK
zE;B2oj9&d6Nawr`JZ=v4zEpJCey;#-<p}cPj}0e55*9^AqqLo>k6}B}=xO^f_Wic~
z2t&C94U2-65r!p#K*tiCx3M><0&RpP8X{)GIVcWq!%0Odj7<>o*SH)k5Lp$L=Gstp
z9884?F`7hJ3KoipKvJ*}J-#0Ho>GG>mjBMoG~-86(F}m>i>p+q!r4;N9O>|q<PStC
z!Y!hOjejZS^Mk>V!HHoQXZ)fQ!X;k23XewBCMT_%1z&ZNRn!Mr71U`xpIqRgL8COE
zqnv_~tq#hhBF${F{X*C$>lG!15^WD-hiF7WlL&}Gq%$?7NYDIKJDBwSGN5dpEo;XA
z@r1U-FZnNAVZT|Z<qT+sz&$0ZYHG9F+p&gNyzdhm@Pf@-9<*(@Q#?b>iP~3rTszgL
z4ilgeS<kyVO8&Zcn{fYv1PI-Ac960Qv&cX#69TRgn#ec#UQ|TUu!tG>M(VJ+(NZ*0
zdzC?~tT)ytM>3DNHM?I0V6)&U^#4itDUfle&l+ary3ua~EOt!Sal9Uj$K{Og6jfXm
zft|frJ$$;jmk8n-1gk`XF_{M?h>SrhP5OiRT7x!BO|}w9!lB~gRI%!}5mtGc1<%5F
z*G-$S`KVw~IU98Zb{C}=Reaqt*dT9K3$*y5RE+pTvJzqt)_?D(P+*z$LeDi_ck>}S
z^%v8|_}a?#wY3#X<sHaswKyPnYnUPB8V{hOau^8~4M3$+T|Rf+ATb`XrK;(Ep#h?%
zQk4Bh@l#Xs-8acKR~I|vCr@bdZ?Wt_DE<X<VQh8gtO1g;$iYwgVG(RU&<!Q{n;+_^
zj1{5Pq*())XT~Uo#c`2{G2`pw`)KF54M{AbV<4?bhuMYE`87e%AoD)e+zt23qoY#U
zA!oeMRkNHfd1_Qr_PRmwA&Mi|`7kEcBr;PqSepNS+hSlK>SwI@DXv59pq8`7|3$_@
z#zxMhNW)CY?4Mk5v!{$Em0dM`oV+%kQ4eCL6ID}!|C8<7KD+SCIYu)x3_Jwi|0c1t
zNSO#TEO>6Jhuy}mOHAKu-&B}&42ox;*?2f=jJRt_&|$5Nl5##V02yE=)z$Kr3*)B3
z(}!WCF@O4Vb6XxK(k12qZOGHpQ`rxL(&mG)>rUCWZFi~(wF^Y1R40uXW2Ok7L=ml^
z9<ic?Li)f&hQo@8h43j()VJL<#y*peYzhWXrbJ(CXgtW@yeuOg!C6d!1UdM%77-UR
zSd!N*z^7l<#nrWFV0R{|%vnlwp;A;J$Q++SrV>3Lk(C{EEQGugcqvHPolVv&MWR4K
zh1*AlsTN*4Qb%NNM4ji%!E@dij?+a<WNKt&G(Z$)I6B7PNhQ)JQ{fOt9FrI%RSCgV
z(B~&>bP$e2@mXQU^`4X%&q<Q$5WW+al7cDEdmq@jt_?Z*)iD=sgtc~}klgp^IT@}I
zU=+H5Y@B63jO{y7%+gvt4g`Ki4;-S*t&A5><egXkTG=t=ILJXm#1g4$(gYJjV`I!%
z-`THh8SH#D&V=jI#~UFDBUWb!iI+m+pN9&Eb|eWvRg_LhMujZun*%AI9nk7D+W$#9
zm*fIrQH=dY#{7a|MF$mrPx<okUC+(`UmRn*`XL^-(vt`@skH`ArfiA;)6XgX*RQ;v
zDU<rkB2A+XY?bz#rlBRI#wu3)urhcAn1~euqBNbXH64g)NK_0nq}iT6aplxB@Ncn~
z>4^H+J4y;M)XwgnGM!gXpnpPz!{RPkR3<u2>{2)v-4BPWaHKdlu;uU%i<0E*=I4AY
zpCF82$ukr;Q`_$S=5K`UR#vk>f`#UG7{=q3#*r2<xq#>voz@*c0A|8qg^>TWGXU$6
z2-rqFRrf1B>Ty#)ew&mtB?Ue}Msb>`8e^n-m5E2=v&pKN(gkn^Xcic=VST~QSje1d
zN0b_t*67zmph?%<J&LOuiQf6%(OkY(j(|hFZ$gZtN+=C2@Cx@9AADJw2WJpsSPR?@
zROyKDBif$|G0;c6-V)P1wbym@V67<68LhslfGG+uUoHugPIadS`I~%XYTmvuc@BI?
zylAQ}j~Fs~E!Lk%9XnAug8bGnieKnZmAd;%YCXZK(cEb-2XbT)dilS}vdi;&T7ql}
zf8vL#juoqZj098-^xX1ox!ogrEL9fQb^8k&`2SN^qd7i)u0Cmh8C6vBrbsLca)=x<
zDx%h`(;R+GT-`0na)1Xcl4IEr92_hhD1IMB=&E?C<B~6m$#NRZ<p@*e8q81KjUUJ>
zcLJ+9#YIfeRh)iQ@Zr3<oLBZRI+-7o%)TF9_IM?8az6b*aG&^&gCJy6Wbsn#Zny^9
z%CUnr6lU|YzPJwYB;lve70+9y$?E!z*T>4H64%naL*mV2CkQA>2)IB5p+E@2U!mW`
z0^zA5B1j1A1$pHQwUNR&fBlBpu@?-1M3oRk_6J@`K@85Ez?EIdb9|>d&vORcOF8{G
zvUaJXc1%IGc`U!X-(B6Vd|bYENwCzAbL?}WgG1^F@&%DgN+H8gSgv|T<0gk>uuQE?
zQLhL8;;Yw1PPG5@sokU$I+aqc^ht5k@k4(a!mOyL$0C&Yis=#QL_w*}JCOUDZm=gp
z_#9TP*AsJ}$zeY-mCgG%s^NM4(f5wY^&S?__xbR07De2OHMidL(Uv=VDh)wL4OcxP
z0C05@I6D8P#;#sa$ua+$GDfNA9ni)`qgGWD<HGt+sh&<uc<`961~tZMLc)M9vjdJe
z3T7Bg*-EM&{g4J$A~h21Y_)-MtgeW9ifikxn8W*ZqQ4Y5%Dp)aA`L7XwPqE8J$$<H
zT3AMg(d9r5&obYvU!2H7D+OIl{HKU^y2C?aGe?_3uoR0l%y#R=$y43x=t^aDd{9(?
zLpP30QjK;)&KSMk&ZpPr^ey0+YI0bw2<}U}Y<6T;tvBE1rV{$B-J*aJtg4^eqgH0s
zlDXZQbLyj4S64wOE0Pe;)g7**%{J?MD;H*QWIsB0Nx?5^3Z-yVaQjk8-yhnmjjOiT
zo<{2DG*dnVqI%F3;!C1u5mD~RmJ~afDasu7S~yQ`qco3tvXL;v5L3CKbdh8SY4WhL
zxEEOMBqt5Gw8Jo%EOkqn*#Dz@a`2mtXqe_s-VoMffbcI5;c?xXUwB_uva&`-gRb0W
z@>f<W+wB#WV)|14QkUy}A9*)G=+RTH#U_-2?J)qZ)iLDEu}$}_IVa|&^?pgmd0~w3
zym8<!Q#mc$#PKPI&0hOyY^+a6IcjI@PY=RjWK<LCr22gGtI}JnS!jrFoG>J_e^L!>
zRJyQjptMrNromA-3JET)=I)MYlsGn>5@Vc}yB;fbS}uZ+YIYzs+oA&6(~113iOzo|
zOfBGCooM3RM!qL%Ue^!Gu1EEhdq~nUmWGJTWXM~(O;Bf=v_rZ>z)5TMzkA}U2GV08
zg_1#gyh9>{-cHaX#W`WjTTT60TKDWc6SJE7yffn$Q7UZYp@#YKsM6@jf7=#GFs4Va
zX@A-Em_Rnlxqw4{x*1MgP6P3$y5pmG7n4~N*OeS)Nb@(UOb$6&^qbI6wmz`|(2ue~
zoDF4z-9D1yqvVt*Tg!Uj$H*Hfl&1x|{a+cA>glBBlk{sw4oFptJnq_~`~|~7;89tj
zb#BfqyU3cUsP~#!Qi8WDBd{o77E+RAk<XHRWGw;h{HG-ptIgEpaB-zYwY8qho0BqJ
zl5>A<D2jFBw6*6cRh)8r#SB_gw|#C$TL0q09N&Z6(>)+1?DrdVeb#WjW|jN~aU}Tk
z2-tc>qaHS$F4_O-1;611(shjd)t94O98><{i>#OLnxteP_7LL`&`v|OcjeUnb4%rE
zqqb73<APFdW@b@KD{?UVBEB<!ez`II?<T9|oR#M=0uOhiG$9B#-#XWQ_pMiaP!dMK
zEfyly#!8~3B#CfZu?Qja+A~>~5F!QnxWmEWi*jMQ?N)7g8>Hg5<nRm2hb@8Sy*#}&
ztx!cumUlzxZ3U$zTr>WwKE~UMo(KDfv%065A|4QS5i9CS*I{q)wCBgyed3q#0)wR9
zR#2Gc$r=kD(sMA!TfVixedF#+e(HdbIB^0i;?NQKTSB{aU`_o}09(+SfH@Wib32{F
zuj4>6DdCjENxvy&Nf$CQ+<&(%$Anah2B`qz&!7|5BwtJfRw=eGBTlAUm{D+KG-w(L
zoQ&0|IDAk)sRkJW)kIt`X?cdop1@?5bdGq2tHq!w0kdMkg1y1^T*`#nWR=zP5oxu_
zs@eUx;-^}qC1+Cs-@VDjYJ;@T<2hlj`(Z~lNsxs{q?OW=vKsa2lHI{n$76U{=Ud*!
zsZxuB>qV!EXV+FMBXc<cc;}U;!Nhe6mFEopU!5u~Hrkt%(5|0J1F$**oyMOZ@0wQE
zTZzTgIxV)|P*WZVxA7u5{(V7vx(mAPH?ChKnNHxkhr>oR1H&KK8ty7m%9qkBn>>bB
zF%vLT85ov~&S}_lZ%=vj7rE?4A`Q|VA5?M%-XG5g)|3orOcmwF78a5|ZcDl+JU@3(
z`Ix?nnMDi<WvW#y|GeDN%epR{f8I%D^wgZbEsfrb7-ux&#EWt6-o<MrA8ja5@8{bQ
zPvvETpRvm@EsfHNB(wW}79eW(ZwU5Ch`9T9w|6v+N|LH4Sv>4WUymPr{;_F3H58-}
zgW!2gSRN{J#*FLUqA`+)5$TjXLeWW797w=ghQCg&CFhnV`3(V_^Zc6epz&b7IjfV|
zfM@@h<?X|+JI(d;nOs&@=)5oaE4q#0^cLUSRcyEP)@$meZ%}h!=%Li`#rNLO-m^2h
z8n1oYo+`KMfHc#^<N@7w{uR<h3G0T-$JbpmcUGz$iNyg?J7y17ga5P)$cSJ8h)qy}
zR3gIUPve(}X`=Gvg|9R16`k|;w4E65?=`L<ul+X6(@iAsbV8V-_u6-WZ3H33J#P20
zM9YN==`PAU+TR}lh9lg|vA@k`wRDvtp)#OgiZHYUqcezOki!tFB*C2Y^qqT5EahV(
zYAj`Y;Xm<$3W=QU@RKyjKsyDNaKj2H<Sx#K<lz{ocqmfnpJCv{zrqbUnF?JZ^!Y#y
z*Gb<e(W@@CuIILV-$z=HyLs*pcrJt%Ydwq*ahEE0o2K2<t*xpEKeswQ&I)8}3@Cl?
zt6fi3rYx^BmOH~7b3BGowiRw9FTBQIVYgjIIQQVc<v4oHoBj`hKz_fWsF<VnC(b!C
zBd9V~?>&K^*$l!=ynjEg{*C9`<M$V+=w~Co%g2tpv#2J~qlm{*Vi2l2m8`u{PkrJW
zXC!^>_)-4(wHNYtpZ>V+t!FtnTtH14nRo8I20yI$$ICyVXP$Nj?>qkjS)FtM_}$<6
zGtNA%%l1t{wr#6*@7`PFsEqz-j<PJroKPZh_WRqTwr?IZ*N|_eqNj4$yhM+}Os=^6
zaveQS=iCWLA@oqI7s1reMk<h+AZ|yH@Pc3*L0lY_)|3#6b3@3_4W#&>I1DCP&Gh>3
zV!46*?8h$P&;H@Bbr<`&e)bN+rZx)`hF!jgu5V+ucG;WF@lRKNf@lB!kLtT`{KWXp
zz5ErwC#Ro&j?V45OV&)J`luO6sH<4t7K;y1RgR4t*PmD$-UFu6q(Szoj6jTGMWQcF
zqOYTWZ}Jr-S^3DCO4z90A24`XN?*dmtd!kw{S9Nyckh)>r}J&F$uymFz^XRTpAdne
zqnK6d85-tBQAkWSV<mY3VqTyayrx()Mcz7D^Yu%)>>EG%r(AO5S9Py0a<4nc>eEi*
zzQH18C&f<|9AwC1QgKihX>XZk&~m)<L+{~=`)?Xw<>clcks|9}5UNLfJAD}OS^!@=
zY?`ysE16s9an@O9od8LD!~q4PamUwW>>UgaL$j+%APzM|Y?o-j;^Ux>71Wp}Dop@O
zAkIq*I>v%o^%#xQb<P-^1wV?(AI5Rp9k)uJrxCUvl=W-Yp0Fkop+0=pniQiJabQBg
zY5+|xi>xUL3OF6is0<OKq&A^Y^I58DN0RDHunM8Y{6c>2hR6NF`21hoa~+@l`WN(G
zIY`+GB;6JZ!x|}Ck@YE0a8{@Yq^&MqEC=0y#Uk+fzkSOJuhA*C&&(avM=#vUvW(tf
zz_9G|!WTV{x4z{9+40u5pC~?LMd8=za^z{lyd^aA5HV1)AyU*JVOg9#$~w&okE4y%
z#d=s+Dk&dfnYgTncpp*3szRQ(PTUHiQPhM>9g!QrCRu~Jh*Ux&{xX}iXchSk1YA|(
z>x$s37o--dFo;BTwu9KUm)c?}%zED!F4SG+0hmgllQ3WRslCG{No+(?5okuUv3O%~
ziBRQm<NmvN%hgLH?5iL1Q*^r<A3aY}OiuIK*S}Wo*>$gc<f9*xH~r@CoIv4#JcQdm
zwCt-IxwXcNT$hN}M6?Od!g$tXghNU~z=nW?2(Ng!k9RQa<JC2WW@xv%CvLQr2FL^6
z)Kqx9HB^#NIypBDmQ)S6<UD$gx>t+%$h~G#2r`_J+^HtuY>Kf{bh;Z>oc=2}ew~m)
zC7zNJn<;5aaP>kQu?`N4Lo~hzZw%fV>O@GoE&k&_FIn0j^DRQwIpUn;sH<DQ`?j}!
z8zkjsT!H##Mx-*zRbptivYZ>?7D^<u(-016SjL!qd3pHZJArCgVjI+gS4XRzpRhKf
z#({d&DiWY35D-+&Ws!YO0C_GUT%08>&GQMw_gP#Vl2OcPmF-AZZ_sWs$?dlegfy`6
zvGLp=`o?EjtcIlP+VsO5J~*;=juAs$mXO6EIUC|r_5wkr`FzMbEpFR=*NW?Ht$Gwo
zzz;m`{rKA`7iXD2cpu*NN%De|wx7Z37al)&O6+Br2Q{Mc;ExK2bmN!9wx!|LA`(Kx
zWL{VH@KvJsFwJLknEuN{iSq{~xk(5TdBSXd;`T{g<*D(cHUdRMa0rlRiHaJb8i1{L
z(8;h_#(}wtENRV5bT`jT<y&U<&DNj2_WC_D|8~*8&s_Am-TFg6@~ZED+IR6U0Jq$C
zx02XM&6E~^i9=I$Nt$&~uh;;#ff0FQnqXH@3kzkBiEhEYgS~8O#ZiOS^y!bjk=*u)
z9qhc~OS--#vUuP=?Y0b=si}i<$F6U1!)2dm`#H~*lfM7Ak8ed18sh5*^E%6>4lx+a
ziob|t5T0h}bXjFgmYpM#-+4?7&yE1LQuT(KAV}~S3ABprgf$YY4T*y>NKo(rBQ+ug
z3xfgEtpbwdyx#tWi+iqMdfgMTKAX93cTYb5wHx&_pTGRl%WvqhZyxF))UswwBURNU
zViZ@^keSF+5Inem<R*?-2QaElVFfU;RH+iX_-UR{X}v5vwU4fmeC=<3mc2J#p{KP|
zdiU(qQ&vskeIKn$FhZp{ln2@M)k^QV?Rt6IPyd11sV&EDd{>tSdX`ta#v#xsUpQnT
z2f*MBC`&`^23@L*g{ALDfA7T*jN(m0xMGAOsih2h6`=}v9g+l3CrMul{L6`GB$<H>
zOX9#d#b7~&I>6M1leFicgI?TPyX8FHe=-++=}IoY<Ql$l?cI9U?Mm%om>Eo(63UW0
zcHTce_emSpN*;oy0?vaA0b3OKBBOGU1VNk1qK@GZ3dUhoNNs`})NE@n_3NCk9z7%Z
z`ukqX+#OfxwpLBIo@3Mc4vYOcyf4Y~$gh;DCGVyzxPu(rKh!J#=9lG}zjWd8F2)=t
zM==lRoivp$W1}|^Gj=j2#AHL1F*D)l??+t1UW72lN<MsO%CM{{ohQ^Kb#Qq6znrL^
zBs4Oi&gbWvU@uG4T*VrK&snHCw7aX=yK|p@{F4{)&wu|xcHcRKDtZlZFfqLvuQfwg
zVlCXe>*g`|=NF!IKJWU-d&o6KO+w{-+_Z8FRgE`_QN^o{i6xK_2?4!fI-O>kmHFJ<
z!CRSL_1NQYB)dQUyOej|pj%ost!fU+9*bolByCJKNhOhL(x_m3pesX+fqe&d>Xm=~
zlk)VR`<r7IVtG#@ks;Qp$J)s8y0rU@K$$UA5{XSj4IX0z9~6_Os28k{knVa|lO~qb
z7)(%nRX0ht;6)+J@WTpY6x3rMrZ;)=GoLP-9&<9MpZQp|iSSE5|Hc!zy46O)G&bp6
zDs>yRZT8L1%WO~h++~;RmDl|fSKqXc-Fqt93X?@j5;79wDLR3&I>5mNSiJ$B`IOas
z-%Fmf;`EO_>13|D|4z~(fpSPP)u!?T$O3AVI>f4@Nb~GbQftX;VSeWxUiXUE%2Ktm
z)Y*Mk$+lBpeEf~%z8kNm?dHgJfiRe-JJq4z8^$g+28V5u*MP;5hYF-((mEDq?>Tla
z&<DEh4twhw6-!ZM^bhngtBbL52utu24cbVGX=GZ_Avi}+4?a-VHF=s+6z%vs&LJwK
z#*WWddq=2iq{uODh(RGdyeY;1{kFF(xAPPFP_u@9RnxC3x%bX_uDkB5ddYuYp*P;@
zneV}T4W^T`X4P7XP-ChZSM^C$sfO^_)8VDhcntsJCC`(`p0YuE^CiRi>$RASh~Jld
z=kw+6PhP0I<`$Wpm}XeH=q)k<RdhHYq%DGv`CpzFBvnn)Q_ed1alH8%KRLeET|55-
zBlE{U+?v1s(^?<g!)ozpJ)mf1%vBD_a;#U3Is$?xU^HOWk!ghygA-+L?moTY!Z*tk
z&;Q+H@)E1Tkk&+p1z$smGw!}2ZV-tkBB5yrsx~pMV6`SQ0cQijdPp;ZG!&c&I7g1s
z5<`*2$EUs~&k_bk(cr+<WJbW%{8v4`enX!xUvw!qUw@O{e(M4U=Yb581d1eM(g?Nf
zQ1<5-%-2k{VEYz$%qi1+?+c#JnP+d2d=*-jdvvh>PU&Q;w7>I%6lcXo^v^x{$N1_k
zx5=ljx=ial!Hc6xEmWSwB-qvzzVB!klay7U+Fvr2c4_r%e(B{uwqlbR%-=<t_#+-(
zJ7Ocb=c><1#|G_MrF0IP<;?YlbXpnWD{P1jCNx$d3=XR`qK3lObTe2uc;7J!m=!CA
zYFLuCTa@L1RKplBxICe6Y@{jOg26L9a353MF7v|*Zwj)sO)Z8XhAc0zwa0shuN$ND
z6?xL3)P_t#mBiTpa)$A>Yp&J5_^bEGSFgNS_uO*}y#tO;0jX_~<N~=;RYPoD(eFW(
zm2B9QbN18M@Vw_dfhRw4yPUjvQd3#Pb5O+&X|;z`^`h#qH>1Liu<xU4*8Ye9yzhr*
z_{IEf@(-7MPLo3DP8ob^Fsg*ACigkk89G^)*@eAyQ^V_i;1zQI>Cayl?Yvd3KS-Jt
z$KR7^U4p9!Qeg}XtCGCcAp}o~#{`FmX0Zrp<krPRnP;S;KYQSqjHYIJLa)C-v0<78
zSK)>Ox|0QSvj<j|bsyLs!IOlF?>p}qoVtCRTyeuadgb-EM}0qI3BgippvV&Hxe`|m
zVp8u*d@0x@!Ps=nXn&;Bi}M$LOc!stP0G5yptFA6%=*{8?okWB{@|^@$E9DsM6bQ!
zMh?vOF$PU2$t7paWJW8?7!Ew8TSPL&CNaN${&zox@BZGG@U&+?jnMmdR(0l}?rEa4
zSYP6+c|zhq9j(M5MrW+)&D?e4C*+jp{D3040KDrZzsYHvHp_=U{jWObJp1QnvBr=|
z3w0KwFdWSCou@sK5B>BG*^sYVy7>BbEf;PRo6M=vN1+59f<vsQs!K8}Bw50s^l>M(
zCRQ98&US4Shs2nu^<h#>l3_K>91}-UJKA}{?BW8&s#T<^VSauWrkyswu*9ZfV#eMO
z5_lxkoVjh2oO@1(*@g9T`PJ8H?JTCV8j>7e_34*=Ru=_%7LA~=VC#}1H&o7Jh=g}p
z_R#wrx4ijHdfT<vaq#Y46oVmBdkq-W3JZVq2b!;0!{eUubhdua_ptu^f9RMQ&0qfI
zU+Nbwx>)YG^)|izw%Zu?7Rfs)c~Q{LGkje#Q50l4!1^8w`}zchleWTRpS*@sPFc_Y
z^PCsRQ@`sMG@puCth=uHu)6AAsE1flz>*{t{dxgogo%6=gM|uP4Cr<;z5A*+oxAz0
zUs0P!62mt<?I(D{(|$r`E`ATU?7o}%gR|OO=#wWcHgDV{KlnZ0%lB@2`pONjcZuG2
z^9M=HzGq{GRQ2%q8%cL+l73<%4UdJw2<31{Vp5#VsmZAg1Y^Ni)JKG<Si_=MyeXKR
zp4xFNUi6mDC!zjpWbF*^JgSZ~F>G4Deq7xe_dQH3<&FS~)>U+=SO-j5p}<qA#|0mg
z#t?N*(jp~GqmgXix|O?U@5Y2c={z1!l4m^g3Ex`6?e=&6iQe$9AE&(QPC8CGbM+K8
z9<?>bL$@_aD024C9%SF=KF7@$eV$GK@b~)M4}SC!F_gEx?QL9r_0@Xw%{Q}u|9<Ma
zq;{ny#!@6Xt5;8BEQH`uKScb1#eIFI3V7@(@VHagapqZ%<%v((ChN8(x@v8g**(1r
zGQAauCD%kM@+{Iec^~83G*3vZK~<<cs7)AzK4OIFymjfWt9HoNC;x;>=ex%DIdk66
zKcvD&x$nc;KX@7Q2d`u8y4I!6z@UHR5z7%9$;r?DLA~@V|4O&jrt*&A{#n*^*D$O+
zrAerp27_%h>jEKSY)pdfPIF*EIcfDuWaf??7jVG^M{hT8c=ois{~v<xEB8}{jA4JC
ziOliC=QR?~8s(>rL;|}dc!@U5=M9Lp9MCCJ`X0)vALXqROUt$?`v+JY#Bl3rkK4|b
zSALyARkF6z#nnSLO$gt)b>cx^%;o>{7xjkEeTHqBVV%HqtHof?9;UlFHi6!tPnfOA
zOv+?cGtug>uGQj}OTWb5f9H4T3*Pu9re6Bcy~>3j`<Pz&l`G_HSASjax@RZ%?cPJc
z)5_b3js2f2O=-6>>bi!80=7Tb9}m-={+P${g7Z#i?PQ-PJ#I=it~Rs^qiPp*U;lRc
z2Mg*t-{H!y&7{PVt9K=iKGr+htro6^eqB<LA$i8Wc~91A;iw3HfDU$@+g`OvZ@>9N
znASzQ{qZvo`5t#(zeD@In<P!<w7a2$%Pjpmp-!idf8uVpJVRQW9?R}~Z`8H6V9i7h
zczmdEk{}q;;7EPUQ9PcZu`DR;A6CpItN5Pte{X!gU;ou#;+=o|r~1Bkzl(Fu{tlk`
zob%*&F8IwOHk1$i%1in6_kNH&cI{&G#!Z~}tf%wBQ&&s8X^*daSV~j`mss$EcNMCF
zcYzi$2`>kIS`!`0;GlnyB+W>SWuaGLvN#m=zn-&MX775Ue);Na=?(U<W^ISx{>cZY
zbh_*nKcWY&`cKYGl(cl@NkY(y$*CzA%%dKXBF6`)LnIpa1nAB4#ECY&#YMibV}|cu
z?CInyUwz2Sf5-2?mBHeGtG;%X-hAWD^oBir<(coz>qL8kBu|*0>{5psi^Ze{b;@wq
zXW(m$F?8Eqww|($C!hTt^1A=|^ZLXy9zXt^-PgTY6L*suGt1&&aBiBJON-1?`yt)-
zq<UYIj#7gvNFt(zG3anWrI2(c@JX9F59LHaiUgbF1aI(lcIiA7A%Tir?7Q{1b?vHi
z*}mq*-*l0CE%l4ny_xAwpFFMAwlWS31hEqgLl;wQKK|hrz-do=f!_S3o>asAy05>N
z$>1UhwJNF(bu~sEgevw<(gL66xNMS*o6lTv!=L}cf9RI2YmuPbaP2i*am82k-S7D`
zPI=5}oc;83<YnLgQhnibpZ}0|g0oJVlu!Nd*B|z0t<=)(6qMrWl>@vcBxz2OwXl8>
zlcXFdVY1sLIM3YtLE7s!(VriZs;4YVrY9!QWx5P+f5mf!S3LJ2UE6iP_NzL3{k5#C
zhO9M~%9kjC$_1P+Y1t)YKp6Eq1q4s(18E6W)niS&%V*yCN1Xr4S0C~jfAQWw*M0l;
z(Qdb?>zZ!2i>GGQ<P_e={*NREi?Fyjk8_UIt5<W%DW`DuIZu{z&UuRd-0R=)05;^M
z!^s@NeuB&)roL1pCyIe5^cELn!^zp$L1(SDhNQ)w{rj0(vzCEL=-W0!onpZn=FNb9
zT~hZeT<u8{8v&)Z!uvp7D}L@XTy)2m6$+->Ygia8@Pv&|;c@HEWOcS)2D-pKHgI2m
zk=!qmIhZdEk|e0K$&;L?JQ_x_`a54Q=?&K~zsH?B-L{w3VG#{OR2^u*+LSbFVMM8%
zV<0I5=}^if-}&SJ-}pT5eCIp$+Usthox|GcDJs`zqE!&Aa>va#a@{po>;L`0-?C=)
zI$gVVEl)q^Y&m7iR(}1rjtne0=r7{RiaMz&I#Ue2!PPY;K*uBm536z*Rt{qmCZ<-g
zIH<rmY|%nBAl_s2$oe2ReDO<6E-o_F?O?^B!9|vPGMw?0#$!=zP*N3Y6OqS8BLpJ=
zd72RriebgYul!*>@56t$ViCXeWj`qIde^&j)!KEm8(qrU2Z}VKt{sDF$i&11r#<d;
z&N$-?Iq$sZ>iIAK;csdbhb!ES2|vP!@LCYHBnE~H2PmeY9DGIlC?RX(H%+lKB<wDQ
z+wNK5_IviRYj&Rf^(>3^0Amu8w9R0kh=AHE&h3yALWYtPG?E|=1{H>nVoXM>=xSn=
zh2DL%vx<cMB&pJ`1(FGz%kg!=J0~vHB3Z?zbtiNBsZZp$p7AO<=0*bW)SrDHU;RI?
zyX?NZZlvvMx;7FS8(%S0rK*L>l`Ob~x|ky5o8|d$`qYYZ{PHjVvRr=o<$BvqU*oo0
zZlaa730h;xXcuYJs8C_p?{oX@ck+#I+^ngwyz|fAO}EHdw{|tBp0btGwx1$vH*V7N
zU-4=-ZQA@zA3%{<I-L%4Wr=1EleGbhah_^e<5A{ETJA~0d|4xT2b)J`#l%{ySG0ck
zM)Gg3_z`XQ7g?29QdP>T!n+V<A_yc#D2?D%NYuo!U<qg=Qfi3FuBcKF*fu%E4Od;w
zfe(H_SO3_LkMH@9{`gOL-}~OjzJ2?!)>0G&+qZ9L%a$#iefHV%<3IjteE|LJ!;06J
z=wod}DFnfY!Kk5?x3wD96hM-#V?h#JYnpre!j-q|;*uNhWZzI&803UB!xd9hwnOj+
zDKoHnq@vY6LCYwoU~N;14;T}pk}T;`mr6CP5Tn?1l2)OF(vS#LnZ=}Sd@2kH+*d84
z{Q+`tFaLVoSNPE9|5eZ4emWod(Ff0Y9uXAqIY0AWZvWI<<hE-sSEQDMd+yhXv`s6^
zDTAY@70LAKbGM!O)XUbr?C_(#AN^>o)_mjouj(Ja<Lz?ejW_DeH{Z&za&)^BO*2Tq
z8f+`2C<+pRK{?>gojbYbt~>aT&wWM*gNi?V$2&;!wo0o*duocQ>D8=RvxW`p)=QY!
zq<7lQh_>i<yUc|^=no;uY2_KFpRj-beyVC6v$L}dhZSX-A!%Us^eXn>cRwu~uwvM=
z`)=Uzhuq7aJ$v+$i@(VEFF!P?9^7_2>w}}Mo=`bZB~NlR2(Bv8#Kgq_*wE0fiUUz3
zNE|^{D6)dZ;UX^7Y%rFaKKTir^<zK2;<J9@Cx1$&r>FV8@B2P|*0Y`^hk>{q4KQT|
zb(8@@kQqaY^XZO>?pg(~cAE@}X}xpqApd;XwOqTW$H8=xg`~i@Q`9DC?xG{o6jh5Q
zCypZwP*V{kj_C#uUPq(XLMDP_8NrU&dMbLMCduNIV-<Y#az@a$VoVZ;9elvo0g^tS
z_}aysas3bI2j1}eJaygU4*N{xk><$S`RTX9>@58Q2j~wgx>M7v+p<+xzv#%+n*Q+j
z-tyARzIf?BUw6Ydn4O)+i@|0o{c?z^r(I+eX@UuXRG`RGhW$Pcp%$UW;8C1ceC_Dz
zB;D_L37yA3i?C)BJyX!H1Js@(&6%$Ev3T8QS-kNYrl0--);|8J++7KkEl{saWI0j|
z*=XmPz2YC}-F!J+SJBOcg@w7;i7#sg{gPo=DJFOGZ~vy=@OK|&dtvBQL-2v5X+V~B
zMR1-ZOQ|(L5HfEO6DZRXk0<p8LxQg}S`%I7dk4@=7+{%SznSM>{N>};biDoRuhYzZ
zV`d`j&*-owvl$M9*NK_IaAL=XQ=X~zq&Et{h1dOpe&VW2xa5{S%;&2ac2?ukE<#Gc
z<Lw}hMSBaCGz{|rOo`YCXk-jVRgxsdxe!MZHHnlr7L4_T+R;g;@Ls7yO~9kZ$4y2Q
zMM?9VdZ7<BtSMI0S_tUw1ulKZ$Jo|gFUQ1_EI+or__q#gj7NIDH~z-&{0qOa^!I=I
z2Y;m3-EghkxofBH-o2Z}#YF~#0gDTL5`>9XK_^YH#HOY-(M>A`=K{fYS+!~v#pEQr
z`+fR}l6I!3sWC(u<xo5Dp2fvQCaVgO7MQp|hm}XF8rw<7Vnq`Ya6?BzV4~Y0S!EdX
z4-Lf*-gyV>vxHQm&UkP>Y6dyM`+%4L-jRtNBkffLgFuM-feAt#0{z8BTCIekFR@AB
zz~0>qZ@W#4(~b{=zmOs{avR2@ln4n{{EV1nN5Aq+j7r_N-p?0r-b20WB(ycf&<QFw
z8iJM(s_03qLT*Wkuy?OQPz7&5A~mX*1lO;@W)0t)KyY|pL8!4tD61YCEF>Ym)27rP
znjEqol#mEXtIbdywv)ixoF97c8@ck=KEN?Il4E_m;n#ju9%y(U`oDjxx88cE?7VXq
zyYAYl_wT%ws_N5sj()#SS=Zx1t6|Y%|Ni}KdqRQ)1C^srE6^w*ms%mQ4Y6|_W!aJ<
zp_U|8?Zl9zIb}V-7)zFA)cqdTII^r@Fzhjy>$7&%hC>Sm_uo&)*B}+fDj_k15GNs%
zB*7X(s2!<ToSHE;XuR7HLoJDUl1&r(i~Gr@GQ1HIr`&hZ7dYj#(~iq~Fp?uCn-P=5
zU0xJ$cpN6N6w7AHuekF*dc_**w99-AYSKt0D~ebfg+|pk(4{zJHO_fVL$TC62n_+T
zSriMZYSad-2pZxuH8ueu>cm(f1RrsOBADj9X_hi9Yn&?)BlPADux8Z;ZaZ)<|Ld~9
z*0(?VHS%q3B!@d*^@>-2(**RMd+ydxe(IClci;W8Z{I%dUbK2!vW0!Kv$$-M&g%8_
z`X#6`><<tdB6?Q?lidk~KnMY^HB<_D3s;vo1H)RW0<4*sqGLSZXis%mUsz7vdgx*;
z`#rKj4?0kJhc`Kh#g~qWRtv3qWU0lw7+%CmR*c6VNFiH$PtnS#oWmKxdoah5J2=l*
zF`TzjCq|7Jyq4G`BY004hSV&Q0vF!;_qubzQMOmn_mJipq4Y$ux<D{KaswEH1cPey
zo-t6>X6Vf~^KEgORB_|g8!5^>ViS~r4@%IoDVr-;C1@PsPDKzPl%68V7}gFIW%{HI
z^yc~`6P7PscLhBAHT;(|k_UyTY}qP5_uAL3h!lR~leco=<u~bU8EIN^4x2_fH^lM!
z*S${O@WLna=8s>`N4{{S`qdL8?Fq6@LD?ISX9eZp0Iz-B&+`Z8fAArPH?4M;_QV8<
zL-aM>001BWNkl<Z8PH$o)1I1OP%25DvN-57m09ZH0L_Xxm*0T$LQ~c9O&*`5DZRmf
zG)cfaT17!vsF>fg_qaXR*7P}2F5Y-S6-siW1dZf<Bola7kWYLE0AIfCdiGa>pPm?x
z+~(FmP@D)sA}NPxEFb$N{>x|-E1qsc_%~*=X=Xqh3MQkb;Q*6m#DvW#gooNIHc}K|
zO@g2}=NQO<S{zOT`xg#A^l;1XzJ|Lm{Rjv5+)dq|#e^Cof(9XILLeDmq`_m<VTik_
zT8-nDm>3&2>?1aqhIwR&L~hs%RKQ8TBS-;el8|H+lWk6Z{F8OfxyMGEBgqTyyMHfC
zu8$+SjU2S^Ih?Q9xM@8b+BW7cMS-`5a()(9OhGxsrIvD7vugFjWLWI9m@jLRR4F=L
zN*_?0;*BM@1@+<rtyYVJC@PTG4U}KNNu1la64id&MTT<&5Q{5?Rx!c!Y1@yRkxXrP
zF$eDb_nCgx6O-o}w4yG(sOesibxu}mPZfaOdlv~wmted2Y7rrj2Zaz5a*v`2K|va+
z<0w@<;vkT5xVfyb)^u0Rk}(lS`%HjPmZ)tWmQ7<gXoMscY=F9~K`ogv)WH#Ihc${Z
z%3^QsTN}xJ|Nb`azV<7a{w#hlr>T}qT2F4l`&cDX$p|C_F^xE+!{SLa&R2M28?t@V
zbfqOKAZffQV;mwLH8l>wX);rj5ttyDl=48$b$4FF;Isdz8@E46&VKbDJfbhSc7cE)
zZ+BSmQ4&s7Nz)WtFXJ?8wZ_6kwA-Xfh6@U=rrjwXwtmQ}Z6~wm_M33t;06mwmXH=H
z`}QATU1ySR)?!#!XeRhE2k~gfG-DlfLE}h5nsab|o{0_X7*?Jw=l|ewh15^3e+ILA
zYAv<I*QL~6C|Vn5PI}_+jjv-c^rU&0p^wS9iZ)Vw0k07^7fj4KR1Q<6*5zzABZIKb
zzlUX>W>oz$v{DNaVs%p^lM5kGyFeY3G)eIa*x2X6N8R{T4Z+vkI(v^kW_pRJWQCD@
z<NZIw!8@+e2?nIDj|nBI268-!#*tTVlv-@m|A<(LXdoews*h8ArifC6;+rOzY1lMI
z%=2~R-)$%|y-5hv1Pwrfh8oFR%=sa+w_K*5fBVaL>JR*aOrQQekBlct61v?kLx>H*
zEGLqF3$<^OznGmeJ2ywYx&tZH3v(oSfe;w>dr@)sVH}Tr%}?{SfBzI+1FMP&k}T)I
z!8z7UO{2A^93`wxp@*j0CLxLZU(K4x(nyZb8+azxZRC#G9;?qf>$r!qYc~IgOs{<o
zb^m59`v<g`c!J~;D+PC|MHdt7)I(}OJi%B(P`nLj0%EioT}UwqUdx8RIb}%(yYU<<
z<8aF~&{;Dg=x)fn>tT&WATgxYU`&b_L7K@07iuaW^BOTRq_aUsTM>i0JiI5l=|jKB
zz8k)*Ym+{OapdAiGmBM0y`s)X-c?m>5-TsZaf2h8Pa4T#)ey_tQX%3Zi<KILY+M^B
z#3q^5fRQTRxJH0so+b?Y3rwh?JF%KQ3wQ9<fBZu|^ZED6x~ISLs9$cs->0fQgR+9O
zh0O|FIY2AlB*oFS56X(7C`h|q=Bmh|l8h3{5V2_w=O~_Zj-;D5YQ6s;{rLsfNWr@H
z6bofZmgnSIMsIPR)C)mEB(#tirmBoc_u|MwH5|}hvyR=viuo+(Dd(I$^JwIJHrs;D
zwn#DkO{!qdk!Vex7|4Zk=m;jqVVeF$h>pT*tXvth#M!J%rqGZPutFqBnh;;y_}^6w
zS-TY@97C)~hJg2VBZTTmS~)l!J0w*IKA;{f*&z)J15oa|hC8mlOi#)yPRaxAP?4yj
zPN{24>DyFvab^<9CJ~cjOhRly7_bT6=2U5iD(T{A6Ub50#^c1~%8S7v7+WBcV<g9t
zlB$qvO&$gmet`53GL_V<&1zbMds%O1nW%Pi=jH$O$RwSuRwGlKfHC;t5Z~-9S(Z07
zd@xB&Bo`MK0i`|BrYZ-B)^s}s907Lg887)>>8WCEM*qM($<UFy$Vj+veioY~<Q`hf
zI3%nZQlF57NWtrd1135hs@l^-XrH=`(=V9W!3lU|rlw;ZMN$(OfbrC#xRLspMzS*F
zh13bgH%h*kCaGtPItZpFn6mk*2~rbvPdpeOOTPlWFknIY^ku-%lmzRrnUbVRS_n=m
z$U<}x#>a5a*d;!;2Uv*#xbmZKWkV~_m72l)e#BRV5F$~YG=|XR8MX5b@2a99Ci1G%
zh!q&TM$X*PxUQ<;C3e5P#uA<Sc;e9fjHbMq3ZxQ9jHT@NVvbWTkkt#UNh=1sZ`S?)
ze)Ma>`<k*Ez=&whdx};UlUVw787p0YNJ?T0(liBC`U`U;iNz*R)_rRC@Cnbh|I+V}
zY~IRTQXt(aDq~2~ltI5onx-p=xJT?(nGa+>!c+o=kQEHGl)W0b-xwbMyywnvf*#J*
zsPPQzK6P1=6gdXlG)N=iY)6N5v?OX@WlfA?4o%pXSGmT#W(_%kE=%yoEVTiQ!&60h
zkYRwK5}a#@n*;b*jz*-Rp9&GqvfM~|H(jLZ!JWF=4ydXM)0)7U6ffY7Bj^Ca99HMB
zQeni!QCD3`lt#MURy~#yYkH*8C&Q5-1WEBGL5*MpQVk>$2v%?gN@J-cs)G1nAZ_82
z7K>$|-JNE#)uoy}$ZD<Fchhx`L?<l9s-j5nU=!+U2qqyIp={Xxf?9&N@m@tRd4>~D
z&47?NBs;Ph_UC{4bF#R3GdH>+`%}YEpxbRzh{k-!cm_$l&P<h5l|&sD!P}IDB;(eq
z;*QL+?fK_%`mg-@juX{LLSpF?sFD<t91WJjBxD|PV<_q#t-(EXs{85W8H1r)#tq<_
zyj3H2v!=`Plo1PO3L$Oslo*nUv4~9~C{lzpO(`^`m`m6gR+EK1p1N*4nFwAy-U=Zx
zac*aYk=%Nzr1d<;^-=Y>5WApaY^<DFu%^bE8l+|=3CNOQXEdD9_>&StjnM|?AxpHM
z@pn8DJgR=I45dw@$l8?B2PDmqG^ZTaRAosgOPENYp5OmSyt;Vv8k$^crM8G^b}ti_
zI37g>yv3+Nn%e%+@XNmV^PiW&)|0q5&*^vC+<kBsDcTHbN61oYQEKO?HQ+?4L|8yM
zD8j;In|(#jN#{PB@A}jCp3od!!3e=L{A&Tc5A^02NHieTkirc)c_O8&J<5eyI+K&j
zk%i0HIt+(0Z;rlSra&f&4r+8zHRN?lxj3L@a!y;jomQQb1hb@C-sE}Oqy$P-kX~UV
z3kwV5Zmuz=>FS2KaGKI+7==+m2qBEG{gAIHi^FJG=x}_v5lf>H3LRo{YDAjyAQ2YL
z2#Oume4UHKT-I9p{r)jkEj1`vQ_8jsv07tQF$gI+sdliwh4n26M<@LGqZfZk{NqmL
z77uLM#%;3$lF1FIq_LBnS!lPYCR)sQGWNGq_H}b^DF>YW(*MEp-t(6yJc*sy1cSu2
z9wH{L-6_aZi*Yq)Y(JUT|JbW|`HNpfw-9;<?tj<{VJqIBLeXx=ti5(<Rbwzb^C?f`
z@?ZWx^6odj1*>2}ED((7Z-pgVsY9xvgTVl6Eyf5|Y_rQRQGuccFHv(F)iH_mgYF(O
zQk62xJjfCsuV{ea8$|fhg$9l6B_=VHb&WAflA6fQ<2*s!w-Ee%1YW8_+nBMzsE(Yk
z!DxylKu9qmJz~nB<;M?v?4RY1KYoW^^{=18btiEyptYx!7UX%(-k=;<T%e~=Y+TR8
zwo~}Y5C78%Zye+NPn))~5_=PP234OtOG$l6R+miTDf|#A7nz*gNH0`J0f`lc!(oJz
znG~xQbrs2oQpg1oZ(@mEA&5bAg^<RfMp9MPxDKohlc6yt0>sorEIyGHMT7_@I|N=Y
zhctjjK4qj*J0cj8WzA9(MZHIy;5ZsP#Ed^9jsr*hlp4iY@U!<|r?(s{GodiWxPu$4
zC7AdyoeHsAWR@TjkHE40SKcJsf8|a1UH9l!?|3_l`|fA%z$}aX9@)eM8@6ucoU_j4
zl%IdYw~cYIY)ugqt06*88pyg26*f3J>RDx!wTU6s0rhYWljTvu;z;{o64Aj`UE-Z1
zaRDu3C2~_bHTEPUHhN_x2b)v>fb&V*El1+?svc=rLq=Wm+GGR*=|hw-9jQiz2B@~I
zvW-ziLcmCrC<wvFuDmgEQ8o>}BuOwv@!my-#Rjk@L60d>t^&i6hmd$ZUKJIO$3gI9
z5~4I5k1UO;J!y-4$Dh8N|4K&;&rL+&8o`KSG6UXGB!YDn;ovN0(4#PrCW2cAH91nl
z6iG;p#Uz$aVaXa-kYUH3B>In7oed9?VVX2eS5BB2)0BTh%ts`_kyDf44^uxLi8q@S
z?kYkIbXk%$0%b~5rZYAs&cS&?P>>W&GrWzTV;acENN96(T@cWt(3<$xp`u~INmE;q
zrqQb)zVUS)q-3O1{@=$#F#ZrLuC@u|gFvkw6O=p%9Z6_Q0>M*167SX;>bk~zkFV><
z{$EG$(2=akMTF(j8B3ewp~h*VBtaPCX=2i>F@ZLQAPGKc;cW{sStD2Q;9f)z6X#3h
zBOLn_Y5be_iVub$8O|2eCXWmk8WEZhVI=Bf0&kk|>{xn|T3r)v`K4-@D3U0WG~eT~
z>i*jTzE$wrkds?&3`7OjXpc!VP?oA-Ld0~5O^^CB(=^3vocgpj4zQ&rZ8mFJ5n8E?
zHgyQ!WMP@As+##=8M~@FC^pGxcP5a$#qQZ2i?zjzrE)HMiH5Z!JfO9+e6fu_)QkwJ
zn~STwqpTctP&(ZSvV4Mmtt@z9wsLqec%>;tC-LD)R4@vm5!pFrZ#6*L7>787*q^Xs
z#s!De8Y~v;<-e`qTUHC3_de=on<hIomY_Cjy$6d1gP1h7Pvyu%tpHSYjZIT(uj6%X
znqtg`Y%(g*1Q{bi#{X5t;}3feha7p)#`(a#d-t(0bZpvox~$o{U4o<$$}zUWhrUQg
zB{m4;ML|}?fuqGi#awTQ<daNp+$Iz2Pde90GB&is?M%mZX*M|;OCmq261l3>WAR8?
zVuu5^w_5*g1xI2wVwz2M^j}#9Lpl1l8yc?=HDk?+;?kaaL3P>B<Ch*1cCAR<4_zXL
zVOe3)f~=i#@)MpU>G%I3-1cwW{!h13F1iTQXsT5za%fprwCTt%3%8d2cu)>8Sqc*8
zQnF%-?N4~J@VwW+-YYJ<`J;bD@aE`6=8v!hyi_~SQO)p8S5|^2S5L=RY%mG`@3S5w
zhe;Ygw(yY;oKJ5N=Utp)6rBMuNihQ;b&W||*xHX@pdVFPP^=ryjEfy&XT)aFGbgsm
z0GD|^Ak+g;KQsR4&h$(&IYr)?Am6Zw<f%`2)Lq_+a7JUkIx>`CqEfLwQg2)s$2Z|H
z8+l;KKpyz+ACi&8#3#Wa^h(E|QquM|SbHXQ5c0f;!};UpOE~O8YXYwEwAfOk#vqAB
zjg3Z9r}Rt5P&0~k-v#~q36h`^W!9{T+T2lSM~{b@EY;K-!ZoX4e9fe<n5=tD_4cu~
zp5?-~{<S{2P-d_H8vF0O1=pX4x{oUtA^4^ds{k{w)F@r*7c~N?VJXxVz#=o_)~qb;
zj-#h4<C*fM#ehVHeib4;kqcOp(rUGlw9t?hbT+J|ebQ#m`l;8@Is0jHTn%JA8)8;0
zNNvKMM=WxcQQmv_6OPvI@=$B^9EAsJYaZ4};)#6#kC5bTY|)KB+W2g|q|`1f8#W4!
zO6`c+!yG0%IkcP?G)|&<lOS0^@F~tTq07|c@M6dP5*mqwFnYLhY~QU>u%pKkEJ=WF
zsL4ag`m)E`-T@}(_pqhEm%Vp<nXk{@PkVlrjvLT1o}x%1E4)M`fl*<cy*0@zW;Avh
z_f8pO`K0kG={W3I+U;~amLM{k=F#OwGWIa(|KHxb$69vX_kEw=T5Iof&V9|D2g%`^
zA|+82Mbfe*OB8LvmQB009<CM34jS09TN}39+I=~-10<+bG<90YZO{NMnz}7gBtaCT
zMH&P_oT4>qL@H`G=>utPr?H|JN%1i=oVky4&faVNe*I&ueIECoJDlO%J1^}YaX5GG
zoX0+EuiyH;zu!90N<wgi)G(e*xH6g2zWNGRzWNn@`}cnjJ9FB;^V2`d!$0$LC%T|{
z+QVUz=HF$(v&bj9(lv8>V?|W(c9o^<JXtOluIvO^AaV)^Vxn+x0~_F~nkMCD!*Q#u
z=iQ0946T_9YE~u_3t7#9!kQFDbdV+OG@&45IHC&XD_RZgwaNy7)H$fjQ{A~Dig7b#
z))`ckW6(xUw^w+_l{YxQ^BVV0FY&<m5~nY|#Ma(r?q6GDJDfttSBSBpb#C_UbAMP@
zgUUBc%Lqjm(~0G*OSZa>mRMYm@<g%noHDypAWxTEt_5`bcDhRt$+H$s#>CoM8!%Pa
z+qukoU31~moBZx?{6)_F_Wx`@_*-9)6SpK?n_n5d^`<j#BNZhVO_>$Vj>oddHQwtE
zZr&RU*R{%$*t}`X5Rd>>$Rv0RH3UktnwsJlEyqHO#!44#;pe0fy%3Fzrxa?a*NP>1
z52<LfStk6%x|aN#pe$k}a<0B|Q`XWhrzZ{f?_S`^OE2-*<yYCh^fC{)3EOFkmxkub
zKCf9~5J2!q3K${NO_(g4np)D0^NsDwU{TlmW+;u1v*!r8(K6Q<=6!Nj);v#kf_8;Z
zr?`5Q$0H)NO+r#b2#ye7)U>Qqv2BSYH5dQr5BYE2|84eD|LFhtEfM*#lQ?p8u`D2p
zSGVA*mzH%>!Aj7T-p6(4@k?Bi0VWpX4O{rkGB;EXGC3kH2}`NZ?j|I~i4-WE`IDPz
z%cgVXRLeYw(#;vqrpes=BCKmU(OJ`F=QdT|6JyMD2bwFeiwbKCZns#zzHS)mMmgl9
za0APdxy>ESVmhO;u4KxVUgp8wH+k&RH+k&MS9s*gMb2A8edQ7(rc{+@Hz?`?^<YFZ
zZt%W>GG`;*X3y2rJic5U3Yo=r3rxVGcpuC6ms#q(z~JJ$ro3WxTsO8_YGWo4b&40E
z@)d(Ypw+~*&Gg{I;9-A<(}Oj3cdxMNJx|<sFTeSr=RWhZzxRKiNZo06NG^Cit_!YZ
zUO;fRkTO0d*O>!Bx)Zl@?}&AijjPmL;{3`r^N$Bj1WWlt++3r5Rp${$Q-VgErQ8rn
zDy{MkF;}YXeyLuPClduj^1OSSsI6h>_NZ-#N~TMxWi!J&hd0GE<{=&LXbtf74K3cl
zfo~^>W`(GN!!!{jBG#g%;_h^hd+Z8NT>2_cUiumjTzQQ%lU?d@WWW#+qtP)gOc58E
zHj23cDK#X<s7z34ibaW}l!!56F;9I`=6zHns*z;*Pl@1KLt>s?BT;a0GxXOKn2OS%
zw3gpnEn+F+Vr0!#3?kU1A+~KMCUQPw;i}+=HJA5yIkmmX&_UR_%=yWfzxS!{IT=%3
zKtQ~fjVnqlh%ntYbS9-O$rW1j8}zdl=A9O6cK21A;ubQPI#ZB5Ih(|>pW+Jl`+zn}
zp_K+*>Eg_uQ%>Z0^7ydpHrHe;MIu)gtsBy6@w5odRSdSRNC>=rX(wZ<;4-(P^R$yD
zA8qBjeaK2!Pj=Ycy}(1`%RD@}!gjOAnk9nf@0eV6Zw{4HJ-C8?UWPhx&RxSJKQD+Q
zNGN~0JSy!n#HaXt-FSyAJe+d`=Lil&bH}zLL+H%fz-{4lcgCchVA`@lVmr0S*I(kz
z|LD&iuYL$i?dV-tGIKd+Cw|x5B*)_79c9t3mg+TRWh`{vDtpq|rJErt4#FT)(+$@l
z)YxE+Mgr;vd8!R~wDxSgd4<!HDO)j8r`%eTB=fw-LR$?X4`VGH9!u%jl|2b3_1z$1
zvzzTisMJ%LCltQICPl<KT1|)u10UG%HSA3IN5A_eqnB$}lABYPxcO4onG<j_of4CR
z_oO65EfwD~<NTTLe?Mn-ciGyXu+b)JO;|xGPu(oK6{w_H62r>K!P|Mr4ZOBIv=k;K
zA85X-^OSjhXPWViLqNpvK@e4HHMYdF^YW{`R$Pmc+zr;^Y7$E7x~e^B3&8_MsA?)#
z<+=AF_l<X1pX@S-4Rs0dwLoZ^IIw`%Q0CwjlSrZ{)7w%GS@AgPb*Vg-fA4JW@~*m<
zK^)G5Xd+-p)8Lwxp$IZ<_=C^?2fbz-T}-^XHMv`qM<@GKD4UgIY6*3U#D>aRWV+7>
zA2<cT_@&qET$(V7Q@l-QMZb)It~2~vF}E~`RWK_Ta&U4DnR|Z&E}1O7OESe%IO=U)
z)$ZyQ-jyUxOnAv?hd4)#P-A@k%YST7LEpW3txB@e%G}{z*mu4AetzrkM_$``ol(6>
zi~*X4I!@Vgk>?-D%o=j(BBz)#bP<hH92rT`TTUcM!8djqQ0WjUjX=)wAqT@odkZhu
zFT^r$C(&9`_*&p^OLUZ+k<3t+CrdRYyvYpcLV`oY(~9A}aOI6Rdd;{ICAk~q`<^_@
zBWKp+;x}Kn%`GK~BUog+5}vy6%p6_z&5Nut#k-uEby7GrW(CxM;xbpgxLNhqj_fnD
z6}gtHZ~C`WnDEF<QLOxz%Cu@K^_N<N5CSR2jIZW0=9G|;?R&Y7?AAdS>uw3=|L*5L
z%g3I5Oiqno<$k-&nepp9d+$*GyI=W{`FG#DLTYv}A}-|7Q;*D$WVE#As4oC}=5WdK
zX<a5eyYy~`*wnI~C!6h(q9{IhzZDymk=1iskRxI=mP#5t2m7ud(xge#YsR;_CF$g^
z{;Qw7dZ4iXCb{C56~Jr8<Z|L@osl!Dim6f9IdIMsqs_(%rqk&xqbA~M+jcepbYd}=
zmt1*_5nS%176VOrST2cmoqxH0+|5^X;2V83(ksa|Z?+k_xI<J3n)@o+N=Yt5w3=qR
zXlFvLg^VT$F=a~<N?|f30~)+{voYzT4f{bQx^}B$x!0anb8)vehY&IXh#IW}b(9*9
z&Wen)CO_rGVVmwcck5eOa%I>d>XDA+)r?kCZmV!P(51>{Wi!bgzAB`Y|K5S>b?(+l
zyQ?Y?#fXx?WxzpilIgD1W_W11RVcS%*y4<b+Ff4)=q<@{ZnzlpR3c$EdTeFP)TErc
zqIgkoLi8SILYpF0H2|P(8$iq0b4Kx4oX5Ggv&+53^Ot`=P1zh&1zuK*f@a{f+?G$*
zAz<^*aF%13yS0eiE6GU&!1b{76ZtX*kub^ZvJS(=+~a0mQ3>EHqWWAhDOST&kOGG!
zVj216CTv3QbJ(6~)-w8yxQtF>rZ`K5C}`e=++)A=N^<?~mVufh5i-iY2#CidA!^hy
zcS=W>-J7XoTeIdo+DrkXt}~r-+fEV5fA64@mM1zpi*Vx}u<tTz3X>Fb(jio(Ua2_&
zp{@)VW$9*k@_b<GZ~h@AF?aaphyvABymgl|KNe>BA(i>G+<b^AKR?e$9NYx%P{;6+
zlW_>Z_~tbVcAvlamsE0LR!(PU4llX2f8Tj7I>(*}LrrXshHP5GG~rAb)+17CnN0Ek
z)UtA{a-ZJ5vPcpd30!o-#DN#bMip2y#bU$2yNr8g^EPoL*GiH*ZY%+rB?P*;qdeT?
z3Ts!s_u6qncC$$x{hO3&Gj!H{K1V?*?8FB%4W`|M^ej%31IZ07HKX~oWUg{KbJPbQ
zs{$4fnPcyYqd<op_K(F5Y*O<JA8bJCsIzCNBP!isP5x3^AbNyQid~*$9$kXbb4YHm
zpc~bao2(!JZaBbM!rTOPO4Jtbgb-?)@dT>_ZKI?pypdY&`M&Sr(MR7QmG^x4OaH*8
zfB66MfcG>LrLJqLFa#X2AU}F7a|{kT(2Tc}(OSGm&Y%u87h2`fkAECFbLNG(Kl$QU
ze*gDqzxq|~4OL<2(qb9s!(P!D>hxG)%><7`#bQfc2ilZ3xi<(3PE#Qj&Gi~{-Odep
zI#wdMDOgL0SxMAV9`m*e!Q;IWEfr)>p{Bx8p6*ni$1)ZbUqxw1xo6KHwuzxsMcL%g
z(ucz*`n7!V8M1E~X3+&@(L?Xm^$sn8d|V~DCY`UdfJkpk=pZ*UFzII0)9gD;#^XE>
z6KbNhm^y}=o4or|Kg{4$KMKIkul^fc_{x{DrYT5*fs~Y{iMYYxfZUc&v>W-3j@T+;
zeS?Sp;$NCIja~fNf61n=z6$M>Ovh;?ms^Yi9Y2d4`|64aQs!xr6FNwQ3~gr1Xo}^^
zWajR<`4EcAEPhHTRTVHBFqtNZ6Q~7O2b>zNRSd}-JuCpXFI>}XquHXf;6Q~nKRoG}
z#F1nM6@g0OqAMnH27|hwTt`6@-SWWQhXdbCaV88xMM{}pC8b0g6Vn)QXYXCy9ZcGW
zRucg?hit7Xk~CM%PTf#O4roYRZkAh1-rTu@PR2~iEdHv_7dhtfSpap3<do=*=o8T;
zC@Jdb74;cs*=T16uE{<^NpN)N?^>bibB(F08Mpa$GN>@CfELq;Mn$O#0A9ihV{~%M
z$`H(D)SiML;2k7OD-Z4y3EYja;5RDT!Rd6C#ALboPY$|LddL#pYFUg=y!U9#qqyP%
zz7~>$xO-(5#Wg7*Wm=F{h$#;^xp1<jDHHI+0Tz~Tt<`~QG{mKbq|=!qblf4v^7P{I
zT~A@^qN84jg%&rb&DB{RJt&L@NJL!3Ng`1fmp-S@b6-P?>J-`ryw5CfPD%~PX4r0d
zoB26*nOg=+>_P&a%|hC2{^rD$#ON@xWJS=;isV4?$5;HjEx26W5Ru%>4(=2Suy?_Q
zDwh-69Ak+TUV1VRw142i`NCEe38Pi0$jyX?5|==>kKcN#z+OA0nI|Rd0019_Nkl<Z
zsr`X;cA&9DlOnYki_P3pxS395WxWzzo|ep*6}dyf7uPNcsLN>m4$E|b&Ps4^8FooK
zX57rkHmn^w7!bt~wS__n5^x2`P%uB+`WSI(ELX~?16q;+h3QS?i20incUfiu{K6@<
z1QvEQ+TKwo<xO|HY!21h#dbNxY8f*|6H|%A@je|yMbwnrr!?UZf^?n2cA_a(6Cn6Z
zySyNiHX@p+h6A*Tvl_`kOX-eTRYasvKs&q`q7J84z{c|=sE8oWas#P>6<AqUsH(wd
zWEn{~Ymxm+s7{DhA)|Hb;TqZ+aS{okE_^a_)v*pUE3tA$r%=%aWK26@B`GJb)4bfS
zU`hGT6xy{nj2{ZLZn9{c&cey1#VyyA3e&5v0=^#LPoJG{x++i)1`JhUszfcBI=^T^
zPR8|0Nl6EcR5AlqVzgzvG!EeO9`iMs8BS`v^8{6-jTvpnvclL5Cm_cL!8}ntNM_n~
z77F}p#M4r9nJvG=)>h4x2$!3EBxZm^wF)N#8fj+x&==y^u%P@}kTEidN1>*6;A76~
z`ojp0Ctx`WNT)Bzh2B!Z1MV<yWtQsddWiHu{lpe-;H_%76YmdXxw;<>S9wr}n$bj~
z^|6crXPGvU$z($79F_Akl2&&WxEz($ShUwGwGRZp>~7T|AcFzcE<iWgLb}9UPPQEL
zdE_H`z>B;FDJemGhNCh!1FG|QeVt`cTtU<Cg9LYiJ1h`9xI^$P7FgVaySr;}2}^Jd
z?gZCmahKpBxNC3?u-tv`bF1FEZ`Hl0YUab~uBop6aO(VLdVVc^)G~yUX{c58wpDD~
zBVXk2rOY%m$vJo*XxuKg=ln8teyzY|GJrh=dgRYqbjv|R=FY+33|)Hc^J^#>J=zcO
z@wgS!`-(Gf`$R7}`lId3*1?%?F3l1)sb?_iU`%Lpv|QJo@bSk|jvj*EJ$zjj{*=V5
ze|BXvg;kb*?yP;b_g7s(fN>UCEhBx@H@O0sCDfxmn?@Voy>-ZjM7rP0Vev5;HW0z@
z`m*s_<_9wC7~+b0jYIZPKG?dBW)u^XVP#}l3N%_c%=gFd$<qpO&{M1A6>F6e4)BaL
z19F<;J(8|@_M~zzrV_Ghj&STN25l#njIva6xysY$(2?LJDbgx+_IwGB+TcyzWG&6;
zvA~lRO1*O3t}W+g(>f+~270xxAq4|o7(nzX>x}@{o%BiQaUdLj3r+!C3J+;MfEKsZ
z8n%%+Xencb2NG-5kNW&*T4%b0Pq4Dh9JJnGtCLrf+m%&|ns?Uzw2kA6!Be4f3sPX$
z3h5iXDAdgQt;k_87Z}+oipBg?jarWMo@11!Fkdh6tvjlReB9CQ%^wzdO+0r{PbPD@
zxlQP#-@prn_1-T<4%VoVThlXYO?E=k+PY+ATl0ZO44UJw+Lu$z?7sxx((U>MY-L*l
z4f(qya9>!L7Mg#z=@Im(%9`Rd#Bx+r@68wq|H~2cdhE8A41oq9K&~+CJpr0e5kIFr
z4lIw47^y}0;ce+leW9QJVi?+Qm3i3ihsO%D5-yewEozdf&}&hUMQ<|VFQbygEjI~E
zck%2fBMU*jvJ!TeEqV&@7gu`Ha7g37&Y51@c-wn5n8-;HuT>RsB>a?2h-Xm7r%$v9
z1EyB2S>2{6V>2y{U_zhCS_=@SS5HN(mKwkH5sR`a99a22?ClPX>JjVx0GKh?;Z^PO
zP6tV^yL+WHPFkv}aQ*DQXU*Qh%<+B-c#<jeIY(M?z!GCA>6>H85FB6}AmY(6kR>Gw
zNFgmR8?xji<If@mvTWP+_{#<W&;M;xPm}EKY`g?IoQeu~nYwRq|G}>uPoBXExcW+h
zTNX0uApb4p#Ub0Y-q;bzT25H(wH9p$Ej(dvekvskJ*BjyR_qwD-qE$0>&q;azy)Gz
zk7L?Dqgn)x0lBKFZ6pqyb`rKp!-D1g)FM0OVT~%?!EFyV%m&GuQ0B)MF6a<V7mUBO
z-c&T+=lEGX;51XAJ@^+v8KJ&Xynuq?yU7|AuuGbY*+AHCp6oB4_kS667E*-&D9;MI
zkMnHHsWyqGKax52%Dt9Y2N`CK{)P>0zzoPhitaSa(1-r~Eggw}DQ=UV;G%aHR=`Bv
zo9J(S-`0>_XVnluNuSb4TVo&8LK<<M_}cfeY266T!L=04C(a^fyqydJ5AnvTwJ$qP
zfDaj=DV;@xh;iw2bnVRAo<=lD@FYa}ECo*2r>q0#l!gAv=NQ!a?yi!j9C13A%6>OI
zTwOxPTFM|Q;+VoaOc}4xKVSo;za#!UK(~O$mz;&HX{pG^j5Z*wnMNoBeeTT%o4__d
z8_nHD8GcOGbJ&uN{&&|%$&|QN;n?>@$-;X&3&Q4O4`f2-J+9>Zbht^(c5J1Px7n&#
zOid}0D@yH0B#D_Qis6*CpH&SO-8#2syK#^&^rhnb<2vf{ioH%}uIlLg#oV;U^*78i
zGw84VVq0{chys5lw-VM#7UU~PdMd|?QN2trv$_PIPK!t%+txs;gvsY>oxgtzj|(s<
z1`ymX5dBOIAaK>(MzbX5@(<0Fe)z_yN9*LVHk>_NZeua9GYz3ldcHB)-lBQZ*}Y*n
zPebn>ppoY#+u_^N<dtyLS7BbJTbaf`<8^{;|Ma2Ql&*<p#OdVo>%pD-`m7N%iQ}Q1
zzl)HZy!tm}Z-(&o`FaJnk!Y%C@Dj6s4d4V#uJP*^IOfHQIzV4|sdko#D2;`;Egu?8
z9rM)_R9BO#XkV@6u6KOi6eAYMtYoO%GAt-Ez&rmIrdULd8y{?#AF;Z-2UP!gDRDbu
zx)4&&B1*WIL&JWG+1rVr$`mdCP4=VB<d69#9t*)5?scD>nSXN^4|82t_ph8lR(SzN
zA4VUUxeP^0N6m@1C|bI9AC*Qg%rr}Va?{AtKiVe}N6|Q}z7zlD)$vg?lc;6)4X*lX
zrcn7Y62@#V3+F7IcP0G;QsYT(Y6reI8_E8u8pdxxYk}xEkvDgAEnk5mdv-mmj%ybJ
ztQ|F2&nq%`n6v9fGVpRXb;%--RO0G5hz-6;sd2w7b03%`BE9#@?YU<=&tqRp@y>7`
zg+-%ah)EwBhb#H-9J42Q8y5O_d^>T@)4a-S?b`wcVmG&eitIPK!8sz{iOvCxJzub=
zGvtR)hoci)$gs~+C+7}Goc!~4v>mNDn8{Kqn>ymgbF=Toc>N~_lH9CIcK7+&=Tdx4
zEVC^Oh+{AnbOVp$PlK<C#t8$y?$0fpsz&?_)VH{XWm|pl7-Z>Web7#0ySa|fvHCvT
zs@!>8@2DzFuYFnCuCcgpm>`TYyHgY;AuRy^h`~qL=oE=#*L9NX7JGlfJ-4oZ(wiIv
zzQpR1P!R<ms+JHoM#TCM#$m#9AJg9E)t<JDidziISrDkAXSRbv$hYsPOu{bs0XH~m
z$!yyL4Oy`78O8aO?Fp&=_8uZ+aKEU<b;^G=$ZulW^p;R?D+Y}tH340qXZA)7v7pG_
ztEC6k3LHKmdr37emm3&zna$N`tni181f4!&hRjTZ_qR`o@tGl+Q#Wn@B#Ac6py6BS
zh*EC9l{=6QcPq7i{eJDK`_bO)tRtO($3w>6%F6+W)(Xob*}Ew^Pi5PBw=vJp8O7W6
zCo$Uo9^$egnvZ|KnRD)McW1`xF_S6ee#R+8pGeG%t=eZwv$QX^zKt~1o`Xn?q2Bw<
zCVn~nLf=Vo552hZ8F30sGzw1B@v>*?_xC-H3a;O<^{xPLup38J*N(rT^!b_P+W8Bn
z@nG5k@%))^tot2#Q#9y~tMT#SnrGb)thCS%6<7{<UOEfB>NoK_|NLAw&gAZY?Y{PN
z9g8IePV9faD9McJmvA~O_?tm|jrj8$uxd(jJSG1@5DLJBn5-KH8*<i&vmZUrUDc8V
zOUoz0Pg7L9tAu2l^(F`=jhHdX3Rc}*{q6|JXh8@;C|d&<9p5O96tbxvX&y#jGg`;?
zKM#xk-ivc^z`7(Jf2i-DfVak0_0tMupL>@kRhBa5&@h2>W4`uu6SoQ<FGG*S1nvUo
zOZrBhW5vKYeq7A2-C_zs+mt{CuXz6alh{SpZ3Sw`IaaeOI<HIPsh?bhjgbmFLrRsz
z5YBdokcmrmz}d~|o`Jrs1rC$(FYmOu{dW5R$remb{m51V46+&Yrbojiu~CbISrTTy
zWPXPqBH0yRu|L22OiznxyVGCxl{Rf=lEpQ~>_%i3bM%K&^qNyze->Np=32mtm6cgk
zTZA0LAj<Af|KK_H(M21`1-93xU5OpW$;eW-J1Ju5KyN_c49Y@0N0EN%QrNlRXloaA
zk7UX*ccEOChdLwH%t@F~<Xm{7ZDK0bt)F{pz|e%bZQtnvfIwuzx@n5?{Ou{^6kc$O
zd$cjGwZ@U%`fr*&n!WJI5ZhnH8P}Ulzu*TGp=kRfd(2)~0vU4LPc`PzMcH)rxN5YK
z0YBnsV<qhZ56<_|F<%OcWiB*w5%(l&cG6B(GC@$<A56gafDfDuY>H0H7inmfsGy!T
z)FXsJ;YWF>@mX5|GJxt&R>yo``)Y8h!rk~9JtOy}i9Yf(2v}mP8XD1<G5+d01OCmQ
zLy6K#7iP{SxB|A|OcxI6r2H-C3{g<s-h^;6;w#Z4hc!e2Cgf;2ZC(xJ`J)h1QXFQ^
z_Hg1>O0uJp2?jdJ-mf(e@iEga5v2$zaiQ3|&eHRd1r1t$BEBe(h{vHpiQ<SfdZD<D
zos9z>q}?S>_3L5`)L68YlH=xF=h7Q>O6O)UUYflYeWGqo<vE#|R6QWRn2l%JIvyTW
z8ToYM#+(Ia_>DbwF1u!0C?@)*+8YtQ;G_Y-OK$EO{n!PS!^n0xgMuj8i3!u+(OTTc
zPc^(>MO;rdcKSS85b64Z^w5p1fbD4#c_v)O4$~$>+lMY`Im@v1kEQa49HAie{R!Ti
zq{=q$Us6hc)}Qns>`!aH)hpT-vO2m1r@uHwoR%P5syDOauB<Vckl%A8_p@w3IR5xQ
zv*N507X%EqI#vT(V?8U=chbXw8L;)cwBqzup^JYLmUV#t_zs_k-MSIJuk>$s6+CPc
zyt-}3yoEc#>D(N^^Q#-TIrbQ;hwE=-(DAbx&G2{|PO<>s7}=!}$F;Zoun)I=eH|RX
z8mZ)wkD@=4xJ+Xn_{&D4=_1;5D*@6*6Fc~qc&3XQ{u#IN+!ujtNHK8S&kk{vK2o;6
z^Y20S)L-<})253!MhuRj+HMe|t{pLVZOvILi3MTfUm_pauGsE(tCfe#WV7@l5yaq-
zkE0z{Sp>ObLSx9*g*A!J#nTjXHhE5Td&&c7BM}HASV=h(>I;p04MY2QLBF_N0S6x_
zr=<Kt4nMJ51h85I^b4CZq`!nThi*m|f4>rv@A9<11Bor-t9WS!P~lF50fc?xDW=fV
z=%sjSDTMe&YqY>;Pph5?O_&AJJRAiN)CZI-<Wubd4cYXZYLDcSlr@Gaa!T9E2fTQ1
z@j6yW)f2QMTwM%_w_@u)72z{&hRaY!*J-nEZIe~0UT6uutA1kr24XE2jZMMgG{ScQ
zUT~V^LmkgbIjFjZFg(7S@fW+RTL+s2WK*o{2P$6?Ge=j>W^Li~5tRq`pi0TvY81MK
zeMVnfX}6j$Q<bV#^9=uCWkcn|z~qIkAHmDHS(dCZMK}5*%c|ByWE1A6RTvdL^KWmh
zxDxr`(;rZr44&*eCG6Cy=z2@Fa18^uBd5`h6)DW#c*IpQEF9VhFI@4>?Yq#Y$)A95
zDU=(|!)*Ocu?ciepF&mq0101n>Fgte?lQ04yuxUMpBUTfz@PQKMbqNL>t7<~5Vp4E
z?q2UV2F>E4%dUvH`ODui8uy@GV3Z~v@(uIEImK8R@*RkiZH%dzwRqG065!Yux0QNy
z>OQ0+>3+(K<IXT~39&#(`B!{uQU}mUX}+DH;`C+ELk^oM*c1c4Jx7uXC^aOXU$WfJ
z9S?2FlBrjYY==yCzBaykA-Ige_9dS;-Scg^AfYXaXy`de>L7KT)M{D@!s%_JuaaNp
zWFr>e38EFZOg7DvCvVyqT5J<)3p1_TJabfIMRUyjwH){yl`+XaRLCgoP^c8Y&x7~m
zx+#3;39cHw697_@W5-|stpl!EAA<|iW+u2T_&O@zW)3pvR_$4YI`9!vv^O^+Wy=Sh
zCcFfq5z$3ZLZheDU2~^Yx6X>O(bn6MgrgBsGR6*U5-UL2z2!i_sBF=Uuvz)}A@X0d
zRd9-do6KZ31Z*hxtZ|;IhI_#pq3!Aj(3NdsEC-cDux)aMZ;{{1BpJ`;>TV}%ax4zm
zXaL5x40t>vDHb<*(NB8$4(K+-$vq8&@@xLi*#L3c0Q0PEOx!$CO%=L7a^|TWoK_2o
zmXIz7>~>QuS8Ixv?l-3);2ce2pX+y?;>83CC5n!beAr-mW8Q^`MI@B6=`PC;A}a&*
z#nMe#BfXum3``|P_`HHFJc)#*<gTe~ZPt5%o;Xn6szCrFrCQ6(kz;)?S}H<mXaSNm
z!~Ez@3f_cu5T0G+inY^Yhqvu@|HQSzUQgmk&>H%gHXM$lVNKN6?%q}3`I)Dep{?8j
z2X$cdd#?>uO;mt+aQbncKTf_4uSf4=1rvSwF+sYC*AL{;ujw-98cB8p=$Bv8tl-#)
z_@oZ$@Z?mEva<BnMPBH?gSHPb%4=^(1Z?i;t>vvr2R^R(Me;}w_xUhi{h)!})YPx8
zPp|$`!{$j$V>@!yFeLg!s#AJRu9i(-i?K;npSdsenSYqaGC}J$vV+u5>5BM@D*r{}
z)VaFeK&MT^;FO`*E~KW$eOa_yWbNSUj(Fp-?6sz~^+u^(v9*Jgt>uk!Ui+ZPo(m>A
zqUR&P(agfREBMec?{Pipask4fK4ETP-ClU{FGz;ckq1YHQ=|TNvq<bg=JlCFc*ZQ-
zb{(WRFp3<OPo$UY-sBi}pNA?qJ!uT*#M-W;3CO`Wrw2&sN}r!c`IbTh4$Z+S-~EGj
z6&S@{RAIkaOlC#~dqbQDM(njVOQbfp1Fgw|hIz5_UN3qlV4$3zV=wv(BHMq_Oag)G
zZY67ztY=R9c>vV@NzdmC7nDPW*GK2rt{raUO4I-dMu5BHK#6;qkEMAJjqUhU;Qhrq
z%|oxjfmuld%6hmRP=~j%%W-adq8{3#{|%HilPjnqgJwFkD@KZCRj0FH3{(Y4JTAS$
ze<$biw{LmNe0>8G1V86*<!|}iP6(VoO_c2s!eJ4@9?HvfsWZ|eHK^as5zyyW#|&m!
zzO(CQ50YBLGRf5ZtevAWv~@&byUwqP)#BIeT#mKZd+M8PCq%)TnE&#;uX;@$e5qe~
zU+*}s<ErpnrZj+WwNm|mYvNBHZH%E##P5F;SJWiclxZ4GE5#wIx3!+u(W<QUd*bx2
zLtJ8-hWY2GTaQn7zOIls?#OT%4qMI2WJ9Z{HS8#^h^;e+xA<j3rr4uLProkSM#X@Z
zLj7EBYF-{po=y;d1zb~T=La9Qpc9LSkqkFEqW8xNIpU83->Q?&BYAMui|1HxMBaw{
zZi-&SQn1(6G#s&qK%vvW5LF{syIyM64Zy8*OO><=&GKzk&x_j6Rl23)gzi4Mo%-YF
z#k?Q@Blq%#|M*E~?mIxRZ`4pkssJtb#kO0L9_vI7u-)0iFK8^=TurNK4n--Ju_RY{
znY1R9JiIsLJLpXBBz1S{`{1IlF#T7S2P|SoOboLI`oEc}fQTL!p{||9?VCG+Kk~<F
z$$wS{DT)ES6F&v&>szK|C=RSP9`YIwK4M4Vtq`|<@D!%R!5?=Whc`EOP6T@_n9>n9
z{Nl9n*qa2&Bboq+o55KFbbx^-<brF^%-U$K&9wvvaRsvB{+m-CO{1rPiozBAliCmV
zaXJW|E%SQpn5`Znc^}BJ&f19lhbx|za~7*x5ms^u=C_KNWrs)X1U!2BSH>&uoP)Q;
ziv_)e2BRnKkn~L<`sQw?>CL1+m9SST_T8snB39oq+E%~t(;znMG_7%IVrn@(6ZSfU
z{Q}?BP0aamZv~_xl?(NDMn~genmaS@ru3}sZ6$kRfS+PPw$3D2&XE~E)<2!O5X+Z{
z7JT3RzDqwUr%51Po96$v4xtQzi(jSdI_(fs@{wk&@s>fePH@#A*NkI9nd_{v7sXUZ
zcjNMTtSrdsi2wD^Q?RVW<%B|g`kh{@N^y<LQ(~0B`7kt32%>XcCUG@N(NTK>0(aD!
z*kqwBWcZ(UF$mKEEAEJ4XgZTCV<_SHj$@5vM(4@GNn9^d#Dr0ij%O%>b``EG9D|g4
z>idlZAa*H1ejkem6LyXC!Q*W_mWmxtRadWr+CAsj<yZaglbCxA6B{Ak8lUn%Opu2D
zR>_NZ!LYJdKFNn)s5pV`&^xZzj%Un`$CvqZg0h|H$$I8)kFN@m2M?#X&*-qe;o!?i
z;@ytKbJ}pO5{qJ58#G<CCUj-w&+oNNk_<MLJ*JYurt3wug+Oc|vTL4&yggXduEx4k
zMBpu?A2)~V`SjrJ=4;o@@P6(=rbZHEkL2IDB&-VY0%{B^6G+hLJ~*8lZb4fr0k~#K
z@LVCym$pOt2<##Wdx5m989thGVVw&h<GtTWGg$YlHBrU3#WN&%>Ndt(YXeq}m}~uu
zB!iE0hl8XI(>t35ouG#&QrzdUN!Xk%$m(4lDPBD1nv8-6TI+O!Q^;RvBj=F81}zNo
z$JY*!)lxSj1C6RIZ7O=sr=AK%-C~pvjC7y02vx;-{8hA;-pkK_Hzx!7sB31g7MXuY
z469pu>YN$RtpiZpOTO1BG<zFX%42FnwkD%xJNTuI={E55w6XhH-ji+7{-O)QWx=9F
zw-b#GnygO!%ZU5S+Tk9j8rYv^U$L5WJbI|+hg0sZLKBbKH0xa-`QMBAS^KlVSLWZ|
zGFf)HrQ|bM0?Y0)rMDt~UE=tDGht8tggFK`Kq(-rkBV2dl9va|LBn%yp&aX9Qqort
zNG#))98>BNko@*tea{qNw<SySxWUozx(8#<4vhd`9Ur3>AK}E`RO{n9_lR5xZ0j$f
z=a3V;7;Vdpj{3Fi%VojY+dtzChTd<_U!WH{kKr57WSNG332QHxP&Up0Rq4TssPnCg
z^H=t8W(mJT{-ogjYb@0lcvr>zXOph0{S)o{nq{RAZLduMoBfg_nYe*1P(sM6xFVdm
zG5u_HzjIJ~%a04|$=~Xw89_CIo<dfe&$Quk<bMm1|IBbXq6AkRlmwYYLey3lhb1~-
zXU2AI41}X>Ie*5ZRLeoG+h|GuqtyRWAB;yO>Bd06Be)Y>iu~WN{-1{b;rstx<iCCY
z$LjxW_&+hU6AOo2IW0}q`PF<TLb85QyjOIKimspp;o(c=7+EgauOC&xO1dnFB%gcJ
zGsvcHTU&I%qUy3qx<SMBS1}p=)q*S#a6r}C`%YKyYIyKx#z-Cs^1aBKlz-S%{!53o
z-dQOgrf=e?;*21$HP{3e3o^gB&W$I>GR$r)!n2^KjfHbCguKC}TnA`v^*QHmG^Aju
zg=28O&z|1*uxp*<^b5Dns^}{p7~9*mI<CN&;Pnyy<LcZ}WqfgC=2jVGm9dq^bM|R9
z^1%#GJuj*rp<_eSxMTevuq>SL)84%my@F^G@uu@{+l|?N3EV1f1$cLO>S-2)YahJF
zY`SU}Sjr3!Gzh#{XB(v|dS_HUGf1J(uIfx=?=cNs%&V4oyV_~s9p70}i56B#SD8V&
zZLzN#GqT$7g-x)PC%7)cXkoz(CC$OoVNS^z=wz_OI!xFCiXpCvxX;7G$v2o1p0Ko3
zWU0|i)FQ4<Uk9%)ZlfBrYo-mTx2mC|VN7KlA`?Y@!$X$+aNvqiT#3UbCEnMJPC^gX
zul69Uiu**8oiQ#jBo_3cuyW~N_AdkQiUIXg?ZIC&<%fjE0-{uuELWtdqT0Tk;jaEJ
zhPTsBgv-vUfBnzIZ;aE+#+)!Bw#Zo+31W7y8NeS94iM>y9IxUjek4l;6Z$c>LoA>C
zCF#y4^o;YBZMDizvPc<>zid+VvldiXRwfHkx-E+iQP_7~r^9k(&TqR9Og5WaECtEt
z`4<W}IkVJJlSq|IHS{(57EwsRS9!R>ZBTRwcolXv?;ZSI3DF;Z47k2^bHwj)t|IRk
zZnSJ#Lte1%uFkMCw{r17c(GX&MSouw1Ump8OkL^Q*`V<I?-1(`@<*zY4-f>AW-P|&
z%yRl$3;1kbL)Xh%;qkugAwgjj4X`}#YY?7Si=eLx!&6ZfRcI--8y(|r-u3ewghi)i
z`f8NxIX9KU|DxM^Z!{^8%S2}f)I4<Nk~`{>BD88IvT9LA?fRqg!D`R9J?#AX@-y^T
z9gLgF^dI+hO8V;_NzfGMOUi51i;jueH~p}_KmSnbpzYHzm+)be2PcU;6BvoJ@0H2J
z%4_%w1P(h|SSOXF*2pw1G;|tjD#}95^92t}+|c<Rr^5`Phwy}CUX5)$u(do*!z5kj
zY^EMbRK=gCxbhy4^1Gc{%U{NHPAN<tvJJaklDAw&maW&v#q%HQ*C8TwkFN;wo{HX`
TllLTV;15tvRkl|8OW6Mc)$krD

literal 0
HcmV?d00001


From f895582bb177e7e74c30c89ad149cf1005f11f9e Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 28 Jun 2012 15:57:33 +0530
Subject: [PATCH 080/239] [IMP]:improved view

bzr revid: apa@tinyerp.com-20120628102733-kc4v1t1egs351pbu
---
 addons/document/document_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 300c874bc2b..e4e344a5406 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -244,7 +244,7 @@
                     <label for="name" class="oe_edit_only"/>
                     <h1>
                         <field name="name" class="oe_inline"/>
-                        <field name="type" class="oe_inline oe_right"/>
+                        (<field name="type" class="oe_inline"/>)
                     </h1>
                     <label for="datas" class="oe_edit_only" attrs="{'invisible':[('type','=','url')]}"/>
                     <label for="url" class="oe_edit_only" attrs="{'invisible':[('type','=','binary')]}"/>

From 47bee8863015aa27fd5281f3352c942d41571258 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Thu, 28 Jun 2012 16:02:03 +0530
Subject: [PATCH 081/239] [Add] image icon

bzr revid: jam@tinyerp.com-20120628103203-hntuiirs39a65s88
---
 addons/mail/__openerp__.py          |   6 ++++--
 addons/mail/static/img/icon.png     | Bin 41037 -> 0 bytes
 addons/mail/static/src/img/icon.png | Bin 0 -> 43860 bytes
 3 files changed, 4 insertions(+), 2 deletions(-)
 delete mode 100644 addons/mail/static/img/icon.png
 create mode 100644 addons/mail/static/src/img/icon.png

diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 95ce7d5619d..58e867dc616 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -20,9 +20,10 @@
 ##############################################################################
 
 {
-    'name': 'Emails Management',
+    'name': 'Social Network',
     'version': '1.0',
-    'category': 'Hidden/Dependency',
+    'category': 'Social Neworking',
+    "sequence": 2,
     'description': """
 A generic email subsystem with message storage and queuing
 ==========================================================
@@ -69,6 +70,7 @@ The main features are:
     ],
     'installable': True,
     'auto_install': False,
+    'application': True,
     'certificate': '001056784984222247309',
     'images': [
         'images/customer_history.jpeg',
diff --git a/addons/mail/static/img/icon.png b/addons/mail/static/img/icon.png
deleted file mode 100644
index 861d806b85588c900bca10e90e06f4538c2ee7e0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 41037
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
TllLTV;15tvRkl|8OW6Mc)$krD

diff --git a/addons/mail/static/src/img/icon.png b/addons/mail/static/src/img/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..120cd66646b3a5d207cad6d038fe32db04c73830
GIT binary patch
literal 43860
zcmeFYRd5|akS!=#vdChv#mvl-#mvmiV8N9vvY45f$zo<^W(zE4W@d(M&zpVoVk7or
zKK5fH=KkD!yQ;IRvNEeqp3DwakP}CM!-fL`14EFM5K#iYN5H_qkzk;JUx#3un7~)C
zn~H{`lA$x<PkUQ43u{wCN7tXGgr+VQW?*10%c@ap2tJH30UN2kD33G=b~46j96voQ
zO4+@TezwHyY&K6IuK2_VhO2*Jkzr+Zkyo@M4(XRLKFHwFro>>t2`H*Aj%r1`yV4KS
zXgEK%8AxNBaO4XJaM&loEa9~5hqJh1e|}lyXVYGl5vKJ?J&R)i1A{%a0EVO?E5l`M
z3!*nPu{AQKcLDtb#tH_;!|(Fb(Adh<k<iH0+`@*J_@b?gn9#z6msp)mmQnVnu;~vA
z2{(IFWj8q$V>c_~?<U0jd~iH2Tz~+OsiPsG3&`5Wfy;%L_&?-w0l)uUW*{c~k1mc@
zyu=!^3WUP8_NIia^sMxZbfPX6znF>n;0Sr_P0YBIM8y761n`fS_=lt8Pc8-qXJ==6
zXBK)}dvgY+@87>OFfubRGt&V*=p0;a91UIQY#d1biTGbKL`)rw?Ja&fTG-kU{*!5F
zWb5R}OH2&36aJ_0f9n6=(rq06Qwe}N82+^|FwrwI{GZ(&EzJI3y8mnWukQbD=2Eb5
zF}2nZu>hIcH~>T7C1z%1`VV3M)vEb_wsQQh)_;<?BteGers@_Zjz4&b|DTs7OfAfR
z0P|o5ZeaMQFNXhA7@&WK|GfbJwDAA^=YJmZ-_r5_sOx{!_21IKf2;HVSl9ok>%XOe
z|5oS!v9AArsSEDEAe^ZUfZLn_fTpOhw+(<hNCzQF6&T>-0b>#Z21W=bDI%!ivV5B9
zoS~~a_t5n+t6kLeC*W2L7LN*C1Y9tIm=4_+S_D$mP0><7fQpGVwiLZ2*RNOjf^>F@
z2pm;OBAc%%vvuKRs0FJV4wI43R*jF_fuH4J-C<(+q)C0viU!3Hp(4jy?3@0r!+GZm
z60`TahsPvIycAjxQIKKGxQW82J*hy>s2bdKM))I4_Jp&h4MEwry@HRs$*OrD6NEPs
zuKSd{mbd#AvM{0R7M>uVbg92HGs3d62wYLHy~t>Rrka?Ak^>Jvt>b;|QDBW}SN0E$
zqm|9G*h~>5=BGaJxNah5nx6{OO+?KpNW>z3>rgAwCJq;|h}cEUr!m5Z_QqJ#2OF=b
z@I((IUH1AE4!R|Pg!1ilk{|Xb%!@LA?fOC!s96cr2ECVA{Pp`>JGt)8<UUWUbi_)v
zAW9{Q928(EL7rVuQj%KHw5}CNz#$j)y7kvzsO!gHp_ZF@?KzyPE}}^}@3i$SJ>aG&
z&`vYGZf0hEJ)+@#MvLXYK_-hmtlx;cKJ6vX`F+0G>qGkXcWFry8M0r{=K|W_%ij=_
zvY?vo%ZlCbUhQI|u%{>QNkvoEvVAz+Zp%Toy7Q`C@MEVuaM=zQMVx6sDb|{Ntf}h_
zbXR6o^>Vv>NI~JSBg+8@G?}&#31FPoC>-%4lb*wlDbHaD@N(MQYwNn3*M8u;n^jh#
zM5jy)16yna9vT9pWraKQi7q9`S9uP~4jpC4?m8>+q7LN8n6E$?Gj3K=QqohV0^<~+
z6qc5TO)j5RUYOzhe$aV<*VP%>elyQ)!fYW`z+7lCy*fQgW7~eG4}oqKd04UT`0jde
zy$OLd+#C3XDse1f%+%7-l2JC^gC5D}YmWk)uI?o+eEs~7iYp!@FyRuxNF(Y%3r(P#
z^;m90L!wfNNR0+*^4JzNj0eF`BQ*bq>rw1bwqn~^dtUqP_1Lbxrek^PLk~~q)m_y{
zUo`)fK6nCKnh9Gz|Eg!vs@Dr1&&?ke5k(R5cp`XVkpOG<bTHu|NWqW;RhT}Q8Aeoo
z;=OHb_R1Xt%@J%$;*jCrwuYEchRE=i1gf89aYX|RLrgUv1$~Nl>w*j!?Y2eaxbDy!
zH@0xHrK^$FZEc^%^w0BZN>KV7HCi31D6;Hp)9fcE|CzI=TN;-Wb=S+<c&))Z5AB#-
zZ)uRP1twU4q6ji%2u!L>5Rq^Yqs^(tpnS^j!AKk$z+zPp5D-}BIASIbYGiKEHZGvS
z_v}-Ry<Ux7_fyS7dSO;-u6POhm_z*_L+sEM)zyQ=VDcb+0Jp--X=zCn{y6ZSE#c>V
zW8vRG)K4d^>UzeGiqCCqOsYJmSG$ETW+T)T{)qFkKOR~2d{~>_*pNpLG^zVeE1i=-
z3{OIx$Sg%A7L7jyg=78u*Sagkl7T<M+@WG#H=_Xj6!s>4!t%H6HpU3gzt{<%Vs|~Y
z9L5_KhAsGc;|B-DrqaSLb`r-<ug`294vB&<7xR$H4$OEczI^o(@b=~}v@q2AT9OcM
zp#|9~KX6kFDn5AG;Md7?ytc?b(j1DgPE0VJnVAVLfoET_{__6VZHbSqR}!`m!QidK
z1)|;=j7r)sgu<GhC$6BAt-TMhW6rOT460|7G#1tyjKrfF!oLyLb9u*#<;>?2Ar&JP
z+rFd^H4+)q^*7$zAbsv{K5Nv@Z)ngQjKU`Y(N#>(Pg6TRX??%jRgR&Q3+k8HWVv}d
zx~{8}Gk*a!#SJc(&zdSTw|A%pHL{IW6VWl(S7=T*5&`ZV)qXww1sL>G@69AJh!8Ev
zX*h+bVp>t3qGN5XmTPhb+wcu3!r6Q>j*fjprnZuVglpM!F@_!M?_c`7V5Io+6A3G6
z|I?>T-904d4f;-X^jPH3x9IL15<aLnNWz+TiK(5-%H0Qoj*AE9HTo87EiLV|{E7-$
zE-o&>4MskH)43dZnNhssE+Z+v9ER|YeY;;428JnZ3{ne1u!vRcTQ+rZFN3$RiFwx1
zx__In$<~@`TJx~Nnr9UmtdEYF_sBbKooQO|F&TgS0SsiVAg5C;sJ=l$TR9KjmVo%*
zC|j+?1|u-(#c_X8+IHQQN}S%HaF$l7`)yZ&5o(=dLxv<l64GqYFirAvWZnbQ=gU_O
zLOO}b5e}Bp)=tmxet-Jd<TK{8^TZ>z>po%8PayF6U<_(%lJcadJBh%dJEM!7o>ri7
zT1tS&nI`_0>Al{y+rw@9CoUs1IaXL~q<L#6za+;MK|(DV1@hh7nz^#=-qHeO9g_p9
znEty=Y%B(!%tR6d%vo<)J8jQB8267ALnmdfG3h;8%;BbO57Q4R1j~pvDD@A)pCS^Q
zBwS`!udeU}^F)2YPQ%5qeFdHpW%c!}BUeKNFY@Oc&omBn?<ql{E@yM8%&r?9`JMC(
zXTn;h@d)$DQS)E1*z;wzu#Zi%*WMe{mY!)=hC}XSnd=*bwY0QMx*#aVuwy(%cDBDv
zm{+Yi$B(lwEBw<2V6Ya}#qq7n8TG6jqf=2twFBzx$pr74!wj!_h}^fxxGM?&CgCn!
z7lFm(L1w^ty6L}Lp{`%zM<Vt~UnH1D-7a=9S+L@20ecs%8-|~`t`rP*l&rJ!jGft9
zB7JsY&-BL-a>=;)Uh_^=30&8!u`Dq`+k{lL$1WNX>J8w6V?j7F2|A;R`_Eih-1Y(R
zAgjdXdODnPUM)BX-VcRKhV)-8tou0m#u9DtIP*j#V$S8@BgstkExW{xtM(56=ACwI
z2|b?LSU4!Sg$sy?z+EN+OuC?>KvQQXCMn2m$)QPiukYzb{Yj*P#il%;R(T$uTMSqg
z)7wi!=3l!o|Ca4z$=lo2br4?jeJl9-9LIJz*kM0JomOI3br<b@NFTPSKgR==76mmh
zB&v)=<du1dz>_qxLDRybI2qPhOj_Hj?w_IVkwhlIc#|?|?Owd=JZXJ&9E2NfGj4Bx
z@#>jsB%0RQAS4O?H5~A_ub_d6?#@-3zV-0bdpKQ@L`+ItJh;A*U0T;zjs9bftgJxi
zEgJ@$z<HJFKQ=-DWLQbFP=BS)3O3c$D3nAF(kKl5n$y*l?ZGFHE-FdiQ+vr9eV&CM
z1drA0^>S7;@%_V3-f68sI(fLm`<X;{ZLPGdEFAbNp{~wR;QMJ$DU?h)*<b~+p`k%U
zF`!ayO3Y4%J$<0TdUTK33pqxv$PO2pAHG_d{>dY2d07h^``7{mQl_J$tFNz@5EkY|
z8<ba&9Uo_9V<Y>HP6T^5cs1J1*R<-vLXqj1Ych?Mp%S#dt~Za(l!3)!M#+(=g|z~S
z?&m9Jtl|wPDKcOFo^Z^Mwi6FO6&H})u)mkevUivlZT9|(B=P-gP)@Z@{QA1hJ@-$3
zrvVI(cZ3f_-dlzD+ai8R5TA4nYd3j1=uaOKZ^8Voq#6;P(=N)Y{TN-`*j{m2Szc39
zvJAQG;pgT`VQ=pb1EP&lt^C44vDVhMqvPXT4cgp<-WrhgP>xawG9>s0@2<h!m_;&z
z-oev>`Ed3{i@0a=p|I=S+`^@2_WQfnHm8{SNk#%QqbwRqkBDI!IdDcCJekyK*3YAd
zi&|P)QK7@76o!IQvWr_#QH&rfx^Fy{O3)24w^gbAO(`l*;v|c}i^un{n2aEIC}b3@
zDjL5215DN}dtZ+;n>Kd4A-ZThJw0b<cd;nZOUlZ2u7<LHdmbtT5|5-`UbU$AABx;F
zDR_{Uk;Cb}r3)FBziO95-!Nc8>6P?TQM?7LTr?}=4iRVCQK7qqZu?YOw|qz9xg23m
zXmQvd>A#yVGL~SuyK9hHKBlo;PFyILB(H>fe)@c1_jb21R%<%;0|a_2<{M!IkXC*s
z`blLQy|#5{%k%U73gDYI5}vxc%tLcz^>t<8Lj>*-+~@7_$@*Sc!c?m&VT>>^j(<W>
zNG^Gz0TiUJ{!I}xZp2Jc3Plv9MF+7=>%&BoJTXihfX9NHXwWEtsog$27*n#P&^cSD
zN8e}<xgq10YH6FMK&3$G{j)h#umS8D){tDx8Ab)MI1@)%nx!EW(SAh{_GDp^;);>K
z3k%|-PFMb5GpsGA*JF#u54;$KsXoFb)Eu)z^>8q7f;nZ_q*RwIrJH|Mr!Wb8A^B3P
z;n~zbo;mE_CntqTNi%DhWVZT{_)VtsC3&tNS+c=KO_dq87SZIj;_dVkZ|6W1Bd1Fj
z#KfUX=s_ZOG6hP70GRf?U(%M%YR@j`x68%W*)u{YOqI!pk$|6TEyR-Nr#r~>=3_CR
zAWa`Z9%70*QJ_R;l0~by`@Pgy8zpHKX^44yf4^O*<o`mSpcJ4Ou-6JXhl(`AI%2{M
z8}eCa=&5aFl``tDqD;QA5o@3k6_t7woDp@R5O^tEs|>mDDfFBb)UN&aPa8w^GVNi(
z7MLcrnov+s5(UaK8Jw|q^Sbh9^*0l>e+$z~b=V(Z>8epFnf!d&ei&h?3XoQPjG}76
zq8c;q=vRRG4B>l9Me%IAJN}~2ZE3-WAL#A|1FR80n)m57P3eh2%3UU%T~-awMpzi4
zqoX6ha9GO<!F0ouqRcp&SFE<By;Kd%%V-*kDr`5BL;s)$8eiez{b{oHun);j2YT{`
zNyUg9Jd{e6jxr)Q#@82|8Y9}8Jsh+$J3p_atv%LkXY2|*PNUiY904H`@Sj)8!A1}O
zw^QEEU$V6c&Boodv%H?ElIV2{lNj_TY73+b0CzSWOH!mt4($u6tfaTJLfeqCk|mE9
z6TkXBXs-iJC*-Wo(c*zWSvEDx6>ztZJ>0nB<rIzgYjG><YG=^XF**nw^RVkvsMtq^
zd~ICSGfAB^qk^jR`P##JEX4gvde($oy-5Bv74X2G!gQP7Jo(PYhbPoO-!6NwfUs|u
zWy<+}QMOP%JL;r01SV>y+U3d!I954NtNUjEiWAU{)6rQXV|s%=fn7{w(RIC@Ash#O
z%Sv9dos^R5(ftO51Z-lmpscKQy={q^#l_*cf$$RBVv5X(>c2ra)lXlwOKneIWwAI6
zGkah&K6-GUp4FQMYC&NG#Eqtkw;qF$1d|Sv9hZUfw`}Tq<PQ52s<vHkjqPvy>3|)0
zY*1v5R2vQ0AD`eHUR)GaRz?}sa26wg_cD^Fk1%@mLN>0uSv8E&w+)M>TbDDw4<N#A
z#bY1te3}0J`I~=~MzcYdhkJ6S=HC`SYp&>|5Jt+ntHG1Y188&d*DL+lbI}KR*bdW!
zW}E87xF1kKo{b=O`H}fbgu4w@D}ihIA9b=ENuR%bHNYJF9l5@-F}cur?=-=6Ld(8t
z0P)${Uup99dswp8nCHXBBm&23H;!$)V1d%7ZZ)W=6J)5+k|e1XTK!HxmE|5*I!mi#
z;1CNtu)FMmE(<TxeRsY%TPn(md3#9bDfR`z)$p%$M!}iC_M^R9AEYxE$GlycW(wsn
z_+b=+d`~#@r!D-ti<GWl`oM<lm?BBLH=)7pGQh~;g*`TkN@`-aNP_D6I66yytr$C}
za@uWgcn3Wi2gds^yA@=ksmnG}tBKT^^aw2h+I2k`Z~9?l(R=e8>gapcq@7(i`OMeQ
z!iURcSFT5!C!s<u&kS$gN-iyePr{a<GQ+o7UIAE2)sKptGbQ@uk&0DeBEO55*UMmj
z73B#&?ofTN`ZU;}oT;>evE;D}?+<sUm$Rm^blc9*9ZujZ*`^G2bIr<5A*m@;p=L5X
zvpcOFqd!jBkxQUq$S$mGy{48dng+r$_ZMV6w=-MkzvJ25;=fkCxJUQks20dzgx%cS
z9?u1#ORQ{~ug3Ic*mdOhJsG20pSfNc4J5>&89Fa>k54Yl_rn>kd%rMT&nnB0Op{3;
zo*xNP1)dZ#!pC!lLHU0f5CWfZ8a89LZvHEF%Hhh~cGj6bYF3+l%m1zw4u%PvzTJad
zD>%1c{(g#NQpJ0p+g60O5^6UCzNdura>|?JFu{r3b$gD!qQO3p<G0r)fZ7cM&s)Ht
za1djeoOD0l!>d&R4m+}bMiRyOX{FIl_gjUro4cEZ1!(WMtZM&c#kPtM5l(;+9=O<i
z-fA@mkQl^cNp#|j)gYV|W+wP}r4j*jfT0-!b|v$wi_;1@-m@ZahqtIfu94lkLyeG~
zlqcz=kMaI`4i1>n{%SfAU>`+&xv0y2o@?OnIC|weh{*mqLZ)2M(UECi;5VP9ebKB7
zYFhg>a*Qt~`I|V(^{io``J(g1<@IW4x8q?SQEZhu3pjH|_U#|NQYBdTgitCBcB{7{
zG8wai(x5O7Q+_MO5=KdK(~mMI7QoXk46@QGgjuu8^JNdQ<4s4=us!iW<GF;S-OaDm
zzTj`<?m8)_s~=YT<ZSit%<p+4u18g0(^IJi)cPQHL+OMM2N}imj91CF-lrQ}6ux&s
zjohj0lkq=|P;o}RC~7omn7rWq+AJ;e5|y?}7a|Q+Q^gyRsv%6)b4zXA3c|@(IHbt@
zMWsH<S%Q0{lJvf=2h4wG0c%oC8&pEywSDZ}NnOP)mPD%`6@`JZaS)_!V^Gz>R~s&l
zV38;=w7IKL*%OvUhU>Wbe*8@1^+K?<v>0n8DesKL_Jm96ADbt3{YHRW;P&#I!tHDm
z7oWnd4s4rIhM4_!GXKC<CB<IrVw5nhctBQg66OqRe8+VmF(UCRrOc;KKA@%F=z1*?
zhGdF;lwo$OtiBg$Lqsh)QBos$3MJKRzqGFoccQ7bQ_Ktb={H{1J8vCbS@&?2s0p)!
zq#2fyW!X#pU5En6kddYg#0;=pVgnO11-x4l2Nl10mk?@J+&AlA-+XC4+zuZxb?8S`
z)>a+@Y<$t`qT`|Yz4he0rxsmx#)lG>vH7Ynz1eY@l`n-uJ`Ed3vPj7XApfY;JUkdo
zW@Op7^5f-=UTi&DD~dK&9c=IZL>!Q%S8lyMZ0sd+Y$&;(sm>A7Rm9cFI>KY{oBZzT
zeTOC}uI$<#n<H#mb*yuw*DpQqIKV$TImyeZ@uh@;$@OV6>lm{eB47v<@>LlnD-~<Q
z#=)UXromLrCd-sVvVlO9BBLGa9nY80WLMlp3q(OBdrD6@`<+qx9m6U?Nuvcf>cjw(
z+z{CZb9Wj`XUOPxmxQtdjZH~(m6s<@fhuet+|qv8&RmweEtPlk4eYj*K(S5|!`=6r
z@;1Pa`c%YUkbR#-1hK{>d_|CjM&-6JT2&@M=)D7eYdP;-Go<SJP6ZhsbvIL5J6w{S
z4kOch8Fqsf$K@=OGOy8z6S<~Ww`lUilU~30W{TvCa&o|j8slM%Fi}M%Er!@vJQ7!I
zx*QUjZfNwEgp&T~hg3k+wqPgSp)WaHcOEaFRK5zi)czwN-x{^&dOwG2Hvi0_)oG5w
zpi%p+66f%fHt<JIK|`ukOT=DEzhcCm8D*lB|BA;Br=|w&SYcIFm1Xa-plnC22?flj
z-l@KFaz?Zzg~h1I9nx3<Q_5}X!&Mb(@YL+nWTd>1?r6sPKtNUKdDi1+&U!-}oiz=9
z_+cG&Cci&;C%(T3;Xg?eupPmZ!!gj-95`!zKX0}zUA|=|I_+h)jv)jOOBKTzzlBC9
z^*S^mx*7lI61YBPksqsU^9oOsL7ZWQ6(aBfb}yk!r~TAWivp+I`5lcYzULozFKy>>
zDqPZl+duHgj2RtG7tC_7)y~Lqm*9Ba3~)}SgIW`5-7fIj?PJ&Oxnk1K+mAM~Xg41A
z261e60is#0&TKr6ES$gph6gV2Q=-)8K;URtY~)?M5)m0TpLxs*K2R^Ns3@rF`nK?k
z3YrKA%Lri(&(36}Y;ke=7)SPMRezF_F*SnX<%&iQ9A;-{V@6DXxFf*=lXZ4MSy{Pn
z+Em(gEAZQ%Khi#Gpk#v}btXBSFtE9i$CF1HVPoSg+68B-(yI?a-+T?R;4W>m{l1{b
zomdF<xrdnQwo9&nIe1w4ct~82jzzzGYW?qEaCov|;ih^rXtL=SuB1Yif1XeXYd=cL
z*ZkwdvRUepa*{jYN!;BR!C+k4jYUIoM6N@^J8x7{8a3MFD(gnrs2wGG^s<f|qbQzh
zXv@*b34h8~uraPk%GS*uXoA-xMR7dQlGE666G~`4V3$~5$G2WFJjit3FHHA-uw^<v
z+~}gJ`|3Q+F(of$CDu4sJITRe{;>7bbFl_+ho*o19#Wr{xwB8S7W5nv+pkB<jvE&A
zfUr`pT`JJ1Bw(JYGF>Q~v@klJvyWH_^i>^!QZm3a4gCfBhXrWhVH5~e0Idmg#rMb+
z44c$OU^4kNHnPtxE=ovC*IBn;70P5ZzYoFT^5eYSw_5G(r`sA$WV9qmlTD|>A33IR
z!WFyVJ2^R7*ItPM&a`CN+kXcJA((gR3mzki{*8|~=nA~?=<=~I{QJ!x_d^=0Qx&)~
zwI9X7E0z2rPOLAe?$SS1VH6?NpyaJG(*E|}FE2(G!C&*~tCJ)e#m)~xv9DPhH?G-0
zJ8erAy>5Vy1i<d(Hx)sn<P_9|0yx?0(!X!+`$1+lqc|0HVr_=QM9cB>NmaZKyEvxB
z^%KwAz^Bd&CbK^pdL9=0U7w>Ys%Ya+Y~5ipafF<U8S#>f7sVYSg%uuSA_ox<9yUHs
z&m7G<ZW>n|XCja97W9(=%r~{RCabTnUyH3C=wzB24$=<w)CZA%6IWE?EjNbm>#tGH
zSE8Cu?bkUzInM!rsZdUKW22f`=lgxKksr^?Y`pzd;J545n@M9#s3#Ao0(j~~I4^}B
zRtz90M|K*Oj|)PB!fuyiOhR+yCGj#HL|=g^%s;(reoljKzAa6b+*5`Z!MB5XIse-|
zaDX4A??s@FL3H>zk(`;%L#yT{eVa9#=doOvYnd!r63vy&W0GQu=}0EaX+bxcN_oOC
zoUT#jqk-`0c>y>RyWY8g@HFJdR|cJarXk!s`c(FYRyU3Ix91c4Sw(Rst9x1*ibT%L
z%D!#^Uk|<^dAT=Of(ywP*TYxy^~95pS9mioQt2;#nlm!L*`6Z8)en1TAvpC2(kthB
zKJZ@}yxl4&@LTlH-`@!4tZX~z91bQ19y%<+1>%w=ie>;k0o=A=Ou{9N@YV}>=S7Zj
zWV}@DxS55erP1M3P6R%iR3r|ETGV3?5{7`Yda_JfJz1cTVRiI8mU%`_)caM9{_*R$
z+X3kN>*dAO`^$y;$t-${PLPJW#^1T|{yX;l#~nGN>#P^bKgfQf{ckLnQqiF&jwD`g
zQpojLH+jZYapq=z+S%lnyf6VLmCM1PrsAR5@E(0QYN)nA(+;dT_UASs8{5x6H-w{y
z&o`dGHn3qG*IDFJc1xL40!&Bf^nRgQ6z4XK)2bcCtF!Mev^eer0N<#`$7MrcczHWy
z*4+u5)*2Szegv9c4Yi#oD9iCCc6Ras42s>fW@~FJBfNi=hbhau{RTvt$=<5LsBEpy
zamXpV5Q{ujh(e(xIzZ?If`Tv$ypB7FU#!`D!<`AZUDm9s+H~~Np5olL0uKtzMfo$w
zxa?T4nCHNegNO<(RNkTus!7@`G)<VXYL{r~=*F$9d!Q`0`$PQ=9>pD3Yxwt<t*R2|
z=f8UJ6Q++}zh@x58yDbsH^0cWT=s@*H2>s_MP&LzSyEg{`Kr|2<h+z<Rn@9ez=98H
zTW551wwp0vZf@-iX9qFaH9G=Z#4FQObV-6E3|-z8)dS+l@)4<{Fg;s8`W<SKi(AP?
z#lNr4!sqpNf#(Iu!1GalORwu^i0P7BQc=}+!y^JYR<GIV@wqP;>0r|zNv$Z`YyTK2
zPP#~T@AYOfS%xdp5S!9;YIe3iUY<{kJX5hhEu5h<<qJcrg3L^AV@_;kr5x@MS@M|O
zbSTC9%Ca$8=G`G~%hnOcp%R;jl7D<@j}p-+D-{%xkw!{V=$?A<jdXc|yX%pkE=IRz
zQRYN_xHnN!I&pdhNpguKF~6AvCiJ7=r;tQN(jg$*XCHyb5~P?XUIw_oKH|qa65ox(
zKeDxPM*-FYaNVKopS|W;j|_hFU9U>?S#CKZIr8WhX;#aahgbquvbw@yH}sr}XDthb
z{d>Wrl<i_%r=K%FH+=mj_rkKU-U?5X*!PRpPl})@vz2Ot*8r{Dg%3<u*J6&<L_25i
z(R;W~*~<eSiSMeKR<jd+;{jk#GzwWXI&>+~4-XGFM`@}|Ue26V%IGBKv6tynWy~0_
zjWoY9bUuE<6Xu?>`?D2{Kl<^00g<mv)k{e{D;fEBIF=-}CM+DvIqN>AeUZSBHM+2^
z&hMlU#TG1qyk19zE1F*QC-e8(j*j}z(ysffwtrK^bR7n&_HLEs@*8U~_-Bz<e9V5&
zN>U#H`7jF`8?)0zChO)cv9kVD9^26+9lHUHIJp93VMA_2AZ*vJkeYnpH(+o*jU8g*
z2@Yx%gOc+6F_VXRZ$FE|U7DR$pEtV{KJ`X`oD`<4<Gh=&w^sQ)(W4&zZ9$1rxMXVb
z`J_ix9luZuN6IJ-(U8$Z$?H!b3!iGt*5Ju*miv1@z*|kX<l+EpWx@=kCvz!t6(}#)
zF7V53nzw@HkVxAA?ymj%xD3ps&O(h=e*({WV_<^&Or}L?A27GABZ{oS+VY;fPtR}=
zr*)Hj#|!HEZKD_F>De0;Rc>Ers{++)6zl@<62T+Qzr&FKvf|$I6J_P3I(|N|Kh8R_
z@6SiEoG;g`eG<b_)ZdWt&Joh>^o`09Uh<e0v+P~Y`zTntb^Xx+Yh2LQ#$B@CfOo%a
zCGRwl*k$IFXJ1084QfV^PUG&;`M+xczA}((#Pp6*3Q5uGw))X=1ZHR35vE62c29$Q
zzO9v3+JT<l^w&32l+Oz)3%<s};3aS#1ypbz{>H;Rq${2OTLdF_V!nR_4t+`?&-X;C
zWhFDy@1!d;V{*QVgvoAAImySJ3FL#``YzZyWd?O!)+b$#kBaQ@f~8vi0JPW;zH|BV
zQ+k_1Wx|qGRfp^K2*t2z-C~kxIa{JsAetQK))#OXAJGUGQ^!q|Z!dqDH00nwDU>r{
zL&Ug;L&aqUsA`O~{&e$LP~F@YlSch1D5v!=^vCUA7!2O0A7*cp@zuN99jWyp1(N9X
zNP#F<c2uI2?7fUc0E~Gl!|m)%eQp<moQD7U@cfJjCLrpbi|-Mv)4RXo^?lOTmpe(P
z&xPu<7N}vI+%lZb6805NOB>y@d21i*_Up0g$+Gej4;VO*ROFtGBO9CjwE_}Hh6D&V
zfK>vv7hx*@8sj1Rc}??j{IvYM22q`%9@zqbKQiC$cXB=KfrjmkS^KpT`AyF&){#qi
za2y#5JPBm?K=9r#mTvPLn2IL8eqGMPQx%L~hfgvmMWz7hg|*Uf)c~D}p5S4<kTY>p
ze3m`*l6?9`z+_8)(bC3qb6UsQD2qNMv-&gdBaCF;re%*j)&6`5Slf)8Gg%F>(9TLd
zt?TMZy?D;|0O65l@&Tz~2&B$#yP|a;!<N~3?Au!v&ZB&YSy=uSr^Hq19EF%F8;(%d
z8$QfcQu8!&LrnWAfC15$>v-ialKi!CwjxQV$R#T;j}!&E87ol+U$pHSX@A;J&!53k
zqDnrmq`zik<9X<n)`t<0<KH3K*nC`T9HgW#nr(oQ7HXHms(}AQNBM>FSA3b%R3L^*
z>({#XfUOTE!}P0F2meTtusu|0+@D|{2#!;N!Nn~Xlj_<arqF>eTvQJhxZJWtQg%lO
zGcDH~NW$YT_G~0e<{N#BhA(H7$sWDK-Hr(7-j5Bcjd2Gzu6Lt<IA+(~FY*A^lS`u~
zMygH6bq~XSqQ(5(T)_U#X<_)bD7&zrAP_h$x2Fyc3GfQ$*9;&Kc~2GaJ#U$SrDK(S
zetG$qV6YwcQg5hls9^S4wR<5jDdN3PxMw0UU9Ok@mtFZ};6Z0O-ES9RSyE*C#5^4(
zOdT)S4qi*IF)IAPU?h?$ns;<l*TMc04YO>Ttmk*2>SLlm9uiB!dARxURJBa=4hShF
z!2cD1eRxt-nG@JuO0>cipgh?Teu4jtreG!L2Kge-m*PP$j!a#B-F`KJdhUMMqiT7r
z<9ueD`aC9${1?-#cW}N@jlTWz+x7Jr!)UUN4XAozd3tR|m@Bgo$Y&wU>qm>@d!?{U
z@F?rLuQe#?ZwTb*lyV)HsA5-qKfWY!eLgBOb(Q~?)o(IQZ-yRYr@K$D!Q+yNSNJBn
zem)H;M-rPzoB*btC_$B7-4(Bc`E&W9YZAo@=L4nZ^|(=c^z}Qz?}S_xdVppOE-p#d
z9q}f4yRWU=n`N04ou=w{lq^t&EFk8VSq@vV>BOK-UvpkbJkWQAwGK8CtvhLY*o@Nl
zY8rL@SZ}K{X*+BDOqeOFNS#<xWo0y9?mU+a6_=gq38k*@*#M;I4pfKpS%9_BZD+Ci
z3e-K+=l_^whTTa4>WfZK-<z<m`h}5(XT#}@o*h`2WWI2K;^eqRxWur+exq(C^33Zx
z6Hm53Djr0k5u}nm$a-fQ9U5sM3KoPXR93G+o&1~;TzMB)KifL1*nYtPX!OIA6Jt@^
ztFG(jgT&j#Oy%7Ohr($#WYmDKX6*7C0u1^a=Vhy&H=x%&25+;E3(x4*d2)}c2rErm
zt*M7Vo*U^&K86*~voh8O4*zLd?b-+u0C5`3UVecdnQAnH{gmA}&(6ioy#yo!W{IHR
zqH*s#F8;1;h_k1giaLL5@yPn_uwVLT6qK9oU#RyJoMXd2k5-ElsqfbhYuqr*u&FWy
z+B>5no#!tQ@C4t}GM!(O(zx!nyKM341>j7xBdjj{74N-uFc~->tSeiOsjoVimt>Lv
z$Z_?^Qs%0SZ(B&{Ab=r|E{Rh#3^nrU&S3WXVB;+=Ti1gd!c<`i3NA;1@+;>dxBJi2
zXzxFr!T3_@-bjrI16h2CYvxGw&v)7A9Y`=e>6<?oLDlKq%c!Sz+36HTxX!5Ry50@-
zh!(z_`3_5PP@|nv#J}|kGu`KpfXofE*DL2gHg$iW{C>?@|NGOdGA89$1*t7pd>~}V
zaGKZj(DTXo`6s&NVck97!IdI%+=;cGLy0z-asYooFS`2%i`@wG#I}_Ppn}sI#G~Je
z{_uEk!mZAUt>b$g5-Ca<t|0D70To+IzwRJIID|(#<P8r8BxZ$?t&9|v;T5A5K(6L_
z0%cf@sr>Fux<m37mKlFghE_un-Ksw&-=}e%cOBT!?$z9V#j$@Ocn?XGSB_WZdFhAv
z<GTN?d~TghbT*f&^-#7%r02WFQXN88@AP+>Hce(wn}B8fWPe^beMf*h{_7WvNq-<6
zLo3I1<wBpzbrwEHY88z~HejUmZlnD*o<d#?0s>;y;X=Q^5d>iAOd7T72e0@!wgtV9
z)GqIjxBI=VV1lGYq~fZoA!fSX#l9i|vgt=fAPK{6^6`eaJ!_2kUd1L46j_9Q?Qx<7
zQbPkYZfaHLRC3>{E{MVk^h~iJO#YY}6~htJkN#8`6+rof9~31(n>&?)KG=eFbc*Tv
zo+uZ^d*yta+}&_OmGts+n%<bAa?Jf^e`Z6S5Cm7kxVt*j)wk}B2yq8qOst6eTLtPb
zyHwHC?$Hf1wKj(c^O9Tf+wGpT`Nt`b*LP4_K739`0TxZ7**;BG34=_0hQq$a+`7iN
zOO`y400SzUUe3Gp!KRN`X<E5c>(AyrzWS7F)aXRL_Mo)iPD`UhLH+n)Ez%3de;FbZ
zFW|n2l|0^AOGS}skHQVA`AZnTjxV5hO3mag$`E9)m^Bz>e9GBfi@sb_EQ0bQUc*1-
zYmyZS7nPFArznf9K)%s1#Uw$#Y_l=LNNd%hZ^X^Xa_Le)X%gU9l+*A8O!jv|KTR7&
zI=o5m_e<I%o7KPsOP1G|K1=x^tALflpbDWIry|VIS%KX$H!iwRnrA%Adbuq_Q058f
zcBU#}vfLzopJip;PGOf4^5{x8&rTh|Z~G;qNS%_~-=`#?BR3J5A7FuAI9qs<uXLWN
zayvc4vc=H<<2m%%k=Y%p>-~;xF~HHuc}I;dodKRyp69)pm7NtCiYN*cFID7vT~b7v
zXpf@kpV*OI5a;}`=DgQ(kVOLTp;W?J0`MVW)iVA@H4^Ub+%Knmns4^U7}<}jHBIg0
zljB~=WCQdbD}rsVy;J!;6%dnsf0?v+hEo!#$)?Q^g};kXQY(s-!_#tD$YTfcsf~(V
z#^Wm+f?v_p&&>`0O1B+}O^-G-IxB_vlNZfHOq1^R@bFN#m!w^(rbT+(9$(F@-Xa&R
z5d<!X<p<Ue4ohx$h*d100KQ44ZHEHm-u*{lRdnfLwsK=xqL<KY)D;Qskyk}1*;<!(
zEZKQ_cF~uFs6Yy-s-q)jPdCtkYx%ek`SVDnD4x%u<xKlFy7*^}MiyR}xqSPs(-i40
zaubeM6%TEzL&mR@+5V=K&(ChKeFB}xF+8`M5X@Hh)?fhn3y{Oc1_nMrhSYit`?S<<
zA=3L%WrG7K?AZ<cruVz8Exfgrs}_sHf}Kt%XHnkD3g;lpJB#c5F`ggmi+80qeb<?n
ziZHZvFKuZ-XszGWA7nSEn$$i<V;u-;Lw-BB2%ZEX(bF%>j5X8rt!^Iv^Vlp!U_|A&
zdFZoj4F+OFH!s{RZzIVm@7q=xuHBWj3zW`@FgN8(bwHj2v(VQfwOr0{!(|{6)#Xc~
z@ogyC+uSF4q(3T7Z)}AmZm3fJIX%?^G$G(KV0->YhNxM1#}A86ld*rarv5Z^9pzUx
zB-w8owtdY(gf)s@WX6Os&Pur|^>E&x3)$h5!BBPg6&099qK#^09LJ3+DO#bHwOhhd
zw$B3;H#w`Z(e3vg<!Kq-3;pK6{o{6k6s;<Soy~&LKvVKSV5Lxlk~DJ5BYSTwspe*a
zyKe25{zsADZ5~PIWN|~#C~z{#)oA2)bl{=ns8G+$tVml~(R|bQfUPr|e8TYo(|K=u
ziFsE1Lqp}4MwGD1HL4aBgT9MRDIG>^@m%j;3F>K@QOTesqX^F~>zOp6!v1P%O-vCk
zcK}<#nsa2t4&PG=DrhpAIryHklp|4?IUwpUZPOWyf&bB1$8nO`WcqZy2jJX-ZJ_qC
zOG{HL(ASw<^OqnkjnE0Rf<(8$5hRHmSQG~yg@hIa6}W1o1XbMnXFFI9GG&>%bk4Ls
z*rAIFwH0i5^fs!**5WeREmgPxJBdcV$!orpr$KiE^S_)1)KDv;r7#JDth6B{xxc^7
z&~CdDWC>SqDvt-7lHx_H;|HSzZGD4?Q`hrMv}P9uf#?d9QVHQD3ubP=g*T_7H$>j8
zUIp{N3;XCezPDJ{uP<MxZ>$pr!9F>{6_B(W!B(jl%@!-Zo;!E#?4?$f0c^$Y##@%H
z{-w|36QWxLe5n^qXME0fu)z|naUWO&rs<D_99TblX5SyIOkCfoNSP2q;&Sr(=Mjyz
zg(MaUw#6)z%y^e4Q6OEXpJHhl(qA7rkUmyC+V|7S5_c9KYskfFM%3B$J&{p)7_?f=
z2;T&Ja+FBdc3C<7etFg_3$#HPB=tnaBSr^(={HFEjnFOfg5jt^YWnSGCPs$mGk9qW
zcrCjN#8~lof#i2~LG;bStvhF)eTF0TpmcB+s2K=u$Q5u?(n7u6ofP&%=A(Lw#B*)F
zIb$a}?XVq<e#N+^71sk@wGMgvdrfl%s^pP_8%Jm7nW-tC3s)d!;^JC%eL2(A`L(q7
zae1Q+YH9i7d7%qLQh8#Lxf+xTCFDfuY3ZCd#Vp@nhrRJ@G_-{FZ`~c^2WOys<vztw
zqIvK$L94)PNJ2Z}8Cgzg3BrVg9!AsWz?b}DiOYv>VwTjTf>%a)M#-@?NTaH!e11j6
zDoYX#JlxpdE34`xmZVYgw{NM}dLr@t;E}>;R1!<z93O>3V>MG%xZ51fx`ksGIJI1v
zDP5Gjb|;y~%=KkPbz(BSRd_nGTe06ym8VD&wna)x2k+}vm|FYnu&z&S)xe%Z(j!4m
zx71B0W-n{1#-<Jl|GVH~#@A%PK0)b6g@v{C@5)ZW3VT`mkGBVDAXjkfdHsY70WmVc
zI@G9H{{tnS95jODeY?|@dfM0JOc{ybbPb&U0J`G}st~ocWdINj5MA4?UQv{$R&`ap
zV+eqqYi#~C#*UfH!9yeJWk;_xCGSb%gsM;!%YZLn6fq3`D)vJ#!Iu-k4vyp(lQ0ej
z)<_73RGFpvH$f~YCS+`=SSw{_JddKF0toyEdboGGc&qzU=Xe`ZyJ^wA6ys=pPu%<8
zNd4)C*x3D20=cvb^gqyq(=nHOLu5j9E_Fk2Ln`_yP!MXsbHEiXQM112LCt*g>vTQ6
zZa`QBy?nJqXXVmdrSz|Gz~mCGA<*-70x#sm6q-gNViw^3txQOzK&60a-~)MBeOX2K
z`#?WQD91;U*Bq!1!qOP{9MyR+0u+!-w$T@wDgog@S(z}EXh9n5>sm#V_cqJTfhS?Q
zO>OM!k-RtRf>RBxL$yP@MH=qUZt&woj&-G>?AIgbJ30c)-$nukR360J!xY!l68Va;
zq~e)Wfhlkm0xI^9*xLp_oU2Fb$l#RYK97WuF_BGSLP6>U5?%uJMy6N+sAyPzzd%A1
z;{sp~N%tN$dh5;`*<@Nv!(8xK-|g?<-j1sSa!hE1OCU*&NQ>yPzXq|RDpRwf8HmUM
zEMJ$pBI=%!;9P<!7bdI^t46DjGyy-SiSwKqv{%a)>48HS_(X7oy7gz|`b?9XhRYG*
zAC7FK?b8Zjf4N?hCvU@VCWh?jXjh2CgaBe8Qxz$W;O&sIpn*J5Zf0&t)Y#a#R&;?~
zF=<50s$yU&rw^K~=Py5399`pL#?#G#vbJ`3DDkzh2s(~UGZO*5ZVvs+99uSYdB36z
zE;I}ZW?BfQFgz_w;^L$jT!L>3RIDKy7JW^u5DwyKh=SPXzDvf$XhAS)$izp+LXZzt
zN{|>z4k?(&6uyK&K6*|q%<X|XDboAiq~#tTbOjq4xy+(*gOFr-%|J#hn1FD3DIS3n
z8!ir+m6Xb7v0U%&5LAj4R7QyEPt{{1R&hToeUbjgQS}A4T%YMKkl&Kvwh5I(Ab%OF
zP3ihApnl*Z<zwI*<qH;Jf1RnOqdNmnYiexxJ|^z=bf?Zp8yFS8(>BR<ati3=o4$*n
z&O(6_{mkmLjJY`l8ynlml5bE?y!<#O<nUK*4^f-8Gxi!#x(8oyNTCu{yi@__+wIJQ
z%i)$df72T%G}MaJd}ui;G`3MO2s|jza1l8jv*zlrA!|TL*c4nnRY+KTo?HZ}5mk^-
zDYm$bXg*uijzJm}*EI^B!O|zWIMpZ-;}pr4sY&UJj*s_EyQL&kCd1c9cXf)0Vi@bw
z{^0QVz*W*uSMiD%Q~ehbtUtGDz>;Dg;mPNM7Eu<#7v~ge=zkYD!&y?j5L~jc*+F1Z
zIvcgk8RPxI)y=%@X_pf`7TD{q?tu%5v?PtRl+f@mv7YU^q`hARIa7T$t&dgFL?YnJ
z_-h<@U7!jVx8BJ|JJVk;0|f;)J2#IiN(3mRyyJdZ5^-<q#q{;D1|Te}0208*G!;FZ
zOs)KISG&z4{NZ3+ouBJD#ao&%0w!ZIfRj9Fcgi$2g%Iwl0~y2W4`nYRul1RsV$W~*
z(u8ucQ4yM8OlVMZz@o^g7(9+5d#qfP-Mm)b4%kXa%{b$c%8wz;{@<UK2eMzVl4v#k
zOf~1e79bYA-`>ti#bVZk(#feRi@<J>%EZ-D%h(groT*`u^-W2F{rMRZiC&W^x<XZ-
z*UjGD7)L@}&Kd+lEulYNiOF<c!(@O01^?(1Qb8yHGn+hz$^#!pfI^hv{?u0mWmZhi
zMwjqD)Zp^K`?IT^@rF!@b@UT=;x@p=V(H|oV@c3+ewafF3ZMr7;fSs-p4O1cD289y
zWX%x%m}*z6^#cSFPYl2biA7)v0%<t=+;R*1K7<8_8BkMI++ieDXqf6~sTempr7U)K
zIeJYVv6xOz3{0X6$=s!_6WJ@Kdp)IyD#X=tz+yKmZp7lyz1xTs%EB!0o{!2W>%Kt&
zB2)@Nze&lpwYB^*amAH6v&}NJ&|)foFv4O#a1or)K5LVn313}VTI}aMVZ9u;u<Fl2
zkp|@0LMpjyWU0{_QUV;@r<{tBcwZy}Q&JWgVT@9`@{vHZn?v6*B<ZgrW&9T}d*INn
zqR`?s>iLfdc*jDA@WcC2mg=R^1M8cb9R9!(?5(L`No0B7W7)|-tf&A*kiB8z8oa)Z
z9iA{<&vR9rPrLCKBc{xAI}1s%V+WY*9-L!I&ZTen`c4PiR0}4A#mE70V-m(8f?`kb
zOm0tq^;T+^9@%@P7^19D`jKhA^~vB0(Xx~<Or!je%ngx3l?(NqHaLQz`gKzw8|?6i
zuN`ks!YGpvOGFDtJwNi)Q1h<y;C-j6E>)m2_~6;gXwpCYw~RnS#!AZi$?uHJ#&>$I
zSP20Wq>{^p(RwCg15uL`N2&Hh5E<dwMhusNKCF>(AV@)#MDMEzVx@)9;?QAEkcZXF
zuhBP@B&x^ltzD%*S#<%v_EIgW4P+53=%q=VY9hHkN}-a#8*WIOTz_x79&lG|TOu*N
z0x$w4c2QhR&p$Sx`AgW;F=mozb^TP_ml1F8x0>nyz0hW+QENhVbKoT)E)Jdhc?0R^
z8anrBbzU0ZTZ=0GOEiXwy=LtaHvHc24loi#tU0Yd26h2iOcs?n6FNUiNyK9fG8#e}
z`D5A9Rs_kYM7fCbo&i*&$UKNf9cR|A#aUGZHceKc(Q!c)RRXEf?6=d~_qGeFAtxwz
z$Y`MGyP?cr9y4T`AXPCYz{e?!Q!0KU0-2iyiiQPuW|*SPL&vm$-0oD=8$EG)?xVhP
zUy~R)n2=IncBoOiLe`T`L=i<+fC@&V{ZC$@g>sIo_cYrM=`>aDaDT(e;RTIw#wT3b
zv1jko4%g-ab=89pP4}*u?+01jvl&u>qr=FI{-h`&XR~-H*pOKDXEp+{J!<GoLS+@Z
zVxO^Npj!7HD5sZ0KzZ<S^J>IG6cS`UF}^~~lZmDIh1{82c=zik4?|uTCE6vVq^ek9
zULM&8d`-uz?i&v4&Rtej4V_jM7s-EJwnE$=zf`@s{?coU_kY+J+DE{_qOH6PQ*T#d
z2XT2=zt*tCt-0rZ!N^%SGtyqW=`oOKS~29oX2Oi1EQ3PX!n<&R{&?%+=Nna!o!RUt
zDwQg=L@$WX9ICYZO#yYlTe*kR$R3&#YcG+Wky0NF?aBipuDL6IOSQt*(cCTzYoFoW
zpY#R_xvi4+=+fH{%IhYcC#Fz_ejEM36{<xvlmGTd?NbM)pXPQl5w@Qu9p}8kD8O=y
zExc#_{h?r<>BLo(N$!Fd_suUQ;^p4=C=(&GE@1uhHV8T&A`hR%O#4<si@7rB*31mC
zEx7CUi|r1{$4<1<PLizk(l6qsH9P1@o|7eyM<l*yLiIaLT!N29@dgXaY1+)g;Egt`
zZyhBiN$}dRr6Dkxay{c58>1(B4?#m9=LB{vg@YQAg0+6Qy=EOzh7vInTB)QW37CLQ
z&2ZG?{9gPn4HjoKAr-gMQI}5E8dA+52aEvYF;TGl(<NaeI*YXJj2&59w;AUN+6cIw
zlmnvgQ_z_xRZl$Znlr|U<*v6vjtq@&s7UNKD(mW`l5m~*5)cQT4;D-v32^ayDu_0V
zPYo_<r&NpW!Lg8OxE$76B6K-3D-s=rGS~A>ugu<$!QS~4*57?wOPUYXb*=gLSbyo<
zZO&vxhsNqSoUs{!m{F1~{LEiUimI!tr%-(nN>0)caONEjbldVbF2;7+vIXNXt*66o
z(tI2+a<BF&*h~2|tzh}sYa|t{jgZb9ts?dmhzZEA{I;pW)O5?RNwBr=an$`pNVtx3
ztyLSQmj*<#wz!AH(AiE2C5;L)`Lbw#y)DlRPYLyjmur0iUr8fGm=_!7WHr7dJIHq6
z68+@#9gIg6qG`>`IsC;oUr{j9haeUmF9zEdFRzej@zW;5`fJd)69UiO2dAA@;4Mf-
zN^z48`h^Xbot?2wmzhY8(vVH;h4WcoJI%NTTK^8cWIBqh?z;^aqgxggh#q$#nBoVt
zr`iyM2BLUHR+m}V2$3Zp%ra3~bPFpItBZsX8FoL~NxMp$4F)(Q*NvFMp?Sn6=L<c&
z=%M%+yPN&-Atx6M+wQGsMFkFmHis_~?#1~x>-C;0zs5I$RNJaizW0~g*v*b(vO?>N
zN;Z>U&dxNA=pcomD<zZ$yqxn-(f{ai(TUS2PWMNKN^lCyKRJ}+4^Owjx<+Hr`WPL1
zKdz$U!dfdyfcWxq<mk}(8m;e5s_tq%)X{c9CK)GLJa=-p*x}CccBEOl3?6jSW!H!H
zm080IJUYaP)}*9hSSe2R%nl)dTun97moyaV*N<0hVRuXegE^W8F%Iq-ib+(M^Wyls
zxgGhBTls=gscBYIM$Br^O6Z1S79_08=%HPt2mj#q-1rzN6hbh!X?Fc!%z!I;B%?dA
zYecv%mbTw(2wfdZhMN&K_m!}aq2U6rb3=Ho!1Dc`>DnhHVWv8~_{<Ru{nb8g`ghEY
z$0C3DARpFpc*MB9UVV?}_zaKHlIv!ik)NEzpfCDhvbuE^H{|yOoC2{29&fED*;7vT
z^g@$mZC<)_oEMB0Vj%-D`Hixj1(`UPD48^!c;F(xXU>>$qqK|z1_nL{`D29T5+2q#
zeVi}VK_f_YZ4}W;vxAmBJPt_Qc1cKsT>JeW)KSweoY!?NBSQ81Umh=^zr~gdSmA1x
z7ePYsk;Hnf2xbiCZ*VB(x7e(>5r@CzP(jSR-K~0W2)z_4JKo^uNbYy+$AEs{Q%rc@
z8gsksct4`M-)nfJ<nr^*?7LULy!&T!Uc4R*liVf`y(@g;yfD_WrFA-^8Z!3UQ~${O
zGg09#^lf?BL>84mn3QB+q1n`kv#=E8pmX9`PBi;&*vpxTsjEkdMoKFg$Np-Mi5O@i
zE?jH3pzCarW}2|WBo@FT$N%=|h<U~~z3*CfMp1@0_t?my(w8{Dc#wlyc2jmnq~&k>
z(!g_b^<bf`$*hCtL&c-~&FD+dM9GY`*Ue!3Fw1bQ)9D)bewMoyNsU8uskH8do@Ka0
z^UM3)b(!tQ?ko4ko2pQXadj<<DVl0#t;HC-O_x<R82>w^-)J7cnp%=0Bj(^=H3x}t
zNmbXY=#B&mt=v;X1~r1W%Ew~-j3Kb%wI*AFd993xe9gi8_$Gp)%PQ9pcLPSEj>}8;
z7C0-@O%N-xNB`7L7At>AatfpY-^e^lErNvkOH__cp$vOW_H}sj`=6?IX+Gz>h228;
ziv-<p=w0PxeH0D@Ni0>C=}gb0_lwE(;WF=i`P+-iMR{|}B!T2RoW`F&KTze}msuW%
ztnf1lPnnQ(bsKi5N3T+N#w6+zHX;5m09in$zlpUZMSjdmxJO;+YC9a(JpFADY#$7<
zY+F~3J<ND4j=g*LwyI2yJkNP7I}x4${{kwArdP!_b^}2!LG7inoqqM+`PQpzY;-hb
zJO3V+s1D4FEm#`&q?q2WQ>VOK$)70z>o#A=x)#gmP92W?%{}#3`QUH8i1)t#l@G8H
z001BWNkl<Z3rx>J<6&4WQ}l#A_wVG@Km9ZE{@?q9$7nlv6vu71-8yl<tH{>Dg#}*w
z+Sh(Z@mvKttkU&hsmR0JGJ(g4AZ0WfVcL6{B$n^IqlI^!UA;9|#Cv8B-9EL4_GjY=
zrUD!A2E6S;Hj6K|u;H|y)~U^JmsJD#_HlN>n=k!)`L}O;wcN80Y>^=*kfsa#&O2Vq
z(HO{M;z?GPmj%!e0^UU<*|>27zy4%u_^F_n=usvQv3Uq@VA=-8!{K_7L*bL^AsaBO
zLs$=KFlMbqJ?bO!dudCgk-~STnY3;30YtBiya92FH#RS}ji>5jRow!qp{xw4on_F>
z%&*(}{CUjx9%dY$+WlGnY4@#q!>xCtYS=Knku4iH@%js1BAc0>{N8)s`%&h$Y?2SX
z`*-z%b2|L|&;Karea~4(eLcr)B*W2Y;zeSDENIa0yp^4VT>dC>j=1_N=9vA7bB^2y
zL804r0UyWrY(C}_3GIX-lj6suNh@3uL_eqE56zSKc2LSBAdW_&%y!kJlJ!p1bz9#w
zPjZNg_G7y)=TAQK3EkTq<iL0twJCX)Q{HwBzO4CQU;31u`_!}f(2IUeW{4r!uU-6J
z&V6d1(@qR>$|;TR-FuVFY<VoRuSao|Wf?i4T0L^-J=?Zz`wp;*hX`dtd|kq~xovS8
z>&WNk7|i76n{LvosxZdjoMU!w_B(I05ha-Bd6BWP0pl+X5-tkXwS8H{Ie5AkqQ!-n
z3?CGS!6X|<d(VUPkb%7Uv;Ud*{Mm=}9`^B#h1&=x_E_#)?(qY3OAoWX&)#g2k6-;s
zp8NiPr+<9km6NUPM_&APIpd6Tb@9GCWW#iN)I0Yv8%bztz#zurJ=C>h>((vD*M|3i
zsWfRjdsSAO7{g(SzO>zry83#XuPDjk#?@Mqv>{l);N?($8Xo1))y{A1j66@);Jwo8
zO&#w+Rhxsf?1@g>)*l~fn`HIo)bp{psI7BJ=LzN_#9RahuPN5dQglvMW`AO`62JMy
zkMQ?9|55kq3irB$tUqHLd&VnNQz?F?!$HQZBozmBh3-@47<V1-{K)&b+3h{_G5ar(
zPS(F9RF5@|_h{m^0KRtEv|xEyvA8_o+;h)84wCkON+1|*<KJY`(QR;8Tr?8X_6td@
zqKo==1jwOQP_s%X5Dg@dV6g~#s25B<Mq?Sk8H2OnC44(~bi{GfEjLP0WU*~OC?{+>
zep^zU_o(tYNMiWZ0N!DI08Ot#@|HyfoQ~#I#;uVgQ1UtI`ch1oCld%=mX?bPi!E=M
zoc|lmy<GP7&*^SCNZARb{SM1zgA|=eAe1LKE7SziZXYiR2bvKpoxrRA;MWfG8olE5
z`Ne}OPnwbBS;k;IW?T+=@sGZM_rLGm@*jWWlH<jP9Ofa6n!})~&_cl4!jVGk!83j}
zes+gr#bORSpSDR##KXcNNckvX;;Jd}-nBJ2A<sL<FG6S(HDSl3Y0<P5a|}l9gue_^
z(CrlS5b#ae^7hsjp@1zZs~T(%v72^~oi@4N5B~k1>OJLtm`z|RVW}C?c!y2WmQT1M
z(2izf@y6m(q0Zr(`|sd=w}0l)XWj6V^!r<%yu`hjnd28P{zZA;?|$$&3<u;9><tsh
z<<PUO5}kmwq19?tSp-32cxJ+6)<oLjtR%!`6E%pMht7K*3jQ4raq3z_GxWOs<2TyM
zTDD79$Gd6ce0t-|g=uJw#3kR)$X!_vYRU4T)+S&TY&lPo&69!i8P?7*RU96oU%m6|
z_zawQ0u?rkO{h(?+@fPdkFS9sv68PCYJ{}k;qrg@yk30jOXCXV+k~vAM~l-RvyuGT
zZ~n${951i^|Ee*p`k2FwNGFi5jbXxJaBgh3P$HR~hHyl|Qs59r*W{H)chqG$X~Oi{
z(Cr<+ZSrawP>&{Uo?$dH%`|!y>Q`qBet;0J%#)s`=`=Wl3l&MyoyTUElFaJV^c=U|
zTncI6^bPUcm)-wWR;n@C<{qQ4h!2jeTVTY{R25{AWYDgHWdcEkfS?M+RF7MB-G12T
z?W{lh$@3&fgbY`FfO2Jlr31V1Zb+JU*mn9^@Z2Y^JtfvM?86#SST&p=@IY>BT~k<;
zfY2aBLI^b>&P=TRD-|S|IBcgNJV^cJ5gdM0k(-oYJPjV3C&#UkxXRPuNE6c*k{m`L
zORVCIP>;bjm(t6yWyZovO`i1TyPa+G)LZ5Q_H#RL+&%xlKl^{?Kl``$>c4x<&%E^X
zv$+i5#@%-+iN$F^(gHBl4rnUUtcQAyQC>@F>WyiGT|q4@mn%&7J1nrm9MKz_;?yVK
zNDf~4UhdfO1>MpWSvjyr`yE4WYMP+jcF#8%UHP}1e!&k*=ZAjziAE$_;_HX=I%}p5
zF&NBYe-X(bV(Y!MEiMrmlQrjv<ad68_B{G@uNsUsK@jh;66kia;}<~J5Y-f{iOq~O
z?N^6kHKI3DK$3hv<NC@$(_wDYS(qlB-@AJ#-}u@s`d5FuW5<_v4%xc|%@`WlaM{}2
z%vhzVYRF9FDF_~#faGS<J#184V1-D=9SkapQ%72)G_1)fC4F*@<jzmNnY}xA=o!6~
z;oW!Wsq1F(euy>|7@^W-s19<^SN~e|rf<m8{{1_Z{?^BDd{@l`mR*Z>O+uj6eBp=(
z*#m~iTX$%P-4Iz*Ru^V+-uCakSc1{W<O$dZ4s1QbV?3w`RlsRU5<I;mdkJva@n|Hu
zfs6#k3UzyLv)B&b+ptZ^Qb4byx9R(Ja58^)#Z`Ri^VjmtYwprJZ&hj!WoEExN>x?d
zcE|mbbDy+jv*bQ#Cg41{5U@po?_|_YNP?hko~V;{2nEw%RY+}u8`W%Lja0=kaG)Kt
zk=*sCzsTZkU)EDP4gGqNxpiH9vxxT<c^>(dQneIQ8O!b<2ltQl#*e>Mp8op(`9y;;
zYZ7y_CQn&gJ86+FV_Q~qbEr8r#AG8H-)drRCizUj;zc6W?HUB_Q6=tWL**Qysi=d)
z<1Ra1JxM?aBp{s&G4?7XQ^XKVmnuxtDK@dRQt2l@bvb|jKmU+jx0g^sQ%2BmdTu>l
zYs#j=TG(~>w<d}8Pe0}Pyu0~ba!m;)rFI_0LY_cf<Beie@!EnYEw36uvEDG3tz(YE
z^SPC!Tj|eje&UU!yyADM?)rv4rQ6W07NHv8352AJ$!4e}^4J;`j1Tl>j4`lp|LuCq
z$9`7Mc-8MeKAr?n=Saj5L~-h|RtVwnfvDI{vpU5Hf}+7;tl+(3vJ~}#b&>MFDI3zn
zk{W~Yimw_V!>Qm!A<yyS3S$)1V;`kAdG^0}u55eyDLmusr)iQ1uYb+Y9mnWa4+-nQ
z^md><FddeL16ddfe{;o`^vl<OoUeRqAG`L{^b}@_lq6&%#?$Eq%IW|Imtp-0@GmY{
z&yT(QyAM14(@#2uuiSSVSto_EB$@3|yAfmoHA)kh%&+*i_?ucw-Uv&#@8*|Z`%7!?
zex(QZeMS0n7e4VuvU}%O=($A-T_%hdNqRj(RmCbc21i1WKtjOMkcSGSrnU{s3wJ$!
zd5916dsE!sG^kjLPR4Nm5VO9s#*oaRoFyn?B!*R@pkr_@P8s?@)imU3N>TJMD8@NN
zh1A%Iu{FLS)HTv6FwGc)!XscZUwizg-~9Epc79wR!E9hy)lk>6`}QTSz3v+Q!arQ4
zJ8$wV4PdDOGnKP(-A0PgVCouIk4QAmra%2m`0)#$%FAEz0(si0TXe8gL3N9g$Ci|r
z|IiENu1|kV?^#@7W_m6PFiC)1Kou=VgtSZWG5^c+4oO{;4wQ3GIg?*`+A9uu=%o*1
zW$8%>x9+-9n}d5;FAi-+6rG$ZcqGfQUNPFVE;$OcSan!m(zOYVD2t1GbkF7Qk`tc)
zYmdt!R-=;c^c2g!fnX`}1n;Uz=w)e12PM)4#TZwx+K`!mv!0NokmUpsf{!5vE(*qU
z#L#KcC-pUXmNGVq`UYG>W(1ms|5uM|b`JUCXRqLf>%XP9+`PiUB_NAbzMUjv#t4m_
zq8u(VT56c>!f8)|r=K>*OJDdL&OU#;6zkBk+@s_Dx5-qtUfKI+a8fKpziRtS`PwsY
zmd||o3a#@5Cs3yrDo<h(Y-bifa&(Issya~bFPTmIbcYSU{;Jm>w#kf^?j%k86JICU
zbIs>u$_DLQrE(6N=PV9Nrn(v8Ym(scHpcWuH8PI-27;$!bEYy_-oJ+v9+z!Sv0|vo
zlC;~UDo11*n46tFVw-Mlq=jz5;3@a-X13pFX;9-$hb-;Vh#`m}%R3~E$9sosY9K*;
zO_5Gf1qjZA>M=3OAFs!qckj~w`l0v9KVJPg-E;R%4E8&wI*{59NiI+*byZ@Un&ANI
zyyAqdIp;lh126c&XYt)<oh~PDn^6;%z#LGdr09%jnt^ILm`Avj1AnfpkNsO8{NcBe
z=b8N3=l@32LYSI0_{?Bb2~|Vk3v6SU%BNXazK?!tc+0<etvr9z`G;yx_q|`OKS-Jv
zPrN75x&&7fq{bL1tBRuABY2Nh2d*JONK6tRON~tHSRxgVR16pPAGLKqY`B~!3`fg!
zw#>2YYFs&{Khxph!hyqK-3OLO@Fbz)Wfxt@$=gnluiU&>ufG1)I0#`9La;O%=wu0v
zD{<8b=we-os|1@Q7@Lv>3oab}^x|Ltm6o^OE@jhPGPQZreDdm7KWX9Dhu;4|uKeQX
z_1c}^<iNrZW6*?(LUK0DWOVbKa^$Go08zyzP*`~3%g^WeFMS2y^L@`D4E~yRy#;6n
zN^<~Q39Lk^3U!g?MEyLvIKOo7<ubGGrHVxL;`e<2FY(k9Pm=$B*{5~UdG;?J#9Bix
zT|#5A3ghuXe(;R5__Lq7MCRxn`tZ%|S}or!NwT0uH$3r161+pKr*29zD<pZsxb$%+
zH74TL*vJ`+MO8>s16ELzV$&R}Vg7M(B#on+7c2~x>8x8vni>|D?!k7`)|2=Nn~I4U
zJ3>H$M?%9{+fR`1J_DA=n`FmVuh+&|%+z|20$&XoRwLGTIuv;{f+B%rP*LQD+IcLI
z@Gi^qNBo)hzv~jc<+|%QaOXXA#$%-R8Zf98mVf8BG~cj+XMFGT*#09wLh?gD{J0s-
z$3OmY{oLh$FSp)!v)*#c&6I-`@~MoXDCp)HzNwfl3UVD`{gCCoBZ9(7+u`ZwZQ!(1
zH}j$&{MT~k1wW^BqF~ct{734VT~LoneA{p;C3QW(7$K3F*wdAa=udTZc-z}A>}`LO
zlAa_0uRHzayzb(c%X_Z-C^zo9i^T&AI#?c3Om{hH>xuG{&wnZ3o1by`g$%!_)!t8#
zn7z-#jH&AJ6K^C_>t-0;Wg`ub1-xR)lEkD0ThN$-#(*~o7>oKqq5-jn6|Xo`Ff%uM
z>Ep4`+fLYu`md4qGF;<Pb!3U*#1pnmu=Q0h5^09aq(L!p71O3+BPlZ$I(TaJxZsH$
ztDf4`WJOArMk6`><deDU+B-2JP&tpo(<?Hb^VDz8nYHlYKh&L{{sh&Xw=?CGbJovN
z<5AmSJoLLW1TEOVaFBg}^EcdZ`QLKl`4{N9ANlBGVkjT@zz6v1SHG$^+;9W?_U)r-
zDjHX6ViGz@PH+8O96$FS^(Ep*tn3?MJMi>V;TdOa;+%7y&Uby!sj~T$MEi3+2K$GX
zP<;zJ+v7bo6^U_#Rka_Dn(j$%P;D9K69ZX=kwtnY-!Zu5oierkCzam!O|J88=e!2a
zc?7`5@}Dc^S6DiD9h)|Hb~FY?!=sN_j@n3O&w7#Gb@iv|cY4&`5f+!|7V97cYLn8m
z1%^Zg+I~$Z5KMyY&v9T`IcekJotf`_@4I>HTmR!RFZ>(63;A$2=)Q74Rmd0*7n#l-
zul}JQYvZaYKW!u+ZHq~3J&2D}BMl%;#Z-|p^iWm9C~uuuI<`kSI>5?k49xPJr=P~v
zSAC69Rk3lZk88%9*cYBX_wWmI(_7!BJOAddI3+i17MSaF8131^T)!YmVK5#N7HTq+
zF;mw}cc$3X?Q+u<U*PY4@VWZKzy6zW(F-5(;$QyR&+1iI?~s4|%GdPHyYFDnuKVyf
zx<#)Qt2Jb4O0Szy*A28f=EKDyz8$7J^Qq6^g%_R4=9v-ao;fR<W&jCFGSIQRg?hQ5
zZi-9s-<XFN#A0hx0%J_m07WbH(op*x$ukC{K;G}+sPS%$*7si6TenRQ?)@aD`(>To
z{I*AYjVrs~tHZ&!Buy5ye?pHYOBgl@O}g$$XmH$mzI0D~2D|RvsT*yF4bwR^4M7{6
zqzINYG-Td`cVIk~O;}dgU)C(9>v;C_-#$6r{BQg!?|jF*^#kvHH|Ib5dHjnX`d4!C
zTYu@OKi((a_ELW7zx@wxz2_dbZ9S2TzVCTFcU`<m2_DxBu*{+&xYU9ZysJ?aybE-Q
zNq9LP(w&~7@(zXvNz#nOT9yYDCXYi=zxZ8+Ed0<}`o*ta%V4ydjhm);=YM$B!+ySR
z{q$>e|Cj%Pvr{E48;T?)XwA&rER2>29+D!*2WWy&6dgPP21|U`bdSNx3jg=le~lkp
z87MFN@go-h_x{`a8Ly1^^4GqiH+=I3hT{RQ_ACvSbh<Z9nkUT7Oi_o11dGWG+9>04
z#CTX^jG^D{v;EXlc=q`h$}hj|Vm)E&A)>tU-gjxz+@SdV;K~b8c64$_?MwRISzS8@
zUDrW+UX%)81i8WF)7X59MXyxTfk7w5CI!J8T%GM$q9!B*YVKj*fp_S}^*_KY7e3@e
z?y2+}yWYiIZ%C2WYP&fHMuONG#-WetocP3tTL5Q#&kOa&D^{c)@7H~!`<V$Ll2EIn
z+Muq9wE|Z`A_QacSx%G9u=S*K4!hvL{ky-@r)=MdcxC5x*KpO<U)J}&?>(IQw5M|Z
zbI+Hb{D~je=bU@~Bi;#4nMN-APe1jbKkKBH{!~FFj$t{*YeJId6j=xBGfa|lu!4TK
zOK3cciwEg$-pXjHBvnr}u9%yiIZW&Qk{6#Vy!hNl^x5ux`)}yM>#t>VJ!Ye^)V@M#
zLp2Yb2{2}3|7F{-EO=5MNK2^d0ULUKE`RsCc>c?d<XHQ!@Be`A+q;);uSe6=^!t4r
z4eMuSaV?9Yq=qC2D=SM;l6n1lPCfNh&cEQ<a^86t=&OF}b@G53?c{K>h_IK$E`qOj
zL{2R*k}?=9$?Wu@9*4ZsQ*4*PXvoyuM#?N@XnT}8$FemnnK8q9Of#%$YDboKV?(K}
zaX!%0ieLOIoPJTE!(49z%cEtUwe@>Av2!YY=A>l6-8Qg$v_j!l$Q&${21yfCx)e#l
zsZWNHaQ070y7O9=?sFH;_3Vzuub`nsHA)a$n?hCqQv^IC$r#BLmCSI~kG*elnh$^Y
z!+PEIJL%=HaosF+Ibym~5Ug_B4d3MYYrd*~^oM`I#`T+Z<Hn6V?}GE?)TeCc7v6Go
z&64Bc3a+fFlZIldN9hf&ZeqipNeCY1a;RLu*o6MvItHT}T!Za&&?+F_VM2XW@4xf&
zUtnfsh1vcTi8!j@NYVsLjx(Ohcr1zyN~%KBb{-pzEf@hP(wu-$loi*#_SJgMAN|Q;
z5Al!x<WI`G-~Aq4w`nsyYZ(j%G(KR`jHYpn>oL>mG-o{HOwK<0Y`N&7AJ*sp$O|6Q
zD2~{<gCo&Z*2R|8K~0Px3{bblJAb_nQ9{wfojA+gA?4mmxasaCZoPXS_Z(beZ+(zK
zGsc*NB<nF6DI%b@iqoZ}gpi};1dZZQqj8Plqga#EDW)_r%JOgzy{sZ(KWVBA8-ZjR
z=W=}0Vcql<S|sb)w)tevJmW0h^0b%8<8LIuY5)F%-0^2`xoY>FJL$QGzKul2##fZ8
zm>^WHV%Zs*VwR9^lk?wncuUe7-tY$5v15nc^iTiDEjQjkC+}j_V#(-rQaYVkd=SRN
zA-68A@K4{mQ8QzC=X>5uzf-Vz<9g0GZ98Y2ewu9BdZPaOpME2GUOeOtC{oMR)D(+l
zg=P+u_u_c3bJXJohqAn?<({TgWsMY5*xcfskK(Cb(W599Uj5Ur(e7x4b%`ZarK~Ev
z3)m#~9w$bqjNnyB)Wor131~YdX)vfJh$<Zdr_9W<^UGi1oWK0E@?$TXT=Va|<3IC(
z4}6fld-swgmZIoz+G(e;efv{5@4WNm^{;=UK7fAqQN`<~rH`G=+_ZAkHZgSao=(J&
z>^hcBitDc9-l1^Sjd%0;owu{M6qZLhA<J>aEVZ4&dxMlY*c`<ZbV$%D$|+bIQBxZ*
z20~VlC4HJwsmmHMicM$eb`)P4Qh_Q<Fj*HLgmM(vU9F(Q5nnraKYw}M)qG^?FZKM>
z&*Xo+=;3po$D|ARlz;nvX20}4x#ij~DN@UU`|j82v`aTDs6xX)Ym&M37oKv?bFQ-g
z>cK~QKl;&#*4)4Q4t>Y`C9-qpPQBsAn<y*CRDYT*E8;p@gYBerIvo;$Q90taJMQ4_
zJ8$Fizx`_+k7|B<{!)^ntJ0aGH#^Jh+y*vm+Q`;Tn<Y%2sJGga5be_MPq7#RVK|1Q
zpi|_SQNsRx`>CI@nT3S~%5g=NWk?!WKevwkd+w)W1Bn>!+jSS5dt}pG(=_^p&;MVZ
z|0732wWFJEW=nAN)Dx-(RLPSZ4T7snG%+nfm0&~5Un~uXB0=J4tU{3&tc+K1zTpI8
zx#2HA#WQ~FWrw}j&;Ey>m$|t)UiPw==`)`3j0b*}V?@VVuH)6SM4On$Cn(vaFx`e*
zC&{Ro)7uvh^5<7x!?k;c9870eP6~W4BiIBj9BLIbL)Bs_h(sMzsHq4N$8>`SudAci
zLMDRb86mNetw$;bp&`j*iMsYavfmg%dx|j$ibOe%IzT$$lVAHBU%&qA`k7z-Jx;S5
zAM~Ec(U3YnEV{7c{jjjWaQ^{@<BI;=9Gjl9U3uQosWtt7AAH|SzW9YJK6Bm9e_~-_
z2`>hlr3|YW*7b^<PMTmsAQkB3DdXV?hfs^qVDKo;E3R=2b%v?uzMQFNeIH@ti407^
zs1DG0inL&^*~`jx|A)ahuVL<a|C)`@d=7V2LTwAwEB(B{RAWxCODtUVXAExm5`9<G
z&xGaWMZ9nDWy5GxQHI0C<o3Pew{_>Ae3a8VhN)@{K14C0B&Dotf^#HUMxz0Oka>%k
zK$VtwJgGMr5`2@>o$j+V*pFtyh=ipr+c^L8|L}wr9T)C;i{|c|^Ibcfr>r5gLOo`B
zzN}_1E!IC<IpJafxcuH<(NBKm^L+k>JuDUL8BcA%rG12yfXCYrB1-TUYH1nfJ(voy
zv7wQP*HV%s#kmki5;ci~b5=0c5gJD?oyB{l2@L^<8Xq?qQ4}RD3Yz61)Uctmp6+rW
z>{{m9|8f}{=*i>aN!A|y3*QpIKSsOO&%OEL%YN?77f=5FBOm&Gy?*Dla_il<>%I5x
zVr6B8(P+%d@{j~!y4ztYO|W<}YhrtdiSy4*69~x^>o=^Un3-YMaL6c8(y3XR)|^Bk
z)DFC7WqE~}szRg-)?i2}D~Hq#b}I57m*bLY@i^~D2u$~<NY)v~!y`kngSX$tmOLTT
z3NeA;JkEi4g7+RV0enLy$)wX>MKB12D0G@2G$AltS)tQODSe4e0|)Nk1-o`B+qOL+
zh9acM>f<A>Wrj&0xOuVZrL1Yo`O;1I^M!Bip<Z_q+MT6zf{KmqM<Y2z90pa$Eh(`(
z!>bTfqav?FYE&^PZd8Mfxrwy`p~3qKLW4CzRS(dRK;kh3q=ou}#x-e1B_xKV(`Bp<
zJC(r3oELrQm-zC}{~?dNkv!hV>wf-c<$;EG*<XEHZ@TF=x&5|#xciRV_5M3<qN<0C
z8pm)rq^z3>rD@sevTyHxPI*>>1Pir`bJGe*YRSBiB(Vzb>nO{X6bX%_5w#OblIB$P
z2xBc-p3w{kSmVgEg3)-ucyYwWbw_fKjrQze$~7PrCQ(8#gb*holO)9&LueeCK%*v(
z2v4pyM79@+QV%vw7!CH5&1N_wBq&Q?+`-Jh{fQ@J9jp|H$>%5fhte904N<wO`?SgL
z?zrt<2AvHwS)Zi_)MSw>TNJSt6=}g9fe?qRRwXmUq_N=G-Utl=u{lT})HP}YRs;<-
z#s-W{V;x2tutEqvQb>tl+ViGaMp-pcBG3r;FYaf<`mNlue;1d2>l1p(nXi=ZXd`*B
z<0UVCnegHV_gbUTP(SsTpJLCR`(^Lmz1+EC^_KK0>^-=E%V+4V-@<TMf-2>3jMxyn
zcQr6G-Nz6JA>e%twL;#-H6_kKSu1sbjnlLAj0YUOxhb;3a>mI|J>qj#qXGGN06nOk
z!<!r=!B-9aP8Y2Q<f)CJgxD6zit+ebDLR10dx}m*-8h^TyaSs(aooXqv5xVQl_F0R
zYk)G+3W=w3W70IXfn0vz@AQskN7Y-;&_kN%gvtS~<wf(68^Bm37*wP8jDf1QLvOyF
zZ!>KnSSC-e3Iz3tO;7?pC_$?hHdnApXh*nHkqE|Bo+8O88;6QAchXh{3j>nrg#UZ(
z4lX(KmHa<vBoB9VyFGc;zkBszk-~3%@c@7NrElp%MO4sr4x2_fH^lKP7r#Y*_QF&7
zozLIRAAjy@_3NiededZ61=V0oo^>e42l&N{FXp$N|B*)=-gLTsy3^AnX2fuLNN;wU
zQK_VP#$Y^THcP0>5t?=4Tz*St5n5Esw|RV$rVPhp(j*1%=yp1UvSMlXeLPW|k6Hh_
zrCRysCAC&$HncP3wuM|fkjEjaFWz!J`zpcDO`{qMjJb{EGarh4001BWNkl<ZdrpKP
zk(5JJ5Vd&L%EmoV5~C&jo3PomGoUR6lhH_$ZWCEUOxTV>cxb$0+c9iw5(LFL$EX_7
z7>DyU`&JG<ig4?`Z?bg#r#ZO$E}G#%OlVp%Y$0euAf0?jgTtu9;DH9U+EVsdG}v~r
z4K~=8d1Q<jM-X?33OLCx4blNKOGq<{nI5M+>${a_K0ewUNzq~V{d-|%a|<h4(k#Od
z7ioOO))Tj|v4C~!*V8FFcx$MZ7I4KZRAXFfsm3+y)^B{230s$?vLQ{C&Qzbudo;;#
z#!}c0^<bH9r^~^XR4;GZR(=5|ac<uV)OAU>$Z&21VsVww=}a^Cv@@Q#-KX<?c>CG;
zVLcF&=Ndvy(>PH-eMvrbvcky%u<QO6LfR+TKE7T-@DxE~%ZpJwiV_LJrIk8XvpPDx
zhW2SK8>Y4fBIb}W5l5&^fKXPE>c|S%G$#E<NK(OuIAMxfGGl0hBQy=xD8?u&gN1Kz
zB=uK5z+KmT88bSFA1!LC6*Jb6Tkt-jL@GIfgdh>eH|nr>5{*Mm-dF+(n6@e%XTl?c
zV!)UN5s#V%hu}1sugM8a6HH3Azu~&uu3`Lt{+FI``m^Qam;Kgby1q>l2pEdq6w5A3
z!l^20nvpbz(7wFWA<Z&E2+-@2CK)a$xSH-%XQG+-NRRcWoWh=4zD45=&1f0P60%Op
z-u(yI+?%1Fbs0Amnh8#nd_qYS@1e>njh+&MCrt|uE-f)VJwsW0y3fDp32mvL-EtuZ
z_taWxg=<P_ywK@xo$s9R_Q~fMjy-AKr}P0rEQ<ON&=Bx#-&`;;=TLbNlv>xa*{mAG
z>c;EWc$(EwY(pnYKs=3@h!nQ(-86wFC~2BTf)^`@SnvUBg;Wi}*X(6QH*rWt{V*fB
z|5Lxf!CStr(~L>o5ECj=^%Qs#6$FDfN+TA<#z{Q^iz5kvOnpm+(1}un;@cva#k3bD
zB6#0K{#_b^fHx_ghM*B4(NH5rmqj;b;f5=9|9|~AocGFK7EZX}vGF8nLciZ<46z`X
zMQ$e%p>~Q{)m$`&g~bJ$^>Id_SzaW`I|zYtIH1TMT@JAAr(Vm~{`xcYEvzf1N%EWn
z2N&5mJBQYuay4OH(-<lW5>gO9Q7*{Sgvxn_W5@L7t=zgWVEsAgJn^w?@vmjwN#{ay
zyW*FX^mHMA>S0fMy%NWowf2x&5Km|~QEx+}3pU!0E~FR)uT{(6+=g&4p_z?4McPI%
zv31rECLx!o(u^A{0*R6)7Gn~`NF=idT&SsiEY6CFA)O7A*oWFThmmhijAZX+Z)5K_
zzNnj$A%$@i(vW7+eGwF#kFHS_n?&Trwr+5h<`V_0392E&+EO9nB8!z8gbX1g&?>Kr
zi~LPelWGE5p=!v}gmSpdv|9Sp>)Eq>E7$zRJM`=q{*2f&e)O2vb~GGP*Pd}%L)yXS
z1+E;SwQG~&=-S6sMW^VH_4_PVkwqn0O(=syn@8D}^7Lm)dg4~C_a9)mw9H0Ru&F!C
zN?DN=IYpi^SXm<VLJ%JbEyQ3$^dgaT&to-Ek4JPjZf4iGVkygc+6Cv&KPgFHvK5kt
zriU_(Bh`jHF^~&Y=?JF4VcPmd%Si7vB3H&7;%wGcQ}C-~1RN%kBoVfcoXzod6-(CZ
z#t6p{5y=*KQB{I>B;6dGPFST>A^1RWV9AasSj11W?*?xB>Xmv@Ua>iG^g>0ViaN!)
zl*;$0=;O=`lFc9{#h3(RAxaM?c$-tDQ&dSGN0&g3l10U-Ho5X*a0teB5GgQ{V@XL>
zD72vnV>*6>86Bi6H5<~3?&w~&*afERUEKbqk3TlybhnF5Y}9Wz7C(+e)c|>3v=}~^
zBqow8D=UD~o$gUrBSaheQw8XwZ%euG6)%;cD%R!<_b-u_j?_g)!o5oi*d(R!&|O39
zV%3oPgd`|gfTkQVJvBvLJBA3oGfrjGTi<pm$KjFNhMsNcBsGB%7*8Vsw<@8hk*v&k
zA$5ZB@wI><h>hmZl9vb55KKidCBf7LX$Zzei3<}$uOKiCBUWU{NJf;VB-jR<DM_lN
z9l=Q*xr`IQ_!#aPdx($i0ajuFc7F0*Z0Q90(%^;%5ML8Qh(vkP8ba$L8|PczRYgNg
z<W;2=D=>JCoVjsaH^iTb(1_qQLUiimiGv!vNUOaj(PM?UD}-toC5)?OvSyhLX~k&Q
z4a!&Ed&~>xeN9=7Ahg3*-cfY>m?U9Xm)NuoqckB&I;3d^s*IKwNfL`qpsYvK?$L{0
z%)b6&l5N{rObVnwOJxjcnlc^^$kGfIkDsiOM+oFTkb6ji#bXFrhjE^AzXtBJhG)Lu
zqIr(fqiJf?c*f0$rm9FfIfkSykVeAUo{s5hNrGU>Iiy|5L&#TzL*9h8HD<M-B>vE!
zn*he)squ}&jsuL9;9N`G9HOp#s{|ZSn&7E|e}IwPeU)YhZ_^ESL|s>y&NR-XcmZ!5
zK}Qf4vAT$r3L{M%b=B22fe7Cj1*;xQg*5|G8It2j5Q3yQlb}W-U#tca2?Q%R1C_DV
zVkaZNq#az+rE*HIKgVphPrY!E4O+4HpRPall{1FS8jL6s9N3hm8pk<yE0jJy{LVvg
zHeRa;rpR#OX&4dG8p)21?BV?X{aG1o+r~Ft$^O((3QYBT6cYJmO5+(NfDv*Hq^cz9
zun68}EGHQ^RW-NemQ!AE5u4ul3zr_RMiSD55rH~MA<0p1DNI7<AUB4h8PFZw%~W+i
zQ+dvK?ACAtG;Q9hk-J&bHXm6-E~qJlw1tIZNG8T2Hi=D<BBW_bp(&lkgsou%S;(V$
zUDJ9p5xjVOB81e$xt+C-i@WP;Nt-2%8=>lPAyz@f*od52u%;m~O^gBU1G`OHy+on_
zPVAPduta7Q(a4!QF?0=}4ig-z4%Z?!x~keLDNYqhGbGI^#|>3kGL<DvC(tbIeGHZ^
z?i5Btn@jmgZU|u7-OGeS9FL*`F2Sfl#1LXL`%!;_=UslejJBV|y+y%rs>fXi7LZPl
zapMSiMk7k&9JL0V1ZokMQ4Wf*Jkw)eC+DOe_yNv-_xq1)j;>$?Z)_wF58!=ZxU?Kc
zx$BaS8*}n>MqdY%%M0{oX4iHWu3_si5BOU9TC&FTC^~A;aov*FDb>oDt|>TU(;0M{
zf+QFwjOQAkNo`XCMeyMPMzXxTJgMdyW7?{2h)GfljRp)(+Zss-lh1y{7p*pTD~lFA
z!vm9`n5+eSWOpRCT@y6^zC9#TDgq${oO9SD!6ugBaQL{YmKv12g|f56VYSApVh~bt
zQk}y3F4lJ;9Gmdxi#~sa_%l!EMh`sY6mD4<lgyleN*XK4nT1}LYP!qPRL1^Z%D#Ti
zP1T5Jzw+gr_g{YRxF@j_n_!WaOF8z$b*DNMS%PV5&N}@R-u$Z9@T!;mDE*EwJh10c
zD})`kehNje7qj-pp>>17@Vys2hpXQ3-{kjy`M0A`Q-}b;>S&m-N-K5b<CToZBdkp@
zMzCTLBGfqP4pxJgB>rD@LL&XJyN9f*N|`ktWDOs02yMM&wNl!?tdYIMSWDG37^5Vq
z!3WUB6U04?0`6n9s0zK-T^bbCRp)CknqmnMQjE_g74c&^{^iF$A&Y<Td-~N+e}-mi
z8s`F9dpcQ%BG0LUa$sedfkJ2N7N$=<jaU59pC9+eG4a_Np;e<T`8=L+HKfQ>GGCE3
zCDV91evFhWOwVj(7^-7vi51Fn9MfErV%4IqMNa{Xka~;NCW4d_VPkmc2P>({dV&LM
z%VcPbi4>n2sezQpiXuX6COe|NUXCaLP4)tf|6i3%llDn8(mI;9E)W$i;zbA+)d;V~
zao|7*9yJ=nz2)67z4h@~RTVm>m{f3swFCn}EKUtkA$}E>^pD9~&c5+Y^22X@6YSZo
zH-F&2u(I!d7WW@uWjG|Co@UF*Cv)C8XEXDf*L}wr$7I9QSgf@gV#`U}vhG8T4GmMl
zGfQA&YRPm&GhW2xd6cj?T2xwMcW~WQ_{Nbqk5=({+C(o#24S_D9}AjmH{VA61I{OL
zw_FvcSM`W05_D2EZ%mFSkUc^P(^b_d-!`hPLAJ3Glm-(S=R@$ZDsN((9{_D?k|e<x
z#d{YS7Tbn339UzaoDK!XZQ`h{v3pfi9KOx7G6}J`$74)mdcszD>brlJ|Cf#!o}1W#
zYXl>T$xTEQ6CrUGc{#w0RwxW)so>VMnjF;{wuQ;mI817p!jcma%M44>dXnfrB03u$
zCc`vYo=&tLBJg8c_&3CSL{b`Z8WQ}2;KyxH6$zr(coP+A`?t*GcPG{=F(Wn_XDUKa
zkPJ<8yiM`Qr0VT`O#Y3ru|0(FsEMc_U7~4NcGB)BtA$>TI6SWPAQhNar~IFfZ+k>l
zs`x!VQ&6kJ2BipwDM^@;wB<Cb9)mYDG);~79$z>3x`DP(+$C*u5n-)##-UB}NK-LU
zlAsM|T4NE>I9F^8K@xo0#oG>I@^-HI;k}4HNSrT`k8n-3R9hoZd@uyba7jUJawLg{
z>s-9BBuP;3X`G8m{^RUPYHcfdb`2UPilmApA^uw(iT<;ZeA^5`B7c9Pt%0cETJ13r
z69Ey8vmPM?BsunW|1{0;8sgkdVj)0kvv#wV!$PZQAkr$AJ%lHzsv2t(M9johH9@gS
zM$zpfMTcDr16G;@Czjf|=p|a#j_`oe&f14<^-awxA+@e1a~|(JP0%>Mo=-Dulw~I@
z)D9=HC>f#XB;Gs`G8_N>037-;Uey3;8<R?d;9}>Q7$gJ;E>1j3g7xN~t>D|Dh3&ep
ziXO#8lwcCPMiEyHv0GeB+E&_+{=NpFZfb0r(s-S0>ZX;ATSq4<(Ri73f=s@v;&Bgp
z4M!Y#r;GD}`}XZ;dF(jxlrv?+_R}Ot8e2IgR`|&C$W?V(2-qygW*LZOWmK^^ERlSM
znXRYF^p=w@bdpRA?ZI}Y$J3M0B3hI8!nA~Sv5Uask*dUwhn(K+{IeAtjoFB4H`&$i
zGBJ+u81Scu)+?y6rZ5@Ldw{X(nxDrnJtFKnEO9^b5iyiyjY&IXy^M9IeV6d!_rh(T
zWnu44R4a}&T_v85JW%o=@s+H3N72LaucoOmSsJJENXd#>W>0>W@GoD>)V{A?wePY&
zCV0b>u}`mss?{f`=J>WME5T8yXUf-XF$q8LjP(z8TmOQ;{EJsIi2Yu!DRH9n04C|o
zM+a47(k`~~lLhpvC<}^p<M~P5NbG!^_!B~6+YE4x*8@T`imdFbFHg<QCo{8<bzt2F
zIOpsq9Tf{}!x@eF>Z+lHw%B+q#n~gl)>dc!K{oQx+Rg)w;-Sh54?c8d6CA>zYFLMX
z?snMlESg{_@=n{*zFK?<5Bi|B0oP<&>=2)y`TyH{_h8Gi`>yZv`>nP2KIcCA_U-PO
zo}L-aXl67INtRS2$+D!eBpYGImX%;3WUK_7fa3zYVmm;p5<<$B5vin-su&wcs*(aK
zu2exV1d@V30yZHJNq+<!f`dXKOMc8q^Xm6~owN5^>z6;)+UJ~m@9CcI>3jR7{i{0F
z-M7y@kG<FL{ri2th<BJekc!k*>`psQ`Y}B4aoByGRGMkgB$IR+g=oiahni6J8-XGJ
z+Zkx=*oZ9~-8Lt;U*qlFCH|LR_!WEqC~@hZ{}axC{a@1UT!C(fFx`R}OC#0*z5rmQ
zQL3}FtPr4<(_?03D?+|7Yt731ko8wpL>BI733eqT^qYc3p$iGG72}mvq#9Xj#;l!t
zfYrCXjpzQIAA@J#ecKc#udd5H<YJMdvOspp5n8!L64@nb!0f8YVw#X<4aGN6lKjFk
zK|rXQRjA8C=tCbRN+x;q{k{dMu+;X@9=aquIb6<5mN(I&^GH1+#u}=^E3xrR9%BfF
zvaL`gB-}y>bd1430#`1Jb>I`Mr<Nv7d1$iD13TwAdF2%z+kTx_zxIFd>z7_-<;o@2
z!Y&VJWIXa26<*0)ktXH1#|#c)Hk(99>T=AU`uEQ9dZ3zx9dm1Ev$X_~JX<ZZLP!Kn
z^gXe<sc0o2C{>)YySK-c$*Xj)e3L8R_y)iF<u74pPT5C4|8KJTBY*f<FKFKOaF~So
zcUg!ma_AGwA&t0wD8jd@Eal|M{$}B_uu3i8djYBgIgvkjfGyXBGt5m=QmIZLf@xji
z$ILI7Hxmn4&4Ez@DU9eK`?XUj2pLKj1@kps@^nb9WJ{efgY%kJ?ucUCPU){mrO>1a
zqb_i&z0A{BUgzA^*LY-dfw%2m;M9ee*x0_zBde=y`je#HD}*qmRaa0@C{%d42bIbx
zPGyC{N;6U{S6!Srq9_?dvKSoe!`D19D+VgLIhTJq7Q;42$M2?Ftcc_hpthxU4I3*B
z(*)aBFSFLvym9dozxKudln4LbKd=w~_rEO1>q&Cich)sV%ID8Y9?R~!q==g3?z|jD
zOmJiO+7@!=`R7{ZNo+neW+osWDxXR4W^rX<d=dpqICFE)vB2uIGz44tdrT0V5R8nc
z<Qr&uPx2gLq0%P(YG;z$6K<&yX@QDS6IqQ{IkngF=+=4OdEq6Vy8JCpU3{5Gb;4$x
z;H0I!vcszu8F>&K5-SW(A`wky^^&X<8KfXzPb&r_hh2e)5oujFdye$pEtRRD@<`>H
z=gm&a?u8IFqV+gK^LEg+5s6cLrFaM9Y0DZFn-&RDbKzh7zx=Hae!%|VKl!J>0{rlC
zn4BcCFOPCb7ee*oA@iaIn&Q&v<EHEQB`?VU6N~wV&EB)G@#jI;8wt0{hL~7puT{y@
zkkRHJcRJ}<*Rt21;okBWU92MXJIR@~vlx#wyGZ@GLFGMN7l>VpC55n1db2X~Wec8D
zBB?Axaf>0B6mDSIryKc3NlK*BtgK|pM!L*nTbFq1!nb(p(l>eH%6ZONOLOG{D@>^>
z$Cghd_0*#k+TCde3NL#$(jRtppgylJ(|eE-64(M0uq2%8igT7(>0C7{OOFqXxooWZ
zwbjxaGpXp(1fPV;*EEuMBqr@1PGRgF>|Etkv&z=?6;3$M(+{2HuYctE&wc(Y|M#)<
zon}UIA?k5`axL=)!i@0Mj?CW8dw2Z|A+prNNJ$lz^-6qReN26_07QI>B#k)p`+5?t
zZm>OYl5o}`WukX}MXGYf=UTehF9|br6(zNShKRXscCDpiZ(nKI%y6nWi<wPJGK^+t
zKxquURT(L`ZZ9i@1gd(3bsb(h#5!W=6YOoy+7+I;@LN1{@moB4^&+SDCNv?@Fh*p;
zH0@@q&4}qVfsQgpSHF-x%cj#cgYC39-eM*1nAN)Go}+BJmie~=zGHoEm?!=fSgmU4
zGOA&eoX1t_^Bi6RH)^=Nv&HGn({$UrOt&ucurt2$+23m)`P;vG^r2S)0ddv?pd`A2
z2-ABTwVZcG%2@ra##uJ!tgwZ{f10tVW#rV}XL-xBcu|xn%1-Q-gx^w<zgfj9=3Ilc
zG{os$r51}kFCN>W&~2{CR+>Z#<`$N;Iy@a%dmV>u98o$4K)bg`<rSP_>gXoZoJ^Oh
zmiHMkpx(R6#@2Zr+r7lw_pWeiy3MKue9D!Ypb&LQJJo?|%+^0Ib)u@*dARb(&-0R-
zmHAIawL-N*v_hQA%S6s0PG=8Q#jE0#*?gOlA#`SA;I?4h)tIysEVZl=*$f@>J1@as
z{PRa%*;*V&?*oKBoQyMz@5%`}3LVvJdbI16dJS2c3*EHJ9(Q%=_SEbZs!^t<8?WV!
zxzQ@Ec#>=KRvYkC<5;_Rh0~J>8zE4~JX#Ya5?msPmJl${1IdE%V0Hu|%V!dfuOAVx
z+09lFs^qE66;jVc8#_dmHbq2)k@Kwk8m><Gr~l}GHwL+ZKFO?9dw*W9x~b{fj>&XN
z@ClqFM!{0)_@)SWUi{7{_&>L<vavg1y~|0Zl^Op?ULD9(2s(>tbK&FQeu6ErXUpuI
zUc+O)+3zj<#Du6R_aP<scrwt4Wg;LFU5eD+BVsr&NJ=!ohB#h*`PD%yZp4$^58mQ>
zQi-A#scHwY%Xm;2zN)FTMizho9@^bvZL-Cvo6?j7KNSc~69x0Q<jWp>EF<*+D>T^s
zj!u5qH6F6?99i;6*LZ~T*#CNcVxRBj;aluQQ3sL&9z&)rI_(&VAd@Mt{#Sot(2N`P
zB-t{h`%Zb%-YzwX6SXq6KvIu%Q!49_$qpZUa3w$S!c{vPCycuZ&ZhL|%`BD#JLA`i
zY3T`-dVi^+%rkerfy%wVg^)}Z(;=co9EwWb<?g%MJrK21W>{)YGGH9)Xb>8V-}%k2
z*+U?Mdc4J)MDGJd`QCRv!b$D0tFJMhUZL5$NIkhovwMLJ?Rej*^27`0Imv{v29ixM
zix?fw0?s;|DK2?jYLL=1N>UKuadY|rnR8@_*uu{bK3sXoO+IY)Pz;~?$?H;DQ8KVZ
z1{BCs)iL4Az;lhG5{GC8o4)$SYlCLoj3>Dt<%18x+s~}Y`ER{uCpHpM6mNmeN_fvh
zXXaMm(gjwT;#?rLp~U$%Z<d<R<1z(;v+v&8HRsIUEH~i>|NpwKKd(Tiyds?kCyiLP
zRik9&ms$kxJuw7QYDrqrSwwKOySsyC+>9qV7}MS_$^8HHAN&En|M{on<nAjxVwX6x
z`x+m3Xe@vIr#?A<()Ja?^eRR`eO^6v$P7s)mC>B&GA@^xqS0_7v(3)Fyla+0u5-wG
zywxr-@F)(M-C##9IGBPsC16Y~g3}E9gW;UVIY-=U2hI3)_awdim4Evaz$dO9Kki;G
zvr$<AT*{5qB${ahEaz;N3}5mARYwRJp&np5o#cvI-5}!Vx)wdor7<8mCBy_Ffhtb(
zXhw>Hi4vtJ#mR%FdB||?{oJriHYmvrOK4{fSCUYrT-ps)B5H<jwIqlcYC@B8DOkJ^
zVy-~-jma1j5O7XsOI_D?><3Tjje8vv0S8?{NpDOLd`19CIWI{{>G7mllhI14A!AYv
zxBiwA_irnajOs4YAy$=jwmb_JFwEsX166J-n`xf#O+t*hoa<bsPtM_1I`$#WBu0=#
zkO-xt?@TgkVX_$>S{{nbV;KFiQ(nce`@RJ*c#@-(nDSO4zKl+!G6$3gFkJ+ZgewQK
za}G73i-D@j*j-&W1u_*i<Zx?F{u6J|cIlgVl>M(WjTx+>D)6$YC@96tC>e6JpOEd}
zLoMepW<%3`P?8&!s=+K<+Pnr4G3ik6@)UGPsAUG&BpzHvNO_T}_ZpTI(SkoE8NuUr
z975-E+Ma3FjHHrrugJ|wHOm-il&Jw&0)a5dpd>dCZzWSA8D&3+6jt1bB%=-yH3(`1
ziA*H>npJhAb_y7EUFWISZi0wW*9{?*DN{MPixc4p_Pm`c>Kv9}FLsDIoUigrr!>RD
zbql#sl%98RKFUAHqLR$WOBQU2B;Z;YNXBf=$o#A~oBEsHubIyFNUWeb9$co;LleXM
zf($!2`+xfe1@qgb#SfE@j!0R4%JIFIoGkCC<APJRMHr{ZiSdXN7O@mj6Grt4F?LKQ
zQ@qy$%E6LE{jH~q5{0RFE~v1l9w*9r?O9C;3oVUPBxmcT37Ye-q(;=E#uAtp1p2)r
zq2KS1__A~sdrnAYj?y4y<JEe+gdTik@yzBtZ2$30`>@)h>>nTK(Nf~RZOPo_QghVm
z4=9OwMBE&hPASk~hvQ?h1BY}0FgnAs#GX2P_GgrSu_k}1gv-lFRET86ykHI%`!VJa
z3UOpv@s!)GAOLlZTEujZq=}GPoGQL*Xm|Ip+S9g)7=$-s$JrnFeLV5RQ&Kz6*Z#ME
zWRrjK8$9Yf?Icpy4YkkQj6n*{amwF0!*``w*mJWLtwryn2DPtwqf0#bna?0+PQTFY
zOuqDuFMo;dw|<MWzA6k|u@ETDm%TbQk|xw2rHVKtB&_SG8&4PWA$JB<B5xvEE=`+C
z9w5z|=6O3-I?yRthYwjvk_C{4WEFzPxk#{x#TF21Dl8VBc$b&d78O59q9uZNU=X^<
zNUBU}jU2l4es0kn+#t5?d_7moGD})emUPHM_OnC#Kt2xK+yh0Wva8Ch>SFuQL2hTn
zl~+5FNFvig?CtL241CqlS%)QMeBuO;e(KZksUHI1?3D|=@r~carY+uAc;^W*(Y77h
z9Q^)qVG~nt@jEJ^OH^y?to~>JMQ=c5<EMVYrmwyN?G%Wa*i$pyrZ4Z;0}dYP<r6{5
zK20o3Um4LQM;QCi6v;%PG7I-~zJyY?rqq;(P*onY5tC_zFo9ao+M~(PE@4RK=;<%(
zBE*%*{Gctozh-1~R^8~hbCOK)R-hvCzJ=+`)y`m0rH{d@3|eP*VI1uI!EcsBCtqcp
z*_eni&;^)u9!@Rrx{EStTe=kRC|wWPTGd3EE(x!WC_)5UBA2K8M@ueUy+YdCV`7oU
zvvl%B%Br>=VYHPr5;YRM5nLo_hKvmo=v*SXRJJU;q6ZO^9fT@d{~rB4RisoRo~mZA
zvkY3^RG3vjhowLYi9}TZ@FG?iqZh$8)f8`<QF{u0fYUq}y3BANOX6-+#WK2LwbE=F
zHKV&M28p(B&v{u%)9!+@{o=uK-jhNkgf4Sn)IxN?-p)c9HXy2at)UY_%p)o4kGC~t
z0&d)3e*dktx}sVcp`j%f2D097sb!=UXL98HFD8i~MoUk<5DG1B%EOjwBuPYxh20<^
z8c>NudJdR8&yeRDT2h*3kLZ1UWl&sEux7B}?!jSz;4naN2<}60hu}WATL>-*I=BP~
z?h*(doWY&o!CeQJVR`#@_ieqZ-9M-5-j+ID=g;|0cYkec9iqu1Mw`VEwP&%r`_~Fn
zF^1&)w4G%21$2tr!q__j-zNr~?RMAyd~|uw``E>p+vnKH3{GNB7<+#DKfC}tULcpj
z1pFOk&Ups)h!08Kq<)_xv5?1F++l~V+Jro<$i%+slM2X~3w&?o&0A2KmRV+y0=`fC
z7{sbr{J>|s|1m16FhLW1wI(=ax0X7ZPV6hy4VmOb1B}@|$IzwX{YqLf%%xT6H2p3w
zLq4ZuFNdryWl#5Ohufi>I++~r2OXK&x<Pe{HmU~8+pC$`)&Q#Qzsi5a9BmCo<!?g5
zjVYYY3{o$fNWVJa%&{^yYtFTwL|XF^pihpYBDE2rrM_sfwqGUpcvb2{&_A`Pw6)Xv
zJAJhHNiFcxPS+)aRLlx)?$=jNPalqG;A*a*!AC9*LrE1?!~6A>In~z;kEIZf<3g@4
zM{mzj@1IC?i>AZCRx!J!t>F-+_~)_p9IDX$t#iN=$kyVv#-@-&lE8D44*99o!e=#D
zv^c)$r)w)9&K>lAs&$oMSzoy2Y%_I&h=cy{95Tp{?dUj;YpgvL_imu<t0MhRjWYLG
zlWQNT8Zv^5FHCa0=1O6oQMfp$-$xJE1u*eS7j>5nmPC0V*r4aJ0$L~uAj8GVpE4K#
zs2ZW#rT2(0OB?&8Eu#^ycWb#Z2o7g+n?f1_j%N8M@~L5ux89ks)iBdfaJ>W`V3a&q
z3mJv99>F~lpEADN-SROZOFPMh1e4k&-gkN7Pt|M%f9NcSR)^!p+u@wdq)%d>b`D?c
zZFlHcpmBEG!ZdD*brXt9-#a?cb66p*<cbw0sGK%9I^MAmhcnV2wher1422Q1Ae%Bf
zYajFZhD4O_BMh-kh(5`2gBfvT1SXXBbt*c01XY9TbP5`^>P)(-*HU`ala11ZP4}bB
zYlDyL&y+Q%9#3Pz=fs^4(<mMu5yLgpUUK>JeX;q9lW3fa=Ia*uD~<`f&!YMfII|A^
z&Q-V{l1N^hQmwP111T4{$gW=^!eT;xMWJNNibgPRLa$Ivy4fw}4AvzHf{h)JV@tQ2
z%dpzp!XdG3`(rX;DVv=~Z$64}<!7;KjG<Dv`sG+v7FM`NOCHj{bAnDF1tEBO!E=nz
z#g2!>Zp%M#A57Y+n8(JwE4I!UV}Exvh8Fv;Y=4OpHYFpk!mn5lQ41_(q++v+bO-M6
z6pJ<(H1M<x+dEDXUG8!A79V09?pXFHK&HOpHxa=Cv5j>I^7Lml(tgBdm+RoLK|3>V
zvW$LE=(l39SOV}pKPOJA0-IPeEnwlH&JCiysZ9AJYCRp??d@Mqx@>cI?uY}%QQQS<
z47`qJq{!T6L61|(HiC4~-!OhKDk#r=JRxwfcbw<{aN_cw{yUN1c7X1<Im>m-20*>&
zkDRU0+(}()L%*$aBtP!ANEziu9CqDdU}t>_Pxifl$gg^6dbt)hr9DnwN}Vr=k1hK%
zAhLS4z%6Qpa`#lS9~d&V#9GI_TR^-f5WXo)Z15R_U9E}0x<_@4eU(#fGb<~0QnMY5
z?u!oqSr?rZa%t~HQq@Q3t8c$~bARzJo5ly;`+H<hQMVJSw7OA2#oE<-bvVK|gDL9e
z7Ot(%&e)2VAQv0R@|5z<=GvRT2x#VM@2JAC)$wr^<sE)DGGg10{NH2QNd8mPqM7Si
zk-BOP)Ko`&d{wnez8|Ketknch1gfdPW9*NfL^3iqctQ&}-@;ZE2f<%h5D(Fq(zSkw
zGpnXTZ9lcpeU9#>-obH1$ru+OJchBS)H1qazvaxC+qfka_&(8aHSAKF>xMcXX%cX}
zb$QCmEI4DbyL~0<AW~D`>7VP~+8aqN0`;d^wd`=suxk07nZYaL-i6$%k1oy@^RGBj
z{fh7Xnp^cu#K$-)gXAd=#=<cB3kAFG<bd7e^@)dSi$F}!@q0F1$f4Wdu=d^Y?bAOq
zLpu}#cM=f`UiSGTs?WS4TCHP0`Fp@$te=T~3HNyP{5&aTL#<{~F>LhW<vz$A2q8Ob
zo#s0D7}RtwM6w|W>D_6K3lu@kO72gPuU@qfj;U!;aP^X}F-@d-7;3v8?(&1I`#d*i
zM5L;A_4tpA4aH7KKp6_ZgN4oP6Cs2aoC?E*ss!q>rDXZEEvShrs)HMR-g6cj!bSrb
zoKbw_7xX(B_K?w^ziNTc7V$w!#lfE^;BBV&H0cJkOr;wAG|wwE8zpPE<SiTG&|hxJ
z84E1~vS)Y&G!0a=9vu9%*BDcX{>D;9kOdPKflH>NZl>l%`Wwjapw4I%%NN;Tx)CvG
zoCyfL`M4@&J~>m3($RD_Hf#$!uPm)^*g{x-xNC^N7>^Vmn!974@ru`M?Fn^YScCt;
z@Sow}4F8xg#E0y)Ngbz~!C%OcV(m+B&ocLrsTb2zB`i!-HjqGHH&zI;Ui3#sR%aZB
zN8jWHJTzP;zf9RUvmcUhDA4TW(}!KnS5Pty?{72B*-BeFEEg~9y3FINl#Z5GWR4Sb
zE9rxE>gtQ8hNvK|LZ5T|Wp3MZ_DM?V07ZdgeMKjQ;q4oG*AHJx44<C7R`E`J#3y`i
zJ#&+cLEzj!H(}POzx~u(bDZ@mLOd=J4qZd_Eob?T*&7Mmc8F+SUl*fQs;pS0DjhWV
ziyguN{A-C5)#NesoHLOLN9E396R-?F4E!R3ep1J?INq}i;v7;jD57iOjk7aOVKIdG
zLms@g^7)*r_TfN+vt$hp%J_FF_?7I$l2jEx%{=#S+{ghSJXfzsWh2S;h!DfoZI4(X
z)yNCtunlteO7(q?2I5pKXcZTF$3*I9PfJGBTll=VXT>+D=R{z(aq;PXtzE@98DbUb
z_j%&(3`+S$7@uq|D{_KSU7tGc+X7CaMUT!LIbkJS?&II%4*qJVAqCV5j0R#X1s%8-
z&8|*oho;HwhNFEwIhDe`wjHfzY+_18U0unvC&>O#N|uDE(8u6W40tC@UPr7e<o}?r
z7bqZl5AM7!GG$O0i&4Gc+{{Vb<b=F8R!G<3gPiFbU#erEbIDnu=M}dsg_Q6X$#$<Z
z+3!zs;%VQ=_}nLO`Gu|=s+S%jVVLvg5*YeiQR;xLsUPyT-S(;gco}GeIFK)@1oVsC
zEnmOTG%{Bo3>(hNhQxo!p1V*}D(te>Z8d$K?(bNzbXpDeSn`}6c*neVeD!d)*CEJy
zJ7H@tpT(~B##YlM!|<nL2ooqF)BAGeA#W_C8E)Y|=kSv#O0!p&c<K@yOkrrRE}F5q
z#lZ%JHsGGOt)Fun^w(j!#^>NEuw})`<3eqpkDtzyZhvdqA22%unY0&q@W+y~a67$k
zMEt?o%xsLfHD>tH9OK%HHsrq10~5G%?w4`L?Ux)Q6anG8niNe;Qono+^d!6=-EJ9m
zy!0<~;sU>D!(xm89HqU#Myd~naQ1-2${3tGt2dpOjPrXR!)b2>i|&6qiry%GSb7;j
zdr9IK!-fl;t6}_MP3ZY+U|{QanIr0(AD$pTYN77CTXv?8#<9RNzGoK>Tx_c;1)w`O
zDI5pFlsYfJ$1kSNwlAS@-p8C=q&K?72zU{sg_51!^&QWNRGIvZR;nPDe4Mg6N2cU}
zoNPE5SmzGg9A{W#8pA64jNI~5F!3KVQ{dgrbt1yDMuA^CxXroZ5_kC|1?=W&tP=e7
z4$p{m;8ENUDOVUkUS^#{0W038#3D*zeVUuJm*5Gc^*TJyZ5RWiRXR^4)doiW<=x=+
zEa4f1ZH}qtCo!k4jZcv=U1hHS#!ABkCT{TO8`)y(by5t;4s}T4og)erLXoW1u(`!2
zM^hDzO<4&x5<NBHhR-kKL7U8f4T87B)4b&!=Wy$HsQ+ad^7|J?`drRP@KZKEYMD<n
zo+lQSFmY~$>W{sa3Q{iabQ%g7#)`EUY7n9L9IoFnf<&KP7gv2qNy`VjYP~lPxUvHm
z20H^zBjK<>HIsGG3s|SYd#7;|sf<uQy~TW!O1s05r=~pIR24o}u!R18hWADF1bmTe
z#DXSC*+Ffje{PUb{7KyR6gAk$XWzKjuGLibTgp;D>y)TR{jqA2UANTH#55XYMFffm
zs_)V;7>67hPQa{-D!c=BB{s&&?`KvkR5){N0t1brWcR4)?QwFZJ+G%A{e@V<RLP?s
zMn+HKm!5lRHZy{cq<g#XU-_)FCLB2ShEOV8V#RP_dK#lr5oo&dDhMJyxf7~Z4#XRU
zYS|*vudJ7`MPCa5qLQq_PH3BHShVBla<{%@o+yLEtIf0Sp(`@olE^2$96Z3jIrBwP
zwQpx(U^<zRbDghjkiJ41SW8)85_B%sH1j8{@`_Q87mq_Iri4(J_4Bo7WjHO9FNfxc
z5w_Q|H3@1<Rx$x&KQe@>b|cpD{Hx&~QH|?T)&c}fIjk9Jxd$Ej7w6$*$I8mhN02+K
zaB+sW$aPCJv~x8fbaiJDtT6l+$O1X}HH;m(y)3?ViRmRW=BGtZj?1ptlQJ!vmsg?%
z=SXrprIW{e2y{>W$D$UBdI9k4kJYlm)gPuzpn8WTs&(+rGNEX%*SZkSi%TDCE4<Ka
zqU<gIdrrSUB|_zxXs-=G;%cq+b`7!bAf!NcX;0r$QHtq9?MEzwdgLN^Nl6vtWS=(`
zKI$O^@*zb5%DKp8rmux`{iFnBW6AAF>bKdl0WqH=FQBU-TwUwtSU@x(#WbIN+v32P
zw8y;(@L=_nDob?qV|{cULJ(uLl`Utybh)R{3PvnalowKJ?{9`!t<V*#T!4Ga)wk~c
z^j`2MgzvrQYg)e<NhDZFfEYCRGoM(E1eD0}{7>rweTNe&un^rFZvpjhzBv?4ISROl
z3#EpqXK4`px(kGOmNud}MVP9y5utnsXv+bw3VW%0tMmGCV}J?;P==G#!BjUj*Zd@H
zR-<Gh9AxQ^g(-`vq%4f)_P-KDb?tlVUSbcc2cn3%Hm%jDxQ$(fWbsw>JVPD(N*+Qs
z%J&%nF_jb>_K)d@o`R;}WM-%ZPik7@=njlSBVzdSN&A)75!I>-(elc9UrhO{NVf=Z
z$e4wEmYbaqi9a5(d>3Yo(hfF7uKyBY_d5JEsspN8VN7J5W#N7qMUDHD_6;X1l#a{o
z({iMsL&CFbvo&j7eNE#&f2t3`@g$4z;bfpK2n#r*&Z-D}><sDjNsv^0OK$m}>!&2i
zx8y0WAE)MwEf$rUp_DC@>^)ewUgv<&_ULX3*0j*1SKA+eP|85G4?|8rN~yQ!dw&#)
z4+)G|fAIMaYs+(h^ef?^6Aa)ir{uZL0lF7v$aE;~Ta+(wptU-d$Pf23yT5W*Yngmm
z>wbo-d?<I{%t_%^Mh47e>%Vc}!R!l%>eUII`4BMh?0JgHuxDPLfTm}-Eh%?Jr;JaK
zHYY_|T0TonYgHcw=||vY`c+dZ!X6n8{$$K9mjD(5@Y~dgi>T=~&ky%o(L2kd(d}z~
zdc}Bu@jwpuQYWnTb;s<ACI>-M=*NZFQ$;0tud@eBjbzWU{m~!-e5YozZAq3pE~&SE
z^&4(7+E}v0OSRsAzTEdPJNHQuJE4nW&-=E2N9WOuB|Oa@TT6?-mPr;P&g0&K9WxF~
z@`6h-NRUi`)fDe}hH|u%;EyZ8<c*O48D*5qzxm~TpG#S-6K&De)pjzG0OFV`-k1-C
zBzq!wD0r<BWOR(e_&4oa^=P^QvPR?<h~sPpw91n_$;YVE3LqDVL`r4b5~1{a7i1Qs
zv@G>4SM~GEjl30OcLAro4gO*HV<%UtwTb6T7pdv){P+8WWFs{V`XZS$tjJIDwNmkW
zubnzm0}4f7WASgiz^rH74Jx^sWF-aUWf$%E^oHodDKm#IGk+Ad0oG^9(h?c@YS(6&
z%F+LT5ZS%$Ke~!O+ERz5viQKqy8cupHmQAEd&y+{vvc|tIAo>&{6l0S!)iR<p<ih@
z65VOS?{yrzOsxHr5WZnrQkF>BLn=DePe#`EXNVprSx3fdr!44Get8Q@1fK(Qn8nW#
zn&jDR9ZNZlKJT%0MTC>!=k?YKj*WsW^-9+KS}pb5kYk0?^b-;Y#@&1t3g-c>$7k&&
zPKKkt1un{f>}FdCPWZXv?gnT=?TiGGHY0>;xbD77Qn8wutwJX8c#|#9PPd(hF~q$O
zAgH_1Z#7(`?ykvc!p}SnO$nnLr_0I`JvW6nU;bIyc^az;zI)C);_L(+(yuv4ZpF($
zJpvT}?06vYx)|I7{9v~P`3+&;MeC00e}ND#hP99gN$Zw)TnA=XyT`vQiQE2&yDNL7
z{UmQ-JSa>07HRC`v3$s$;MMD9nAHemqjTttzoyqO>{qZVCRmb>QHD<Kw^CcC=3V8d
z4kIp>;;Fh+RG@BR-ERnZdHq@NG2MBR-DK}mdS|2adypH32D)8evR|oP=zkJt$p_W_
zwc@s?m;CWspv`DhsN`KkWJ{_}<?gBsw)1iSlyn4bn22_ky8~z$OSOGz{!&bmN1z>N
zJEY!Y+m2yF)0r<awO&h&FXm5J7)zBy-N{I3v;X@oYMBjw@{VL8nSu?U*~^imV=fbd
zF^~^Km7wukWjej_ABuEz1lteuXSTojCzw+i@>Ddur5A4ht)nsuF_nR`e}V_J3ba_J
z^`w?a&=Jyrb28=fd?lbRJD{*gAH9$wvp=nLbb$xY6vu&jBVFzC36Cn3LCaTv9TS0;
z#j5OUbMqdW_mJxBB_fJ%iol+v!9n~W*4e48!hd5{L3r;5vTRNR#$;}!&ANQCD{F#Q
zaZEjDW!p6}+jPB&%TcMfzg1Bcpi@gqZ}yeasW8P2IQ;bMJ39rd=LGK8%36%ST{cC+
zrz_%Xqvo{?g7$y0N^LMHi<apNA?Cj9EN39g1RhxTB+9s!N4DO?!>{souRH!|QOwrx
zt{w<BxMec=9M1Em5>Hpx`v2Mrf6cFdH*(mcOm!nWtWY1AVl|5FCNS`&k7i5u#Vw6R
zs1g-qR4EafP-fW!?z}5W0o%oxodcZdX&wkA2F4#)4L!qiS3aZC%`!N8ej72luR7pN
z6A<t@>v}os_@&%cqjQidVA0Q=6MCm;r(~}&yQ`GWXE<%Q|JOw0d(cbl`h-B!?QdJ0
zWuGr2=qBqK1UjJFqd}u$^DQSeZun{Z8h$KEE2UgN8G5qVIe6YuTf4QoS7>7SgS8d5
zTp_;G!gT+i{XTRlG(7Vl_!<$rfOTZ{wqVsVb8z0>t=Pzd(dH40OFsEUoAJN7VVH)d
zD?Fb!PW(wU;2a5+?eXz4%xYtyJMVVQ%&wBN>C3-7eC#=ow?uy<nbpk#%&`T8jeZ9#
za6K_5dW%Ap$D-EDL~AN5T`oeB1Kc|{D#~^aTN>K;W?mk0Fzd{#KMU>AGBzfR-Q+fB
zd6lw=tY*J34MdR`bT{Q}cI5F02^1}*Yh>4%VJo?*Tt;`@2yCxPTnd>;1jeK-=(Kn|
z@R`c{?u;^>J@)3M#lP&l>?UN?zYeFYOQt&b;>J#EHlDzf#->GQ$O$v`Qb14z{<xYu
zsR;WmTKCf3b&G4YbAJn)j^^)d+Pr@-7}Is2>v+@`zbt_RvLs;4r+P+4_ZXhvl~_wz
z6(WklepZS?VCm#eB8$O+Nt0Tyop=73OS)lABNJ*Zf*K2RhHxY4yzRF;brLXH-{Xk@
zo|mn>m)485+x0#(VHH)nK%l7~#U)eIX#VdMx{nR0uHkuZ)hT6K9f!pQ;OfBl;y15E
zckn9A8uF5fHGXJ;^m&0w8;(Rd+6+#jkyZk->P&(ceO96GwUbf&{t}5Ib|HkAy)S9G
z`*fU>0al6z2|iK+`Xn{e3zX6>95Nqz2H7jab=hZjqFFetP+TM1K@$WJ1!ShSWoJ0T
z89mAYm)<eGb?P1&R<>;}4`%r5!w#s$mkXK&EVpkxAc{qgjRphFoZ2y<WZ&fa$f9|$
zl-z2RB!tgm1QhGz)TcL+#zmuebNbyMM{<R1E;`LUat3x+SxY{sCANM%VKZOYkbUh{
zMB&w-&^I-<NWM6x$O}A2P>7%pYmz2y;*{UQH<v?8bl;<H5mTD>jts9(2)|J*OeKva
zM-NEUn*|1Xo@&eYX()c&t15U*7MY5A&L)AGyxq0dY$Lbmiknbo4P6_l@ef<n3m}TJ
z$4u_GqchShZu75P301nh+GWU2pRM#HZsPA}?nj9~OChe%S7V@FUoo|RnVead^m%4w
z*58onz^SS=r~(Rg_1l-$#&VRHj|Jb|;X<9%ljfJW?uKW6%N%-fQ!;r{KM{62;^v1#
zSLPz|)J+pd70hr;5b){rdNR~87YS_p136NO0ZOMxef8`BvTAlUMjIJ#!41$fMXAE9
z%<RY6k4buH#v{i%m$v0D)01AeYm5&&69JOB&bdGQoQ4+<0TuaXenF9*pnuI_zbd{<
z+_vN`-iicYMXL?l<h=lHrg18oLOl4v^1jD?g})aNOPVO)f0^O`I0CD)G?H4uCg~tU
zbBxm0EO<Fyk%zxOJSv>$WXd+2^Go@}j?kq^1k4w4Uh3au{n#^}+zG|Xe0X;6j&u#|
zFoj4BZ)E--zw%GS2r~lMmGk1z2&P_2ZuG9xu)h`@p7&6*b1Mp?%Y<oy)Yzyi1fthl
zd%VRTsDmz;gTCX|v~NwOJyrzo+w9<WoU>$NhG?3F6Z(HYEgESL3`muLA56g9X&x<_
zJtV>9t=fvP9kOrx;oEGLmyLAJu|kw`fDJP<9tG{_DTVRG#^PAb0+s?Lz7dMR!>H5<
z<bzV8D{2A3uBUr0j6VW`&N1g+psoYbha#FgyZa)VFYEvKF=cZ1HW=E_1d0Hwd_f+^
z?~+t6eZpmv$XUO}Fax+<AL);(v%c<HDq*oRs#JNPif&S-GxvSu&pwkR*;X81xsnXV
zl{c+xW7+CxSPq2p7aC<YgdG*zzVfeZ{#<V)Bw6rUA}h__C1;?gwgu#~e38j!4UwT-
z8KU(rTbZ4T(^e%V#_y-FJuYScghb?lTV}84??GL_kB!doQ$Z<T>kmE4uRgK^EU(ai
zhrc$!SZ-%*&<BQiC?o-h?Ww^^D97aEcGN`}dQt9jn6Y>!>T_e(`st=Q9GE?8)d|*}
z+C(?t6~E2>4@;W&(3Zg#0#+|8l_MR+RyhwgkNTb_ZO2FA)+uOUSHtB>?D2kjlR;sX
z&i(*}<584ihn&C~?e`DSg)`^JHW6*FXru;U(|IOg4J*5a`hM^U^)xws$2s)2W*I%m
ze<B$q!7=gV@OboB^a>&O>CfO!y9jilDSW{yG_4n7d8;A7Vi`6K9utvx+6;_TXsqn9
zOa)^K7b=)cQEl697o$?<-A#4%R0MCWLpm^PYJasox);n%RJ@K`xsw*X?~uTV4_L@w
zUktd2jRV08p2l^9bDT~5<_>wWm+>>@K_lLQw<Q}b6FA=H36JuMZ>S#<yJlam_nfc1
z2iC87MboZrerUeihGRFs0*?O)TK;qW59soik$gL0lqqsAiZv8V>GFidD|D!dAku;V
zJ+!&4p1sZK;9W2d@I93FRSF!U{ojBF>%aZ_e+pi~&;PCa|8??Ty8q4le+mBA9^4q*
z-t4S`vrVt%@>s1)v331ECHc#+L+McP)n#TpL4k;`WeJ)sn)IzQLOAWsjM+HNUauPJ
zIEhF5J$dp&%;q=^-9`TquUFx8RiwphaBeTcKPWsfn4}08v6XmV1MaQr$k~ikcEKe@
zMgC(QtTt-=edr(Ptvl}!Ke3HIisLH=?Cc;8?fu2mjZJF(DXGmc+g%SRV@dK*Dr_E?
zzIbdCSf-=xTCUvtv)`?H@f##&xtapp^8?`BY{bUA53yGF9mV2hD3(#OyFVjBF<4Te
z1aH5Bf#g@hw7YvrUjP<ThJR#WjN7+}f{aA-zEP`hzjNK*{hbsf7ln2l8DAwJQe6oz
zTz*u}bD))V==-RO)3NY+4lCDmY31Y8sM1yaNH5kFfM?kCTbud_f^$6ZD({Al61t=U
zG=YeRN5*P?3NP_;g))XiWF`9ELH1ZUUndu_$yV7tOY*Inn=aESlz^pQI(PH)Z^i<_
zy^BuafMhKm;!y&gh$7!1Anu2ue~PE}t_;jN+9a}e!llT_DEv%z@qidSJXXB!*$vi&
z!`dW;hOb`u*a*=aOpD5ZlLT=Ao-y$ON^qmpY9)@q>-EmNx&3*I>u)&c=KRFR^3vpz
z)ts-wNjmAmqe7!BQzA`E-*Z0H`QGG9*LeCS{f(iPFrgbz01y}lA=5McFrd?zksW+Z
z!YlEvgh?u%y4{bT5sSG;EHG=f0%kp>(Ga*M1qVy373!=q5zRz*>)ns5Yg`@%gC8c9
zJI=P&dmWqxb@)mt%GEWc_zG`uc+ypvJyOppj@t1V&ftFsBmBAFLsz-hFZ_eJNKu-M
zH!s(;K{*DDr$**QS?0Rc^%~!z#$Cldk8_v8Y;r^7sU=ccx}FDvv+w?qn_zOxsE^%%
zF^#1R8B`7W=)v0=vmwp{9A2Or_rq8Tk(B1Qj4h8lR1%MSRwp8BP-T<ft-fD%H3v_B
z@0Ncwj2EO~@VhaC&)uZ3W!c>IalPd1pgt~o4~v)vB(8%7`t2bn7w`PH2*WPk&P<_K
z&$DIMIGB`)ap|5X(mX$5_RdN4(2v&c`aWGwz_%y<_Se8Aj@usy3MV%SE32zuOGU<B
zat@-;9eLYG!55_KE0-@@FLUrcF1XO)iSf!BwYE|^6Q|m(t*-sr%~PAtW%yZYWKfH;
z8rGXPZ)6l@B(;v!a7kYaoBTD4gI|IhtJa@hWJ<cVRxz1rf^U=qPTd7)NIIVCjo~7}
uX(M}F+|=KMVDQ^blP5S`yD-!J3&M<oh4~yzkmuFk8%0@=OtsYKum1yVhRa3(

literal 0
HcmV?d00001


From cfd6c7344c0d6db4b0d0944602d1536ba5c26597 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Thu, 28 Jun 2012 16:17:20 +0530
Subject: [PATCH 082/239] [FIX] replaced the Socail network module icon

bzr revid: jam@tinyerp.com-20120628104720-vwr16b9c3or3c161
---
 addons/mail/static/src/img/icon.png | Bin 43860 -> 10371 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/addons/mail/static/src/img/icon.png b/addons/mail/static/src/img/icon.png
index 120cd66646b3a5d207cad6d038fe32db04c73830..77e42f1ac6cba9c364f11f72a8970f84e60ef7e2 100644
GIT binary patch
literal 10371
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

literal 43860
zcmeFYRd5|akS!=#vdChv#mvl-#mvmiV8N9vvY45f$zo<^W(zE4W@d(M&zpVoVk7or
zKK5fH=KkD!yQ;IRvNEeqp3DwakP}CM!-fL`14EFM5K#iYN5H_qkzk;JUx#3un7~)C
zn~H{`lA$x<PkUQ43u{wCN7tXGgr+VQW?*10%c@ap2tJH30UN2kD33G=b~46j96voQ
zO4+@TezwHyY&K6IuK2_VhO2*Jkzr+Zkyo@M4(XRLKFHwFro>>t2`H*Aj%r1`yV4KS
zXgEK%8AxNBaO4XJaM&loEa9~5hqJh1e|}lyXVYGl5vKJ?J&R)i1A{%a0EVO?E5l`M
z3!*nPu{AQKcLDtb#tH_;!|(Fb(Adh<k<iH0+`@*J_@b?gn9#z6msp)mmQnVnu;~vA
z2{(IFWj8q$V>c_~?<U0jd~iH2Tz~+OsiPsG3&`5Wfy;%L_&?-w0l)uUW*{c~k1mc@
zyu=!^3WUP8_NIia^sMxZbfPX6znF>n;0Sr_P0YBIM8y761n`fS_=lt8Pc8-qXJ==6
zXBK)}dvgY+@87>OFfubRGt&V*=p0;a91UIQY#d1biTGbKL`)rw?Ja&fTG-kU{*!5F
zWb5R}OH2&36aJ_0f9n6=(rq06Qwe}N82+^|FwrwI{GZ(&EzJI3y8mnWukQbD=2Eb5
zF}2nZu>hIcH~>T7C1z%1`VV3M)vEb_wsQQh)_;<?BteGers@_Zjz4&b|DTs7OfAfR
z0P|o5ZeaMQFNXhA7@&WK|GfbJwDAA^=YJmZ-_r5_sOx{!_21IKf2;HVSl9ok>%XOe
z|5oS!v9AArsSEDEAe^ZUfZLn_fTpOhw+(<hNCzQF6&T>-0b>#Z21W=bDI%!ivV5B9
zoS~~a_t5n+t6kLeC*W2L7LN*C1Y9tIm=4_+S_D$mP0><7fQpGVwiLZ2*RNOjf^>F@
z2pm;OBAc%%vvuKRs0FJV4wI43R*jF_fuH4J-C<(+q)C0viU!3Hp(4jy?3@0r!+GZm
z60`TahsPvIycAjxQIKKGxQW82J*hy>s2bdKM))I4_Jp&h4MEwry@HRs$*OrD6NEPs
zuKSd{mbd#AvM{0R7M>uVbg92HGs3d62wYLHy~t>Rrka?Ak^>Jvt>b;|QDBW}SN0E$
zqm|9G*h~>5=BGaJxNah5nx6{OO+?KpNW>z3>rgAwCJq;|h}cEUr!m5Z_QqJ#2OF=b
z@I((IUH1AE4!R|Pg!1ilk{|Xb%!@LA?fOC!s96cr2ECVA{Pp`>JGt)8<UUWUbi_)v
zAW9{Q928(EL7rVuQj%KHw5}CNz#$j)y7kvzsO!gHp_ZF@?KzyPE}}^}@3i$SJ>aG&
z&`vYGZf0hEJ)+@#MvLXYK_-hmtlx;cKJ6vX`F+0G>qGkXcWFry8M0r{=K|W_%ij=_
zvY?vo%ZlCbUhQI|u%{>QNkvoEvVAz+Zp%Toy7Q`C@MEVuaM=zQMVx6sDb|{Ntf}h_
zbXR6o^>Vv>NI~JSBg+8@G?}&#31FPoC>-%4lb*wlDbHaD@N(MQYwNn3*M8u;n^jh#
zM5jy)16yna9vT9pWraKQi7q9`S9uP~4jpC4?m8>+q7LN8n6E$?Gj3K=QqohV0^<~+
z6qc5TO)j5RUYOzhe$aV<*VP%>elyQ)!fYW`z+7lCy*fQgW7~eG4}oqKd04UT`0jde
zy$OLd+#C3XDse1f%+%7-l2JC^gC5D}YmWk)uI?o+eEs~7iYp!@FyRuxNF(Y%3r(P#
z^;m90L!wfNNR0+*^4JzNj0eF`BQ*bq>rw1bwqn~^dtUqP_1Lbxrek^PLk~~q)m_y{
zUo`)fK6nCKnh9Gz|Eg!vs@Dr1&&?ke5k(R5cp`XVkpOG<bTHu|NWqW;RhT}Q8Aeoo
z;=OHb_R1Xt%@J%$;*jCrwuYEchRE=i1gf89aYX|RLrgUv1$~Nl>w*j!?Y2eaxbDy!
zH@0xHrK^$FZEc^%^w0BZN>KV7HCi31D6;Hp)9fcE|CzI=TN;-Wb=S+<c&))Z5AB#-
zZ)uRP1twU4q6ji%2u!L>5Rq^Yqs^(tpnS^j!AKk$z+zPp5D-}BIASIbYGiKEHZGvS
z_v}-Ry<Ux7_fyS7dSO;-u6POhm_z*_L+sEM)zyQ=VDcb+0Jp--X=zCn{y6ZSE#c>V
zW8vRG)K4d^>UzeGiqCCqOsYJmSG$ETW+T)T{)qFkKOR~2d{~>_*pNpLG^zVeE1i=-
z3{OIx$Sg%A7L7jyg=78u*Sagkl7T<M+@WG#H=_Xj6!s>4!t%H6HpU3gzt{<%Vs|~Y
z9L5_KhAsGc;|B-DrqaSLb`r-<ug`294vB&<7xR$H4$OEczI^o(@b=~}v@q2AT9OcM
zp#|9~KX6kFDn5AG;Md7?ytc?b(j1DgPE0VJnVAVLfoET_{__6VZHbSqR}!`m!QidK
z1)|;=j7r)sgu<GhC$6BAt-TMhW6rOT460|7G#1tyjKrfF!oLyLb9u*#<;>?2Ar&JP
z+rFd^H4+)q^*7$zAbsv{K5Nv@Z)ngQjKU`Y(N#>(Pg6TRX??%jRgR&Q3+k8HWVv}d
zx~{8}Gk*a!#SJc(&zdSTw|A%pHL{IW6VWl(S7=T*5&`ZV)qXww1sL>G@69AJh!8Ev
zX*h+bVp>t3qGN5XmTPhb+wcu3!r6Q>j*fjprnZuVglpM!F@_!M?_c`7V5Io+6A3G6
z|I?>T-904d4f;-X^jPH3x9IL15<aLnNWz+TiK(5-%H0Qoj*AE9HTo87EiLV|{E7-$
zE-o&>4MskH)43dZnNhssE+Z+v9ER|YeY;;428JnZ3{ne1u!vRcTQ+rZFN3$RiFwx1
zx__In$<~@`TJx~Nnr9UmtdEYF_sBbKooQO|F&TgS0SsiVAg5C;sJ=l$TR9KjmVo%*
zC|j+?1|u-(#c_X8+IHQQN}S%HaF$l7`)yZ&5o(=dLxv<l64GqYFirAvWZnbQ=gU_O
zLOO}b5e}Bp)=tmxet-Jd<TK{8^TZ>z>po%8PayF6U<_(%lJcadJBh%dJEM!7o>ri7
zT1tS&nI`_0>Al{y+rw@9CoUs1IaXL~q<L#6za+;MK|(DV1@hh7nz^#=-qHeO9g_p9
znEty=Y%B(!%tR6d%vo<)J8jQB8267ALnmdfG3h;8%;BbO57Q4R1j~pvDD@A)pCS^Q
zBwS`!udeU}^F)2YPQ%5qeFdHpW%c!}BUeKNFY@Oc&omBn?<ql{E@yM8%&r?9`JMC(
zXTn;h@d)$DQS)E1*z;wzu#Zi%*WMe{mY!)=hC}XSnd=*bwY0QMx*#aVuwy(%cDBDv
zm{+Yi$B(lwEBw<2V6Ya}#qq7n8TG6jqf=2twFBzx$pr74!wj!_h}^fxxGM?&CgCn!
z7lFm(L1w^ty6L}Lp{`%zM<Vt~UnH1D-7a=9S+L@20ecs%8-|~`t`rP*l&rJ!jGft9
zB7JsY&-BL-a>=;)Uh_^=30&8!u`Dq`+k{lL$1WNX>J8w6V?j7F2|A;R`_Eih-1Y(R
zAgjdXdODnPUM)BX-VcRKhV)-8tou0m#u9DtIP*j#V$S8@BgstkExW{xtM(56=ACwI
z2|b?LSU4!Sg$sy?z+EN+OuC?>KvQQXCMn2m$)QPiukYzb{Yj*P#il%;R(T$uTMSqg
z)7wi!=3l!o|Ca4z$=lo2br4?jeJl9-9LIJz*kM0JomOI3br<b@NFTPSKgR==76mmh
zB&v)=<du1dz>_qxLDRybI2qPhOj_Hj?w_IVkwhlIc#|?|?Owd=JZXJ&9E2NfGj4Bx
z@#>jsB%0RQAS4O?H5~A_ub_d6?#@-3zV-0bdpKQ@L`+ItJh;A*U0T;zjs9bftgJxi
zEgJ@$z<HJFKQ=-DWLQbFP=BS)3O3c$D3nAF(kKl5n$y*l?ZGFHE-FdiQ+vr9eV&CM
z1drA0^>S7;@%_V3-f68sI(fLm`<X;{ZLPGdEFAbNp{~wR;QMJ$DU?h)*<b~+p`k%U
zF`!ayO3Y4%J$<0TdUTK33pqxv$PO2pAHG_d{>dY2d07h^``7{mQl_J$tFNz@5EkY|
z8<ba&9Uo_9V<Y>HP6T^5cs1J1*R<-vLXqj1Ych?Mp%S#dt~Za(l!3)!M#+(=g|z~S
z?&m9Jtl|wPDKcOFo^Z^Mwi6FO6&H})u)mkevUivlZT9|(B=P-gP)@Z@{QA1hJ@-$3
zrvVI(cZ3f_-dlzD+ai8R5TA4nYd3j1=uaOKZ^8Voq#6;P(=N)Y{TN-`*j{m2Szc39
zvJAQG;pgT`VQ=pb1EP&lt^C44vDVhMqvPXT4cgp<-WrhgP>xawG9>s0@2<h!m_;&z
z-oev>`Ed3{i@0a=p|I=S+`^@2_WQfnHm8{SNk#%QqbwRqkBDI!IdDcCJekyK*3YAd
zi&|P)QK7@76o!IQvWr_#QH&rfx^Fy{O3)24w^gbAO(`l*;v|c}i^un{n2aEIC}b3@
zDjL5215DN}dtZ+;n>Kd4A-ZThJw0b<cd;nZOUlZ2u7<LHdmbtT5|5-`UbU$AABx;F
zDR_{Uk;Cb}r3)FBziO95-!Nc8>6P?TQM?7LTr?}=4iRVCQK7qqZu?YOw|qz9xg23m
zXmQvd>A#yVGL~SuyK9hHKBlo;PFyILB(H>fe)@c1_jb21R%<%;0|a_2<{M!IkXC*s
z`blLQy|#5{%k%U73gDYI5}vxc%tLcz^>t<8Lj>*-+~@7_$@*Sc!c?m&VT>>^j(<W>
zNG^Gz0TiUJ{!I}xZp2Jc3Plv9MF+7=>%&BoJTXihfX9NHXwWEtsog$27*n#P&^cSD
zN8e}<xgq10YH6FMK&3$G{j)h#umS8D){tDx8Ab)MI1@)%nx!EW(SAh{_GDp^;);>K
z3k%|-PFMb5GpsGA*JF#u54;$KsXoFb)Eu)z^>8q7f;nZ_q*RwIrJH|Mr!Wb8A^B3P
z;n~zbo;mE_CntqTNi%DhWVZT{_)VtsC3&tNS+c=KO_dq87SZIj;_dVkZ|6W1Bd1Fj
z#KfUX=s_ZOG6hP70GRf?U(%M%YR@j`x68%W*)u{YOqI!pk$|6TEyR-Nr#r~>=3_CR
zAWa`Z9%70*QJ_R;l0~by`@Pgy8zpHKX^44yf4^O*<o`mSpcJ4Ou-6JXhl(`AI%2{M
z8}eCa=&5aFl``tDqD;QA5o@3k6_t7woDp@R5O^tEs|>mDDfFBb)UN&aPa8w^GVNi(
z7MLcrnov+s5(UaK8Jw|q^Sbh9^*0l>e+$z~b=V(Z>8epFnf!d&ei&h?3XoQPjG}76
zq8c;q=vRRG4B>l9Me%IAJN}~2ZE3-WAL#A|1FR80n)m57P3eh2%3UU%T~-awMpzi4
zqoX6ha9GO<!F0ouqRcp&SFE<By;Kd%%V-*kDr`5BL;s)$8eiez{b{oHun);j2YT{`
zNyUg9Jd{e6jxr)Q#@82|8Y9}8Jsh+$J3p_atv%LkXY2|*PNUiY904H`@Sj)8!A1}O
zw^QEEU$V6c&Boodv%H?ElIV2{lNj_TY73+b0CzSWOH!mt4($u6tfaTJLfeqCk|mE9
z6TkXBXs-iJC*-Wo(c*zWSvEDx6>ztZJ>0nB<rIzgYjG><YG=^XF**nw^RVkvsMtq^
zd~ICSGfAB^qk^jR`P##JEX4gvde($oy-5Bv74X2G!gQP7Jo(PYhbPoO-!6NwfUs|u
zWy<+}QMOP%JL;r01SV>y+U3d!I954NtNUjEiWAU{)6rQXV|s%=fn7{w(RIC@Ash#O
z%Sv9dos^R5(ftO51Z-lmpscKQy={q^#l_*cf$$RBVv5X(>c2ra)lXlwOKneIWwAI6
zGkah&K6-GUp4FQMYC&NG#Eqtkw;qF$1d|Sv9hZUfw`}Tq<PQ52s<vHkjqPvy>3|)0
zY*1v5R2vQ0AD`eHUR)GaRz?}sa26wg_cD^Fk1%@mLN>0uSv8E&w+)M>TbDDw4<N#A
z#bY1te3}0J`I~=~MzcYdhkJ6S=HC`SYp&>|5Jt+ntHG1Y188&d*DL+lbI}KR*bdW!
zW}E87xF1kKo{b=O`H}fbgu4w@D}ihIA9b=ENuR%bHNYJF9l5@-F}cur?=-=6Ld(8t
z0P)${Uup99dswp8nCHXBBm&23H;!$)V1d%7ZZ)W=6J)5+k|e1XTK!HxmE|5*I!mi#
z;1CNtu)FMmE(<TxeRsY%TPn(md3#9bDfR`z)$p%$M!}iC_M^R9AEYxE$GlycW(wsn
z_+b=+d`~#@r!D-ti<GWl`oM<lm?BBLH=)7pGQh~;g*`TkN@`-aNP_D6I66yytr$C}
za@uWgcn3Wi2gds^yA@=ksmnG}tBKT^^aw2h+I2k`Z~9?l(R=e8>gapcq@7(i`OMeQ
z!iURcSFT5!C!s<u&kS$gN-iyePr{a<GQ+o7UIAE2)sKptGbQ@uk&0DeBEO55*UMmj
z73B#&?ofTN`ZU;}oT;>evE;D}?+<sUm$Rm^blc9*9ZujZ*`^G2bIr<5A*m@;p=L5X
zvpcOFqd!jBkxQUq$S$mGy{48dng+r$_ZMV6w=-MkzvJ25;=fkCxJUQks20dzgx%cS
z9?u1#ORQ{~ug3Ic*mdOhJsG20pSfNc4J5>&89Fa>k54Yl_rn>kd%rMT&nnB0Op{3;
zo*xNP1)dZ#!pC!lLHU0f5CWfZ8a89LZvHEF%Hhh~cGj6bYF3+l%m1zw4u%PvzTJad
zD>%1c{(g#NQpJ0p+g60O5^6UCzNdura>|?JFu{r3b$gD!qQO3p<G0r)fZ7cM&s)Ht
za1djeoOD0l!>d&R4m+}bMiRyOX{FIl_gjUro4cEZ1!(WMtZM&c#kPtM5l(;+9=O<i
z-fA@mkQl^cNp#|j)gYV|W+wP}r4j*jfT0-!b|v$wi_;1@-m@ZahqtIfu94lkLyeG~
zlqcz=kMaI`4i1>n{%SfAU>`+&xv0y2o@?OnIC|weh{*mqLZ)2M(UECi;5VP9ebKB7
zYFhg>a*Qt~`I|V(^{io``J(g1<@IW4x8q?SQEZhu3pjH|_U#|NQYBdTgitCBcB{7{
zG8wai(x5O7Q+_MO5=KdK(~mMI7QoXk46@QGgjuu8^JNdQ<4s4=us!iW<GF;S-OaDm
zzTj`<?m8)_s~=YT<ZSit%<p+4u18g0(^IJi)cPQHL+OMM2N}imj91CF-lrQ}6ux&s
zjohj0lkq=|P;o}RC~7omn7rWq+AJ;e5|y?}7a|Q+Q^gyRsv%6)b4zXA3c|@(IHbt@
zMWsH<S%Q0{lJvf=2h4wG0c%oC8&pEywSDZ}NnOP)mPD%`6@`JZaS)_!V^Gz>R~s&l
zV38;=w7IKL*%OvUhU>Wbe*8@1^+K?<v>0n8DesKL_Jm96ADbt3{YHRW;P&#I!tHDm
z7oWnd4s4rIhM4_!GXKC<CB<IrVw5nhctBQg66OqRe8+VmF(UCRrOc;KKA@%F=z1*?
zhGdF;lwo$OtiBg$Lqsh)QBos$3MJKRzqGFoccQ7bQ_Ktb={H{1J8vCbS@&?2s0p)!
zq#2fyW!X#pU5En6kddYg#0;=pVgnO11-x4l2Nl10mk?@J+&AlA-+XC4+zuZxb?8S`
z)>a+@Y<$t`qT`|Yz4he0rxsmx#)lG>vH7Ynz1eY@l`n-uJ`Ed3vPj7XApfY;JUkdo
zW@Op7^5f-=UTi&DD~dK&9c=IZL>!Q%S8lyMZ0sd+Y$&;(sm>A7Rm9cFI>KY{oBZzT
zeTOC}uI$<#n<H#mb*yuw*DpQqIKV$TImyeZ@uh@;$@OV6>lm{eB47v<@>LlnD-~<Q
z#=)UXromLrCd-sVvVlO9BBLGa9nY80WLMlp3q(OBdrD6@`<+qx9m6U?Nuvcf>cjw(
z+z{CZb9Wj`XUOPxmxQtdjZH~(m6s<@fhuet+|qv8&RmweEtPlk4eYj*K(S5|!`=6r
z@;1Pa`c%YUkbR#-1hK{>d_|CjM&-6JT2&@M=)D7eYdP;-Go<SJP6ZhsbvIL5J6w{S
z4kOch8Fqsf$K@=OGOy8z6S<~Ww`lUilU~30W{TvCa&o|j8slM%Fi}M%Er!@vJQ7!I
zx*QUjZfNwEgp&T~hg3k+wqPgSp)WaHcOEaFRK5zi)czwN-x{^&dOwG2Hvi0_)oG5w
zpi%p+66f%fHt<JIK|`ukOT=DEzhcCm8D*lB|BA;Br=|w&SYcIFm1Xa-plnC22?flj
z-l@KFaz?Zzg~h1I9nx3<Q_5}X!&Mb(@YL+nWTd>1?r6sPKtNUKdDi1+&U!-}oiz=9
z_+cG&Cci&;C%(T3;Xg?eupPmZ!!gj-95`!zKX0}zUA|=|I_+h)jv)jOOBKTzzlBC9
z^*S^mx*7lI61YBPksqsU^9oOsL7ZWQ6(aBfb}yk!r~TAWivp+I`5lcYzULozFKy>>
zDqPZl+duHgj2RtG7tC_7)y~Lqm*9Ba3~)}SgIW`5-7fIj?PJ&Oxnk1K+mAM~Xg41A
z261e60is#0&TKr6ES$gph6gV2Q=-)8K;URtY~)?M5)m0TpLxs*K2R^Ns3@rF`nK?k
z3YrKA%Lri(&(36}Y;ke=7)SPMRezF_F*SnX<%&iQ9A;-{V@6DXxFf*=lXZ4MSy{Pn
z+Em(gEAZQ%Khi#Gpk#v}btXBSFtE9i$CF1HVPoSg+68B-(yI?a-+T?R;4W>m{l1{b
zomdF<xrdnQwo9&nIe1w4ct~82jzzzGYW?qEaCov|;ih^rXtL=SuB1Yif1XeXYd=cL
z*ZkwdvRUepa*{jYN!;BR!C+k4jYUIoM6N@^J8x7{8a3MFD(gnrs2wGG^s<f|qbQzh
zXv@*b34h8~uraPk%GS*uXoA-xMR7dQlGE666G~`4V3$~5$G2WFJjit3FHHA-uw^<v
z+~}gJ`|3Q+F(of$CDu4sJITRe{;>7bbFl_+ho*o19#Wr{xwB8S7W5nv+pkB<jvE&A
zfUr`pT`JJ1Bw(JYGF>Q~v@klJvyWH_^i>^!QZm3a4gCfBhXrWhVH5~e0Idmg#rMb+
z44c$OU^4kNHnPtxE=ovC*IBn;70P5ZzYoFT^5eYSw_5G(r`sA$WV9qmlTD|>A33IR
z!WFyVJ2^R7*ItPM&a`CN+kXcJA((gR3mzki{*8|~=nA~?=<=~I{QJ!x_d^=0Qx&)~
zwI9X7E0z2rPOLAe?$SS1VH6?NpyaJG(*E|}FE2(G!C&*~tCJ)e#m)~xv9DPhH?G-0
zJ8erAy>5Vy1i<d(Hx)sn<P_9|0yx?0(!X!+`$1+lqc|0HVr_=QM9cB>NmaZKyEvxB
z^%KwAz^Bd&CbK^pdL9=0U7w>Ys%Ya+Y~5ipafF<U8S#>f7sVYSg%uuSA_ox<9yUHs
z&m7G<ZW>n|XCja97W9(=%r~{RCabTnUyH3C=wzB24$=<w)CZA%6IWE?EjNbm>#tGH
zSE8Cu?bkUzInM!rsZdUKW22f`=lgxKksr^?Y`pzd;J545n@M9#s3#Ao0(j~~I4^}B
zRtz90M|K*Oj|)PB!fuyiOhR+yCGj#HL|=g^%s;(reoljKzAa6b+*5`Z!MB5XIse-|
zaDX4A??s@FL3H>zk(`;%L#yT{eVa9#=doOvYnd!r63vy&W0GQu=}0EaX+bxcN_oOC
zoUT#jqk-`0c>y>RyWY8g@HFJdR|cJarXk!s`c(FYRyU3Ix91c4Sw(Rst9x1*ibT%L
z%D!#^Uk|<^dAT=Of(ywP*TYxy^~95pS9mioQt2;#nlm!L*`6Z8)en1TAvpC2(kthB
zKJZ@}yxl4&@LTlH-`@!4tZX~z91bQ19y%<+1>%w=ie>;k0o=A=Ou{9N@YV}>=S7Zj
zWV}@DxS55erP1M3P6R%iR3r|ETGV3?5{7`Yda_JfJz1cTVRiI8mU%`_)caM9{_*R$
z+X3kN>*dAO`^$y;$t-${PLPJW#^1T|{yX;l#~nGN>#P^bKgfQf{ckLnQqiF&jwD`g
zQpojLH+jZYapq=z+S%lnyf6VLmCM1PrsAR5@E(0QYN)nA(+;dT_UASs8{5x6H-w{y
z&o`dGHn3qG*IDFJc1xL40!&Bf^nRgQ6z4XK)2bcCtF!Mev^eer0N<#`$7MrcczHWy
z*4+u5)*2Szegv9c4Yi#oD9iCCc6Ras42s>fW@~FJBfNi=hbhau{RTvt$=<5LsBEpy
zamXpV5Q{ujh(e(xIzZ?If`Tv$ypB7FU#!`D!<`AZUDm9s+H~~Np5olL0uKtzMfo$w
zxa?T4nCHNegNO<(RNkTus!7@`G)<VXYL{r~=*F$9d!Q`0`$PQ=9>pD3Yxwt<t*R2|
z=f8UJ6Q++}zh@x58yDbsH^0cWT=s@*H2>s_MP&LzSyEg{`Kr|2<h+z<Rn@9ez=98H
zTW551wwp0vZf@-iX9qFaH9G=Z#4FQObV-6E3|-z8)dS+l@)4<{Fg;s8`W<SKi(AP?
z#lNr4!sqpNf#(Iu!1GalORwu^i0P7BQc=}+!y^JYR<GIV@wqP;>0r|zNv$Z`YyTK2
zPP#~T@AYOfS%xdp5S!9;YIe3iUY<{kJX5hhEu5h<<qJcrg3L^AV@_;kr5x@MS@M|O
zbSTC9%Ca$8=G`G~%hnOcp%R;jl7D<@j}p-+D-{%xkw!{V=$?A<jdXc|yX%pkE=IRz
zQRYN_xHnN!I&pdhNpguKF~6AvCiJ7=r;tQN(jg$*XCHyb5~P?XUIw_oKH|qa65ox(
zKeDxPM*-FYaNVKopS|W;j|_hFU9U>?S#CKZIr8WhX;#aahgbquvbw@yH}sr}XDthb
z{d>Wrl<i_%r=K%FH+=mj_rkKU-U?5X*!PRpPl})@vz2Ot*8r{Dg%3<u*J6&<L_25i
z(R;W~*~<eSiSMeKR<jd+;{jk#GzwWXI&>+~4-XGFM`@}|Ue26V%IGBKv6tynWy~0_
zjWoY9bUuE<6Xu?>`?D2{Kl<^00g<mv)k{e{D;fEBIF=-}CM+DvIqN>AeUZSBHM+2^
z&hMlU#TG1qyk19zE1F*QC-e8(j*j}z(ysffwtrK^bR7n&_HLEs@*8U~_-Bz<e9V5&
zN>U#H`7jF`8?)0zChO)cv9kVD9^26+9lHUHIJp93VMA_2AZ*vJkeYnpH(+o*jU8g*
z2@Yx%gOc+6F_VXRZ$FE|U7DR$pEtV{KJ`X`oD`<4<Gh=&w^sQ)(W4&zZ9$1rxMXVb
z`J_ix9luZuN6IJ-(U8$Z$?H!b3!iGt*5Ju*miv1@z*|kX<l+EpWx@=kCvz!t6(}#)
zF7V53nzw@HkVxAA?ymj%xD3ps&O(h=e*({WV_<^&Or}L?A27GABZ{oS+VY;fPtR}=
zr*)Hj#|!HEZKD_F>De0;Rc>Ers{++)6zl@<62T+Qzr&FKvf|$I6J_P3I(|N|Kh8R_
z@6SiEoG;g`eG<b_)ZdWt&Joh>^o`09Uh<e0v+P~Y`zTntb^Xx+Yh2LQ#$B@CfOo%a
zCGRwl*k$IFXJ1084QfV^PUG&;`M+xczA}((#Pp6*3Q5uGw))X=1ZHR35vE62c29$Q
zzO9v3+JT<l^w&32l+Oz)3%<s};3aS#1ypbz{>H;Rq${2OTLdF_V!nR_4t+`?&-X;C
zWhFDy@1!d;V{*QVgvoAAImySJ3FL#``YzZyWd?O!)+b$#kBaQ@f~8vi0JPW;zH|BV
zQ+k_1Wx|qGRfp^K2*t2z-C~kxIa{JsAetQK))#OXAJGUGQ^!q|Z!dqDH00nwDU>r{
zL&Ug;L&aqUsA`O~{&e$LP~F@YlSch1D5v!=^vCUA7!2O0A7*cp@zuN99jWyp1(N9X
zNP#F<c2uI2?7fUc0E~Gl!|m)%eQp<moQD7U@cfJjCLrpbi|-Mv)4RXo^?lOTmpe(P
z&xPu<7N}vI+%lZb6805NOB>y@d21i*_Up0g$+Gej4;VO*ROFtGBO9CjwE_}Hh6D&V
zfK>vv7hx*@8sj1Rc}??j{IvYM22q`%9@zqbKQiC$cXB=KfrjmkS^KpT`AyF&){#qi
za2y#5JPBm?K=9r#mTvPLn2IL8eqGMPQx%L~hfgvmMWz7hg|*Uf)c~D}p5S4<kTY>p
ze3m`*l6?9`z+_8)(bC3qb6UsQD2qNMv-&gdBaCF;re%*j)&6`5Slf)8Gg%F>(9TLd
zt?TMZy?D;|0O65l@&Tz~2&B$#yP|a;!<N~3?Au!v&ZB&YSy=uSr^Hq19EF%F8;(%d
z8$QfcQu8!&LrnWAfC15$>v-ialKi!CwjxQV$R#T;j}!&E87ol+U$pHSX@A;J&!53k
zqDnrmq`zik<9X<n)`t<0<KH3K*nC`T9HgW#nr(oQ7HXHms(}AQNBM>FSA3b%R3L^*
z>({#XfUOTE!}P0F2meTtusu|0+@D|{2#!;N!Nn~Xlj_<arqF>eTvQJhxZJWtQg%lO
zGcDH~NW$YT_G~0e<{N#BhA(H7$sWDK-Hr(7-j5Bcjd2Gzu6Lt<IA+(~FY*A^lS`u~
zMygH6bq~XSqQ(5(T)_U#X<_)bD7&zrAP_h$x2Fyc3GfQ$*9;&Kc~2GaJ#U$SrDK(S
zetG$qV6YwcQg5hls9^S4wR<5jDdN3PxMw0UU9Ok@mtFZ};6Z0O-ES9RSyE*C#5^4(
zOdT)S4qi*IF)IAPU?h?$ns;<l*TMc04YO>Ttmk*2>SLlm9uiB!dARxURJBa=4hShF
z!2cD1eRxt-nG@JuO0>cipgh?Teu4jtreG!L2Kge-m*PP$j!a#B-F`KJdhUMMqiT7r
z<9ueD`aC9${1?-#cW}N@jlTWz+x7Jr!)UUN4XAozd3tR|m@Bgo$Y&wU>qm>@d!?{U
z@F?rLuQe#?ZwTb*lyV)HsA5-qKfWY!eLgBOb(Q~?)o(IQZ-yRYr@K$D!Q+yNSNJBn
zem)H;M-rPzoB*btC_$B7-4(Bc`E&W9YZAo@=L4nZ^|(=c^z}Qz?}S_xdVppOE-p#d
z9q}f4yRWU=n`N04ou=w{lq^t&EFk8VSq@vV>BOK-UvpkbJkWQAwGK8CtvhLY*o@Nl
zY8rL@SZ}K{X*+BDOqeOFNS#<xWo0y9?mU+a6_=gq38k*@*#M;I4pfKpS%9_BZD+Ci
z3e-K+=l_^whTTa4>WfZK-<z<m`h}5(XT#}@o*h`2WWI2K;^eqRxWur+exq(C^33Zx
z6Hm53Djr0k5u}nm$a-fQ9U5sM3KoPXR93G+o&1~;TzMB)KifL1*nYtPX!OIA6Jt@^
ztFG(jgT&j#Oy%7Ohr($#WYmDKX6*7C0u1^a=Vhy&H=x%&25+;E3(x4*d2)}c2rErm
zt*M7Vo*U^&K86*~voh8O4*zLd?b-+u0C5`3UVecdnQAnH{gmA}&(6ioy#yo!W{IHR
zqH*s#F8;1;h_k1giaLL5@yPn_uwVLT6qK9oU#RyJoMXd2k5-ElsqfbhYuqr*u&FWy
z+B>5no#!tQ@C4t}GM!(O(zx!nyKM341>j7xBdjj{74N-uFc~->tSeiOsjoVimt>Lv
z$Z_?^Qs%0SZ(B&{Ab=r|E{Rh#3^nrU&S3WXVB;+=Ti1gd!c<`i3NA;1@+;>dxBJi2
zXzxFr!T3_@-bjrI16h2CYvxGw&v)7A9Y`=e>6<?oLDlKq%c!Sz+36HTxX!5Ry50@-
zh!(z_`3_5PP@|nv#J}|kGu`KpfXofE*DL2gHg$iW{C>?@|NGOdGA89$1*t7pd>~}V
zaGKZj(DTXo`6s&NVck97!IdI%+=;cGLy0z-asYooFS`2%i`@wG#I}_Ppn}sI#G~Je
z{_uEk!mZAUt>b$g5-Ca<t|0D70To+IzwRJIID|(#<P8r8BxZ$?t&9|v;T5A5K(6L_
z0%cf@sr>Fux<m37mKlFghE_un-Ksw&-=}e%cOBT!?$z9V#j$@Ocn?XGSB_WZdFhAv
z<GTN?d~TghbT*f&^-#7%r02WFQXN88@AP+>Hce(wn}B8fWPe^beMf*h{_7WvNq-<6
zLo3I1<wBpzbrwEHY88z~HejUmZlnD*o<d#?0s>;y;X=Q^5d>iAOd7T72e0@!wgtV9
z)GqIjxBI=VV1lGYq~fZoA!fSX#l9i|vgt=fAPK{6^6`eaJ!_2kUd1L46j_9Q?Qx<7
zQbPkYZfaHLRC3>{E{MVk^h~iJO#YY}6~htJkN#8`6+rof9~31(n>&?)KG=eFbc*Tv
zo+uZ^d*yta+}&_OmGts+n%<bAa?Jf^e`Z6S5Cm7kxVt*j)wk}B2yq8qOst6eTLtPb
zyHwHC?$Hf1wKj(c^O9Tf+wGpT`Nt`b*LP4_K739`0TxZ7**;BG34=_0hQq$a+`7iN
zOO`y400SzUUe3Gp!KRN`X<E5c>(AyrzWS7F)aXRL_Mo)iPD`UhLH+n)Ez%3de;FbZ
zFW|n2l|0^AOGS}skHQVA`AZnTjxV5hO3mag$`E9)m^Bz>e9GBfi@sb_EQ0bQUc*1-
zYmyZS7nPFArznf9K)%s1#Uw$#Y_l=LNNd%hZ^X^Xa_Le)X%gU9l+*A8O!jv|KTR7&
zI=o5m_e<I%o7KPsOP1G|K1=x^tALflpbDWIry|VIS%KX$H!iwRnrA%Adbuq_Q058f
zcBU#}vfLzopJip;PGOf4^5{x8&rTh|Z~G;qNS%_~-=`#?BR3J5A7FuAI9qs<uXLWN
zayvc4vc=H<<2m%%k=Y%p>-~;xF~HHuc}I;dodKRyp69)pm7NtCiYN*cFID7vT~b7v
zXpf@kpV*OI5a;}`=DgQ(kVOLTp;W?J0`MVW)iVA@H4^Ub+%Knmns4^U7}<}jHBIg0
zljB~=WCQdbD}rsVy;J!;6%dnsf0?v+hEo!#$)?Q^g};kXQY(s-!_#tD$YTfcsf~(V
z#^Wm+f?v_p&&>`0O1B+}O^-G-IxB_vlNZfHOq1^R@bFN#m!w^(rbT+(9$(F@-Xa&R
z5d<!X<p<Ue4ohx$h*d100KQ44ZHEHm-u*{lRdnfLwsK=xqL<KY)D;Qskyk}1*;<!(
zEZKQ_cF~uFs6Yy-s-q)jPdCtkYx%ek`SVDnD4x%u<xKlFy7*^}MiyR}xqSPs(-i40
zaubeM6%TEzL&mR@+5V=K&(ChKeFB}xF+8`M5X@Hh)?fhn3y{Oc1_nMrhSYit`?S<<
zA=3L%WrG7K?AZ<cruVz8Exfgrs}_sHf}Kt%XHnkD3g;lpJB#c5F`ggmi+80qeb<?n
ziZHZvFKuZ-XszGWA7nSEn$$i<V;u-;Lw-BB2%ZEX(bF%>j5X8rt!^Iv^Vlp!U_|A&
zdFZoj4F+OFH!s{RZzIVm@7q=xuHBWj3zW`@FgN8(bwHj2v(VQfwOr0{!(|{6)#Xc~
z@ogyC+uSF4q(3T7Z)}AmZm3fJIX%?^G$G(KV0->YhNxM1#}A86ld*rarv5Z^9pzUx
zB-w8owtdY(gf)s@WX6Os&Pur|^>E&x3)$h5!BBPg6&099qK#^09LJ3+DO#bHwOhhd
zw$B3;H#w`Z(e3vg<!Kq-3;pK6{o{6k6s;<Soy~&LKvVKSV5Lxlk~DJ5BYSTwspe*a
zyKe25{zsADZ5~PIWN|~#C~z{#)oA2)bl{=ns8G+$tVml~(R|bQfUPr|e8TYo(|K=u
ziFsE1Lqp}4MwGD1HL4aBgT9MRDIG>^@m%j;3F>K@QOTesqX^F~>zOp6!v1P%O-vCk
zcK}<#nsa2t4&PG=DrhpAIryHklp|4?IUwpUZPOWyf&bB1$8nO`WcqZy2jJX-ZJ_qC
zOG{HL(ASw<^OqnkjnE0Rf<(8$5hRHmSQG~yg@hIa6}W1o1XbMnXFFI9GG&>%bk4Ls
z*rAIFwH0i5^fs!**5WeREmgPxJBdcV$!orpr$KiE^S_)1)KDv;r7#JDth6B{xxc^7
z&~CdDWC>SqDvt-7lHx_H;|HSzZGD4?Q`hrMv}P9uf#?d9QVHQD3ubP=g*T_7H$>j8
zUIp{N3;XCezPDJ{uP<MxZ>$pr!9F>{6_B(W!B(jl%@!-Zo;!E#?4?$f0c^$Y##@%H
z{-w|36QWxLe5n^qXME0fu)z|naUWO&rs<D_99TblX5SyIOkCfoNSP2q;&Sr(=Mjyz
zg(MaUw#6)z%y^e4Q6OEXpJHhl(qA7rkUmyC+V|7S5_c9KYskfFM%3B$J&{p)7_?f=
z2;T&Ja+FBdc3C<7etFg_3$#HPB=tnaBSr^(={HFEjnFOfg5jt^YWnSGCPs$mGk9qW
zcrCjN#8~lof#i2~LG;bStvhF)eTF0TpmcB+s2K=u$Q5u?(n7u6ofP&%=A(Lw#B*)F
zIb$a}?XVq<e#N+^71sk@wGMgvdrfl%s^pP_8%Jm7nW-tC3s)d!;^JC%eL2(A`L(q7
zae1Q+YH9i7d7%qLQh8#Lxf+xTCFDfuY3ZCd#Vp@nhrRJ@G_-{FZ`~c^2WOys<vztw
zqIvK$L94)PNJ2Z}8Cgzg3BrVg9!AsWz?b}DiOYv>VwTjTf>%a)M#-@?NTaH!e11j6
zDoYX#JlxpdE34`xmZVYgw{NM}dLr@t;E}>;R1!<z93O>3V>MG%xZ51fx`ksGIJI1v
zDP5Gjb|;y~%=KkPbz(BSRd_nGTe06ym8VD&wna)x2k+}vm|FYnu&z&S)xe%Z(j!4m
zx71B0W-n{1#-<Jl|GVH~#@A%PK0)b6g@v{C@5)ZW3VT`mkGBVDAXjkfdHsY70WmVc
zI@G9H{{tnS95jODeY?|@dfM0JOc{ybbPb&U0J`G}st~ocWdINj5MA4?UQv{$R&`ap
zV+eqqYi#~C#*UfH!9yeJWk;_xCGSb%gsM;!%YZLn6fq3`D)vJ#!Iu-k4vyp(lQ0ej
z)<_73RGFpvH$f~YCS+`=SSw{_JddKF0toyEdboGGc&qzU=Xe`ZyJ^wA6ys=pPu%<8
zNd4)C*x3D20=cvb^gqyq(=nHOLu5j9E_Fk2Ln`_yP!MXsbHEiXQM112LCt*g>vTQ6
zZa`QBy?nJqXXVmdrSz|Gz~mCGA<*-70x#sm6q-gNViw^3txQOzK&60a-~)MBeOX2K
z`#?WQD91;U*Bq!1!qOP{9MyR+0u+!-w$T@wDgog@S(z}EXh9n5>sm#V_cqJTfhS?Q
zO>OM!k-RtRf>RBxL$yP@MH=qUZt&woj&-G>?AIgbJ30c)-$nukR360J!xY!l68Va;
zq~e)Wfhlkm0xI^9*xLp_oU2Fb$l#RYK97WuF_BGSLP6>U5?%uJMy6N+sAyPzzd%A1
z;{sp~N%tN$dh5;`*<@Nv!(8xK-|g?<-j1sSa!hE1OCU*&NQ>yPzXq|RDpRwf8HmUM
zEMJ$pBI=%!;9P<!7bdI^t46DjGyy-SiSwKqv{%a)>48HS_(X7oy7gz|`b?9XhRYG*
zAC7FK?b8Zjf4N?hCvU@VCWh?jXjh2CgaBe8Qxz$W;O&sIpn*J5Zf0&t)Y#a#R&;?~
zF=<50s$yU&rw^K~=Py5399`pL#?#G#vbJ`3DDkzh2s(~UGZO*5ZVvs+99uSYdB36z
zE;I}ZW?BfQFgz_w;^L$jT!L>3RIDKy7JW^u5DwyKh=SPXzDvf$XhAS)$izp+LXZzt
zN{|>z4k?(&6uyK&K6*|q%<X|XDboAiq~#tTbOjq4xy+(*gOFr-%|J#hn1FD3DIS3n
z8!ir+m6Xb7v0U%&5LAj4R7QyEPt{{1R&hToeUbjgQS}A4T%YMKkl&Kvwh5I(Ab%OF
zP3ihApnl*Z<zwI*<qH;Jf1RnOqdNmnYiexxJ|^z=bf?Zp8yFS8(>BR<ati3=o4$*n
z&O(6_{mkmLjJY`l8ynlml5bE?y!<#O<nUK*4^f-8Gxi!#x(8oyNTCu{yi@__+wIJQ
z%i)$df72T%G}MaJd}ui;G`3MO2s|jza1l8jv*zlrA!|TL*c4nnRY+KTo?HZ}5mk^-
zDYm$bXg*uijzJm}*EI^B!O|zWIMpZ-;}pr4sY&UJj*s_EyQL&kCd1c9cXf)0Vi@bw
z{^0QVz*W*uSMiD%Q~ehbtUtGDz>;Dg;mPNM7Eu<#7v~ge=zkYD!&y?j5L~jc*+F1Z
zIvcgk8RPxI)y=%@X_pf`7TD{q?tu%5v?PtRl+f@mv7YU^q`hARIa7T$t&dgFL?YnJ
z_-h<@U7!jVx8BJ|JJVk;0|f;)J2#IiN(3mRyyJdZ5^-<q#q{;D1|Te}0208*G!;FZ
zOs)KISG&z4{NZ3+ouBJD#ao&%0w!ZIfRj9Fcgi$2g%Iwl0~y2W4`nYRul1RsV$W~*
z(u8ucQ4yM8OlVMZz@o^g7(9+5d#qfP-Mm)b4%kXa%{b$c%8wz;{@<UK2eMzVl4v#k
zOf~1e79bYA-`>ti#bVZk(#feRi@<J>%EZ-D%h(groT*`u^-W2F{rMRZiC&W^x<XZ-
z*UjGD7)L@}&Kd+lEulYNiOF<c!(@O01^?(1Qb8yHGn+hz$^#!pfI^hv{?u0mWmZhi
zMwjqD)Zp^K`?IT^@rF!@b@UT=;x@p=V(H|oV@c3+ewafF3ZMr7;fSs-p4O1cD289y
zWX%x%m}*z6^#cSFPYl2biA7)v0%<t=+;R*1K7<8_8BkMI++ieDXqf6~sTempr7U)K
zIeJYVv6xOz3{0X6$=s!_6WJ@Kdp)IyD#X=tz+yKmZp7lyz1xTs%EB!0o{!2W>%Kt&
zB2)@Nze&lpwYB^*amAH6v&}NJ&|)foFv4O#a1or)K5LVn313}VTI}aMVZ9u;u<Fl2
zkp|@0LMpjyWU0{_QUV;@r<{tBcwZy}Q&JWgVT@9`@{vHZn?v6*B<ZgrW&9T}d*INn
zqR`?s>iLfdc*jDA@WcC2mg=R^1M8cb9R9!(?5(L`No0B7W7)|-tf&A*kiB8z8oa)Z
z9iA{<&vR9rPrLCKBc{xAI}1s%V+WY*9-L!I&ZTen`c4PiR0}4A#mE70V-m(8f?`kb
zOm0tq^;T+^9@%@P7^19D`jKhA^~vB0(Xx~<Or!je%ngx3l?(NqHaLQz`gKzw8|?6i
zuN`ks!YGpvOGFDtJwNi)Q1h<y;C-j6E>)m2_~6;gXwpCYw~RnS#!AZi$?uHJ#&>$I
zSP20Wq>{^p(RwCg15uL`N2&Hh5E<dwMhusNKCF>(AV@)#MDMEzVx@)9;?QAEkcZXF
zuhBP@B&x^ltzD%*S#<%v_EIgW4P+53=%q=VY9hHkN}-a#8*WIOTz_x79&lG|TOu*N
z0x$w4c2QhR&p$Sx`AgW;F=mozb^TP_ml1F8x0>nyz0hW+QENhVbKoT)E)Jdhc?0R^
z8anrBbzU0ZTZ=0GOEiXwy=LtaHvHc24loi#tU0Yd26h2iOcs?n6FNUiNyK9fG8#e}
z`D5A9Rs_kYM7fCbo&i*&$UKNf9cR|A#aUGZHceKc(Q!c)RRXEf?6=d~_qGeFAtxwz
z$Y`MGyP?cr9y4T`AXPCYz{e?!Q!0KU0-2iyiiQPuW|*SPL&vm$-0oD=8$EG)?xVhP
zUy~R)n2=IncBoOiLe`T`L=i<+fC@&V{ZC$@g>sIo_cYrM=`>aDaDT(e;RTIw#wT3b
zv1jko4%g-ab=89pP4}*u?+01jvl&u>qr=FI{-h`&XR~-H*pOKDXEp+{J!<GoLS+@Z
zVxO^Npj!7HD5sZ0KzZ<S^J>IG6cS`UF}^~~lZmDIh1{82c=zik4?|uTCE6vVq^ek9
zULM&8d`-uz?i&v4&Rtej4V_jM7s-EJwnE$=zf`@s{?coU_kY+J+DE{_qOH6PQ*T#d
z2XT2=zt*tCt-0rZ!N^%SGtyqW=`oOKS~29oX2Oi1EQ3PX!n<&R{&?%+=Nna!o!RUt
zDwQg=L@$WX9ICYZO#yYlTe*kR$R3&#YcG+Wky0NF?aBipuDL6IOSQt*(cCTzYoFoW
zpY#R_xvi4+=+fH{%IhYcC#Fz_ejEM36{<xvlmGTd?NbM)pXPQl5w@Qu9p}8kD8O=y
zExc#_{h?r<>BLo(N$!Fd_suUQ;^p4=C=(&GE@1uhHV8T&A`hR%O#4<si@7rB*31mC
zEx7CUi|r1{$4<1<PLizk(l6qsH9P1@o|7eyM<l*yLiIaLT!N29@dgXaY1+)g;Egt`
zZyhBiN$}dRr6Dkxay{c58>1(B4?#m9=LB{vg@YQAg0+6Qy=EOzh7vInTB)QW37CLQ
z&2ZG?{9gPn4HjoKAr-gMQI}5E8dA+52aEvYF;TGl(<NaeI*YXJj2&59w;AUN+6cIw
zlmnvgQ_z_xRZl$Znlr|U<*v6vjtq@&s7UNKD(mW`l5m~*5)cQT4;D-v32^ayDu_0V
zPYo_<r&NpW!Lg8OxE$76B6K-3D-s=rGS~A>ugu<$!QS~4*57?wOPUYXb*=gLSbyo<
zZO&vxhsNqSoUs{!m{F1~{LEiUimI!tr%-(nN>0)caONEjbldVbF2;7+vIXNXt*66o
z(tI2+a<BF&*h~2|tzh}sYa|t{jgZb9ts?dmhzZEA{I;pW)O5?RNwBr=an$`pNVtx3
ztyLSQmj*<#wz!AH(AiE2C5;L)`Lbw#y)DlRPYLyjmur0iUr8fGm=_!7WHr7dJIHq6
z68+@#9gIg6qG`>`IsC;oUr{j9haeUmF9zEdFRzej@zW;5`fJd)69UiO2dAA@;4Mf-
zN^z48`h^Xbot?2wmzhY8(vVH;h4WcoJI%NTTK^8cWIBqh?z;^aqgxggh#q$#nBoVt
zr`iyM2BLUHR+m}V2$3Zp%ra3~bPFpItBZsX8FoL~NxMp$4F)(Q*NvFMp?Sn6=L<c&
z=%M%+yPN&-Atx6M+wQGsMFkFmHis_~?#1~x>-C;0zs5I$RNJaizW0~g*v*b(vO?>N
zN;Z>U&dxNA=pcomD<zZ$yqxn-(f{ai(TUS2PWMNKN^lCyKRJ}+4^Owjx<+Hr`WPL1
zKdz$U!dfdyfcWxq<mk}(8m;e5s_tq%)X{c9CK)GLJa=-p*x}CccBEOl3?6jSW!H!H
zm080IJUYaP)}*9hSSe2R%nl)dTun97moyaV*N<0hVRuXegE^W8F%Iq-ib+(M^Wyls
zxgGhBTls=gscBYIM$Br^O6Z1S79_08=%HPt2mj#q-1rzN6hbh!X?Fc!%z!I;B%?dA
zYecv%mbTw(2wfdZhMN&K_m!}aq2U6rb3=Ho!1Dc`>DnhHVWv8~_{<Ru{nb8g`ghEY
z$0C3DARpFpc*MB9UVV?}_zaKHlIv!ik)NEzpfCDhvbuE^H{|yOoC2{29&fED*;7vT
z^g@$mZC<)_oEMB0Vj%-D`Hixj1(`UPD48^!c;F(xXU>>$qqK|z1_nL{`D29T5+2q#
zeVi}VK_f_YZ4}W;vxAmBJPt_Qc1cKsT>JeW)KSweoY!?NBSQ81Umh=^zr~gdSmA1x
z7ePYsk;Hnf2xbiCZ*VB(x7e(>5r@CzP(jSR-K~0W2)z_4JKo^uNbYy+$AEs{Q%rc@
z8gsksct4`M-)nfJ<nr^*?7LULy!&T!Uc4R*liVf`y(@g;yfD_WrFA-^8Z!3UQ~${O
zGg09#^lf?BL>84mn3QB+q1n`kv#=E8pmX9`PBi;&*vpxTsjEkdMoKFg$Np-Mi5O@i
zE?jH3pzCarW}2|WBo@FT$N%=|h<U~~z3*CfMp1@0_t?my(w8{Dc#wlyc2jmnq~&k>
z(!g_b^<bf`$*hCtL&c-~&FD+dM9GY`*Ue!3Fw1bQ)9D)bewMoyNsU8uskH8do@Ka0
z^UM3)b(!tQ?ko4ko2pQXadj<<DVl0#t;HC-O_x<R82>w^-)J7cnp%=0Bj(^=H3x}t
zNmbXY=#B&mt=v;X1~r1W%Ew~-j3Kb%wI*AFd993xe9gi8_$Gp)%PQ9pcLPSEj>}8;
z7C0-@O%N-xNB`7L7At>AatfpY-^e^lErNvkOH__cp$vOW_H}sj`=6?IX+Gz>h228;
ziv-<p=w0PxeH0D@Ni0>C=}gb0_lwE(;WF=i`P+-iMR{|}B!T2RoW`F&KTze}msuW%
ztnf1lPnnQ(bsKi5N3T+N#w6+zHX;5m09in$zlpUZMSjdmxJO;+YC9a(JpFADY#$7<
zY+F~3J<ND4j=g*LwyI2yJkNP7I}x4${{kwArdP!_b^}2!LG7inoqqM+`PQpzY;-hb
zJO3V+s1D4FEm#`&q?q2WQ>VOK$)70z>o#A=x)#gmP92W?%{}#3`QUH8i1)t#l@G8H
z001BWNkl<Z3rx>J<6&4WQ}l#A_wVG@Km9ZE{@?q9$7nlv6vu71-8yl<tH{>Dg#}*w
z+Sh(Z@mvKttkU&hsmR0JGJ(g4AZ0WfVcL6{B$n^IqlI^!UA;9|#Cv8B-9EL4_GjY=
zrUD!A2E6S;Hj6K|u;H|y)~U^JmsJD#_HlN>n=k!)`L}O;wcN80Y>^=*kfsa#&O2Vq
z(HO{M;z?GPmj%!e0^UU<*|>27zy4%u_^F_n=usvQv3Uq@VA=-8!{K_7L*bL^AsaBO
zLs$=KFlMbqJ?bO!dudCgk-~STnY3;30YtBiya92FH#RS}ji>5jRow!qp{xw4on_F>
z%&*(}{CUjx9%dY$+WlGnY4@#q!>xCtYS=Knku4iH@%js1BAc0>{N8)s`%&h$Y?2SX
z`*-z%b2|L|&;Karea~4(eLcr)B*W2Y;zeSDENIa0yp^4VT>dC>j=1_N=9vA7bB^2y
zL804r0UyWrY(C}_3GIX-lj6suNh@3uL_eqE56zSKc2LSBAdW_&%y!kJlJ!p1bz9#w
zPjZNg_G7y)=TAQK3EkTq<iL0twJCX)Q{HwBzO4CQU;31u`_!}f(2IUeW{4r!uU-6J
z&V6d1(@qR>$|;TR-FuVFY<VoRuSao|Wf?i4T0L^-J=?Zz`wp;*hX`dtd|kq~xovS8
z>&WNk7|i76n{LvosxZdjoMU!w_B(I05ha-Bd6BWP0pl+X5-tkXwS8H{Ie5AkqQ!-n
z3?CGS!6X|<d(VUPkb%7Uv;Ud*{Mm=}9`^B#h1&=x_E_#)?(qY3OAoWX&)#g2k6-;s
zp8NiPr+<9km6NUPM_&APIpd6Tb@9GCWW#iN)I0Yv8%bztz#zurJ=C>h>((vD*M|3i
zsWfRjdsSAO7{g(SzO>zry83#XuPDjk#?@Mqv>{l);N?($8Xo1))y{A1j66@);Jwo8
zO&#w+Rhxsf?1@g>)*l~fn`HIo)bp{psI7BJ=LzN_#9RahuPN5dQglvMW`AO`62JMy
zkMQ?9|55kq3irB$tUqHLd&VnNQz?F?!$HQZBozmBh3-@47<V1-{K)&b+3h{_G5ar(
zPS(F9RF5@|_h{m^0KRtEv|xEyvA8_o+;h)84wCkON+1|*<KJY`(QR;8Tr?8X_6td@
zqKo==1jwOQP_s%X5Dg@dV6g~#s25B<Mq?Sk8H2OnC44(~bi{GfEjLP0WU*~OC?{+>
zep^zU_o(tYNMiWZ0N!DI08Ot#@|HyfoQ~#I#;uVgQ1UtI`ch1oCld%=mX?bPi!E=M
zoc|lmy<GP7&*^SCNZARb{SM1zgA|=eAe1LKE7SziZXYiR2bvKpoxrRA;MWfG8olE5
z`Ne}OPnwbBS;k;IW?T+=@sGZM_rLGm@*jWWlH<jP9Ofa6n!})~&_cl4!jVGk!83j}
zes+gr#bORSpSDR##KXcNNckvX;;Jd}-nBJ2A<sL<FG6S(HDSl3Y0<P5a|}l9gue_^
z(CrlS5b#ae^7hsjp@1zZs~T(%v72^~oi@4N5B~k1>OJLtm`z|RVW}C?c!y2WmQT1M
z(2izf@y6m(q0Zr(`|sd=w}0l)XWj6V^!r<%yu`hjnd28P{zZA;?|$$&3<u;9><tsh
z<<PUO5}kmwq19?tSp-32cxJ+6)<oLjtR%!`6E%pMht7K*3jQ4raq3z_GxWOs<2TyM
zTDD79$Gd6ce0t-|g=uJw#3kR)$X!_vYRU4T)+S&TY&lPo&69!i8P?7*RU96oU%m6|
z_zawQ0u?rkO{h(?+@fPdkFS9sv68PCYJ{}k;qrg@yk30jOXCXV+k~vAM~l-RvyuGT
zZ~n${951i^|Ee*p`k2FwNGFi5jbXxJaBgh3P$HR~hHyl|Qs59r*W{H)chqG$X~Oi{
z(Cr<+ZSrawP>&{Uo?$dH%`|!y>Q`qBet;0J%#)s`=`=Wl3l&MyoyTUElFaJV^c=U|
zTncI6^bPUcm)-wWR;n@C<{qQ4h!2jeTVTY{R25{AWYDgHWdcEkfS?M+RF7MB-G12T
z?W{lh$@3&fgbY`FfO2Jlr31V1Zb+JU*mn9^@Z2Y^JtfvM?86#SST&p=@IY>BT~k<;
zfY2aBLI^b>&P=TRD-|S|IBcgNJV^cJ5gdM0k(-oYJPjV3C&#UkxXRPuNE6c*k{m`L
zORVCIP>;bjm(t6yWyZovO`i1TyPa+G)LZ5Q_H#RL+&%xlKl^{?Kl``$>c4x<&%E^X
zv$+i5#@%-+iN$F^(gHBl4rnUUtcQAyQC>@F>WyiGT|q4@mn%&7J1nrm9MKz_;?yVK
zNDf~4UhdfO1>MpWSvjyr`yE4WYMP+jcF#8%UHP}1e!&k*=ZAjziAE$_;_HX=I%}p5
zF&NBYe-X(bV(Y!MEiMrmlQrjv<ad68_B{G@uNsUsK@jh;66kia;}<~J5Y-f{iOq~O
z?N^6kHKI3DK$3hv<NC@$(_wDYS(qlB-@AJ#-}u@s`d5FuW5<_v4%xc|%@`WlaM{}2
z%vhzVYRF9FDF_~#faGS<J#184V1-D=9SkapQ%72)G_1)fC4F*@<jzmNnY}xA=o!6~
z;oW!Wsq1F(euy>|7@^W-s19<^SN~e|rf<m8{{1_Z{?^BDd{@l`mR*Z>O+uj6eBp=(
z*#m~iTX$%P-4Iz*Ru^V+-uCakSc1{W<O$dZ4s1QbV?3w`RlsRU5<I;mdkJva@n|Hu
zfs6#k3UzyLv)B&b+ptZ^Qb4byx9R(Ja58^)#Z`Ri^VjmtYwprJZ&hj!WoEExN>x?d
zcE|mbbDy+jv*bQ#Cg41{5U@po?_|_YNP?hko~V;{2nEw%RY+}u8`W%Lja0=kaG)Kt
zk=*sCzsTZkU)EDP4gGqNxpiH9vxxT<c^>(dQneIQ8O!b<2ltQl#*e>Mp8op(`9y;;
zYZ7y_CQn&gJ86+FV_Q~qbEr8r#AG8H-)drRCizUj;zc6W?HUB_Q6=tWL**Qysi=d)
z<1Ra1JxM?aBp{s&G4?7XQ^XKVmnuxtDK@dRQt2l@bvb|jKmU+jx0g^sQ%2BmdTu>l
zYs#j=TG(~>w<d}8Pe0}Pyu0~ba!m;)rFI_0LY_cf<Beie@!EnYEw36uvEDG3tz(YE
z^SPC!Tj|eje&UU!yyADM?)rv4rQ6W07NHv8352AJ$!4e}^4J;`j1Tl>j4`lp|LuCq
z$9`7Mc-8MeKAr?n=Saj5L~-h|RtVwnfvDI{vpU5Hf}+7;tl+(3vJ~}#b&>MFDI3zn
zk{W~Yimw_V!>Qm!A<yyS3S$)1V;`kAdG^0}u55eyDLmusr)iQ1uYb+Y9mnWa4+-nQ
z^md><FddeL16ddfe{;o`^vl<OoUeRqAG`L{^b}@_lq6&%#?$Eq%IW|Imtp-0@GmY{
z&yT(QyAM14(@#2uuiSSVSto_EB$@3|yAfmoHA)kh%&+*i_?ucw-Uv&#@8*|Z`%7!?
zex(QZeMS0n7e4VuvU}%O=($A-T_%hdNqRj(RmCbc21i1WKtjOMkcSGSrnU{s3wJ$!
zd5916dsE!sG^kjLPR4Nm5VO9s#*oaRoFyn?B!*R@pkr_@P8s?@)imU3N>TJMD8@NN
zh1A%Iu{FLS)HTv6FwGc)!XscZUwizg-~9Epc79wR!E9hy)lk>6`}QTSz3v+Q!arQ4
zJ8$wV4PdDOGnKP(-A0PgVCouIk4QAmra%2m`0)#$%FAEz0(si0TXe8gL3N9g$Ci|r
z|IiENu1|kV?^#@7W_m6PFiC)1Kou=VgtSZWG5^c+4oO{;4wQ3GIg?*`+A9uu=%o*1
zW$8%>x9+-9n}d5;FAi-+6rG$ZcqGfQUNPFVE;$OcSan!m(zOYVD2t1GbkF7Qk`tc)
zYmdt!R-=;c^c2g!fnX`}1n;Uz=w)e12PM)4#TZwx+K`!mv!0NokmUpsf{!5vE(*qU
z#L#KcC-pUXmNGVq`UYG>W(1ms|5uM|b`JUCXRqLf>%XP9+`PiUB_NAbzMUjv#t4m_
zq8u(VT56c>!f8)|r=K>*OJDdL&OU#;6zkBk+@s_Dx5-qtUfKI+a8fKpziRtS`PwsY
zmd||o3a#@5Cs3yrDo<h(Y-bifa&(Issya~bFPTmIbcYSU{;Jm>w#kf^?j%k86JICU
zbIs>u$_DLQrE(6N=PV9Nrn(v8Ym(scHpcWuH8PI-27;$!bEYy_-oJ+v9+z!Sv0|vo
zlC;~UDo11*n46tFVw-Mlq=jz5;3@a-X13pFX;9-$hb-;Vh#`m}%R3~E$9sosY9K*;
zO_5Gf1qjZA>M=3OAFs!qckj~w`l0v9KVJPg-E;R%4E8&wI*{59NiI+*byZ@Un&ANI
zyyAqdIp;lh126c&XYt)<oh~PDn^6;%z#LGdr09%jnt^ILm`Avj1AnfpkNsO8{NcBe
z=b8N3=l@32LYSI0_{?Bb2~|Vk3v6SU%BNXazK?!tc+0<etvr9z`G;yx_q|`OKS-Jv
zPrN75x&&7fq{bL1tBRuABY2Nh2d*JONK6tRON~tHSRxgVR16pPAGLKqY`B~!3`fg!
zw#>2YYFs&{Khxph!hyqK-3OLO@Fbz)Wfxt@$=gnluiU&>ufG1)I0#`9La;O%=wu0v
zD{<8b=we-os|1@Q7@Lv>3oab}^x|Ltm6o^OE@jhPGPQZreDdm7KWX9Dhu;4|uKeQX
z_1c}^<iNrZW6*?(LUK0DWOVbKa^$Go08zyzP*`~3%g^WeFMS2y^L@`D4E~yRy#;6n
zN^<~Q39Lk^3U!g?MEyLvIKOo7<ubGGrHVxL;`e<2FY(k9Pm=$B*{5~UdG;?J#9Bix
zT|#5A3ghuXe(;R5__Lq7MCRxn`tZ%|S}or!NwT0uH$3r161+pKr*29zD<pZsxb$%+
zH74TL*vJ`+MO8>s16ELzV$&R}Vg7M(B#on+7c2~x>8x8vni>|D?!k7`)|2=Nn~I4U
zJ3>H$M?%9{+fR`1J_DA=n`FmVuh+&|%+z|20$&XoRwLGTIuv;{f+B%rP*LQD+IcLI
z@Gi^qNBo)hzv~jc<+|%QaOXXA#$%-R8Zf98mVf8BG~cj+XMFGT*#09wLh?gD{J0s-
z$3OmY{oLh$FSp)!v)*#c&6I-`@~MoXDCp)HzNwfl3UVD`{gCCoBZ9(7+u`ZwZQ!(1
zH}j$&{MT~k1wW^BqF~ct{734VT~LoneA{p;C3QW(7$K3F*wdAa=udTZc-z}A>}`LO
zlAa_0uRHzayzb(c%X_Z-C^zo9i^T&AI#?c3Om{hH>xuG{&wnZ3o1by`g$%!_)!t8#
zn7z-#jH&AJ6K^C_>t-0;Wg`ub1-xR)lEkD0ThN$-#(*~o7>oKqq5-jn6|Xo`Ff%uM
z>Ep4`+fLYu`md4qGF;<Pb!3U*#1pnmu=Q0h5^09aq(L!p71O3+BPlZ$I(TaJxZsH$
ztDf4`WJOArMk6`><deDU+B-2JP&tpo(<?Hb^VDz8nYHlYKh&L{{sh&Xw=?CGbJovN
z<5AmSJoLLW1TEOVaFBg}^EcdZ`QLKl`4{N9ANlBGVkjT@zz6v1SHG$^+;9W?_U)r-
zDjHX6ViGz@PH+8O96$FS^(Ep*tn3?MJMi>V;TdOa;+%7y&Uby!sj~T$MEi3+2K$GX
zP<;zJ+v7bo6^U_#Rka_Dn(j$%P;D9K69ZX=kwtnY-!Zu5oierkCzam!O|J88=e!2a
zc?7`5@}Dc^S6DiD9h)|Hb~FY?!=sN_j@n3O&w7#Gb@iv|cY4&`5f+!|7V97cYLn8m
z1%^Zg+I~$Z5KMyY&v9T`IcekJotf`_@4I>HTmR!RFZ>(63;A$2=)Q74Rmd0*7n#l-
zul}JQYvZaYKW!u+ZHq~3J&2D}BMl%;#Z-|p^iWm9C~uuuI<`kSI>5?k49xPJr=P~v
zSAC69Rk3lZk88%9*cYBX_wWmI(_7!BJOAddI3+i17MSaF8131^T)!YmVK5#N7HTq+
zF;mw}cc$3X?Q+u<U*PY4@VWZKzy6zW(F-5(;$QyR&+1iI?~s4|%GdPHyYFDnuKVyf
zx<#)Qt2Jb4O0Szy*A28f=EKDyz8$7J^Qq6^g%_R4=9v-ao;fR<W&jCFGSIQRg?hQ5
zZi-9s-<XFN#A0hx0%J_m07WbH(op*x$ukC{K;G}+sPS%$*7si6TenRQ?)@aD`(>To
z{I*AYjVrs~tHZ&!Buy5ye?pHYOBgl@O}g$$XmH$mzI0D~2D|RvsT*yF4bwR^4M7{6
zqzINYG-Td`cVIk~O;}dgU)C(9>v;C_-#$6r{BQg!?|jF*^#kvHH|Ib5dHjnX`d4!C
zTYu@OKi((a_ELW7zx@wxz2_dbZ9S2TzVCTFcU`<m2_DxBu*{+&xYU9ZysJ?aybE-Q
zNq9LP(w&~7@(zXvNz#nOT9yYDCXYi=zxZ8+Ed0<}`o*ta%V4ydjhm);=YM$B!+ySR
z{q$>e|Cj%Pvr{E48;T?)XwA&rER2>29+D!*2WWy&6dgPP21|U`bdSNx3jg=le~lkp
z87MFN@go-h_x{`a8Ly1^^4GqiH+=I3hT{RQ_ACvSbh<Z9nkUT7Oi_o11dGWG+9>04
z#CTX^jG^D{v;EXlc=q`h$}hj|Vm)E&A)>tU-gjxz+@SdV;K~b8c64$_?MwRISzS8@
zUDrW+UX%)81i8WF)7X59MXyxTfk7w5CI!J8T%GM$q9!B*YVKj*fp_S}^*_KY7e3@e
z?y2+}yWYiIZ%C2WYP&fHMuONG#-WetocP3tTL5Q#&kOa&D^{c)@7H~!`<V$Ll2EIn
z+Muq9wE|Z`A_QacSx%G9u=S*K4!hvL{ky-@r)=MdcxC5x*KpO<U)J}&?>(IQw5M|Z
zbI+Hb{D~je=bU@~Bi;#4nMN-APe1jbKkKBH{!~FFj$t{*YeJId6j=xBGfa|lu!4TK
zOK3cciwEg$-pXjHBvnr}u9%yiIZW&Qk{6#Vy!hNl^x5ux`)}yM>#t>VJ!Ye^)V@M#
zLp2Yb2{2}3|7F{-EO=5MNK2^d0ULUKE`RsCc>c?d<XHQ!@Be`A+q;);uSe6=^!t4r
z4eMuSaV?9Yq=qC2D=SM;l6n1lPCfNh&cEQ<a^86t=&OF}b@G53?c{K>h_IK$E`qOj
zL{2R*k}?=9$?Wu@9*4ZsQ*4*PXvoyuM#?N@XnT}8$FemnnK8q9Of#%$YDboKV?(K}
zaX!%0ieLOIoPJTE!(49z%cEtUwe@>Av2!YY=A>l6-8Qg$v_j!l$Q&${21yfCx)e#l
zsZWNHaQ070y7O9=?sFH;_3Vzuub`nsHA)a$n?hCqQv^IC$r#BLmCSI~kG*elnh$^Y
z!+PEIJL%=HaosF+Ibym~5Ug_B4d3MYYrd*~^oM`I#`T+Z<Hn6V?}GE?)TeCc7v6Go
z&64Bc3a+fFlZIldN9hf&ZeqipNeCY1a;RLu*o6MvItHT}T!Za&&?+F_VM2XW@4xf&
zUtnfsh1vcTi8!j@NYVsLjx(Ohcr1zyN~%KBb{-pzEf@hP(wu-$loi*#_SJgMAN|Q;
z5Al!x<WI`G-~Aq4w`nsyYZ(j%G(KR`jHYpn>oL>mG-o{HOwK<0Y`N&7AJ*sp$O|6Q
zD2~{<gCo&Z*2R|8K~0Px3{bblJAb_nQ9{wfojA+gA?4mmxasaCZoPXS_Z(beZ+(zK
zGsc*NB<nF6DI%b@iqoZ}gpi};1dZZQqj8Plqga#EDW)_r%JOgzy{sZ(KWVBA8-ZjR
z=W=}0Vcql<S|sb)w)tevJmW0h^0b%8<8LIuY5)F%-0^2`xoY>FJL$QGzKul2##fZ8
zm>^WHV%Zs*VwR9^lk?wncuUe7-tY$5v15nc^iTiDEjQjkC+}j_V#(-rQaYVkd=SRN
zA-68A@K4{mQ8QzC=X>5uzf-Vz<9g0GZ98Y2ewu9BdZPaOpME2GUOeOtC{oMR)D(+l
zg=P+u_u_c3bJXJohqAn?<({TgWsMY5*xcfskK(Cb(W599Uj5Ur(e7x4b%`ZarK~Ev
z3)m#~9w$bqjNnyB)Wor131~YdX)vfJh$<Zdr_9W<^UGi1oWK0E@?$TXT=Va|<3IC(
z4}6fld-swgmZIoz+G(e;efv{5@4WNm^{;=UK7fAqQN`<~rH`G=+_ZAkHZgSao=(J&
z>^hcBitDc9-l1^Sjd%0;owu{M6qZLhA<J>aEVZ4&dxMlY*c`<ZbV$%D$|+bIQBxZ*
z20~VlC4HJwsmmHMicM$eb`)P4Qh_Q<Fj*HLgmM(vU9F(Q5nnraKYw}M)qG^?FZKM>
z&*Xo+=;3po$D|ARlz;nvX20}4x#ij~DN@UU`|j82v`aTDs6xX)Ym&M37oKv?bFQ-g
z>cK~QKl;&#*4)4Q4t>Y`C9-qpPQBsAn<y*CRDYT*E8;p@gYBerIvo;$Q90taJMQ4_
zJ8$Fizx`_+k7|B<{!)^ntJ0aGH#^Jh+y*vm+Q`;Tn<Y%2sJGga5be_MPq7#RVK|1Q
zpi|_SQNsRx`>CI@nT3S~%5g=NWk?!WKevwkd+w)W1Bn>!+jSS5dt}pG(=_^p&;MVZ
z|0732wWFJEW=nAN)Dx-(RLPSZ4T7snG%+nfm0&~5Un~uXB0=J4tU{3&tc+K1zTpI8
zx#2HA#WQ~FWrw}j&;Ey>m$|t)UiPw==`)`3j0b*}V?@VVuH)6SM4On$Cn(vaFx`e*
zC&{Ro)7uvh^5<7x!?k;c9870eP6~W4BiIBj9BLIbL)Bs_h(sMzsHq4N$8>`SudAci
zLMDRb86mNetw$;bp&`j*iMsYavfmg%dx|j$ibOe%IzT$$lVAHBU%&qA`k7z-Jx;S5
zAM~Ec(U3YnEV{7c{jjjWaQ^{@<BI;=9Gjl9U3uQosWtt7AAH|SzW9YJK6Bm9e_~-_
z2`>hlr3|YW*7b^<PMTmsAQkB3DdXV?hfs^qVDKo;E3R=2b%v?uzMQFNeIH@ti407^
zs1DG0inL&^*~`jx|A)ahuVL<a|C)`@d=7V2LTwAwEB(B{RAWxCODtUVXAExm5`9<G
z&xGaWMZ9nDWy5GxQHI0C<o3Pew{_>Ae3a8VhN)@{K14C0B&Dotf^#HUMxz0Oka>%k
zK$VtwJgGMr5`2@>o$j+V*pFtyh=ipr+c^L8|L}wr9T)C;i{|c|^Ibcfr>r5gLOo`B
zzN}_1E!IC<IpJafxcuH<(NBKm^L+k>JuDUL8BcA%rG12yfXCYrB1-TUYH1nfJ(voy
zv7wQP*HV%s#kmki5;ci~b5=0c5gJD?oyB{l2@L^<8Xq?qQ4}RD3Yz61)Uctmp6+rW
z>{{m9|8f}{=*i>aN!A|y3*QpIKSsOO&%OEL%YN?77f=5FBOm&Gy?*Dla_il<>%I5x
zVr6B8(P+%d@{j~!y4ztYO|W<}YhrtdiSy4*69~x^>o=^Un3-YMaL6c8(y3XR)|^Bk
z)DFC7WqE~}szRg-)?i2}D~Hq#b}I57m*bLY@i^~D2u$~<NY)v~!y`kngSX$tmOLTT
z3NeA;JkEi4g7+RV0enLy$)wX>MKB12D0G@2G$AltS)tQODSe4e0|)Nk1-o`B+qOL+
zh9acM>f<A>Wrj&0xOuVZrL1Yo`O;1I^M!Bip<Z_q+MT6zf{KmqM<Y2z90pa$Eh(`(
z!>bTfqav?FYE&^PZd8Mfxrwy`p~3qKLW4CzRS(dRK;kh3q=ou}#x-e1B_xKV(`Bp<
zJC(r3oELrQm-zC}{~?dNkv!hV>wf-c<$;EG*<XEHZ@TF=x&5|#xciRV_5M3<qN<0C
z8pm)rq^z3>rD@sevTyHxPI*>>1Pir`bJGe*YRSBiB(Vzb>nO{X6bX%_5w#OblIB$P
z2xBc-p3w{kSmVgEg3)-ucyYwWbw_fKjrQze$~7PrCQ(8#gb*holO)9&LueeCK%*v(
z2v4pyM79@+QV%vw7!CH5&1N_wBq&Q?+`-Jh{fQ@J9jp|H$>%5fhte904N<wO`?SgL
z?zrt<2AvHwS)Zi_)MSw>TNJSt6=}g9fe?qRRwXmUq_N=G-Utl=u{lT})HP}YRs;<-
z#s-W{V;x2tutEqvQb>tl+ViGaMp-pcBG3r;FYaf<`mNlue;1d2>l1p(nXi=ZXd`*B
z<0UVCnegHV_gbUTP(SsTpJLCR`(^Lmz1+EC^_KK0>^-=E%V+4V-@<TMf-2>3jMxyn
zcQr6G-Nz6JA>e%twL;#-H6_kKSu1sbjnlLAj0YUOxhb;3a>mI|J>qj#qXGGN06nOk
z!<!r=!B-9aP8Y2Q<f)CJgxD6zit+ebDLR10dx}m*-8h^TyaSs(aooXqv5xVQl_F0R
zYk)G+3W=w3W70IXfn0vz@AQskN7Y-;&_kN%gvtS~<wf(68^Bm37*wP8jDf1QLvOyF
zZ!>KnSSC-e3Iz3tO;7?pC_$?hHdnApXh*nHkqE|Bo+8O88;6QAchXh{3j>nrg#UZ(
z4lX(KmHa<vBoB9VyFGc;zkBszk-~3%@c@7NrElp%MO4sr4x2_fH^lKP7r#Y*_QF&7
zozLIRAAjy@_3NiededZ61=V0oo^>e42l&N{FXp$N|B*)=-gLTsy3^AnX2fuLNN;wU
zQK_VP#$Y^THcP0>5t?=4Tz*St5n5Esw|RV$rVPhp(j*1%=yp1UvSMlXeLPW|k6Hh_
zrCRysCAC&$HncP3wuM|fkjEjaFWz!J`zpcDO`{qMjJb{EGarh4001BWNkl<ZdrpKP
zk(5JJ5Vd&L%EmoV5~C&jo3PomGoUR6lhH_$ZWCEUOxTV>cxb$0+c9iw5(LFL$EX_7
z7>DyU`&JG<ig4?`Z?bg#r#ZO$E}G#%OlVp%Y$0euAf0?jgTtu9;DH9U+EVsdG}v~r
z4K~=8d1Q<jM-X?33OLCx4blNKOGq<{nI5M+>${a_K0ewUNzq~V{d-|%a|<h4(k#Od
z7ioOO))Tj|v4C~!*V8FFcx$MZ7I4KZRAXFfsm3+y)^B{230s$?vLQ{C&Qzbudo;;#
z#!}c0^<bH9r^~^XR4;GZR(=5|ac<uV)OAU>$Z&21VsVww=}a^Cv@@Q#-KX<?c>CG;
zVLcF&=Ndvy(>PH-eMvrbvcky%u<QO6LfR+TKE7T-@DxE~%ZpJwiV_LJrIk8XvpPDx
zhW2SK8>Y4fBIb}W5l5&^fKXPE>c|S%G$#E<NK(OuIAMxfGGl0hBQy=xD8?u&gN1Kz
zB=uK5z+KmT88bSFA1!LC6*Jb6Tkt-jL@GIfgdh>eH|nr>5{*Mm-dF+(n6@e%XTl?c
zV!)UN5s#V%hu}1sugM8a6HH3Azu~&uu3`Lt{+FI``m^Qam;Kgby1q>l2pEdq6w5A3
z!l^20nvpbz(7wFWA<Z&E2+-@2CK)a$xSH-%XQG+-NRRcWoWh=4zD45=&1f0P60%Op
z-u(yI+?%1Fbs0Amnh8#nd_qYS@1e>njh+&MCrt|uE-f)VJwsW0y3fDp32mvL-EtuZ
z_taWxg=<P_ywK@xo$s9R_Q~fMjy-AKr}P0rEQ<ON&=Bx#-&`;;=TLbNlv>xa*{mAG
z>c;EWc$(EwY(pnYKs=3@h!nQ(-86wFC~2BTf)^`@SnvUBg;Wi}*X(6QH*rWt{V*fB
z|5Lxf!CStr(~L>o5ECj=^%Qs#6$FDfN+TA<#z{Q^iz5kvOnpm+(1}un;@cva#k3bD
zB6#0K{#_b^fHx_ghM*B4(NH5rmqj;b;f5=9|9|~AocGFK7EZX}vGF8nLciZ<46z`X
zMQ$e%p>~Q{)m$`&g~bJ$^>Id_SzaW`I|zYtIH1TMT@JAAr(Vm~{`xcYEvzf1N%EWn
z2N&5mJBQYuay4OH(-<lW5>gO9Q7*{Sgvxn_W5@L7t=zgWVEsAgJn^w?@vmjwN#{ay
zyW*FX^mHMA>S0fMy%NWowf2x&5Km|~QEx+}3pU!0E~FR)uT{(6+=g&4p_z?4McPI%
zv31rECLx!o(u^A{0*R6)7Gn~`NF=idT&SsiEY6CFA)O7A*oWFThmmhijAZX+Z)5K_
zzNnj$A%$@i(vW7+eGwF#kFHS_n?&Trwr+5h<`V_0392E&+EO9nB8!z8gbX1g&?>Kr
zi~LPelWGE5p=!v}gmSpdv|9Sp>)Eq>E7$zRJM`=q{*2f&e)O2vb~GGP*Pd}%L)yXS
z1+E;SwQG~&=-S6sMW^VH_4_PVkwqn0O(=syn@8D}^7Lm)dg4~C_a9)mw9H0Ru&F!C
zN?DN=IYpi^SXm<VLJ%JbEyQ3$^dgaT&to-Ek4JPjZf4iGVkygc+6Cv&KPgFHvK5kt
zriU_(Bh`jHF^~&Y=?JF4VcPmd%Si7vB3H&7;%wGcQ}C-~1RN%kBoVfcoXzod6-(CZ
z#t6p{5y=*KQB{I>B;6dGPFST>A^1RWV9AasSj11W?*?xB>Xmv@Ua>iG^g>0ViaN!)
zl*;$0=;O=`lFc9{#h3(RAxaM?c$-tDQ&dSGN0&g3l10U-Ho5X*a0teB5GgQ{V@XL>
zD72vnV>*6>86Bi6H5<~3?&w~&*afERUEKbqk3TlybhnF5Y}9Wz7C(+e)c|>3v=}~^
zBqow8D=UD~o$gUrBSaheQw8XwZ%euG6)%;cD%R!<_b-u_j?_g)!o5oi*d(R!&|O39
zV%3oPgd`|gfTkQVJvBvLJBA3oGfrjGTi<pm$KjFNhMsNcBsGB%7*8Vsw<@8hk*v&k
zA$5ZB@wI><h>hmZl9vb55KKidCBf7LX$Zzei3<}$uOKiCBUWU{NJf;VB-jR<DM_lN
z9l=Q*xr`IQ_!#aPdx($i0ajuFc7F0*Z0Q90(%^;%5ML8Qh(vkP8ba$L8|PczRYgNg
z<W;2=D=>JCoVjsaH^iTb(1_qQLUiimiGv!vNUOaj(PM?UD}-toC5)?OvSyhLX~k&Q
z4a!&Ed&~>xeN9=7Ahg3*-cfY>m?U9Xm)NuoqckB&I;3d^s*IKwNfL`qpsYvK?$L{0
z%)b6&l5N{rObVnwOJxjcnlc^^$kGfIkDsiOM+oFTkb6ji#bXFrhjE^AzXtBJhG)Lu
zqIr(fqiJf?c*f0$rm9FfIfkSykVeAUo{s5hNrGU>Iiy|5L&#TzL*9h8HD<M-B>vE!
zn*he)squ}&jsuL9;9N`G9HOp#s{|ZSn&7E|e}IwPeU)YhZ_^ESL|s>y&NR-XcmZ!5
zK}Qf4vAT$r3L{M%b=B22fe7Cj1*;xQg*5|G8It2j5Q3yQlb}W-U#tca2?Q%R1C_DV
zVkaZNq#az+rE*HIKgVphPrY!E4O+4HpRPall{1FS8jL6s9N3hm8pk<yE0jJy{LVvg
zHeRa;rpR#OX&4dG8p)21?BV?X{aG1o+r~Ft$^O((3QYBT6cYJmO5+(NfDv*Hq^cz9
zun68}EGHQ^RW-NemQ!AE5u4ul3zr_RMiSD55rH~MA<0p1DNI7<AUB4h8PFZw%~W+i
zQ+dvK?ACAtG;Q9hk-J&bHXm6-E~qJlw1tIZNG8T2Hi=D<BBW_bp(&lkgsou%S;(V$
zUDJ9p5xjVOB81e$xt+C-i@WP;Nt-2%8=>lPAyz@f*od52u%;m~O^gBU1G`OHy+on_
zPVAPduta7Q(a4!QF?0=}4ig-z4%Z?!x~keLDNYqhGbGI^#|>3kGL<DvC(tbIeGHZ^
z?i5Btn@jmgZU|u7-OGeS9FL*`F2Sfl#1LXL`%!;_=UslejJBV|y+y%rs>fXi7LZPl
zapMSiMk7k&9JL0V1ZokMQ4Wf*Jkw)eC+DOe_yNv-_xq1)j;>$?Z)_wF58!=ZxU?Kc
zx$BaS8*}n>MqdY%%M0{oX4iHWu3_si5BOU9TC&FTC^~A;aov*FDb>oDt|>TU(;0M{
zf+QFwjOQAkNo`XCMeyMPMzXxTJgMdyW7?{2h)GfljRp)(+Zss-lh1y{7p*pTD~lFA
z!vm9`n5+eSWOpRCT@y6^zC9#TDgq${oO9SD!6ugBaQL{YmKv12g|f56VYSApVh~bt
zQk}y3F4lJ;9Gmdxi#~sa_%l!EMh`sY6mD4<lgyleN*XK4nT1}LYP!qPRL1^Z%D#Ti
zP1T5Jzw+gr_g{YRxF@j_n_!WaOF8z$b*DNMS%PV5&N}@R-u$Z9@T!;mDE*EwJh10c
zD})`kehNje7qj-pp>>17@Vys2hpXQ3-{kjy`M0A`Q-}b;>S&m-N-K5b<CToZBdkp@
zMzCTLBGfqP4pxJgB>rD@LL&XJyN9f*N|`ktWDOs02yMM&wNl!?tdYIMSWDG37^5Vq
z!3WUB6U04?0`6n9s0zK-T^bbCRp)CknqmnMQjE_g74c&^{^iF$A&Y<Td-~N+e}-mi
z8s`F9dpcQ%BG0LUa$sedfkJ2N7N$=<jaU59pC9+eG4a_Np;e<T`8=L+HKfQ>GGCE3
zCDV91evFhWOwVj(7^-7vi51Fn9MfErV%4IqMNa{Xka~;NCW4d_VPkmc2P>({dV&LM
z%VcPbi4>n2sezQpiXuX6COe|NUXCaLP4)tf|6i3%llDn8(mI;9E)W$i;zbA+)d;V~
zao|7*9yJ=nz2)67z4h@~RTVm>m{f3swFCn}EKUtkA$}E>^pD9~&c5+Y^22X@6YSZo
zH-F&2u(I!d7WW@uWjG|Co@UF*Cv)C8XEXDf*L}wr$7I9QSgf@gV#`U}vhG8T4GmMl
zGfQA&YRPm&GhW2xd6cj?T2xwMcW~WQ_{Nbqk5=({+C(o#24S_D9}AjmH{VA61I{OL
zw_FvcSM`W05_D2EZ%mFSkUc^P(^b_d-!`hPLAJ3Glm-(S=R@$ZDsN((9{_D?k|e<x
z#d{YS7Tbn339UzaoDK!XZQ`h{v3pfi9KOx7G6}J`$74)mdcszD>brlJ|Cf#!o}1W#
zYXl>T$xTEQ6CrUGc{#w0RwxW)so>VMnjF;{wuQ;mI817p!jcma%M44>dXnfrB03u$
zCc`vYo=&tLBJg8c_&3CSL{b`Z8WQ}2;KyxH6$zr(coP+A`?t*GcPG{=F(Wn_XDUKa
zkPJ<8yiM`Qr0VT`O#Y3ru|0(FsEMc_U7~4NcGB)BtA$>TI6SWPAQhNar~IFfZ+k>l
zs`x!VQ&6kJ2BipwDM^@;wB<Cb9)mYDG);~79$z>3x`DP(+$C*u5n-)##-UB}NK-LU
zlAsM|T4NE>I9F^8K@xo0#oG>I@^-HI;k}4HNSrT`k8n-3R9hoZd@uyba7jUJawLg{
z>s-9BBuP;3X`G8m{^RUPYHcfdb`2UPilmApA^uw(iT<;ZeA^5`B7c9Pt%0cETJ13r
z69Ey8vmPM?BsunW|1{0;8sgkdVj)0kvv#wV!$PZQAkr$AJ%lHzsv2t(M9johH9@gS
zM$zpfMTcDr16G;@Czjf|=p|a#j_`oe&f14<^-awxA+@e1a~|(JP0%>Mo=-Dulw~I@
z)D9=HC>f#XB;Gs`G8_N>037-;Uey3;8<R?d;9}>Q7$gJ;E>1j3g7xN~t>D|Dh3&ep
ziXO#8lwcCPMiEyHv0GeB+E&_+{=NpFZfb0r(s-S0>ZX;ATSq4<(Ri73f=s@v;&Bgp
z4M!Y#r;GD}`}XZ;dF(jxlrv?+_R}Ot8e2IgR`|&C$W?V(2-qygW*LZOWmK^^ERlSM
znXRYF^p=w@bdpRA?ZI}Y$J3M0B3hI8!nA~Sv5Uask*dUwhn(K+{IeAtjoFB4H`&$i
zGBJ+u81Scu)+?y6rZ5@Ldw{X(nxDrnJtFKnEO9^b5iyiyjY&IXy^M9IeV6d!_rh(T
zWnu44R4a}&T_v85JW%o=@s+H3N72LaucoOmSsJJENXd#>W>0>W@GoD>)V{A?wePY&
zCV0b>u}`mss?{f`=J>WME5T8yXUf-XF$q8LjP(z8TmOQ;{EJsIi2Yu!DRH9n04C|o
zM+a47(k`~~lLhpvC<}^p<M~P5NbG!^_!B~6+YE4x*8@T`imdFbFHg<QCo{8<bzt2F
zIOpsq9Tf{}!x@eF>Z+lHw%B+q#n~gl)>dc!K{oQx+Rg)w;-Sh54?c8d6CA>zYFLMX
z?snMlESg{_@=n{*zFK?<5Bi|B0oP<&>=2)y`TyH{_h8Gi`>yZv`>nP2KIcCA_U-PO
zo}L-aXl67INtRS2$+D!eBpYGImX%;3WUK_7fa3zYVmm;p5<<$B5vin-su&wcs*(aK
zu2exV1d@V30yZHJNq+<!f`dXKOMc8q^Xm6~owN5^>z6;)+UJ~m@9CcI>3jR7{i{0F
z-M7y@kG<FL{ri2th<BJekc!k*>`psQ`Y}B4aoByGRGMkgB$IR+g=oiahni6J8-XGJ
z+Zkx=*oZ9~-8Lt;U*qlFCH|LR_!WEqC~@hZ{}axC{a@1UT!C(fFx`R}OC#0*z5rmQ
zQL3}FtPr4<(_?03D?+|7Yt731ko8wpL>BI733eqT^qYc3p$iGG72}mvq#9Xj#;l!t
zfYrCXjpzQIAA@J#ecKc#udd5H<YJMdvOspp5n8!L64@nb!0f8YVw#X<4aGN6lKjFk
zK|rXQRjA8C=tCbRN+x;q{k{dMu+;X@9=aquIb6<5mN(I&^GH1+#u}=^E3xrR9%BfF
zvaL`gB-}y>bd1430#`1Jb>I`Mr<Nv7d1$iD13TwAdF2%z+kTx_zxIFd>z7_-<;o@2
z!Y&VJWIXa26<*0)ktXH1#|#c)Hk(99>T=AU`uEQ9dZ3zx9dm1Ev$X_~JX<ZZLP!Kn
z^gXe<sc0o2C{>)YySK-c$*Xj)e3L8R_y)iF<u74pPT5C4|8KJTBY*f<FKFKOaF~So
zcUg!ma_AGwA&t0wD8jd@Eal|M{$}B_uu3i8djYBgIgvkjfGyXBGt5m=QmIZLf@xji
z$ILI7Hxmn4&4Ez@DU9eK`?XUj2pLKj1@kps@^nb9WJ{efgY%kJ?ucUCPU){mrO>1a
zqb_i&z0A{BUgzA^*LY-dfw%2m;M9ee*x0_zBde=y`je#HD}*qmRaa0@C{%d42bIbx
zPGyC{N;6U{S6!Srq9_?dvKSoe!`D19D+VgLIhTJq7Q;42$M2?Ftcc_hpthxU4I3*B
z(*)aBFSFLvym9dozxKudln4LbKd=w~_rEO1>q&Cich)sV%ID8Y9?R~!q==g3?z|jD
zOmJiO+7@!=`R7{ZNo+neW+osWDxXR4W^rX<d=dpqICFE)vB2uIGz44tdrT0V5R8nc
z<Qr&uPx2gLq0%P(YG;z$6K<&yX@QDS6IqQ{IkngF=+=4OdEq6Vy8JCpU3{5Gb;4$x
z;H0I!vcszu8F>&K5-SW(A`wky^^&X<8KfXzPb&r_hh2e)5oujFdye$pEtRRD@<`>H
z=gm&a?u8IFqV+gK^LEg+5s6cLrFaM9Y0DZFn-&RDbKzh7zx=Hae!%|VKl!J>0{rlC
zn4BcCFOPCb7ee*oA@iaIn&Q&v<EHEQB`?VU6N~wV&EB)G@#jI;8wt0{hL~7puT{y@
zkkRHJcRJ}<*Rt21;okBWU92MXJIR@~vlx#wyGZ@GLFGMN7l>VpC55n1db2X~Wec8D
zBB?Axaf>0B6mDSIryKc3NlK*BtgK|pM!L*nTbFq1!nb(p(l>eH%6ZONOLOG{D@>^>
z$Cghd_0*#k+TCde3NL#$(jRtppgylJ(|eE-64(M0uq2%8igT7(>0C7{OOFqXxooWZ
zwbjxaGpXp(1fPV;*EEuMBqr@1PGRgF>|Etkv&z=?6;3$M(+{2HuYctE&wc(Y|M#)<
zon}UIA?k5`axL=)!i@0Mj?CW8dw2Z|A+prNNJ$lz^-6qReN26_07QI>B#k)p`+5?t
zZm>OYl5o}`WukX}MXGYf=UTehF9|br6(zNShKRXscCDpiZ(nKI%y6nWi<wPJGK^+t
zKxquURT(L`ZZ9i@1gd(3bsb(h#5!W=6YOoy+7+I;@LN1{@moB4^&+SDCNv?@Fh*p;
zH0@@q&4}qVfsQgpSHF-x%cj#cgYC39-eM*1nAN)Go}+BJmie~=zGHoEm?!=fSgmU4
zGOA&eoX1t_^Bi6RH)^=Nv&HGn({$UrOt&ucurt2$+23m)`P;vG^r2S)0ddv?pd`A2
z2-ABTwVZcG%2@ra##uJ!tgwZ{f10tVW#rV}XL-xBcu|xn%1-Q-gx^w<zgfj9=3Ilc
zG{os$r51}kFCN>W&~2{CR+>Z#<`$N;Iy@a%dmV>u98o$4K)bg`<rSP_>gXoZoJ^Oh
zmiHMkpx(R6#@2Zr+r7lw_pWeiy3MKue9D!Ypb&LQJJo?|%+^0Ib)u@*dARb(&-0R-
zmHAIawL-N*v_hQA%S6s0PG=8Q#jE0#*?gOlA#`SA;I?4h)tIysEVZl=*$f@>J1@as
z{PRa%*;*V&?*oKBoQyMz@5%`}3LVvJdbI16dJS2c3*EHJ9(Q%=_SEbZs!^t<8?WV!
zxzQ@Ec#>=KRvYkC<5;_Rh0~J>8zE4~JX#Ya5?msPmJl${1IdE%V0Hu|%V!dfuOAVx
z+09lFs^qE66;jVc8#_dmHbq2)k@Kwk8m><Gr~l}GHwL+ZKFO?9dw*W9x~b{fj>&XN
z@ClqFM!{0)_@)SWUi{7{_&>L<vavg1y~|0Zl^Op?ULD9(2s(>tbK&FQeu6ErXUpuI
zUc+O)+3zj<#Du6R_aP<scrwt4Wg;LFU5eD+BVsr&NJ=!ohB#h*`PD%yZp4$^58mQ>
zQi-A#scHwY%Xm;2zN)FTMizho9@^bvZL-Cvo6?j7KNSc~69x0Q<jWp>EF<*+D>T^s
zj!u5qH6F6?99i;6*LZ~T*#CNcVxRBj;aluQQ3sL&9z&)rI_(&VAd@Mt{#Sot(2N`P
zB-t{h`%Zb%-YzwX6SXq6KvIu%Q!49_$qpZUa3w$S!c{vPCycuZ&ZhL|%`BD#JLA`i
zY3T`-dVi^+%rkerfy%wVg^)}Z(;=co9EwWb<?g%MJrK21W>{)YGGH9)Xb>8V-}%k2
z*+U?Mdc4J)MDGJd`QCRv!b$D0tFJMhUZL5$NIkhovwMLJ?Rej*^27`0Imv{v29ixM
zix?fw0?s;|DK2?jYLL=1N>UKuadY|rnR8@_*uu{bK3sXoO+IY)Pz;~?$?H;DQ8KVZ
z1{BCs)iL4Az;lhG5{GC8o4)$SYlCLoj3>Dt<%18x+s~}Y`ER{uCpHpM6mNmeN_fvh
zXXaMm(gjwT;#?rLp~U$%Z<d<R<1z(;v+v&8HRsIUEH~i>|NpwKKd(Tiyds?kCyiLP
zRik9&ms$kxJuw7QYDrqrSwwKOySsyC+>9qV7}MS_$^8HHAN&En|M{on<nAjxVwX6x
z`x+m3Xe@vIr#?A<()Ja?^eRR`eO^6v$P7s)mC>B&GA@^xqS0_7v(3)Fyla+0u5-wG
zywxr-@F)(M-C##9IGBPsC16Y~g3}E9gW;UVIY-=U2hI3)_awdim4Evaz$dO9Kki;G
zvr$<AT*{5qB${ahEaz;N3}5mARYwRJp&np5o#cvI-5}!Vx)wdor7<8mCBy_Ffhtb(
zXhw>Hi4vtJ#mR%FdB||?{oJriHYmvrOK4{fSCUYrT-ps)B5H<jwIqlcYC@B8DOkJ^
zVy-~-jma1j5O7XsOI_D?><3Tjje8vv0S8?{NpDOLd`19CIWI{{>G7mllhI14A!AYv
zxBiwA_irnajOs4YAy$=jwmb_JFwEsX166J-n`xf#O+t*hoa<bsPtM_1I`$#WBu0=#
zkO-xt?@TgkVX_$>S{{nbV;KFiQ(nce`@RJ*c#@-(nDSO4zKl+!G6$3gFkJ+ZgewQK
za}G73i-D@j*j-&W1u_*i<Zx?F{u6J|cIlgVl>M(WjTx+>D)6$YC@96tC>e6JpOEd}
zLoMepW<%3`P?8&!s=+K<+Pnr4G3ik6@)UGPsAUG&BpzHvNO_T}_ZpTI(SkoE8NuUr
z975-E+Ma3FjHHrrugJ|wHOm-il&Jw&0)a5dpd>dCZzWSA8D&3+6jt1bB%=-yH3(`1
ziA*H>npJhAb_y7EUFWISZi0wW*9{?*DN{MPixc4p_Pm`c>Kv9}FLsDIoUigrr!>RD
zbql#sl%98RKFUAHqLR$WOBQU2B;Z;YNXBf=$o#A~oBEsHubIyFNUWeb9$co;LleXM
zf($!2`+xfe1@qgb#SfE@j!0R4%JIFIoGkCC<APJRMHr{ZiSdXN7O@mj6Grt4F?LKQ
zQ@qy$%E6LE{jH~q5{0RFE~v1l9w*9r?O9C;3oVUPBxmcT37Ye-q(;=E#uAtp1p2)r
zq2KS1__A~sdrnAYj?y4y<JEe+gdTik@yzBtZ2$30`>@)h>>nTK(Nf~RZOPo_QghVm
z4=9OwMBE&hPASk~hvQ?h1BY}0FgnAs#GX2P_GgrSu_k}1gv-lFRET86ykHI%`!VJa
z3UOpv@s!)GAOLlZTEujZq=}GPoGQL*Xm|Ip+S9g)7=$-s$JrnFeLV5RQ&Kz6*Z#ME
zWRrjK8$9Yf?Icpy4YkkQj6n*{amwF0!*``w*mJWLtwryn2DPtwqf0#bna?0+PQTFY
zOuqDuFMo;dw|<MWzA6k|u@ETDm%TbQk|xw2rHVKtB&_SG8&4PWA$JB<B5xvEE=`+C
z9w5z|=6O3-I?yRthYwjvk_C{4WEFzPxk#{x#TF21Dl8VBc$b&d78O59q9uZNU=X^<
zNUBU}jU2l4es0kn+#t5?d_7moGD})emUPHM_OnC#Kt2xK+yh0Wva8Ch>SFuQL2hTn
zl~+5FNFvig?CtL241CqlS%)QMeBuO;e(KZksUHI1?3D|=@r~carY+uAc;^W*(Y77h
z9Q^)qVG~nt@jEJ^OH^y?to~>JMQ=c5<EMVYrmwyN?G%Wa*i$pyrZ4Z;0}dYP<r6{5
zK20o3Um4LQM;QCi6v;%PG7I-~zJyY?rqq;(P*onY5tC_zFo9ao+M~(PE@4RK=;<%(
zBE*%*{Gctozh-1~R^8~hbCOK)R-hvCzJ=+`)y`m0rH{d@3|eP*VI1uI!EcsBCtqcp
z*_eni&;^)u9!@Rrx{EStTe=kRC|wWPTGd3EE(x!WC_)5UBA2K8M@ueUy+YdCV`7oU
zvvl%B%Br>=VYHPr5;YRM5nLo_hKvmo=v*SXRJJU;q6ZO^9fT@d{~rB4RisoRo~mZA
zvkY3^RG3vjhowLYi9}TZ@FG?iqZh$8)f8`<QF{u0fYUq}y3BANOX6-+#WK2LwbE=F
zHKV&M28p(B&v{u%)9!+@{o=uK-jhNkgf4Sn)IxN?-p)c9HXy2at)UY_%p)o4kGC~t
z0&d)3e*dktx}sVcp`j%f2D097sb!=UXL98HFD8i~MoUk<5DG1B%EOjwBuPYxh20<^
z8c>NudJdR8&yeRDT2h*3kLZ1UWl&sEux7B}?!jSz;4naN2<}60hu}WATL>-*I=BP~
z?h*(doWY&o!CeQJVR`#@_ieqZ-9M-5-j+ID=g;|0cYkec9iqu1Mw`VEwP&%r`_~Fn
zF^1&)w4G%21$2tr!q__j-zNr~?RMAyd~|uw``E>p+vnKH3{GNB7<+#DKfC}tULcpj
z1pFOk&Ups)h!08Kq<)_xv5?1F++l~V+Jro<$i%+slM2X~3w&?o&0A2KmRV+y0=`fC
z7{sbr{J>|s|1m16FhLW1wI(=ax0X7ZPV6hy4VmOb1B}@|$IzwX{YqLf%%xT6H2p3w
zLq4ZuFNdryWl#5Ohufi>I++~r2OXK&x<Pe{HmU~8+pC$`)&Q#Qzsi5a9BmCo<!?g5
zjVYYY3{o$fNWVJa%&{^yYtFTwL|XF^pihpYBDE2rrM_sfwqGUpcvb2{&_A`Pw6)Xv
zJAJhHNiFcxPS+)aRLlx)?$=jNPalqG;A*a*!AC9*LrE1?!~6A>In~z;kEIZf<3g@4
zM{mzj@1IC?i>AZCRx!J!t>F-+_~)_p9IDX$t#iN=$kyVv#-@-&lE8D44*99o!e=#D
zv^c)$r)w)9&K>lAs&$oMSzoy2Y%_I&h=cy{95Tp{?dUj;YpgvL_imu<t0MhRjWYLG
zlWQNT8Zv^5FHCa0=1O6oQMfp$-$xJE1u*eS7j>5nmPC0V*r4aJ0$L~uAj8GVpE4K#
zs2ZW#rT2(0OB?&8Eu#^ycWb#Z2o7g+n?f1_j%N8M@~L5ux89ks)iBdfaJ>W`V3a&q
z3mJv99>F~lpEADN-SROZOFPMh1e4k&-gkN7Pt|M%f9NcSR)^!p+u@wdq)%d>b`D?c
zZFlHcpmBEG!ZdD*brXt9-#a?cb66p*<cbw0sGK%9I^MAmhcnV2wher1422Q1Ae%Bf
zYajFZhD4O_BMh-kh(5`2gBfvT1SXXBbt*c01XY9TbP5`^>P)(-*HU`ala11ZP4}bB
zYlDyL&y+Q%9#3Pz=fs^4(<mMu5yLgpUUK>JeX;q9lW3fa=Ia*uD~<`f&!YMfII|A^
z&Q-V{l1N^hQmwP111T4{$gW=^!eT;xMWJNNibgPRLa$Ivy4fw}4AvzHf{h)JV@tQ2
z%dpzp!XdG3`(rX;DVv=~Z$64}<!7;KjG<Dv`sG+v7FM`NOCHj{bAnDF1tEBO!E=nz
z#g2!>Zp%M#A57Y+n8(JwE4I!UV}Exvh8Fv;Y=4OpHYFpk!mn5lQ41_(q++v+bO-M6
z6pJ<(H1M<x+dEDXUG8!A79V09?pXFHK&HOpHxa=Cv5j>I^7Lml(tgBdm+RoLK|3>V
zvW$LE=(l39SOV}pKPOJA0-IPeEnwlH&JCiysZ9AJYCRp??d@Mqx@>cI?uY}%QQQS<
z47`qJq{!T6L61|(HiC4~-!OhKDk#r=JRxwfcbw<{aN_cw{yUN1c7X1<Im>m-20*>&
zkDRU0+(}()L%*$aBtP!ANEziu9CqDdU}t>_Pxifl$gg^6dbt)hr9DnwN}Vr=k1hK%
zAhLS4z%6Qpa`#lS9~d&V#9GI_TR^-f5WXo)Z15R_U9E}0x<_@4eU(#fGb<~0QnMY5
z?u!oqSr?rZa%t~HQq@Q3t8c$~bARzJo5ly;`+H<hQMVJSw7OA2#oE<-bvVK|gDL9e
z7Ot(%&e)2VAQv0R@|5z<=GvRT2x#VM@2JAC)$wr^<sE)DGGg10{NH2QNd8mPqM7Si
zk-BOP)Ko`&d{wnez8|Ketknch1gfdPW9*NfL^3iqctQ&}-@;ZE2f<%h5D(Fq(zSkw
zGpnXTZ9lcpeU9#>-obH1$ru+OJchBS)H1qazvaxC+qfka_&(8aHSAKF>xMcXX%cX}
zb$QCmEI4DbyL~0<AW~D`>7VP~+8aqN0`;d^wd`=suxk07nZYaL-i6$%k1oy@^RGBj
z{fh7Xnp^cu#K$-)gXAd=#=<cB3kAFG<bd7e^@)dSi$F}!@q0F1$f4Wdu=d^Y?bAOq
zLpu}#cM=f`UiSGTs?WS4TCHP0`Fp@$te=T~3HNyP{5&aTL#<{~F>LhW<vz$A2q8Ob
zo#s0D7}RtwM6w|W>D_6K3lu@kO72gPuU@qfj;U!;aP^X}F-@d-7;3v8?(&1I`#d*i
zM5L;A_4tpA4aH7KKp6_ZgN4oP6Cs2aoC?E*ss!q>rDXZEEvShrs)HMR-g6cj!bSrb
zoKbw_7xX(B_K?w^ziNTc7V$w!#lfE^;BBV&H0cJkOr;wAG|wwE8zpPE<SiTG&|hxJ
z84E1~vS)Y&G!0a=9vu9%*BDcX{>D;9kOdPKflH>NZl>l%`Wwjapw4I%%NN;Tx)CvG
zoCyfL`M4@&J~>m3($RD_Hf#$!uPm)^*g{x-xNC^N7>^Vmn!974@ru`M?Fn^YScCt;
z@Sow}4F8xg#E0y)Ngbz~!C%OcV(m+B&ocLrsTb2zB`i!-HjqGHH&zI;Ui3#sR%aZB
zN8jWHJTzP;zf9RUvmcUhDA4TW(}!KnS5Pty?{72B*-BeFEEg~9y3FINl#Z5GWR4Sb
zE9rxE>gtQ8hNvK|LZ5T|Wp3MZ_DM?V07ZdgeMKjQ;q4oG*AHJx44<C7R`E`J#3y`i
zJ#&+cLEzj!H(}POzx~u(bDZ@mLOd=J4qZd_Eob?T*&7Mmc8F+SUl*fQs;pS0DjhWV
ziyguN{A-C5)#NesoHLOLN9E396R-?F4E!R3ep1J?INq}i;v7;jD57iOjk7aOVKIdG
zLms@g^7)*r_TfN+vt$hp%J_FF_?7I$l2jEx%{=#S+{ghSJXfzsWh2S;h!DfoZI4(X
z)yNCtunlteO7(q?2I5pKXcZTF$3*I9PfJGBTll=VXT>+D=R{z(aq;PXtzE@98DbUb
z_j%&(3`+S$7@uq|D{_KSU7tGc+X7CaMUT!LIbkJS?&II%4*qJVAqCV5j0R#X1s%8-
z&8|*oho;HwhNFEwIhDe`wjHfzY+_18U0unvC&>O#N|uDE(8u6W40tC@UPr7e<o}?r
z7bqZl5AM7!GG$O0i&4Gc+{{Vb<b=F8R!G<3gPiFbU#erEbIDnu=M}dsg_Q6X$#$<Z
z+3!zs;%VQ=_}nLO`Gu|=s+S%jVVLvg5*YeiQR;xLsUPyT-S(;gco}GeIFK)@1oVsC
zEnmOTG%{Bo3>(hNhQxo!p1V*}D(te>Z8d$K?(bNzbXpDeSn`}6c*neVeD!d)*CEJy
zJ7H@tpT(~B##YlM!|<nL2ooqF)BAGeA#W_C8E)Y|=kSv#O0!p&c<K@yOkrrRE}F5q
z#lZ%JHsGGOt)Fun^w(j!#^>NEuw})`<3eqpkDtzyZhvdqA22%unY0&q@W+y~a67$k
zMEt?o%xsLfHD>tH9OK%HHsrq10~5G%?w4`L?Ux)Q6anG8niNe;Qono+^d!6=-EJ9m
zy!0<~;sU>D!(xm89HqU#Myd~naQ1-2${3tGt2dpOjPrXR!)b2>i|&6qiry%GSb7;j
zdr9IK!-fl;t6}_MP3ZY+U|{QanIr0(AD$pTYN77CTXv?8#<9RNzGoK>Tx_c;1)w`O
zDI5pFlsYfJ$1kSNwlAS@-p8C=q&K?72zU{sg_51!^&QWNRGIvZR;nPDe4Mg6N2cU}
zoNPE5SmzGg9A{W#8pA64jNI~5F!3KVQ{dgrbt1yDMuA^CxXroZ5_kC|1?=W&tP=e7
z4$p{m;8ENUDOVUkUS^#{0W038#3D*zeVUuJm*5Gc^*TJyZ5RWiRXR^4)doiW<=x=+
zEa4f1ZH}qtCo!k4jZcv=U1hHS#!ABkCT{TO8`)y(by5t;4s}T4og)erLXoW1u(`!2
zM^hDzO<4&x5<NBHhR-kKL7U8f4T87B)4b&!=Wy$HsQ+ad^7|J?`drRP@KZKEYMD<n
zo+lQSFmY~$>W{sa3Q{iabQ%g7#)`EUY7n9L9IoFnf<&KP7gv2qNy`VjYP~lPxUvHm
z20H^zBjK<>HIsGG3s|SYd#7;|sf<uQy~TW!O1s05r=~pIR24o}u!R18hWADF1bmTe
z#DXSC*+Ffje{PUb{7KyR6gAk$XWzKjuGLibTgp;D>y)TR{jqA2UANTH#55XYMFffm
zs_)V;7>67hPQa{-D!c=BB{s&&?`KvkR5){N0t1brWcR4)?QwFZJ+G%A{e@V<RLP?s
zMn+HKm!5lRHZy{cq<g#XU-_)FCLB2ShEOV8V#RP_dK#lr5oo&dDhMJyxf7~Z4#XRU
zYS|*vudJ7`MPCa5qLQq_PH3BHShVBla<{%@o+yLEtIf0Sp(`@olE^2$96Z3jIrBwP
zwQpx(U^<zRbDghjkiJ41SW8)85_B%sH1j8{@`_Q87mq_Iri4(J_4Bo7WjHO9FNfxc
z5w_Q|H3@1<Rx$x&KQe@>b|cpD{Hx&~QH|?T)&c}fIjk9Jxd$Ej7w6$*$I8mhN02+K
zaB+sW$aPCJv~x8fbaiJDtT6l+$O1X}HH;m(y)3?ViRmRW=BGtZj?1ptlQJ!vmsg?%
z=SXrprIW{e2y{>W$D$UBdI9k4kJYlm)gPuzpn8WTs&(+rGNEX%*SZkSi%TDCE4<Ka
zqU<gIdrrSUB|_zxXs-=G;%cq+b`7!bAf!NcX;0r$QHtq9?MEzwdgLN^Nl6vtWS=(`
zKI$O^@*zb5%DKp8rmux`{iFnBW6AAF>bKdl0WqH=FQBU-TwUwtSU@x(#WbIN+v32P
zw8y;(@L=_nDob?qV|{cULJ(uLl`Utybh)R{3PvnalowKJ?{9`!t<V*#T!4Ga)wk~c
z^j`2MgzvrQYg)e<NhDZFfEYCRGoM(E1eD0}{7>rweTNe&un^rFZvpjhzBv?4ISROl
z3#EpqXK4`px(kGOmNud}MVP9y5utnsXv+bw3VW%0tMmGCV}J?;P==G#!BjUj*Zd@H
zR-<Gh9AxQ^g(-`vq%4f)_P-KDb?tlVUSbcc2cn3%Hm%jDxQ$(fWbsw>JVPD(N*+Qs
z%J&%nF_jb>_K)d@o`R;}WM-%ZPik7@=njlSBVzdSN&A)75!I>-(elc9UrhO{NVf=Z
z$e4wEmYbaqi9a5(d>3Yo(hfF7uKyBY_d5JEsspN8VN7J5W#N7qMUDHD_6;X1l#a{o
z({iMsL&CFbvo&j7eNE#&f2t3`@g$4z;bfpK2n#r*&Z-D}><sDjNsv^0OK$m}>!&2i
zx8y0WAE)MwEf$rUp_DC@>^)ewUgv<&_ULX3*0j*1SKA+eP|85G4?|8rN~yQ!dw&#)
z4+)G|fAIMaYs+(h^ef?^6Aa)ir{uZL0lF7v$aE;~Ta+(wptU-d$Pf23yT5W*Yngmm
z>wbo-d?<I{%t_%^Mh47e>%Vc}!R!l%>eUII`4BMh?0JgHuxDPLfTm}-Eh%?Jr;JaK
zHYY_|T0TonYgHcw=||vY`c+dZ!X6n8{$$K9mjD(5@Y~dgi>T=~&ky%o(L2kd(d}z~
zdc}Bu@jwpuQYWnTb;s<ACI>-M=*NZFQ$;0tud@eBjbzWU{m~!-e5YozZAq3pE~&SE
z^&4(7+E}v0OSRsAzTEdPJNHQuJE4nW&-=E2N9WOuB|Oa@TT6?-mPr;P&g0&K9WxF~
z@`6h-NRUi`)fDe}hH|u%;EyZ8<c*O48D*5qzxm~TpG#S-6K&De)pjzG0OFV`-k1-C
zBzq!wD0r<BWOR(e_&4oa^=P^QvPR?<h~sPpw91n_$;YVE3LqDVL`r4b5~1{a7i1Qs
zv@G>4SM~GEjl30OcLAro4gO*HV<%UtwTb6T7pdv){P+8WWFs{V`XZS$tjJIDwNmkW
zubnzm0}4f7WASgiz^rH74Jx^sWF-aUWf$%E^oHodDKm#IGk+Ad0oG^9(h?c@YS(6&
z%F+LT5ZS%$Ke~!O+ERz5viQKqy8cupHmQAEd&y+{vvc|tIAo>&{6l0S!)iR<p<ih@
z65VOS?{yrzOsxHr5WZnrQkF>BLn=DePe#`EXNVprSx3fdr!44Get8Q@1fK(Qn8nW#
zn&jDR9ZNZlKJT%0MTC>!=k?YKj*WsW^-9+KS}pb5kYk0?^b-;Y#@&1t3g-c>$7k&&
zPKKkt1un{f>}FdCPWZXv?gnT=?TiGGHY0>;xbD77Qn8wutwJX8c#|#9PPd(hF~q$O
zAgH_1Z#7(`?ykvc!p}SnO$nnLr_0I`JvW6nU;bIyc^az;zI)C);_L(+(yuv4ZpF($
zJpvT}?06vYx)|I7{9v~P`3+&;MeC00e}ND#hP99gN$Zw)TnA=XyT`vQiQE2&yDNL7
z{UmQ-JSa>07HRC`v3$s$;MMD9nAHemqjTttzoyqO>{qZVCRmb>QHD<Kw^CcC=3V8d
z4kIp>;;Fh+RG@BR-ERnZdHq@NG2MBR-DK}mdS|2adypH32D)8evR|oP=zkJt$p_W_
zwc@s?m;CWspv`DhsN`KkWJ{_}<?gBsw)1iSlyn4bn22_ky8~z$OSOGz{!&bmN1z>N
zJEY!Y+m2yF)0r<awO&h&FXm5J7)zBy-N{I3v;X@oYMBjw@{VL8nSu?U*~^imV=fbd
zF^~^Km7wukWjej_ABuEz1lteuXSTojCzw+i@>Ddur5A4ht)nsuF_nR`e}V_J3ba_J
z^`w?a&=Jyrb28=fd?lbRJD{*gAH9$wvp=nLbb$xY6vu&jBVFzC36Cn3LCaTv9TS0;
z#j5OUbMqdW_mJxBB_fJ%iol+v!9n~W*4e48!hd5{L3r;5vTRNR#$;}!&ANQCD{F#Q
zaZEjDW!p6}+jPB&%TcMfzg1Bcpi@gqZ}yeasW8P2IQ;bMJ39rd=LGK8%36%ST{cC+
zrz_%Xqvo{?g7$y0N^LMHi<apNA?Cj9EN39g1RhxTB+9s!N4DO?!>{souRH!|QOwrx
zt{w<BxMec=9M1Em5>Hpx`v2Mrf6cFdH*(mcOm!nWtWY1AVl|5FCNS`&k7i5u#Vw6R
zs1g-qR4EafP-fW!?z}5W0o%oxodcZdX&wkA2F4#)4L!qiS3aZC%`!N8ej72luR7pN
z6A<t@>v}os_@&%cqjQidVA0Q=6MCm;r(~}&yQ`GWXE<%Q|JOw0d(cbl`h-B!?QdJ0
zWuGr2=qBqK1UjJFqd}u$^DQSeZun{Z8h$KEE2UgN8G5qVIe6YuTf4QoS7>7SgS8d5
zTp_;G!gT+i{XTRlG(7Vl_!<$rfOTZ{wqVsVb8z0>t=Pzd(dH40OFsEUoAJN7VVH)d
zD?Fb!PW(wU;2a5+?eXz4%xYtyJMVVQ%&wBN>C3-7eC#=ow?uy<nbpk#%&`T8jeZ9#
za6K_5dW%Ap$D-EDL~AN5T`oeB1Kc|{D#~^aTN>K;W?mk0Fzd{#KMU>AGBzfR-Q+fB
zd6lw=tY*J34MdR`bT{Q}cI5F02^1}*Yh>4%VJo?*Tt;`@2yCxPTnd>;1jeK-=(Kn|
z@R`c{?u;^>J@)3M#lP&l>?UN?zYeFYOQt&b;>J#EHlDzf#->GQ$O$v`Qb14z{<xYu
zsR;WmTKCf3b&G4YbAJn)j^^)d+Pr@-7}Is2>v+@`zbt_RvLs;4r+P+4_ZXhvl~_wz
z6(WklepZS?VCm#eB8$O+Nt0Tyop=73OS)lABNJ*Zf*K2RhHxY4yzRF;brLXH-{Xk@
zo|mn>m)485+x0#(VHH)nK%l7~#U)eIX#VdMx{nR0uHkuZ)hT6K9f!pQ;OfBl;y15E
zckn9A8uF5fHGXJ;^m&0w8;(Rd+6+#jkyZk->P&(ceO96GwUbf&{t}5Ib|HkAy)S9G
z`*fU>0al6z2|iK+`Xn{e3zX6>95Nqz2H7jab=hZjqFFetP+TM1K@$WJ1!ShSWoJ0T
z89mAYm)<eGb?P1&R<>;}4`%r5!w#s$mkXK&EVpkxAc{qgjRphFoZ2y<WZ&fa$f9|$
zl-z2RB!tgm1QhGz)TcL+#zmuebNbyMM{<R1E;`LUat3x+SxY{sCANM%VKZOYkbUh{
zMB&w-&^I-<NWM6x$O}A2P>7%pYmz2y;*{UQH<v?8bl;<H5mTD>jts9(2)|J*OeKva
zM-NEUn*|1Xo@&eYX()c&t15U*7MY5A&L)AGyxq0dY$Lbmiknbo4P6_l@ef<n3m}TJ
z$4u_GqchShZu75P301nh+GWU2pRM#HZsPA}?nj9~OChe%S7V@FUoo|RnVead^m%4w
z*58onz^SS=r~(Rg_1l-$#&VRHj|Jb|;X<9%ljfJW?uKW6%N%-fQ!;r{KM{62;^v1#
zSLPz|)J+pd70hr;5b){rdNR~87YS_p136NO0ZOMxef8`BvTAlUMjIJ#!41$fMXAE9
z%<RY6k4buH#v{i%m$v0D)01AeYm5&&69JOB&bdGQoQ4+<0TuaXenF9*pnuI_zbd{<
z+_vN`-iicYMXL?l<h=lHrg18oLOl4v^1jD?g})aNOPVO)f0^O`I0CD)G?H4uCg~tU
zbBxm0EO<Fyk%zxOJSv>$WXd+2^Go@}j?kq^1k4w4Uh3au{n#^}+zG|Xe0X;6j&u#|
zFoj4BZ)E--zw%GS2r~lMmGk1z2&P_2ZuG9xu)h`@p7&6*b1Mp?%Y<oy)Yzyi1fthl
zd%VRTsDmz;gTCX|v~NwOJyrzo+w9<WoU>$NhG?3F6Z(HYEgESL3`muLA56g9X&x<_
zJtV>9t=fvP9kOrx;oEGLmyLAJu|kw`fDJP<9tG{_DTVRG#^PAb0+s?Lz7dMR!>H5<
z<bzV8D{2A3uBUr0j6VW`&N1g+psoYbha#FgyZa)VFYEvKF=cZ1HW=E_1d0Hwd_f+^
z?~+t6eZpmv$XUO}Fax+<AL);(v%c<HDq*oRs#JNPif&S-GxvSu&pwkR*;X81xsnXV
zl{c+xW7+CxSPq2p7aC<YgdG*zzVfeZ{#<V)Bw6rUA}h__C1;?gwgu#~e38j!4UwT-
z8KU(rTbZ4T(^e%V#_y-FJuYScghb?lTV}84??GL_kB!doQ$Z<T>kmE4uRgK^EU(ai
zhrc$!SZ-%*&<BQiC?o-h?Ww^^D97aEcGN`}dQt9jn6Y>!>T_e(`st=Q9GE?8)d|*}
z+C(?t6~E2>4@;W&(3Zg#0#+|8l_MR+RyhwgkNTb_ZO2FA)+uOUSHtB>?D2kjlR;sX
z&i(*}<584ihn&C~?e`DSg)`^JHW6*FXru;U(|IOg4J*5a`hM^U^)xws$2s)2W*I%m
ze<B$q!7=gV@OboB^a>&O>CfO!y9jilDSW{yG_4n7d8;A7Vi`6K9utvx+6;_TXsqn9
zOa)^K7b=)cQEl697o$?<-A#4%R0MCWLpm^PYJasox);n%RJ@K`xsw*X?~uTV4_L@w
zUktd2jRV08p2l^9bDT~5<_>wWm+>>@K_lLQw<Q}b6FA=H36JuMZ>S#<yJlam_nfc1
z2iC87MboZrerUeihGRFs0*?O)TK;qW59soik$gL0lqqsAiZv8V>GFidD|D!dAku;V
zJ+!&4p1sZK;9W2d@I93FRSF!U{ojBF>%aZ_e+pi~&;PCa|8??Ty8q4le+mBA9^4q*
z-t4S`vrVt%@>s1)v331ECHc#+L+McP)n#TpL4k;`WeJ)sn)IzQLOAWsjM+HNUauPJ
zIEhF5J$dp&%;q=^-9`TquUFx8RiwphaBeTcKPWsfn4}08v6XmV1MaQr$k~ikcEKe@
zMgC(QtTt-=edr(Ptvl}!Ke3HIisLH=?Cc;8?fu2mjZJF(DXGmc+g%SRV@dK*Dr_E?
zzIbdCSf-=xTCUvtv)`?H@f##&xtapp^8?`BY{bUA53yGF9mV2hD3(#OyFVjBF<4Te
z1aH5Bf#g@hw7YvrUjP<ThJR#WjN7+}f{aA-zEP`hzjNK*{hbsf7ln2l8DAwJQe6oz
zTz*u}bD))V==-RO)3NY+4lCDmY31Y8sM1yaNH5kFfM?kCTbud_f^$6ZD({Al61t=U
zG=YeRN5*P?3NP_;g))XiWF`9ELH1ZUUndu_$yV7tOY*Inn=aESlz^pQI(PH)Z^i<_
zy^BuafMhKm;!y&gh$7!1Anu2ue~PE}t_;jN+9a}e!llT_DEv%z@qidSJXXB!*$vi&
z!`dW;hOb`u*a*=aOpD5ZlLT=Ao-y$ON^qmpY9)@q>-EmNx&3*I>u)&c=KRFR^3vpz
z)ts-wNjmAmqe7!BQzA`E-*Z0H`QGG9*LeCS{f(iPFrgbz01y}lA=5McFrd?zksW+Z
z!YlEvgh?u%y4{bT5sSG;EHG=f0%kp>(Ga*M1qVy373!=q5zRz*>)ns5Yg`@%gC8c9
zJI=P&dmWqxb@)mt%GEWc_zG`uc+ypvJyOppj@t1V&ftFsBmBAFLsz-hFZ_eJNKu-M
zH!s(;K{*DDr$**QS?0Rc^%~!z#$Cldk8_v8Y;r^7sU=ccx}FDvv+w?qn_zOxsE^%%
zF^#1R8B`7W=)v0=vmwp{9A2Or_rq8Tk(B1Qj4h8lR1%MSRwp8BP-T<ft-fD%H3v_B
z@0Ncwj2EO~@VhaC&)uZ3W!c>IalPd1pgt~o4~v)vB(8%7`t2bn7w`PH2*WPk&P<_K
z&$DIMIGB`)ap|5X(mX$5_RdN4(2v&c`aWGwz_%y<_Se8Aj@usy3MV%SE32zuOGU<B
zat@-;9eLYG!55_KE0-@@FLUrcF1XO)iSf!BwYE|^6Q|m(t*-sr%~PAtW%yZYWKfH;
z8rGXPZ)6l@B(;v!a7kYaoBTD4gI|IhtJa@hWJ<cVRxz1rf^U=qPTd7)NIIVCjo~7}
uX(M}F+|=KMVDQ^blP5S`yD-!J3&M<oh4~yzkmuFk8%0@=OtsYKum1yVhRa3(


From 5135c8a3a502127a024f693e07edab9e19f57d4c Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 28 Jun 2012 16:58:41 +0530
Subject: [PATCH 083/239] [IMP]event_moodle: remove xpath

bzr revid: kjo@tinyerp.com-20120628112841-c1sp8tm4wqef9g1k
---
 addons/event_moodle/event_view.xml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/addons/event_moodle/event_view.xml b/addons/event_moodle/event_view.xml
index b009339d564..4fa0172c5f5 100644
--- a/addons/event_moodle/event_view.xml
+++ b/addons/event_moodle/event_view.xml
@@ -7,14 +7,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="event.view_event_registration_form" />
             <field name="arch" type="xml">
-                <xpath expr="//page[@string='Emails']" position="after">
-                    <page string="Moodle">
-                        <field name="moodle_user_password" readonly='1' colspan="2"/>
-                        <field name="moodle_uid" readonly="1"/>
-                    </page>
-                </xpath>
                 <field name="email" position="replace">
-                     <field name="email" required="1" />
+                     <field name="email" nolabel="1" required="1" />
                 </field>
                 <field name="name" position="replace">
                      <field name="moodle_username" colspan="2" on_change="onchange_moodle_name(moodle_user_password)"/>

From 6d0c9fa8865835b23b56c7c734647b9e027bffea Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 28 Jun 2012 18:03:26 +0530
Subject: [PATCH 084/239] [IMP]event_sale: inherit event.registration

bzr revid: kjo@tinyerp.com-20120628123326-sqyhz0qj6kft82hf
---
 addons/event_sale/event_sale.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index 0d6497c45f2..96468bd471f 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -91,3 +91,9 @@ class sale_order_line(osv.osv):
                 message = _("The registration %s has been created from the Sale Order %s.") % (registration_id, order_line.order_id.name)
                 registration_obj.log(cr, uid, registration_id, message)
         return super(sale_order_line, self).button_confirm(cr, uid, ids, context=context)
+
+class event_registration(osv.osv):
+    # TOFIX: section_id field is not availble in event_registration table in database but In _columns (_inherited) findout section_id field which added in crm module in res.partner model. so need to fix in framework to restrive columns but right now Fixed to inherit again to update  event_registration table.
+    _name = 'event.registration'
+    _inherit = ['event.registration','ir.needaction_mixin','mail.thread', 'res.partner']
+    

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 085/239] [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 086/239] [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 7cfcdbbcd977c725999f2e6108083703c8374eb9 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Thu, 28 Jun 2012 18:57:06 +0530
Subject: [PATCH 087/239] [IMP]analytic user function access

bzr revid: dhr@tinyerp.com-20120628132706-qsnx126sylha9cc4
---
 addons/analytic_user_function/security/ir.model.access.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/analytic_user_function/security/ir.model.access.csv b/addons/analytic_user_function/security/ir.model.access.csv
index fe48e329aea..55fb4b335b7 100644
--- a/addons/analytic_user_function/security/ir.model.access.csv
+++ b/addons/analytic_user_function/security/ir.model.access.csv
@@ -4,3 +4,4 @@ access_analytic_user_funct_manager,analytic user funct manager,model_analytic_us
 access_analytic_user_funct_account_manager,analytic user funct account manager,model_analytic_user_funct_grid,account.group_account_manager,1,1,1,1
 access_analytic_user_funct_grid_hr_user,analytic user funct grid hr user,model_analytic_user_funct_grid,base.group_hr_user,1,0,0,0
 access_analytic_user_funct_grid_hr_manager,analytic user funct grid hr manager,model_analytic_user_funct_grid,base.group_hr_manager,1,1,1,1
+access_analytic_user_funct_grid_all,analytic user funct grid,model_analytic_user_funct_grid,,1,0,0,0

From 93727a6c192d49831d90f6972971626ff5d50c95 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Fri, 29 Jun 2012 11:33:34 +0530
Subject: [PATCH 088/239] [IMP]Read access of sale order to project groups when
 contract is installed

bzr revid: dhr@tinyerp.com-20120629060334-mlzdvc1aii0jm26p
---
 addons/project_timesheet/security/ir.model.access.csv | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/project_timesheet/security/ir.model.access.csv b/addons/project_timesheet/security/ir.model.access.csv
index 85ccf63e19f..24143531f53 100644
--- a/addons/project_timesheet/security/ir.model.access.csv
+++ b/addons/project_timesheet/security/ir.model.access.csv
@@ -2,3 +2,5 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_report_timesheet_task_user_manager,report.timesheet.task.user.manager,model_report_timesheet_task_user,project.group_project_manager,1,1,1,1
 access_hr_analytic_timesheet_user,hr.analytic.timesheet.user,hr_timesheet_sheet.model_hr_analytic_timesheet,project.group_project_user,1,1,1,0
 access_hr_timesheet_sheet_sheet_user,hr.timesheet.sheet.sheet.user,hr_timesheet_sheet.model_hr_timesheet_sheet_sheet,project.group_project_user,1,1,1,0
+access_sale_order_manager,sale.order,sale.model_sale_order,project.group_project_manager,1,0,0,0
+access_sale_order_user,sale.order,sale.model_sale_order,project.group_project_user,1,0,0,0

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 089/239] [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 bafe6650225d858e4ca2b485f95b078fe99d8c02 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Fri, 29 Jun 2012 12:54:31 +0530
Subject: [PATCH 090/239] [IMP]event: remove res.partner inherit

bzr revid: kjo@tinyerp.com-20120629072431-4bsg54hzww6dzjd6
---
 addons/event/event.py           | 8 +++++++-
 addons/event_sale/event_sale.py | 5 -----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index ba3fedea69e..029b9f86310 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -312,7 +312,7 @@ class event_registration(osv.osv):
     """Event Registration"""
     _name= 'event.registration'
     _description = __doc__
-    _inherit = ['ir.needaction_mixin','mail.thread','res.partner']
+    _inherit = ['ir.needaction_mixin','mail.thread']
     _columns = {
         'id': fields.integer('ID'),
         'origin': fields.char('Source', size=124,readonly=True,help="Name of the sale order which create the registration"),
@@ -333,11 +333,17 @@ class event_registration(osv.osv):
                                     ('open', 'Confirmed'),
                                     ('done', 'Attended')], 'Status',
                                     size=16, readonly=True),
+        # Fields for address, due to separation from event.registration and res.partner
+        'email': fields.char('Email', size=240),
+        'phone': fields.char('Phone', size=64),
+        'name': fields.char('Name', size=128, required=True, select=True),
+        'active': fields.boolean('Active'),
     }
 
     _defaults = {
         'nb_register': 1,
         'state': 'draft',
+        'active': True,
     }
     _order = 'name, create_date desc'
 
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index 0fb89f46775..426c410dd99 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -90,9 +90,4 @@ class sale_order_line(osv.osv):
                 message = _("The registration %s has been created from the Sale Order %s.") % (registration_id, order_line.order_id.name)
                 registration_obj.message_append_note(cr, uid, [registration_id], body=message, context=context)
         return super(sale_order_line, self).button_confirm(cr, uid, ids, context=context)
-
-class event_registration(osv.osv):
-    # TOFIX: section_id field is not availble in event_registration table in database but In _columns (_inherited) findout section_id field which added in crm module in res.partner model. so need to fix in framework to restrive columns but right now Fixed to inherit again to update  event_registration table.
-    _name = 'event.registration'
-    _inherit = ['event.registration','ir.needaction_mixin','mail.thread', 'res.partner']
     

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 091/239] [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 092/239] [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 093/239] [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 094/239] [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 095/239] [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 2cea76a9828788bc027f1de183ae52b6c0344a09 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Fri, 29 Jun 2012 15:31:39 +0530
Subject: [PATCH 096/239] [IMP]mrp related access for sales group

bzr revid: dhr@tinyerp.com-20120629100139-v94s5qhlxkh2vber
---
 addons/mrp_subproduct/security/ir.model.access.csv | 5 +++--
 addons/sale_mrp/security/ir.model.access.csv       | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/mrp_subproduct/security/ir.model.access.csv b/addons/mrp_subproduct/security/ir.model.access.csv
index 7c012237dd6..40ea0b31864 100644
--- a/addons/mrp_subproduct/security/ir.model.access.csv
+++ b/addons/mrp_subproduct/security/ir.model.access.csv
@@ -1,3 +1,4 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_mrp_subproduct_user,mrp.subproduct,model_mrp_subproduct,mrp.group_mrp_user,1,1,1,1
-access_mrp_subproduct_manager,mrp.subproduct manager,model_mrp_subproduct,mrp.group_mrp_manager,1,0,0,0
+access_mrp_subproduct_user,mrp.subproduct,model_mrp_subproduct,mrp.group_mrp_user,1,0,0,0
+access_mrp_subproduct_manager,mrp.subproduct manager,model_mrp_subproduct,mrp.group_mrp_manager,1,1,1,1
+access_mrp_subproduct_all,mrp.subproduct,model_mrp_subproduct,,1,0,0,0
diff --git a/addons/sale_mrp/security/ir.model.access.csv b/addons/sale_mrp/security/ir.model.access.csv
index a0f117b61e5..4f0f0f8072c 100644
--- a/addons/sale_mrp/security/ir.model.access.csv
+++ b/addons/sale_mrp/security/ir.model.access.csv
@@ -2,3 +2,4 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_mrp_bom_user,mrp.bom,mrp.model_mrp_bom,base.group_sale_salesman,1,0,0,0
 access_sale_order_manufacturing_user,sale.order manufacturing.user,sale.model_sale_order,mrp.group_mrp_user,1,1,0,0
 access_sale_order_line_manufacturing_user,sale.order.line manufacturing.user,sale.model_sale_order_line,mrp.group_mrp_user,1,1,0,0
+access_mrp_bom_revision_salesman,mrp.bom.revision,mrp.model_mrp_bom_revision,base.group_sale_salesman,1,0,0,0

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 097/239] [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 57329cc83378057590cbb33d8350c7a138247d08 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Fri, 29 Jun 2012 17:40:00 +0530
Subject: [PATCH 098/239] [IMP]event: event_view.xml change

bzr revid: kjo@tinyerp.com-20120629121000-x071xn35pb4wi4wa
---
 addons/event/event_view.xml | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 8f378af3775..d6da35a3e2f 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -382,19 +382,17 @@
                     <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/>
                     <field name="state" select="1" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
                 </header>
-               <sheet string="Registration">
-                    <group colspan="6" col="7">
-                        <group colspan="3">
-                            <h1>
-                                <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]" class="oe_tital"/>
-                            </h1>
-                        </group>
-                        <group colspan="4">
-                            <h1>
-                                ( <field name="event_begin_date" class="oe_inline"/> - <field name="event_end_date" class="oe_inline"/> )
-                            </h1>
-                        </group>  
-                    </group>              
+                <sheet string="Registration">
+                   <label for="event_id" class="oe_edit_only"/>
+                   <h1>
+                            <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]" nolabel="1" class="oe_inline"/>
+                            <label string="(" attrs="{'invisible': ['|',('event_begin_date', '=', ''),('event_id', '=', '')]}" class="oe_inline"/>
+                            <field nolabel="1" name="event_begin_date" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
+                            <label string="-" attrs="{'invisible': ['|',('event_begin_date', '=', ''), ('event_id', '=', '')]}" class="oe_inline"/>
+                            <field nolabel="1" name="event_end_date" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline" />
+                            <label string=")" attrs="{'invisible': ['|',('event_begin_date', '=', ''),('event_id', '=', '')]}" class="oe_inline"/>
+	                </h1>   
+		                   
                     <group colspan="2" col="2">
                         <h2>
                             <field name="nb_register" class="oe_inline"/>  Participants
@@ -431,12 +429,12 @@
                         <field name="create_date"/>
                         <field name="date_closed"/>
                     </group>
-                    </sheet>
-                    <footer>
-                        <div class="oe_sheet_width">
-                            <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                        </div>
-                    </footer>
+                </sheet>
+                <footer>
+                    <div class="oe_sheet_width">
+                        <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                    </div>
+                </footer>
                 </form>
             </field>
         </record>

From a930cc7b9d5072a3b449a87ff7a07c6192ff9967 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 29 Jun 2012 18:57:33 +0530
Subject: [PATCH 099/239] [IMP]set cancel button

bzr revid: dbr@tinyerp.com-20120629132733-uoq3hb3x85hs6ttf
---
 addons/document_ftp/wizard/ftp_browse_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/document_ftp/wizard/ftp_browse_view.xml b/addons/document_ftp/wizard/ftp_browse_view.xml
index a0656b5597d..6063fc3bdce 100644
--- a/addons/document_ftp/wizard/ftp_browse_view.xml
+++ b/addons/document_ftp/wizard/ftp_browse_view.xml
@@ -9,6 +9,7 @@
                 <form string="Browse Document" version="7.0">
                     <header>
                         <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok" class="oe_highlight"  />
+                        <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </header>

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 100/239] [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 101/239] 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 8e4a8d865452413fb4597fcadcc07b277ae38ce7 Mon Sep 17 00:00:00 2001
From: "Twinkle (OpenERP)" <tch@tinyerp.com>
Date: Mon, 2 Jul 2012 10:58:57 +0530
Subject: [PATCH 102/239] [IMP]Improving Social Networking

bzr revid: tch@tinyerp.com-20120702052857-vreiim1bgfdud5sx
---
 addons/mail/__openerp__.py | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 58e867dc616..6299f900db0 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -20,29 +20,32 @@
 ##############################################################################
 
 {
-    'name': 'Social Network',
+    'name': 'Social Networking',
     'version': '1.0',
-    'category': 'Social Neworking',
-    "sequence": 2,
+    'category': 'Dependency',
     'description': """
-A generic email subsystem with message storage and queuing
-==========================================================
+A bussiness oriented Social Networking stands with message storage,
+queuing and  feeds.     
+===================================================================
 
-This email subsystem is not intended to be used as as standalone
-application, but to provide a unified email abstraction that all
-other applications can use.
+This Social Networking service that enables its users to send and read 
+text-based posts via feeds,and its provide a unified social network 
+abstraction that all other applications can use,also it used as a email
+subsystem.
 
 The main features are:
-
-    * Relies on the global Outgoing Mail Servers configured in the 
-      Administration menu for delivering outgoing mail
+    
+    * Trouble free application.
+    * Hassle free user communication via feeds menu.
+    * And also it relies on the global Outgoing Mail Servers configured
+      in the , Administration menu for delivering outgoing mail.
+    * Includes queuing mechanism with automated configurable
+      scheduler-based processing
     * Provides an API for sending messages and archiving them,
-      grouped by conversation
+      grouped by conversation,
     * Any OpenERP document can act as a conversation topic, provided
       it includes the necessary support for handling incoming emails
       (see the ``mail.thread`` class for more details). 
-    * Includes queuing mechanism with automated configurable
-      scheduler-based processing
     * Includes a generic email composition assistant, that can turn
       into a mass-mailing assistant, and is capable of interpreting
       simple *placeholder expressions* that will be replaced with
@@ -70,7 +73,6 @@ The main features are:
     ],
     'installable': True,
     'auto_install': False,
-    'application': True,
     'certificate': '001056784984222247309',
     'images': [
         'images/customer_history.jpeg',
@@ -96,5 +98,6 @@ The main features are:
     'demo': [
         'mail_demo.xml',
     ],
+    'application':True,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From a24636f400c836425778dd5aafc7991fed46df94 Mon Sep 17 00:00:00 2001
From: "Twinkle (OpenERP)" <tch@tinyerp.com>
Date: Mon, 2 Jul 2012 11:07:13 +0530
Subject: [PATCH 103/239] [IMP]Improving Social Networking

bzr revid: tch@tinyerp.com-20120702053713-8i213fljhq6npvkm
---
 addons/mail/__openerp__.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 6299f900db0..c2859268bd9 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -22,7 +22,8 @@
 {
     'name': 'Social Networking',
     'version': '1.0',
-    'category': 'Dependency',
+    'category':'Social Network',
+    "sequence": 2,
     'description': """
 A bussiness oriented Social Networking stands with message storage,
 queuing and  feeds.     
@@ -73,6 +74,7 @@ The main features are:
     ],
     'installable': True,
     'auto_install': False,
+    'application':True,
     'certificate': '001056784984222247309',
     'images': [
         'images/customer_history.jpeg',
@@ -98,6 +100,6 @@ The main features are:
     'demo': [
         'mail_demo.xml',
     ],
-    'application':True,
+    
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From bc3463a9cbfb3e19ff468b2fa82cde7c6c664347 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 2 Jul 2012 11:42:08 +0530
Subject: [PATCH 104/239] [IMP]survey: Improve survey view

bzr revid: dbr@tinyerp.com-20120702061208-qyomfgnvd75pkgzt
---
 addons/survey/survey_view.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index a53993ae591..2c691c0388c 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -26,16 +26,20 @@
                     <field name="state" widget="statusbar" statusbar_visible="open,close"/>
                 </header>
                 <sheet>
+                    <div class="oe_button_box oe_right">
+                        <button name="122" states="open,draft,close,cancel" string="Test Survey" type="action" icon="gtk-new" context="{'active':True,'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}"/>
+                        <button name="106" states="open,draft,close,cancel" string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
+                    </div>
                     <h1>
                         <field name="title" select="1" class="oe_inline"/>
+                        <label string="(" attrs="{'invisible':[('type','=',False)]}" class="oe_inline"/>
                         <field name="type" class="oe_inline"/>
-                        <button name="122" states="open,draft,close,cancel" string="Test Survey" type="action" icon="gtk-new" context="{'active':True,'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}" class="oe_right"/>
+                        <label string=")" attrs="{'invisible':[('type','=',False)]}" class="oe_inline"/>
                     </h1>
                     
                     <div>
                         <label for="responsible_id"/>
                         <field name="responsible_id" class="oe_inline"/>
-                        <button name="106" states="open,draft,close,cancel" string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}" class="oe_right"/>
                         <button name="106" states="open,draft,close,cancel" string="Edit Survey" type="action" icon="gtk-edit" context="{'active':True,'edit' : True,'survey_id': active_id}" invisible="1"/>
                     </div>
                     <group>

From 2be268b2a9ea630a6bcd4537bf4cc83b4bba5a0e Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 2 Jul 2012 12:06:43 +0530
Subject: [PATCH 105/239] [IMP]survey: View imp for label

bzr revid: dbr@tinyerp.com-20120702063643-ue8nu3c61iszsllq
---
 addons/survey/survey_view.xml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 2c691c0388c..2684a4c1d59 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -29,22 +29,19 @@
                     <div class="oe_button_box oe_right">
                         <button name="122" states="open,draft,close,cancel" string="Test Survey" type="action" icon="gtk-new" context="{'active':True,'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}"/>
                         <button name="106" states="open,draft,close,cancel" string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
+                        <button name="106" states="open,draft,close,cancel" string="Edit Survey" type="action" icon="gtk-edit" context="{'active':True,'edit' : True,'survey_id': active_id}" invisible="1"/>
                     </div>
+                    <label for="title" class="oe_edit_only"/>
                     <h1>
                         <field name="title" select="1" class="oe_inline"/>
                         <label string="(" attrs="{'invisible':[('type','=',False)]}" class="oe_inline"/>
                         <field name="type" class="oe_inline"/>
                         <label string=")" attrs="{'invisible':[('type','=',False)]}" class="oe_inline"/>
                     </h1>
-                    
-                    <div>
-                        <label for="responsible_id"/>
-                        <field name="responsible_id" class="oe_inline"/>
-                        <button name="106" states="open,draft,close,cancel" string="Edit Survey" type="action" icon="gtk-edit" context="{'active':True,'edit' : True,'survey_id': active_id}" invisible="1"/>
-                    </div>
                     <group>
                         <group>
                             <field name="id" invisible="1"/>
+                            <field name="responsible_id" class="oe_inline"/>
                             <field name="send_response"/>
                         </group>
                         <group>
@@ -55,11 +52,12 @@
                      <notebook>
                         <page string="Survey">
                             <field name="page_ids" colspan="4" nolabel="1" mode="tree">
-                                <form string="Survey Page">
+                                <form string="Survey Page" version="7.0">
+                                    <sheet>
+                                    <label for="title" class="oe_edit_only"/>
+                                    <label for="sequence" class="oe_edit_only" groups="base.group_no_one"/>
                                     <h2>
-                                        <label for="title" class="oe_edit_only"/>
                                         <field name="title" select="1" class="oe_inline"/>
-                                        <label for="sequence" class="oe_edit_only"/>
                                         (<field name="sequence" groups="base.group_no_one" class="oe_inline"/>)
                                     </h2>
                                     <newline/>
@@ -214,6 +212,7 @@
                                             </tree>
                                         </field>
                                     </group>
+                                    </sheet>
                                     </form>
                                 </field>
 

From e094d069293195287525a21e6adbe95ebb376f0f Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 2 Jul 2012 12:13:42 +0530
Subject: [PATCH 106/239] [IMP]:survey:improved view

bzr revid: apa@tinyerp.com-20120702064342-nrq2vt0i3ekl4wvd
---
 addons/survey/survey_view.xml                 | 1 -
 addons/survey/wizard/survey_browse_answer.xml | 2 +-
 addons/survey/wizard/survey_print_answer.xml  | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 2684a4c1d59..fe3b5a0d0d8 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -55,7 +55,6 @@
                                 <form string="Survey Page" version="7.0">
                                     <sheet>
                                     <label for="title" class="oe_edit_only"/>
-                                    <label for="sequence" class="oe_edit_only" groups="base.group_no_one"/>
                                     <h2>
                                         <field name="title" select="1" class="oe_inline"/>
                                         (<field name="sequence" groups="base.group_no_one" class="oe_inline"/>)
diff --git a/addons/survey/wizard/survey_browse_answer.xml b/addons/survey/wizard/survey_browse_answer.xml
index bdfbb200237..be654768f40 100644
--- a/addons/survey/wizard/survey_browse_answer.xml
+++ b/addons/survey/wizard/survey_browse_answer.xml
@@ -16,7 +16,7 @@
                         <button icon="gtk-go-forward" name="action_next" string="Start" type="object"/>
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                     </header>
-                    <group col="4" string =  "Select Survey and Related Answer">
+                    <group col="4" string = "Select Survey and Related Answer">
                         <field name="survey_id"/>
                         <field name="response_id" domain="[('survey_id','=', survey_id)]"/>
                     </group>
diff --git a/addons/survey/wizard/survey_print_answer.xml b/addons/survey/wizard/survey_print_answer.xml
index 265c56ee1c6..4c2075cd66e 100644
--- a/addons/survey/wizard/survey_print_answer.xml
+++ b/addons/survey/wizard/survey_print_answer.xml
@@ -11,8 +11,8 @@
             <field name="arch" type="xml">
                 <form string="Print Answer" version="7.0">
                     <header>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                         <button icon="gtk-print" name="action_next" string="Print" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                     </header>
                     <group col="4">
                         <separator string="Answer" colspan="4"/>

From 7d90e49560a02b2689bd5868f155aa894f35b0a2 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 2 Jul 2012 12:58:42 +0530
Subject: [PATCH 107/239] [IMP]:lunch:improved view

bzr revid: apa@tinyerp.com-20120702072842-boch3po931wc8czx
---
 addons/lunch/lunch_view.xml | 61 +++++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 27 deletions(-)

diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 785cc1490f4..c246937a3a3 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -109,10 +109,12 @@
             <field name="model">lunch.cashbox</field>
             <field name="arch" type="xml">
                 <form string="Cashboxes" version="7.0">
-                    <group>
-                        <field name="name"/>
-                        <field name="manager"/>
-                    </group>
+                    <sheet>
+                        <group>
+                            <field name="name"/>
+                            <field name="manager"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -151,14 +153,16 @@
             <field name="model">lunch.cashmove</field>
             <field name="arch" type="xml">
                 <form string="CashMove" version="7.0">
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="user_cashmove"/>
-                        <field name="amount"/>
-                        <field name="box"/>
-                        <field name="create_date"/>
-                        <field name="active"/>
-                    </group>
+                    <sheet>
+                        <group col="4">
+                            <field name="name"/>
+                            <field name="user_cashmove"/>
+                            <field name="amount"/>
+                            <field name="box"/>
+                            <field name="create_date"/>
+                            <field name="active"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -222,9 +226,11 @@
             <field name="model">lunch.category</field>
             <field name="arch" type="xml">
                 <form string="Category" version="7.0">
-                    <group col="4">
-                    <field name="name"/>
-                    </group>
+                    <sheet>
+                        <group col="4">
+                            <field name="name"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -257,18 +263,19 @@
             <field name="model">lunch.product</field>
             <field name="arch" type="xml">
                 <form string="Products" version="7.0">
-                    <group>
-                    <group>
-                        <field name="name"/>
-                        <field name="category_id"/>
-                        <field name="price" />
-                    </group>
-                    <group>
-                        <field name="active"/>
-                    </group>
-                    <field name="description" placeholder="Add a description" nolabel="1"/>
-                    </group>
-
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="name"/>
+                                <field name="category_id"/>
+                                <field name="price" />
+                            </group>
+                            <group>
+                                <field name="active"/>
+                            </group>
+                            <field name="description" placeholder="Add a description" nolabel="1" colspan="4"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>

From 15a8836b14519c352279201df7fec3fe6215dc95 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 2 Jul 2012 13:01:19 +0530
Subject: [PATCH 108/239] [IMP]:idea:improved view

bzr revid: apa@tinyerp.com-20120702073119-dxn0h7uwy5bh0gi7
---
 addons/idea/idea_view.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 7e393bc4f75..4361cabe638 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -20,9 +20,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Category of Ideas" version="7.0">
-                    <group>
-                        <field name="name"/>
-                    </group>
+                    <sheet>
+                        <group>
+                            <field name="name"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>

From 35f394ac16823f0d211d11f4381f9a46f104958c Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Mon, 2 Jul 2012 14:14:20 +0530
Subject: [PATCH 109/239] [IMP]fixing sale application related access errors

bzr revid: dhr@tinyerp.com-20120702084420-4f5ouv9rrf0m7w01
---
 addons/project/security/ir.model.access.csv       | 4 +++-
 addons/project_issue/security/ir.model.access.csv | 2 ++
 addons/project_mrp/security/ir.model.access.csv   | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index 1dec5def32e..89067a16e08 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -10,7 +10,9 @@ access_report_project_task_user,report.project.task.user,model_report_project_ta
 access_partner_task user,base.res.partner user,base.model_res_partner,project.group_project_user,1,0,0,0
 access_task_on_partner,project.task on partners,model_project_task,base.group_user,1,0,0,0
 access_project_on_partner,project.project on partners,model_project_project,base.group_user,1,0,0,0
-access_project_task_sale_user,project.task salesman,model_project_task,base.group_sale_salesman,1,0,0,0
+access_project_task_sale_user,project.task salesman,model_project_task,base.group_sale_salesman,1,1,1,0
+access_project_task_type_sale_user,project.task.type salesman,project.model_project_task_type,base.group_sale_salesman,1,1,1,0
+access_project_task_history_sale_user,project.task.history salesman,project.model_project_task_history,base.group_sale_salesman,1,1,1,0
 access_project_project_sale_user,project.project salesman,model_project_project,base.group_sale_salesman,1,0,0,0
 access_account_analytic_line_project,account.analytic.line project,analytic.model_account_analytic_line,project.group_project_manager,1,1,1,1
 access_project_task_history,project.task.history project,project.model_project_task_history,project.group_project_user,1,1,1,0
diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv
index 4708a6fdcd6..789f93b5175 100644
--- a/addons/project_issue/security/ir.model.access.csv
+++ b/addons/project_issue/security/ir.model.access.csv
@@ -9,3 +9,5 @@ access_resource_calendar_project_manager,resource.calendar.project.manager,resou
 access_project_issue_report_user,project.issue.report user,model_project_issue_report,project.group_project_user,1,0,0,0
 access_mail_message_issue_project_user,mail.message.user,mail.model_mail_message,project.group_project_user,1,1,1,0
 access_crm_case_section,crm.case.section,crm.model_crm_case_section,project.group_project_user,1,0,0,0
+access_project_issue_salesman,project.issue,model_project_issue,base.group_sale_salesman,1,0,0,0
+access_project_issue_manager,project.issue,model_project_issue,base.group_sale_manager,1,0,0,0
diff --git a/addons/project_mrp/security/ir.model.access.csv b/addons/project_mrp/security/ir.model.access.csv
index 8bc4d4ba1b5..0ab645f60ed 100644
--- a/addons/project_mrp/security/ir.model.access.csv
+++ b/addons/project_mrp/security/ir.model.access.csv
@@ -1,2 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_procurement_project_user,procurement.order project_user,model_procurement_order,project.group_project_user,1,1,1,1
+

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 110/239] [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 111/239] [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 ea41fd0fee0768af14448f5b47b6f5ca54505920 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Mon, 2 Jul 2012 15:55:32 +0530
Subject: [PATCH 113/239] [FIX] aupdated new icon

bzr revid: jam@tinyerp.com-20120702102532-ytc8smg5310wfxw0
---
 addons/mail/static/src/img/icon.png | Bin 10371 -> 3092 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/addons/mail/static/src/img/icon.png b/addons/mail/static/src/img/icon.png
index 77e42f1ac6cba9c364f11f72a8970f84e60ef7e2..cf160022470e0f0d1c8928b9364bf99349bbee45 100644
GIT binary patch
literal 3092
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

literal 10371
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


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 114/239] [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 6bf174235c98d55ac922021c241271270d26809d Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Mon, 2 Jul 2012 16:09:16 +0530
Subject: [PATCH 115/239] [FIX] udapted the new description

bzr revid: jam@tinyerp.com-20120702103916-u5ij54gezk9jxz8q
---
 addons/mail/__openerp__.py | 40 ++++++++++++--------------------------
 1 file changed, 12 insertions(+), 28 deletions(-)

diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index e2114a3c0b7..cc161baa1ec 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -20,40 +20,24 @@
 ##############################################################################
 
 {
-    'name': 'Social Networking',
+    'name': 'Social Network',
     'version': '1.0',
     'category':'Social Network',
     "sequence": 2,
     'description': """
-A bussiness oriented Social Networking stands with message storage,
-queuing and  feeds.     
+A business oriented Social Network stands with message storage, queuing 
+and feeds.                    
 ===================================================================
+This Social Network service enables users to send, share and read posts via 
+feeds and provides an unified social network you can use in a global feed or
+in all application. 
 
-This Social Networking service that enables its users to send and read 
-text-based posts via feeds,and its provide a unified social network 
-abstraction that all other applications can use,also it used as a email
-subsystem.
-
-The main features are:
-    
-    * Trouble free application.
-    * Hassle free user communication via feeds menu.
-    * And also it relies on the global Outgoing Mail Servers configured
-      in the , Administration menu for delivering outgoing mail.
-    * Includes queuing mechanism with automated configurable
-      scheduler-based processing
-    * Provides an API for sending messages and archiving them,
-      grouped by conversation,
-    * Any OpenERP document can act as a conversation topic, provided
-      it includes the necessary support for handling incoming emails
-      (see the ``mail.thread`` class for more details). 
-    * Includes a generic email composition assistant, that can turn
-      into a mass-mailing assistant, and is capable of interpreting
-      simple *placeholder expressions* that will be replaced with
-      dynamic data when each email is actually sent.
-      This generic assistant is easily extensible to provide advanced
-      features (see ``email_template`` for example, which adds email
-      templating features to this assistant)
+With this feature: 
+    * Track all the notification of the system.
+    * Send emails to your colleagues and/or your customers.
+    * Share your ideas by adding message.
+    * Add comments on your colleague's post.
+    * Add and follow discussion group.
 
     """,
     'author': 'OpenERP SA',

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 116/239] [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 6e3b8c78dafcf1649e32ddc61989be7433828d48 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 2 Jul 2012 16:36:34 +0200
Subject: [PATCH 117/239] [FIX] crm: fix links from customers kanban to
 opportunities and meetings

bzr revid: rco@openerp.com-20120702143634-t7p1k4mfypwwxrnb
---
 addons/crm/res_partner_view.xml | 71 ++++++++++++++++++++++++---------
 1 file changed, 52 insertions(+), 19 deletions(-)

diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 19bb151b9b3..411e3374fca 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -45,25 +45,58 @@
                 </field>
         </record>
 
-    <act_window
-        id="crm_meeting_partner"
-        name="Meetings"
-        res_model="crm.meeting"
-        src_model="res.partner"
-        view_mode="calendar,tree,form,gantt"
-        context="{'search_default_partner_id': [active_id],'default_partner_id': active_id}"
-    />
-    <act_window
-        id="act_res_partner_2_opportunity"
-        name="Opportunities"
-        res_model="crm.lead"
-        src_model="res.partner"
-        view_mode="kanban,tree,form,graph,calendar"
-        domain="[('type','=','opportunity')]"
-        context="{'search_default_partner_id': [active_id],'default_partner_id': active_id}"
+        <!-- open meetings related to given partner -->
+        <act_window
+            id="crm_meeting_partner"
+            name="Meetings"
+            res_model="crm.meeting"
+            src_model="res.partner"
+            view_mode="calendar,tree,form,gantt"
+            context="{'search_default_partner_id': active_id, 'default_partner_id': active_id}"
         />
 
-<!-- Partner kanban view inherte -->
+        <!-- open opportunities related to given partner -->
+        <record model="ir.actions.act_window" id="act_res_partner_2_opportunity">
+            <field name="name">Opportunities</field>
+            <field name="res_model">crm.lead</field>
+            <field name="view_mode">kanban,tree,form,graph,calendar</field>
+            <field name="domain">[('type','=','opportunity')]</field>
+            <field name="context">{'search_default_partner_id': active_id, 'default_partner_id': active_id,
+                'stage_type': 'opportunity', 'default_type': 'opportunity'}</field>
+            <field name="view_id" eval="False"/>
+            <field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
+            <field name="help">
+                With opportunities you can manage and keep track of your sales pipeline by creating specific customer- or prospect-related sales documents to follow up potential sales. Information such as expected revenue, opportunity stage, expected closing date, communication history and much more can be stored. Opportunities can be connected to the email gateway: new emails may create opportunities, each of them automatically gets the history of the conversation with the customer.
+
+                You and your team(s) will be able to plan meetings and phone calls from opportunities, convert them into quotations, manage related documents, track all customer related activities, and much more.
+            </field>
+        </record>
+        <record model="ir.actions.act_window.view" id="action_crm_tag_kanban_view_oppor11">
+            <field name="sequence" eval="0"/>
+            <field name="view_mode">kanban</field>
+            <field name="view_id" ref="crm_case_kanban_view_leads"/>
+            <field name="act_window_id" ref="act_res_partner_2_opportunity"/>
+        </record>
+        <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor11">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="crm_case_tree_view_oppor"/>
+            <field name="act_window_id" ref="act_res_partner_2_opportunity"/>
+        </record>
+        <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor11">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="crm_case_form_view_oppor"/>
+            <field name="act_window_id" ref="act_res_partner_2_opportunity"/>
+        </record>
+        <record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_oppor11">
+            <field name="sequence" eval="4"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="crm_case_graph_view_opportunity"/>
+            <field name="act_window_id" ref="act_res_partner_2_opportunity"/>
+        </record>
+
+        <!-- Partner kanban view inherte -->
         <record model="ir.ui.view" id="crm_lead_partner_kanban_view">
             <field name="name">res.partner.kanban.inherit</field>
             <field name="model">res.partner</field>
@@ -76,10 +109,10 @@
                 </field>
                  <xpath expr="//h4[@class='oe_partner_heading']" position="after">
                         <a name="%(act_res_partner_2_opportunity)d" type="action">
-                            <t t-if="record.opportunity_count.value"><t t-esc="record.opportunity_count.value"/> Opportunities</t>
+                            <t t-if="record.opportunity_count.value">Opportunities(<t t-esc="record.opportunity_count.value"/>)</t>
                         </a>
                         <a name="%(crm_meeting_partner)d" type="action">
-                            <t t-if="record.meeting_count.value"><t t-esc="record.meeting_count.value"/> Meetings</t>
+                            <t t-if="record.meeting_count.value">Meetings(<t t-esc="record.meeting_count.value"/>)</t>
                         </a>
                 </xpath>
             </field>

From 6a3ac6949db0071cdf6f73fbc53a748966070b03 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 2 Jul 2012 16:46:37 +0200
Subject: [PATCH 118/239] [FIX] crm: fix search_defaults in contexts

bzr revid: rco@openerp.com-20120702144637-v39xqru5wt79yy3q
---
 addons/crm/res_partner_view.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 411e3374fca..67f7d044d16 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -129,13 +129,12 @@
                     <button type="action"
                         string="Schedule a Meeting"
                         name="%(crm.crm_case_categ_meet_create_partner)d"
-                        context="{'default_partner_id': [active_id], 'default_duration': 4.0}"/>
+                        context="{'default_partner_id': active_id, 'default_duration': 4.0}"/>
                     <button type="action" string="Schedule a Call" 
                         name="%(crm.crm_case_categ_phone_create_partner)d" 
-                        context="{'search_default_partner_id': [active_id], 'default_duration': 1.0}" />
+                        context="{'search_default_partner_id': active_id, 'default_duration': 1.0}" />
                     <button type="action" string="Opportunities"
-                        context="{'search_default_partner_id': [active_id]}"
-                        name="%(crm.action_view_crm_partner2opportunity)d" />
+                        name="%(crm.act_res_partner_2_opportunity)d" />
                 </xpath>
             </field>
         </record>

From 5baf102d4032cb7cc3a6a1d3d14c960990888c9e Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 3 Jul 2012 08:07:13 +0200
Subject: [PATCH 119/239] [IMP] better partner form view

bzr revid: fp@tinyerp.com-20120703060713-cqu01p4byjit27yy
---
 openerp/addons/base/res/res_partner_view.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index aaab3a7d008..5159a7075cc 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -121,12 +121,6 @@
                                 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)]}">
                             <field name="function" class="oe_inline" placeholder="Job Position"/>
                         </h2>
                         <field name="category_id" widget="many2many_tags" placeholder="Tags..."/>

From 72ba5b724686c38113aa649ed01a5e8071d96dbf Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 3 Jul 2012 08:07:35 +0200
Subject: [PATCH 120/239] [IMP] improved CSS for oe_title

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

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 68fdbc8a215..d6212b64739 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -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;
@@ -294,7 +294,7 @@
   background: #ed6f6a;
 }
 .openerp .oe_title {
-  width: 55%;
+  width: 60%;
 }
 .openerp .oe_title:after {
   content: ".";
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 395b9dd694b..3010de3f675 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -260,7 +260,7 @@ $colour4: #8a89ba
             &:hover
                 background: #ED6F6A
     .oe_title
-        width: 55%
+        width: 60%
     .oe_title:after
         content: "."
         display: block

From 76a4071c9b965d731059125644b2771ed4b509b3 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 3 Jul 2012 09:13:28 +0200
Subject: [PATCH 121/239] [FIX] crm: fix inappropriate duplicate ids in
 act_window view records

bzr revid: rco@openerp.com-20120703071328-0n26gqbnyvjb4fhl
---
 addons/crm/res_partner_view.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 67f7d044d16..09f9e8ec9e4 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -56,7 +56,7 @@
         />
 
         <!-- open opportunities related to given partner -->
-        <record model="ir.actions.act_window" id="act_res_partner_2_opportunity">
+        <record model="ir.actions.act_window" id="relate_partner_opportunities">
             <field name="name">Opportunities</field>
             <field name="res_model">crm.lead</field>
             <field name="view_mode">kanban,tree,form,graph,calendar</field>
@@ -71,29 +71,29 @@
                 You and your team(s) will be able to plan meetings and phone calls from opportunities, convert them into quotations, manage related documents, track all customer related activities, and much more.
             </field>
         </record>
-        <record model="ir.actions.act_window.view" id="action_crm_tag_kanban_view_oppor11">
+        <record model="ir.actions.act_window.view" id="relate_partner_opportunities_kanban">
             <field name="sequence" eval="0"/>
             <field name="view_mode">kanban</field>
             <field name="view_id" ref="crm_case_kanban_view_leads"/>
-            <field name="act_window_id" ref="act_res_partner_2_opportunity"/>
+            <field name="act_window_id" ref="relate_partner_opportunities"/>
         </record>
-        <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor11">
+        <record model="ir.actions.act_window.view" id="relate_partner_opportunities_tree">
             <field name="sequence" eval="1"/>
             <field name="view_mode">tree</field>
             <field name="view_id" ref="crm_case_tree_view_oppor"/>
-            <field name="act_window_id" ref="act_res_partner_2_opportunity"/>
+            <field name="act_window_id" ref="relate_partner_opportunities"/>
         </record>
-        <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor11">
+        <record model="ir.actions.act_window.view" id="relate_partner_opportunities_form">
             <field name="sequence" eval="2"/>
             <field name="view_mode">form</field>
             <field name="view_id" ref="crm_case_form_view_oppor"/>
-            <field name="act_window_id" ref="act_res_partner_2_opportunity"/>
+            <field name="act_window_id" ref="relate_partner_opportunities"/>
         </record>
-        <record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_oppor11">
+        <record model="ir.actions.act_window.view" id="relate_partner_opportunities_graph">
             <field name="sequence" eval="4"/>
             <field name="view_mode">graph</field>
             <field name="view_id" ref="crm_case_graph_view_opportunity"/>
-            <field name="act_window_id" ref="act_res_partner_2_opportunity"/>
+            <field name="act_window_id" ref="relate_partner_opportunities"/>
         </record>
 
         <!-- Partner kanban view inherte -->
@@ -108,7 +108,7 @@
                     <field name="meeting_count"/>
                 </field>
                  <xpath expr="//h4[@class='oe_partner_heading']" position="after">
-                        <a name="%(act_res_partner_2_opportunity)d" type="action">
+                        <a name="%(relate_partner_opportunities)d" type="action">
                             <t t-if="record.opportunity_count.value">Opportunities(<t t-esc="record.opportunity_count.value"/>)</t>
                         </a>
                         <a name="%(crm_meeting_partner)d" type="action">
@@ -134,7 +134,7 @@
                         name="%(crm.crm_case_categ_phone_create_partner)d" 
                         context="{'search_default_partner_id': active_id, 'default_duration': 1.0}" />
                     <button type="action" string="Opportunities"
-                        name="%(crm.act_res_partner_2_opportunity)d" />
+                        name="%(crm.relate_partner_opportunities)d" />
                 </xpath>
             </field>
         </record>

From 55266ca80c1d4f11e574a4af5a5222f624363fac Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 3 Jul 2012 09:14:35 +0200
Subject: [PATCH 122/239] [IMP] crm: put together contact name and title in
 lead and opportunity form views

bzr revid: rco@openerp.com-20120703071435-a6iu9ypkpg0zi9yk
---
 addons/crm/crm_lead_view.xml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index a2f3c30c611..be74fbb0ff9 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -134,10 +134,13 @@
                             </div>
                         </group>
                         <group>
-                            <field name="contact_name" />
+                            <label for="contact_name" />
+                            <div>
+                                <field name="contact_name" class="oe_inline"/>,
+                                <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" class="oe_inline"/>
+                            </div>
                             <field name="email_from" widget="email"/>
                             <field name="function" />
-                            <field domain="[('domain', '=', 'contact')]" name="title"/>
                             <field name="phone"/>
                             <field name="mobile"/>
                             <field name="fax"/>
@@ -491,9 +494,12 @@
                             </group>
 
                             <group>
-                                <field name="contact_name" />
+                                <label for="contact_name" />
+                                <div>
+                                    <field name="contact_name" class="oe_inline"/>,
+                                    <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" class="oe_inline"/>
+                                </div>
                                 <field name="function" />
-                                <field domain="[('domain', '=', 'contact')]" name="title"/>
                                 <field name="mobile"/>
                                 <field name="fax"/>
                             </group>

From fbe17561cf2a99f8c82fb3306cfb9f491d19e3d5 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 3 Jul 2012 09:25:58 +0200
Subject: [PATCH 123/239] [FIX] crm, sale: renumber menuitems in menu
 Sales/Sales

bzr revid: rco@openerp.com-20120703072558-fxgog5cj6epa3qfe
---
 .../account_analytic_analysis_menu.xml                        | 2 +-
 addons/crm/crm_meeting_menu.xml                               | 2 +-
 addons/crm_todo/crm_todo_view.xml                             | 2 +-
 addons/sale/sale_view.xml                                     | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index c3ac5f5b71c..8f86e9eeedc 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -77,7 +77,7 @@
         <menuitem id="base.menu_sales" name="Sales"
             parent="base.menu_base_partner"
             sequence="1"/>
-        <menuitem action="action_account_analytic_overdue_all" id="menu_action_account_analytic_overdue_all" sequence="6" parent="base.menu_sales"/>
+        <menuitem action="action_account_analytic_overdue_all" id="menu_action_account_analytic_overdue_all" sequence="7" parent="base.menu_sales"/>
 
 
     </data>
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 6c4c9051cbf..3da817e8611 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -83,7 +83,7 @@
 
     <menuitem name="Meetings" id="menu_crm_case_categ_meet"
         action="crm_case_categ_meet" parent="base.menu_sales"
-        sequence="7" />
+        sequence="8" />
 
     <record id="action_view_attendee_form" model="ir.actions.act_window">
          <field name="name">Meeting Invitations</field>
diff --git a/addons/crm_todo/crm_todo_view.xml b/addons/crm_todo/crm_todo_view.xml
index c7617f317b0..c959f1722e6 100644
--- a/addons/crm_todo/crm_todo_view.xml
+++ b/addons/crm_todo/crm_todo_view.xml
@@ -58,7 +58,7 @@
         id="menu_crm_todo"
         parent="base.menu_sales"
         action="crm_todo_action"
-        sequence="5"/>
+        sequence="6"/>
 
 
     </data>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 239cffe481f..e7c4a3d3769 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -327,7 +327,7 @@
             <field name="context">{"search_default_sales":1}</field>
             <field name="help">Sales Orders help you manage quotations and orders from your customers. OpenERP suggests that you start by creating a quotation. Once it is confirmed, the quotation will be converted into a Sales Order. OpenERP can handle several types of products so that a sales order may trigger tasks, delivery orders, manufacturing orders, purchases and so on. Based on the configuration of the sales order, a draft invoice will be generated so that you just have to confirm it when you want to bill your customer.</field>
         </record>
-        <menuitem action="action_order_form" id="menu_sale_order" parent="base.menu_sales" sequence="4" groups="base.group_sale_salesman,base.group_sale_manager"/>
+        <menuitem action="action_order_form" id="menu_sale_order" parent="base.menu_sales" sequence="5" groups="base.group_sale_salesman,base.group_sale_manager"/>
 
         <record id="action_order_tree2" model="ir.actions.act_window">
             <field name="name">Sales in Exception</field>
@@ -370,7 +370,7 @@
 
         <menuitem id="menu_sale_quotations"
         action="action_order_tree5" parent="base.menu_sales"
-        sequence="3"/>
+        sequence="4"/>
 
         <record id="action_order_tree" model="ir.actions.act_window">
             <field name="name">Old Quotations</field>

From ee5a558470f4f19621426635094f95d29848f313 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 3 Jul 2012 10:36:41 +0200
Subject: [PATCH 124/239] [IMP] crm: clean up record definition in xml

bzr revid: rco@openerp.com-20120703083641-82c5qpejum3kn10q
---
 addons/crm/res_partner_view.xml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 1576259fb01..69f71c95405 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -46,14 +46,13 @@
         </record>
 
         <!-- open meetings related to given partner -->
-        <act_window
-            id="crm_meeting_partner"
-            name="Meetings"
-            res_model="crm.meeting"
-            src_model="res.partner"
-            view_mode="calendar,tree,form,gantt"
-            context="{'search_default_partner_id': active_id}"
-        />
+        <record id="crm_meeting_partner" model="ir.actions.act_window">
+            <field name="name">Meetings</field>
+            <field name="src_model">res.partner</field>
+            <field name="res_model">crm.meeting</field>
+            <field name="view_mode">calendar,tree,form,gantt</field>
+            <field name="context">{'search_default_partner_id': active_id}</field>
+        </record>
 
         <!-- open opportunities related to given partner -->
         <record model="ir.actions.act_window" id="relate_partner_opportunities">

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 125/239] [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 126/239] [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 127/239] [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 128/239] [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 6b1606f8de023dadb9118ed1ba2faf4a726b445c Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 3 Jul 2012 15:14:53 +0200
Subject: [PATCH 129/239] [IMP] move crm.wizard.mail_compose_message to module
 mail, to reduce module dependencies on crm

bzr revid: rco@openerp.com-20120703131453-dz0gpdq3t9155bfw
---
 addons/crm/crm_lead.py                     |  1 +
 addons/crm/wizard/__init__.py              |  1 -
 addons/crm/wizard/mail_compose_message.py  | 63 ----------------------
 addons/crm_claim/crm_claim.py              |  4 +-
 addons/crm_fundraising/crm_fundraising.py  |  4 +-
 addons/crm_helpdesk/crm_helpdesk.py        |  4 +-
 addons/hr_recruitment/hr_recruitment.py    |  6 +--
 addons/mail/wizard/mail_compose_message.py | 39 ++++++++++++++
 addons/project_issue/project_issue.py      |  4 +-
 9 files changed, 45 insertions(+), 81 deletions(-)
 delete mode 100644 addons/crm/wizard/mail_compose_message.py

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 69d390ff04d..015fa10c27f 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -41,6 +41,7 @@ class crm_lead(base_stage, osv.osv):
     _description = "Lead/Opportunity"
     _order = "priority,date_action,id desc"
     _inherit = ['ir.needaction_mixin', 'mail.thread']
+    _mail_compose_message = True
 
     def _get_default_section_id(self, cr, uid, context=None):
         """ Gives default section by checking if present in the context """
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 2fc39c51505..9d128492422 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import mail_compose_message
 import crm_add_note
 
 import crm_lead_to_partner
diff --git a/addons/crm/wizard/mail_compose_message.py b/addons/crm/wizard/mail_compose_message.py
deleted file mode 100644
index b82c3083f3a..00000000000
--- a/addons/crm/wizard/mail_compose_message.py
+++ /dev/null
@@ -1,63 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010-Today OpenERP SA (<http://www.openerp.com>)
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>
-#
-##############################################################################
-
-from osv import osv
-from osv import fields
-import tools
-
-SUPPORTED_MODELS = ['crm.lead',]
-
-class mail_compose_message(osv.osv_memory):
-    _inherit = 'mail.compose.message'
-
-    def get_value(self, cr, uid, model, res_id, context=None):
-        """Returns a defaults-like dict with initial values for the composition
-           wizard when sending an email related to the document record identified
-           by ``model`` and ``res_id``.
-
-           Overrides the default implementation to provide more default field values
-           related to the corresponding CRM case.
-
-           :param str model: model name of the document record this mail is related to.
-           :param int res_id: id of the document record this mail is related to.
-           :param dict context: several context values will modify the behavior
-                                of the wizard, cfr. the class description.
-        """
-        result = super(mail_compose_message, self).get_value(cr, uid,  model, res_id, context=context)
-        if model in SUPPORTED_MODELS and res_id:
-            model_obj = self.pool.get(model)
-            data = model_obj.browse(cr, uid , res_id, context)
-            user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-            result.update({
-                    'subject' : data.name or False,
-                    'email_to' : data.email_from or False,
-                    'email_from' : user.user_email or tools.config.get('email_from', False),
-                    'body_text' : '\n' + tools.ustr(user.signature or ''),
-                    'email_cc' : tools.ustr(data.email_cc or ''),
-                    'model': model,
-                    'res_id': res_id,
-                    'subtype': 'plain',
-                })
-            if hasattr(data, 'section_id'):
-                result.update({'reply_to' : data.section_id and data.section_id.reply_to or False})
-        return result
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index 5b98258240c..ec6252bcdca 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -22,14 +22,11 @@
 from base_status.base_stage import base_stage
 import binascii
 from crm import crm
-from crm import wizard
 from osv import fields, osv
 import time
 import tools
 from tools.translate import _
 
-wizard.mail_compose_message.SUPPORTED_MODELS.append('crm.claim')
-
 CRM_CLAIM_PENDING_STATES = (
     crm.AVAILABLE_STATES[2][0], # Cancelled
     crm.AVAILABLE_STATES[3][0], # Done
@@ -75,6 +72,7 @@ class crm_claim(base_stage, osv.osv):
     _description = "Claim"
     _order = "priority,date desc"
     _inherit = ['mail.thread']
+    _mail_compose_message = True
     _columns = {
         'id': fields.integer('ID', readonly=True),
         'name': fields.char('Claim Subject', size=128, required=True),
diff --git a/addons/crm_fundraising/crm_fundraising.py b/addons/crm_fundraising/crm_fundraising.py
index 20d90795ffc..495be4d729c 100644
--- a/addons/crm_fundraising/crm_fundraising.py
+++ b/addons/crm_fundraising/crm_fundraising.py
@@ -21,12 +21,9 @@
 
 from base_status.base_stage import base_stage
 from crm import crm
-from crm import wizard
 from osv import fields, osv
 from tools.translate import _
 
-wizard.mail_compose_message.SUPPORTED_MODELS.append('crm.fundraising')
-
 class crm_fundraising(base_stage, osv.osv):
     """ Fund Raising Cases """
 
@@ -34,6 +31,7 @@ class crm_fundraising(base_stage, osv.osv):
     _description = "Fund Raising"
     _order = "id desc"
     _inherit = ['mail.thread']
+    _mail_compose_message = True
     _columns = {
             'id': fields.integer('ID', readonly=True),
             'name': fields.char('Name', size=128, required=True),
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index fe7b0581e9b..4b0cb2e3ffa 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -21,7 +21,6 @@
 
 from base_status.base_state import base_state
 from crm import crm
-from crm import wizard
 from osv import fields, osv
 import tools
 from tools.translate import _
@@ -32,8 +31,6 @@ CRM_HELPDESK_STATES = (
     crm.AVAILABLE_STATES[4][0], # Pending
 )
 
-wizard.mail_compose_message.SUPPORTED_MODELS.append('crm.helpdesk')
-
 class crm_helpdesk(base_state, osv.osv):
     """ Helpdesk Cases """
 
@@ -41,6 +38,7 @@ class crm_helpdesk(base_state, osv.osv):
     _description = "Helpdesk"
     _order = "id desc"
     _inherit = ['mail.thread']
+    _mail_compose_message = True
     _columns = {
             'id': fields.integer('ID', readonly=True),
             'name': fields.char('Name', size=128, required=True),
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 7b0090d60ea..21aa1b4327d 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -24,15 +24,10 @@ import time
 from datetime import datetime, timedelta
 
 from osv import fields, osv
-from crm import crm
 import tools
 import collections
 import binascii
-import tools
 from tools.translate import _
-from crm import wizard
-
-wizard.mail_compose_message.SUPPORTED_MODELS.append('hr.applicant')
 
 AVAILABLE_STATES = [
     ('draft', 'New'),
@@ -98,6 +93,7 @@ class hr_applicant(base_stage, osv.Model):
     _description = "Applicant"
     _order = "id desc"
     _inherit = ['ir.needaction_mixin', 'mail.thread']
+    _mail_compose_message = True
 
     def _get_default_department_id(self, cr, uid, context=None):
         """ Gives default department by checking if present in the context """
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index cb2ed1eec19..1b19a383c10 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -292,4 +292,43 @@ class mail_compose_message(osv.osv_memory):
             return tools.ustr(result)
         return template and EXPRESSION_PATTERN.sub(merge, template)
 
+
+
+class mail_compose_message_extended(osv.osv_memory):
+    """ Extension of 'mail.compose.message' to support default field values related
+        to CRM-like models that follow the following conventions:
+
+        1. The model object must have an attribute '_mail_compose_message' equal to True.
+
+        2. The model should define the following fields:
+            - 'name' as subject of the message (required);
+            - 'email_from' as destination email address (required);
+            - 'email_cc' as cc email addresses (required);
+            - 'section_id.reply_to' as reply-to address (optional).
+    """
+    _inherit = 'mail.compose.message'
+
+    def get_value(self, cr, uid, model, res_id, context=None):
+        """Overrides the default implementation to provide more default field values
+           related to the corresponding CRM case.
+        """
+        result = super(mail_compose_message_extended, self).get_value(cr, uid,  model, res_id, context=context)
+        model_obj = self.pool.get(model)
+        if getattr(model_obj, '_mail_compose_message', False) and res_id:
+            data = model_obj.browse(cr, uid , res_id, context)
+            user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+            result.update({
+                'model': model,
+                'res_id': res_id,
+                'email_from': user.user_email or tools.config.get('email_from', False),
+                'email_to': data.email_from or False,
+                'email_cc': tools.ustr(data.email_cc or ''),
+                'subject': data.name or False,
+                'body_text': '\n' + tools.ustr(user.signature or ''),
+                'subtype': 'plain',
+            })
+            if hasattr(data, 'section_id'):
+                result['reply_to'] = data.section_id and data.section_id.reply_to or False
+        return result
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index fea7a64d2b7..5f9b0a369ca 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -27,9 +27,6 @@ from tools.translate import _
 import binascii
 import time
 import tools
-from crm import wizard
-
-wizard.mail_compose_message.SUPPORTED_MODELS.append('project.issue')
 
 class project_issue_version(osv.osv):
     _name = "project.issue.version"
@@ -50,6 +47,7 @@ class project_issue(base_stage, osv.osv):
     _description = "Project Issue"
     _order = "priority, create_date desc"
     _inherit = ['ir.needaction_mixin', 'mail.thread']
+    _mail_compose_message = True
 
     def _get_default_project_id(self, cr, uid, context=None):
         """ Gives default project by checking if present in the context """

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 130/239] [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 131/239] [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 132/239] [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 133/239] 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 134/239] [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 135/239] [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 38e91f1434187a0c1b1eefbfec77b2020664cb45 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 4 Jul 2012 14:52:51 +0530
Subject: [PATCH 136/239] [IMP]survey: Improve survey page also imp answer and
 browse ans. wizard view

bzr revid: dbr@tinyerp.com-20120704092251-cpsxco49c8wejssy
---
 addons/survey/survey_view.xml                 | 4 ++--
 addons/survey/wizard/survey_browse_answer.xml | 2 +-
 addons/survey/wizard/survey_selection.xml     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index e6043586c6e..b55e073cf4d 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -376,8 +376,8 @@
                             <field name="survey_id" select="1"/>
                             <field name="sequence"/>
                         </group>
-                        <group string="Description" col="4">
-                            <field name="note" nolabel="1"/>
+                        <group col="4">
+                            <field name="note" nolabel="1" placeholder="Add a description on the survey page"/>
                         </group>
                         <group col="4">
                             <field name="question_ids" nolabel="1">
diff --git a/addons/survey/wizard/survey_browse_answer.xml b/addons/survey/wizard/survey_browse_answer.xml
index 337c7c029fd..20c028068bb 100644
--- a/addons/survey/wizard/survey_browse_answer.xml
+++ b/addons/survey/wizard/survey_browse_answer.xml
@@ -17,7 +17,7 @@
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
-                    <group col="4" string = "Select Survey and Related Answer">
+                    <group col="4">
                         <field name="survey_id"/>
                         <field name="response_id" domain="[('survey_id','=', survey_id)]"/>
                     </group>
diff --git a/addons/survey/wizard/survey_selection.xml b/addons/survey/wizard/survey_selection.xml
index 7dc736d3008..15b4af6756f 100644
--- a/addons/survey/wizard/survey_selection.xml
+++ b/addons/survey/wizard/survey_selection.xml
@@ -16,10 +16,10 @@
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
-                    <group string="Select Survey">
+                    <group>
                         <field name="survey_id" on_change="on_change_survey(survey_id)"/>
                     </group>
-                    <field name="note" attrs="{'readonly': [('survey_id','=',False)]}"/>
+                    <field name="note" placeholder="Add Description" attrs="{'readonly': [('survey_id','=',False)]}"/>
                 </form>
             </field>
         </record>

From 10a2fb5b28ab02ffde83614ac55c1b84625f2119 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Wed, 4 Jul 2012 15:00:38 +0530
Subject: [PATCH 137/239] [IMP]remove extra cancel button

bzr revid: sgo@tinyerp.com-20120704093038-4jp02eg7pja0dd5z
---
 addons/document_ftp/wizard/ftp_browse_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/document_ftp/wizard/ftp_browse_view.xml b/addons/document_ftp/wizard/ftp_browse_view.xml
index 6063fc3bdce..a0656b5597d 100644
--- a/addons/document_ftp/wizard/ftp_browse_view.xml
+++ b/addons/document_ftp/wizard/ftp_browse_view.xml
@@ -9,7 +9,6 @@
                 <form string="Browse Document" version="7.0">
                     <header>
                         <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok" class="oe_highlight"  />
-                        <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </header>

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 138/239] [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 36dca91195fc322dc80782a993ab9e644dc4fa1e Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Wed, 4 Jul 2012 16:45:29 +0530
Subject: [PATCH 139/239] [IMP]event: remove date and add duration

bzr revid: kjo@tinyerp.com-20120704111529-8nm276wyabrcn1wd
---
 addons/event/event.py       | 17 ++++++++++++-----
 addons/event/event_view.xml | 14 +++-----------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 029b9f86310..09495560051 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -23,6 +23,7 @@ import time
 from osv import fields, osv
 from tools.translate import _
 import decimal_precision as dp
+from datetime import datetime, timedelta
 
 class event_type(osv.osv):
     """ Event Type """
@@ -336,8 +337,9 @@ class event_registration(osv.osv):
         # Fields for address, due to separation from event.registration and res.partner
         'email': fields.char('Email', size=240),
         'phone': fields.char('Phone', size=64),
-        'name': fields.char('Name', size=128, required=True, select=True),
+        'name': fields.char('Name', size=128, select=True),
         'active': fields.boolean('Active'),
+        'duration': fields.float('Duration'),
     }
 
     _defaults = {
@@ -347,7 +349,6 @@ class event_registration(osv.osv):
     }
     _order = 'name, create_date desc'
 
-
     def do_draft(self, cr, uid, ids, context=None):
         self.do_draft_send_note(cr, uid, ids, context=context)
         return self.write(cr, uid, ids, {'state': 'draft'}, context=context)
@@ -432,17 +433,23 @@ class event_registration(osv.osv):
     def onchange_event(self, cr, uid, ids, event_id, context=None):
         """This function returns value of Product Name, Unit Price based on Event.
         """
+        value= {}
         if context is None:
             context = {}
         if not event_id:
             return {}
         event_obj = self.pool.get('event.event')
         data_event =  event_obj.browse(cr, uid, event_id, context=context)
-        return {'value': 
-                    {'event_begin_date': data_event.date_begin,
+        start = datetime.strptime(data_event.date_begin, "%Y-%m-%d %H:%M:%S")
+        end = datetime.strptime(data_event.date_end, "%Y-%m-%d %H:%M:%S")
+        diff = end - start
+        duration = float(diff.days)* 24 + (float(diff.seconds) / 3600)
+        value['duration'] = round(duration, 2)
+        return {'value': {'event_begin_date': data_event.date_begin,
                      'event_end_date': data_event.date_end,
                      'company_id': data_event.company_id and data_event.company_id.id or False,
-                    }
+                     'duration': value['duration'],
+               }
                }
 
     def onchange_partner_id(self, cr, uid, ids, part, context=None):
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index d6da35a3e2f..0b424b9794b 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -386,18 +386,10 @@
                    <label for="event_id" class="oe_edit_only"/>
                    <h1>
                             <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]" nolabel="1" class="oe_inline"/>
-                            <label string="(" attrs="{'invisible': ['|',('event_begin_date', '=', ''),('event_id', '=', '')]}" class="oe_inline"/>
-                            <field nolabel="1" name="event_begin_date" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
-                            <label string="-" attrs="{'invisible': ['|',('event_begin_date', '=', ''), ('event_id', '=', '')]}" class="oe_inline"/>
-                            <field nolabel="1" name="event_end_date" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline" />
-                            <label string=")" attrs="{'invisible': ['|',('event_begin_date', '=', ''),('event_id', '=', '')]}" class="oe_inline"/>
+                            <label string="(" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
+                            <field name="duration" widget="float_time" attrs="{'invisible': [('event_id', '=', '')]}"/>
+                            <label string=")" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
 	                </h1>   
-		                   
-                    <group colspan="2" col="2">
-                        <h2>
-                            <field name="nb_register" class="oe_inline"/>  Participants
-                        </h2>
-                    </group>
                     <group colspan="4" col="4">
                         <group colspan="2">
                             <field name="name" invisible="1"/>

From 3bf79cdb7840d5942f963f63acf16510718de475 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 4 Jul 2012 13:27:54 +0200
Subject: [PATCH 140/239] [IMP] crm: remove dummy Python class definition by
 reordering Python module imports

bzr revid: rco@openerp.com-20120704112754-u6kg6pxe279zmgvf
---
 addons/crm/__init__.py    | 2 +-
 addons/crm/crm_meeting.py | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/addons/crm/__init__.py b/addons/crm/__init__.py
index 95cf8b53f27..729d54e0fc6 100644
--- a/addons/crm/__init__.py
+++ b/addons/crm/__init__.py
@@ -22,8 +22,8 @@
 import crm
 import crm_action_rule
 import crm_segmentation
-import crm_meeting
 import crm_lead
+import crm_meeting
 import crm_phonecall
 import report
 import wizard
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 37f03d80ec4..e0915590d6a 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -28,10 +28,6 @@ import tools
 from tools.translate import _
 _logger = logging.getLogger(__name__)
 
-class crm_lead(base_stage, osv.osv):
-        """ CRM Leads """
-        _name = 'crm.lead'
-
 class crm_meeting(base_state, osv.Model):
     """ Model for CRM meetings """
     _name = 'crm.meeting'

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 141/239] [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 bd1d436f9daae1696adbdb69d16ca31c5f97e354 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 4 Jul 2012 16:10:42 +0200
Subject: [PATCH 142/239] [IMP] crm, base_calendar: move the core of
 crm.meeting into base_calendar

bzr revid: rco@openerp.com-20120704141042-fiy0o7pdhc8hboht
---
 addons/base_calendar/__init__.py              |  26 ++++
 addons/base_calendar/__openerp__.py           |   2 +-
 addons/base_calendar/crm_meeting.py           | 112 ++++++++++++++++++
 addons/base_status/base_state.py              |   1 +
 addons/crm/crm_meeting.py                     |  97 +--------------
 addons/crm/crm_meeting_data.xml               |  12 +-
 addons/crm/crm_meeting_view.xml               |  30 +++--
 addons/hr_recruitment/hr_recruitment_data.xml |   6 +-
 8 files changed, 169 insertions(+), 117 deletions(-)
 create mode 100644 addons/base_calendar/__init__.py
 create mode 100644 addons/base_calendar/crm_meeting.py

diff --git a/addons/base_calendar/__init__.py b/addons/base_calendar/__init__.py
new file mode 100644
index 00000000000..ec4f5070d63
--- /dev/null
+++ b/addons/base_calendar/__init__.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 base_calendar
+import crm_meeting
+import wizard
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index 1c8d35099b8..d3a9d9e533d 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -22,7 +22,7 @@
 {
     "name": "Calendar Layer",
     "version": "1.0",
-    "depends": ["base", "mail"],
+    "depends": ["base", "base_status", "mail"],
     'description': """
 This is a full-featured calendar system.
 ========================================
diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
new file mode 100644
index 00000000000..7c18f6826e8
--- /dev/null
+++ b/addons/base_calendar/crm_meeting.py
@@ -0,0 +1,112 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-today OpenERP SA (<http://www.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, fields
+import tools
+from tools.translate import _
+
+import base_calendar
+from base_status.base_state import base_state
+
+#
+# crm.meeting is defined here so that it may be used by modules other than crm,
+# without forcing the installation of crm.
+#
+
+class crm_meeting_type(osv.Model):
+    _name = 'crm.meeting.type'
+    _description = 'Meeting Type'
+    _columns = {
+        'name': fields.char('Name', size=64, required=True, translate=True),
+    }
+
+class crm_meeting(base_state, osv.Model):
+    """ Model for CRM meetings """
+    _name = 'crm.meeting'
+    _description = "Meeting"
+    _order = "id desc"
+    _inherit = ["calendar.event", 'ir.needaction_mixin', "mail.thread"]
+    _columns = {
+        # base_state required fields
+        'create_date': fields.datetime('Creation Date', readonly=True),
+        'write_date': fields.datetime('Write Date', readonly=True),
+        'date_open': fields.datetime('Confirmed', readonly=True),
+        'date_closed': fields.datetime('Closed', readonly=True),
+        'partner_id': fields.many2one('res.partner', 'Partner', states={'done': [('readonly', True)]}),
+        'email_from': fields.char('Email', size=128, states={'done': [('readonly', True)]},
+                        help="These people will receive email."),
+        'state': fields.selection(
+                    [('draft', 'Unconfirmed'), ('open', 'Confirmed'), ('cancel', 'Cancelled'), ('done', 'Done')],
+                    string='Status', size=16, readonly=True),
+        # Meeting fields
+        'name': fields.char('Summary', size=128, required=True, states={'done': [('readonly', True)]}),
+        'categ_id': fields.many2one('crm.meeting.type', 'Meeting Type'),
+        'attendee_ids': fields.many2many('calendar.attendee', 'meeting_attendee_rel',\
+                            'event_id', 'attendee_id', 'Attendees', states={'done': [('readonly', True)]}),
+    }
+    _defaults = {
+        'state': 'draft',
+    }
+
+    def create(self, cr, uid, vals, context=None):
+        obj_id = super(crm_meeting, self).create(cr, uid, vals, context=context)
+        self.create_send_note(cr, uid, [obj_id], context=context)
+        return obj_id
+
+    # ----------------------------------------
+    # OpenChatter
+    # ----------------------------------------
+
+    def case_get_note_msg_prefix(self, cr, uid, id, context=None):
+        return 'Meeting'
+
+    def create_send_note(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        # update context: if come from phonecall, default state values can make the message_append_note crash
+        context.pop('default_state', False)
+        for meeting in self.browse(cr, uid, ids, context=context):
+            # convert datetime field to a datetime, using server format, then
+            # convert it to the user TZ and re-render it with %Z to add the timezone
+            meeting_datetime = fields.DT.datetime.strptime(meeting.date, tools.DEFAULT_SERVER_DATETIME_FORMAT)
+            meeting_date_str = fields.datetime.context_timestamp(cr, uid, meeting_datetime, context=context).strftime(tools.DATETIME_FORMATS_MAP['%+'] + " (%Z)")
+            message = _("A meeting has been <b>scheduled</b> on <em>%s</em>.") % (meeting_date_str)
+            if meeting.opportunity_id: # meeting can be create from phonecalls or opportunities, therefore checking for the parent
+                lead = meeting.opportunity_id
+                parent_message = _("Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and <b>cscheduled</b> on <em>%s</em>.") % (lead.name, meeting.date)
+                lead.message_append_note(_('System Notification'), message)
+            elif meeting.phonecall_id:
+                phonecall = meeting.phonecall_id
+                parent_message = _("Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and <b>cscheduled</b> on <em>%s</em>.") % (phonecall.name, meeting.date)
+                phonecall.message_append_note(body=message)
+            else:
+                parent_message = message
+            if parent_message:
+                meeting.message_append_note(body=parent_message)
+        return True
+
+    def case_open_send_note(self, cr, uid, ids, context=None):
+        return self.message_append_note(cr, uid, ids, body=_("Meeting has been <b>confirmed</b>."), context=context)
+
+    def case_close_send_note(self, cr, uid, ids, context=None):
+        return self.message_append_note(cr, uid, ids, body=_("Meeting has been <b>done</b>."), context=context)
+
+
diff --git a/addons/base_status/base_state.py b/addons/base_status/base_state.py
index 5baf71a01b6..35995ac7da3 100644
--- a/addons/base_status/base_state.py
+++ b/addons/base_status/base_state.py
@@ -29,6 +29,7 @@ class base_state(object):
         - ``date_closed`` (datetime field)
         - ``user_id`` (many2one to res.users)
         - ``partner_id`` (many2one to res.partner)
+        - ``email_from`` (char field)
         - ``state`` (selection field)
     """
 
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index e0915590d6a..e16e03f2206 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -19,104 +19,24 @@
 #
 ##############################################################################
 
-from base_calendar import base_calendar
-from base_status.base_state import base_state
-from base_status.base_stage import base_stage
-import logging
 from osv import fields, osv
 import tools
 from tools.translate import _
+import logging
 _logger = logging.getLogger(__name__)
 
-class crm_meeting(base_state, osv.Model):
+#
+# crm.meeting is defined in module base_calendar
+#
+class crm_meeting(osv.Model):
     """ Model for CRM meetings """
-    _name = 'crm.meeting'
-    _description = "Meeting"
-    _order = "id desc"
-    _inherit = ["calendar.event", 'ir.needaction_mixin', "mail.thread"]
+    _inherit = 'crm.meeting'
     _columns = {
-        # base_state required fields
-        'partner_id': fields.many2one('res.partner', 'Partner', states={'done': [('readonly', True)]}),
         'section_id': fields.many2one('crm.case.section', 'Sales Team', states={'done': [('readonly', True)]},
                         select=True, groups='base.group_sale_salesman', help='Sales team to which Case belongs to.'),
-        'email_from': fields.char('Email', size=128, states={'done': [('readonly', True)]}, help="These people will receive email."),
-        'create_date': fields.datetime('Creation Date' , readonly=True),
-        'write_date': fields.datetime('Write Date' , readonly=True),
-        'date_action_last': fields.datetime('Last Action', readonly=1),
-        'date_action_next': fields.datetime('Next Action', readonly=1),
-        # Meeting fields
-        'name': fields.char('Summary', size=124, required=True, states={'done': [('readonly', True)]}),
-        'categ_id': fields.many2one('crm.case.categ', 'Meeting Type', \
-                        domain="[('object_id.model', '=', 'crm.meeting')]", \
-            ),
         'phonecall_id': fields.many2one ('crm.phonecall', 'Phonecall'),
         'opportunity_id': fields.many2one ('crm.lead', 'Opportunity', domain="[('type', '=', 'opportunity')]"),
-        'attendee_ids': fields.many2many('calendar.attendee', 'meeting_attendee_rel',\
-                                 'event_id', 'attendee_id', 'Attendees', states={'done': [('readonly', True)]}),
-        'date_closed': fields.datetime('Closed', readonly=True),
-        'date_deadline': fields.datetime('Deadline', states={'done': [('readonly', True)]}),
-        'state': fields.selection([ ('draft', 'Unconfirmed'),
-                                    ('open', 'Confirmed'),
-                                    ('cancel', 'Cancelled'),
-                                    ('done', 'Done')],
-                                    string='Status', size=16, readonly=True),
     }
-    _defaults = {
-        'state': 'draft',
-        'active': 1,
-        'user_id': lambda self, cr, uid, ctx: uid,
-    }
-
-    def create(self, cr, uid, vals, context=None):
-        obj_id = super(crm_meeting, self).create(cr, uid, vals, context=context)
-        self.create_send_note(cr, uid, [obj_id], context=context)
-        return obj_id
-
-    def case_open(self, cr, uid, ids, context=None):
-        """ Confirms meeting """
-        res = super(crm_meeting, self).case_open(cr, uid, ids, context)
-        for (id, name) in self.name_get(cr, uid, ids):
-            id=base_calendar.base_calendar_id2real_id(id)
-        return res
-    
-    # ----------------------------------------
-    # OpenChatter
-    # ----------------------------------------
-
-    def case_get_note_msg_prefix(self, cr, uid, id, context=None):
-        return 'Meeting'
-
-    def create_send_note(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        # update context: if come from phonecall, default state values can make the message_append_note crash
-        context.pop('default_state', False)
-        for meeting in self.browse(cr, uid, ids, context=context):
-            # convert datetime field to a datetime, using server format, then
-            # convert it to the user TZ and re-render it with %Z to add the timezone
-            meeting_datetime = fields.DT.datetime.strptime(meeting.date, tools.DEFAULT_SERVER_DATETIME_FORMAT)
-            meeting_date_str = fields.datetime.context_timestamp(cr, uid, meeting_datetime, context=context).strftime(tools.DATETIME_FORMATS_MAP['%+'] + " (%Z)")
-            message = _("A meeting has been <b>scheduled</b> on <em>%s</em>.") % (meeting_date_str)
-            if meeting.opportunity_id: # meeting can be create from phonecalls or opportunities, therefore checking for the parent
-                lead = meeting.opportunity_id
-                parent_message = _("Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and <b>cscheduled</b> on <em>%s</em>.") % (lead.name, meeting.date)
-                lead.message_append_note(_('System Notification'), message)
-            elif meeting.phonecall_id:
-                phonecall = meeting.phonecall_id
-                parent_message = _("Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and <b>cscheduled</b> on <em>%s</em>.") % (phonecall.name, meeting.date)
-                phonecall.message_append_note(body=message)
-            else:
-                parent_message = message
-            if parent_message:
-                meeting.message_append_note(body=parent_message)
-        return True
-
-    def case_open_send_note(self, cr, uid, ids, context=None):
-        return self.message_append_note(cr, uid, ids, body=_("Meeting has been <b>confirmed</b>."), context=context)
-
-    def case_close_send_note(self, cr, uid, ids, context=None):
-        return self.message_append_note(cr, uid, ids, body=_("Meeting has been <b>done</b>."), context=context)
-
 
 class calendar_attendee(osv.osv):
     """ Calendar Attendee """
@@ -151,8 +71,6 @@ class calendar_attendee(osv.osv):
                         relation="crm.case.categ", multi='categ_id'),
     }
 
-calendar_attendee()
-
 class res_users(osv.osv):
     _name = 'res.users'
     _inherit = 'res.users'
@@ -173,7 +91,4 @@ class res_users(osv.osv):
                 _logger.debug('Skipped meetings shortcut for user "%s"', data.get('name','<new'))
         return user_id
 
-res_users()
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_meeting_data.xml b/addons/crm/crm_meeting_data.xml
index 86cdf97a2a3..82752d1dc7d 100644
--- a/addons/crm/crm_meeting_data.xml
+++ b/addons/crm/crm_meeting_data.xml
@@ -4,22 +4,16 @@
 
         <!--    CASE CATEGORY(categ_id)        -->
 
-        <record model="crm.case.categ" id="categ_meet1">
+        <record model="crm.meeting.type" id="categ_meet1">
             <field name="name">Customer Meeting</field>
-            <field name="section_id" ref="section_sales_department"/>
-            <field name="object_id" search="[('model','=','crm.meeting')]" model="ir.model"/>
         </record>
 
-        <record model="crm.case.categ" id="categ_meet2">
+        <record model="crm.meeting.type" id="categ_meet2">
             <field name="name">Internal Meeting</field>
-            <field name="section_id" ref="section_sales_department"/>
-            <field name="object_id" search="[('model','=','crm.meeting')]" model="ir.model"/>
         </record>
 
-        <record model="crm.case.categ" id="categ_meet3">
+        <record model="crm.meeting.type" id="categ_meet3">
             <field name="name">Phone Call</field>
-            <field name="section_id" ref="section_sales_department"/>
-            <field name="object_id" search="[('model','=','crm.meeting')]" model="ir.model"/>
         </record>
 
          <record model="res.request.link" id="request_link_meeting">
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 5473b727ea3..34d6ebd1aca 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -39,21 +39,29 @@
         <field name="key2">client_action_multi</field>
     </record>
 
-    <!-- CRM Meetings Categories Form View -->
+    <!-- CRM Meetings Types Form View -->
+
+    <record id="crm_meeting_type_tree" model="ir.ui.view">
+        <field name="name">Meeting Types Tree</field>
+        <field name="model">crm.meeting.type</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Meeting Types" editable="bottom">
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
 
     <record id="crm_meeting_categ_action" model="ir.actions.act_window">
-        <field name="name">Meeting Categories</field>
-        <field name="res_model">crm.case.categ</field>
+        <field name="name">Meeting Types</field>
+        <field name="res_model">crm.meeting.type</field>
         <field name="view_type">form</field>
-        <field name="view_id"  ref="crm.crm_case_categ_tree-view"/>
-        <field name="domain">[('object_id.model', '=', 'crm.meeting')]</field>
-        <field name="context" eval="{'object_id': ref('model_crm_meeting')}"/>
+        <field name="view_id" ref="crm_meeting_type_tree"/>
         <field name="help">Create different meeting categories to better organize and classify your meetings.</field>
     </record>
 
-     <menuitem action="crm_meeting_categ_action"
-        groups="base.group_no_one"
-        id="menu_crm_case_meeting-act" parent="base.menu_calendar_configuration" sequence="1"/>
+    <menuitem id="menu_crm_case_meeting-act" parent="base.menu_calendar_configuration" sequence="1"
+        action="crm_meeting_categ_action" groups="base.group_no_one"/>
 
     <!-- CRM Meetings Form View -->
 
@@ -122,9 +130,7 @@
                         <field name="email_from"/>
                     </group>
                     <group colspan="2">
-                        <field name="categ_id" widget="selection"
-                            string="Meeting Type"
-                            domain="[('object_id.model', '=', 'crm.meeting')]" />
+                        <field name="categ_id" widget="selection"/>
                         <field name="rrule" invisible="1" readonly="1"/>
                         <field name="recurrent_id" invisible="1"/>
                         <field name="recurrent_uid" invisible="1"/>
diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index 13436bef45a..fe5d3d9969b 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -5,11 +5,9 @@
 -->
 <data>
 
-    <!-- Case category (for interview meetings) -->
-    <record model="crm.case.categ" id="categ_meet_interview">
+    <!-- Meeting Types (for interview meetings) -->
+    <record model="crm.meeting.type" id="categ_meet_interview">
         <field name="name">Interview</field>
-        <field name="section_id" ref="crm.section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.meeting')]" model="ir.model"/>
     </record>
 
         <!--    HR Recruitment Source        -->

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 143/239] [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 144/239] [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 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 145/239] 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 146/239] 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 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 147/239] 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 4d14b9378a1d96e4f4bbdf84cea85e13f54b7054 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 5 Jul 2012 12:27:12 +0530
Subject: [PATCH 148/239] [IMP]event: add duration field

bzr revid: kjo@tinyerp.com-20120705065712-ivluxs98wd1kjyza
---
 addons/event/__openerp__.py |  2 +-
 addons/event/event.py       |  8 ++-
 addons/event/event_demo.xml | 98 -------------------------------------
 addons/event/event_demo.yml | 73 +++++++++++++++++++++++++++
 addons/event/event_view.xml |  2 +-
 5 files changed, 78 insertions(+), 105 deletions(-)
 delete mode 100644 addons/event/event_demo.xml
 create mode 100644 addons/event/event_demo.yml

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index f1a9769f803..120f9651745 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -51,7 +51,7 @@ Note that:
         'res_partner_view.xml',
         'email_template.xml',
     ],
-    'demo_xml': ['event_demo.xml'],
+    'demo_xml': ['event_demo.yml'],
     'test': ['test/process/event_draft2done.yml'],
     'css': ['static/src/css/event.css'],
     'installable': True,
diff --git a/addons/event/event.py b/addons/event/event.py
index 09495560051..72c28b3315f 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -424,7 +424,6 @@ class event_registration(osv.osv):
         contact_id =  addr_obj.browse(cr, uid, contact, context=context)
         data = {
             'email':contact_id.email,
-            'contact_id':contact_id.id,
             'name':contact_id.name,
             'phone':contact_id.phone,
             }
@@ -444,13 +443,12 @@ class event_registration(osv.osv):
         end = datetime.strptime(data_event.date_end, "%Y-%m-%d %H:%M:%S")
         diff = end - start
         duration = float(diff.days)* 24 + (float(diff.seconds) / 3600)
-        value['duration'] = round(duration, 2)
-        return {'value': {'event_begin_date': data_event.date_begin,
+        value ['value']= {'event_begin_date': data_event.date_begin,
                      'event_end_date': data_event.date_end,
                      'company_id': data_event.company_id and data_event.company_id.id or False,
-                     'duration': value['duration'],
-               }
+                     'duration': round(duration, 2),
                }
+        return value
 
     def onchange_partner_id(self, cr, uid, ids, part, context=None):
         res_obj = self.pool.get('res.partner')
diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
deleted file mode 100644
index 81dad07b5e4..00000000000
--- a/addons/event/event_demo.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-    <record id="base.user_demo" model="res.users">
-             <field name="groups_id" eval="[(4, ref('event.group_event_user'))]"/>
-     </record>
-
-
-<!-- Demo Data for Event Type -->
-    <record id="event_type_0" model="event.type">
-        <field name="name">Seminar</field>
-    </record>
-
-    <record id="event_type_1" model="event.type">
-        <field name="name">Exhibition</field>
-    </record>
-
-    <record id="event_type_2" model="event.type">
-        <field name="name">Conference</field>
-    </record>
-
-    <record id="event_type_3" model="event.type">
-        <field name="name">Show</field>
-    </record>
-
-    <record id="event_type_4" model="event.type">
-        <field name="name">Training</field>
-    </record>
-
-<!-- Demo data for Event -->
-    <record id="event_0" model="event.event">
-        <field name="name">Concert of Bon Jovi</field>
-        <field eval="time.strftime('%Y-%m-01 19:05:15')" name="date_begin"/>
-        <field eval="time.strftime('%Y-%m-01 23:05:15')" name="date_end"/>
-        <field name="register_max">500</field>
-        <field name="type" ref="event_type_1"/>
-    </record>
-
-    <record id="event_1" model="event.event">
-        <field name="name">Opera of Verdi</field>
-        <field eval="(DateTime.today()+ timedelta(days=1)).strftime('%Y-%m-%d 18:00:00')" name="date_begin"/>
-        <field eval="(DateTime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 21:00:00')" name="date_end"/>
-        <field name="type" ref="event_type_1"/>
-        <field name="register_min">50</field>
-        <field name="register_max">350</field>
-    </record>
-    <record id="event_2" model="event.event">
-        <field name="name">Conference on ERP Business</field>
-        <field eval="(DateTime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 14:00:00')" name="date_begin"/>
-        <field eval="(DateTime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 16:30:00')" name="date_end"/>
-        <field name="type" ref="event_type_2"/>
-        <field name="register_max">200</field>
-    </record>
-    <function model="event.event" name="button_confirm" eval="[ref('event_2')]"/>
-    <function model="event.event" name="button_confirm" eval="[ref('event_2')]"/>
-
-<!-- Demo data for Event Registration-->
-    <record id="reg_1_1" model="event.registration">
-        <field name="name">Agrolait</field>
-        <field name="email">s.l@agrolait.be</field>
-        <field name="phone">003281588558</field>
-        <field name="event_id" ref="event_1"/>
-        <field name="partner_id" ref="base.res_partner_agrolait"/>
-        <field name="nb_register">5</field>
-    </record>
-
-    <record id="reg_1_2" model="event.registration">
-        <field name="name">ASUStek</field>
-        <field name="email">info@asustek.com</field>
-        <field name="phone">+ 1 64 61 04 01</field>
-        <field name="partner_id" ref="base.res_partner_asus"/>
-        <field name="event_id" ref="event_1"/>
-        <field name="nb_register">10</field>
-    </record>
-
-
-    <record id="reg_0_1" model="event.registration">
-        <field name="name">Syleam</field>
-        <field name="email">contact@syleam.fr</field>
-        <field name="phone">+33 (0) 2 33 31 22 10</field>
-        <field name="partner_id" ref="base.res_partner_sednacom"/>
-        <field name="event_id" ref="event_0"/>
-        <field name="nb_register">6</field>
-    </record>
-
-
-
-    <record id="reg_0_2" model="event.registration">
-        <field name="name">Camptocamp</field>
-        <field name="email">openerp@camptocamp.com</field>
-        <field name="phone">+41 21 619 10 04 </field>
-        <field name="event_id" ref="event_2"/>
-        <field name="partner_id" ref="base.res_partner_c2c"/>
-        <field name="nb_register">5</field>
-    </record>
-
-    </data>
-</openerp>
diff --git a/addons/event/event_demo.yml b/addons/event/event_demo.yml
new file mode 100644
index 00000000000..f4e5cf04495
--- /dev/null
+++ b/addons/event/event_demo.yml
@@ -0,0 +1,73 @@
+-
+  from datetime import datetime, timedelta
+-
+  !record {model: event.type, id: event_type_0}:
+    name: 'Seminar'
+-
+  !record {model: event.type, id: event_type_1}:
+    name: 'Exhibition'
+-
+  !record {model: event.type, id: event_type_2}:
+    name: 'Conference'
+-
+  !record {model: event.type, id: event_type_3}:
+    name: 'Show'
+-
+  !record {model: event.type, id: event_type_4}:
+    name: 'Training'
+-
+  !record {model: event.event, id: event_0}:
+    name: 'Concert of Bon Jovi'
+    date_begin: !eval time.strftime('%Y-%m-01 19:05:15')
+    date_end: !eval time.strftime('%Y-%m-01 23:05:15')
+    register_max: 500
+    type: event_type_1
+-
+  !record {model: event.event, id: event_1}:
+    name: 'Opera of Verdi'
+    date_begin: !eval (datetime.today()+ timedelta(days=1)).strftime('%Y-%m-%d 18:00:00')
+    date_end: !eval (datetime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 21:00:00')
+    register_min: 50
+    register_max: 350
+    type: event_type_1
+-
+  !record {model: event.event, id: event_2}:
+    name: 'Conference on ERP Business'
+    date_begin: !eval (datetime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 14:00:00')
+    date_end: !eval (datetime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 16:30:00')
+    register_min: 50
+    register_max: 350
+    type: event_type_2
+-
+  !record {model: event.registration, id: reg_1_1}:
+    name: 'Agrolait'
+    email: 's.l@agrolait.be'
+    phone: '003281588558'
+    event_id: event_1
+    partner_id: base.res_partner_asus
+    nb_register: 5
+-
+  !record {model: event.registration, id: reg_1_2}:
+    name: 'ASUStek'
+    email: 'info@asustek.com'
+    phone: '+ 1 64 61 04 01'
+    event_id: event_1
+    partner_id: base.res_partner_asus
+    nb_register: 10
+-
+  !record {model: event.registration, id: reg_0_1}:
+    name: 'Syleam'
+    email: 'contact@syleam.fr'
+    phone: '+33 (0) 2 33 31 22 10'
+    event_id: event_0
+    partner_id: base.res_partner_sednacom
+    nb_register: 6
+-
+  !record {model: event.registration, id: reg_0_2}:
+    name: 'Camptocamp'
+    email: 'openerp@camptocamp.com'
+    phone: '+41 21 619 10 04'
+    event_id: event_2
+    partner_id: base.res_partner_c2c
+    nb_register: 5
+ 
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 0b424b9794b..f3564048b55 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -387,7 +387,7 @@
                    <h1>
                             <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]" nolabel="1" class="oe_inline"/>
                             <label string="(" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
-                            <field name="duration" widget="float_time" attrs="{'invisible': [('event_id', '=', '')]}"/>
+                            <field name="duration" widget="float_time" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
                             <label string=")" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
 	                </h1>   
                     <group colspan="4" col="4">

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 149/239] [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 870aa740d343445f79956016b1fde2cef2912651 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 5 Jul 2012 12:32:51 +0530
Subject: [PATCH 150/239] [IMP]:survey:removed tabs

bzr revid: apa@tinyerp.com-20120705070251-28oba6mos9a4f6wv
---
 addons/survey/survey_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index b55e073cf4d..dedb044eee9 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -331,7 +331,7 @@
                                </div><br/>
                                <div class="oe_survey_rate">
                                    Rate:
-    							<div class="oe_survey_fill" >
+                                <div class="oe_survey_fill" >
                                    <button type="object" name="fill_survey" class="">
                                        <span>Fill</span>
                                    </button>

From 5e973e676b62155c6155db3f1c7c0a34b9ee4336 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 5 Jul 2012 10:00:09 +0200
Subject: [PATCH 151/239] [FIX] base_calendar: move method accessing
 opportunities and phone calls back to module crm

bzr revid: rco@openerp.com-20120705080009-dine29zce1d865rw
---
 addons/base_calendar/crm_meeting.py | 30 -----------------------------
 addons/crm/crm_meeting.py           | 27 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index 7c18f6826e8..dcc97156681 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -66,11 +66,6 @@ class crm_meeting(base_state, osv.Model):
         'state': 'draft',
     }
 
-    def create(self, cr, uid, vals, context=None):
-        obj_id = super(crm_meeting, self).create(cr, uid, vals, context=context)
-        self.create_send_note(cr, uid, [obj_id], context=context)
-        return obj_id
-
     # ----------------------------------------
     # OpenChatter
     # ----------------------------------------
@@ -78,31 +73,6 @@ class crm_meeting(base_state, osv.Model):
     def case_get_note_msg_prefix(self, cr, uid, id, context=None):
         return 'Meeting'
 
-    def create_send_note(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        # update context: if come from phonecall, default state values can make the message_append_note crash
-        context.pop('default_state', False)
-        for meeting in self.browse(cr, uid, ids, context=context):
-            # convert datetime field to a datetime, using server format, then
-            # convert it to the user TZ and re-render it with %Z to add the timezone
-            meeting_datetime = fields.DT.datetime.strptime(meeting.date, tools.DEFAULT_SERVER_DATETIME_FORMAT)
-            meeting_date_str = fields.datetime.context_timestamp(cr, uid, meeting_datetime, context=context).strftime(tools.DATETIME_FORMATS_MAP['%+'] + " (%Z)")
-            message = _("A meeting has been <b>scheduled</b> on <em>%s</em>.") % (meeting_date_str)
-            if meeting.opportunity_id: # meeting can be create from phonecalls or opportunities, therefore checking for the parent
-                lead = meeting.opportunity_id
-                parent_message = _("Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and <b>cscheduled</b> on <em>%s</em>.") % (lead.name, meeting.date)
-                lead.message_append_note(_('System Notification'), message)
-            elif meeting.phonecall_id:
-                phonecall = meeting.phonecall_id
-                parent_message = _("Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and <b>cscheduled</b> on <em>%s</em>.") % (phonecall.name, meeting.date)
-                phonecall.message_append_note(body=message)
-            else:
-                parent_message = message
-            if parent_message:
-                meeting.message_append_note(body=parent_message)
-        return True
-
     def case_open_send_note(self, cr, uid, ids, context=None):
         return self.message_append_note(cr, uid, ids, body=_("Meeting has been <b>confirmed</b>."), context=context)
 
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index e16e03f2206..bdc5e91ad33 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -38,6 +38,33 @@ class crm_meeting(osv.Model):
         'opportunity_id': fields.many2one ('crm.lead', 'Opportunity', domain="[('type', '=', 'opportunity')]"),
     }
 
+    def create(self, cr, uid, vals, context=None):
+        obj_id = super(crm_meeting, self).create(cr, uid, vals, context=context)
+        self.create_send_note(cr, uid, [obj_id], context=context)
+        return obj_id
+
+    def create_send_note(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        # update context: if come from phonecall, default state values can make the message_append_note crash
+        context.pop('default_state', False)
+        for meeting in self.browse(cr, uid, ids, context=context):
+            # in the message, transpose meeting.date to the timezone of the current user
+            meeting_date = fields.DT.datetime.strptime(meeting.date, tools.DEFAULT_SERVER_DATETIME_FORMAT)
+            meeting_date_tz = fields.datetime.context_timestamp(cr, uid, meeting_date, context=context).strftime(tools.DATETIME_FORMATS_MAP['%+'] + " (%Z)")
+            if meeting.opportunity_id: # meeting can be create from phonecalls or opportunities, therefore checking for the parent
+                lead = meeting.opportunity_id
+                message = _("Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and <b>scheduled</b> on <em>%s</em>.") % (lead.name, meeting_date_tz)
+                lead.message_append_note(_('System Notification'), message)
+            elif meeting.phonecall_id:
+                phonecall = meeting.phonecall_id
+                message = _("Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and <b>scheduled</b> on <em>%s</em>.") % (phonecall.name, meeting_date_tz)
+                phonecall.message_append_note(body=message)
+            else:
+                message = _("A meeting has been <b>scheduled</b> on <em>%s</em>.") % (meeting_date_tz)
+            meeting.message_append_note(body=message)
+        return True
+
 class calendar_attendee(osv.osv):
     """ Calendar Attendee """
 

From 7163de4d2c42cf507448ec2ac391affba844ff9f Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 5 Jul 2012 10:06:16 +0200
Subject: [PATCH 152/239] [FIX] base_calendar: define access rights for
 crm.meeting and crm.meeting.type

bzr revid: rco@openerp.com-20120705080616-k9rhleajvmdg0ieu
---
 addons/base_calendar/security/ir.model.access.csv | 6 ++++++
 addons/crm/security/ir.model.access.csv           | 4 ----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/base_calendar/security/ir.model.access.csv b/addons/base_calendar/security/ir.model.access.csv
index 34543f0e912..24af1abf0e5 100644
--- a/addons/base_calendar/security/ir.model.access.csv
+++ b/addons/base_calendar/security/ir.model.access.csv
@@ -5,3 +5,9 @@ access_res_alarm,res.alarm,model_res_alarm,base.group_user,1,1,1,1
 access_calendar_todo,calendar.todo,model_calendar_todo,base.group_user,1,1,1,1
 access_calendar_event,calendar.event,model_calendar_event,base.group_user,1,1,1,1
 access_calendar_attendee_survey_user,calendar.attendee,model_calendar_attendee,base.group_survey_user,1,0,0,0
+access_crm_meeting_manager,crm.meeting.manager,model_crm_meeting,base.group_sale_manager,1,1,1,1
+access_crm_meeting,crm.meeting,model_crm_meeting,base.group_sale_salesman,1,1,1,0
+access_crm_meeting_all,crm.meeting_allll,model_crm_meeting,base.group_user,1,0,0,0
+access_crm_meeting_partner_manager,crm.meeting.partner.manager,model_crm_meeting,base.group_partner_manager,1,1,1,1
+access_crm_meeting_type_manager,crm.meeting.type.manager,model_crm_meeting_type,base.group_sale_manager,1,1,1,0
+access_crm_meeting_type_manager,crm.meeting.type.manager,model_crm_meeting_type,base.group_system,1,1,1,1
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index 7707118324f..5665839f365 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -7,12 +7,9 @@ access_crm_case_channel_user,crm.case.channel user,model_crm_case_channel,base.g
 access_crm_case_channel_manager,crm.case.channel manager,model_crm_case_channel,base.group_sale_manager,1,1,1,1
 access_crm_case_section,crm.case.section,model_crm_case_section,base.group_user,1,0,0,0
 access_crm_case_categ,crm.case.categ,model_crm_case_categ,base.group_sale_salesman,1,1,1,0
-access_crm_meeting_manager,crm.meeting.manager,model_crm_meeting,base.group_sale_manager,1,1,1,1
 access_crm_lead_manager,crm.lead.manager,model_crm_lead,base.group_sale_manager,1,1,1,1
 access_crm_phonecall_manager,crm.phonecall.manager,model_crm_phonecall,base.group_sale_manager,1,1,1,1
 access_crm_case_categ,crm.case.categ,model_crm_case_categ,base.group_user,1,0,0,0
-access_crm_meeting,crm.meeting,model_crm_meeting,base.group_sale_salesman,1,1,1,0
-access_crm_meeting_all,crm.meeting_allll,model_crm_meeting,base.group_user,1,0,0,0
 access_crm_lead,crm.lead,model_crm_lead,base.group_sale_salesman,1,1,1,0
 access_crm_lead_all,crm.lead.all,model_crm_lead,base.group_user,1,0,0,0
 access_crm_phonecall,crm.phonecall,model_crm_phonecall,base.group_sale_salesman,1,1,1,0
@@ -40,4 +37,3 @@ access_crm_lead_report_user,crm.lead.report user,model_crm_lead_report,base.grou
 access_res_partner_bank_type_crm_user,res.partner.bank.type.crm.user,base.model_res_partner_bank_type,base.group_sale_salesman,1,0,0,0
 access_crm_lead_partner_manager,crm.lead.partner.manager,model_crm_lead,base.group_partner_manager,1,0,0,0
 access_crm_phonecall_partner_manager,crm.phonecall.partner.manager,model_crm_phonecall,base.group_partner_manager,1,1,1,1
-access_crm_meeting_partner_manager,crm.meeting.partner.manager,model_crm_meeting,base.group_partner_manager,1,1,1,1

From 76500b8a5e9d6f80b9734a2df3f1d5b09ff98e64 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 5 Jul 2012 10:06:59 +0200
Subject: [PATCH 153/239] [IMP] hr_holidays: remove dependency on module crm

bzr revid: rco@openerp.com-20120705080659-983x3zcr3cdz48ob
---
 addons/hr_holidays/__openerp__.py       |  2 +-
 addons/hr_holidays/hr_holidays.py       | 40 +++++++++----------------
 addons/hr_holidays/hr_holidays_view.xml | 13 ++------
 3 files changed, 17 insertions(+), 38 deletions(-)

diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index 09809e488ba..c5c2d370cd1 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -50,7 +50,7 @@ Note that:
                 for example, you maybe will do it for the user 'admin'.
 """,
     'images': ['images/hr_allocation_requests.jpeg', 'images/hr_leave_requests.jpeg', 'images/leaves_analysis.jpeg'],
-    'depends': ['hr', 'crm', 'process', 'resource'],
+    'depends': ['hr', 'base_calendar', 'process', 'resource'],
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index a1ab0ae04f3..2a2648f1beb 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -74,7 +74,8 @@ class hr_holidays_status(osv.osv):
 
     _columns = {
         'name': fields.char('Leave Type', size=64, required=True, translate=True),
-        'categ_id': fields.many2one('crm.case.categ', 'Meeting', domain="[('object_id.model', '=', 'crm.meeting')]", help='If you set a meeting type, OpenERP will create a meeting in the calendar once a leave is validated.'),
+        'categ_id': fields.many2one('crm.meeting.type', 'Meeting Type',
+            help='Once a leave is validated, OpenERP will create a corresponding meeting of this type in the calendar.'),
         'color_name': fields.selection([('red', 'Red'),('blue','Blue'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color in Report', required=True, help='This color will be used in the leaves summary located in Reporting\Leaves by Departement'),
         'limit': fields.boolean('Allow to Override Limit', help='If you select this checkbox, the system allows the employees to take more leaves than the available ones for this type.'),
         'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the leave type without removing it."),
@@ -128,7 +129,7 @@ class hr_holidays(osv.osv):
         'notes': fields.text('Reasons',readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'number_of_days_temp': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'number_of_days': fields.function(_compute_number_of_days, string='Number of Days', store=True),
-        'case_id': fields.many2one('crm.meeting', 'Meeting'),
+        'meeting_id': fields.many2one('crm.meeting', 'Meeting'),
         'type': fields.selection([('remove','Leave Request'),('add','Allocation Request')], 'Request Type', required=True, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help="Choose 'Leave Request' if someone wants to take an off-day. \nChoose 'Allocation Request' if you want to increase the number of leaves available for someone", select=True),
         'parent_id': fields.many2one('hr.holidays', 'Parent'),
         'linked_request_ids': fields.one2many('hr.holidays', 'parent_id', 'Linked Requests',),
@@ -217,19 +218,12 @@ class hr_holidays(osv.osv):
         }
         return result
 
-    def onchange_sec_id(self, cr, uid, ids, status, context=None):
-        warning = {}
+    def onchange_status_id(self, cr, uid, ids, status_id, context=None):
         double_validation = False
-        obj_holiday_status = self.pool.get('hr.holidays.status')
-        if status:
-            holiday_status = obj_holiday_status.browse(cr, uid, status, context=context)
+        if status_id:
+            holiday_status = self.pool.get('hr.holidays.status').browse(cr, uid, status_id, context=context)
             double_validation = holiday_status.double_validation
-            if holiday_status.categ_id and holiday_status.categ_id.section_id and not holiday_status.categ_id.section_id.allow_unlink:
-                warning = {
-                    'title': "Warning for ",
-                    'message': "You won\'t be able to cancel this leave request because the CRM Sales Team of the leave type disallows."
-                }
-        return {'warning': warning, 'value': {'double_validation': double_validation}}
+        return {'value': {'double_validation': double_validation}}
 
     def set_to_draft(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {
@@ -271,7 +265,7 @@ class hr_holidays(osv.osv):
                 holiday_ids.append(record.id)
             if record.holiday_type == 'employee' and record.type == 'remove':
                 meeting_obj = self.pool.get('crm.meeting')
-                vals = {
+                meeting_vals = {
                     'name': record.name,
                     'categ_id': record.holiday_status_id.categ_id.id,
                     'duration': record.number_of_days_temp * 8,
@@ -280,11 +274,11 @@ class hr_holidays(osv.osv):
                     'date': record.date_from,
                     'end_date': record.date_to,
                     'date_deadline': record.date_to,
-                    'leave_id': record.id,
+                    'state': 'done',            # to block that meeting date in the calendar
                 }
-                case_id = meeting_obj.create(cr, uid, vals)
+                meeting_id = meeting_obj.create(cr, uid, meeting_vals)
                 self._create_resource_leave(cr, uid, [record], context=context)
-                self.write(cr, uid, ids, {'case_id': case_id})
+                self.write(cr, uid, ids, {'meeting_id': meeting_id})
             elif record.holiday_type == 'category':
                 emp_ids = obj_emp.search(cr, uid, [('category_ids', 'child_of', [record.category_id.id])])
                 leave_ids = []
@@ -330,11 +324,11 @@ class hr_holidays(osv.osv):
         return True
 
     def holidays_cancel(self, cr, uid, ids, context=None):
-        obj_crm_meeting = self.pool.get('crm.meeting')
+        meeting_obj = self.pool.get('crm.meeting')
         for record in self.browse(cr, uid, ids):
             # Delete the meeting
-            if record.case_id:
-                obj_crm_meeting.unlink(cr, uid, [record.case_id.id])
+            if record.meeting_id:
+                meeting_obj.unlink(cr, uid, [record.meeting_id.id])
 
             # If a category that created several holidays, cancel all related
             wf_service = netsvc.LocalService("workflow")
@@ -519,10 +513,4 @@ class hr_employee(osv.osv):
 
 hr_employee()
 
-class crm_meeting(osv.osv):
-    _inherit = 'crm.meeting'
-    _columns = {
-        'leave_id': fields.many2one('hr.holidays','Leave'),
-    }
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index bda18f1bc6c..dc541b20ceb 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -122,7 +122,7 @@
                     </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="holiday_status_id" on_change="onchange_status_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"/>
@@ -168,7 +168,7 @@
                 <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="holiday_status_id" on_change="onchange_status_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"/>
@@ -556,14 +556,5 @@
             </field>
         </record>
 
-        <act_window
-            id="act_hr_leave_request_to_meeting"
-            name="Leave Meetings"
-            src_model="hr.holidays"
-            res_model="crm.meeting"
-            domain="[('leave_id', '=', active_id)]"
-            view_mode="tree,form,calendar,gantt"
-            view_type="form"/>
-
     </data>
 </openerp>

From c9345ee6583c8f8231f7bf90bebe81f53053c279 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 5 Jul 2012 10:31:57 +0200
Subject: [PATCH 154/239] [FIX] crm_caldav: fix incorrect field references
 (because crm.meeting changed module)

bzr revid: rco@openerp.com-20120705083157-b8kgwb12c6u182hs
---
 addons/crm_caldav/crm_caldav_setup.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/crm_caldav/crm_caldav_setup.xml b/addons/crm_caldav/crm_caldav_setup.xml
index 7e20a318e4f..36f3c3fd78b 100644
--- a/addons/crm_caldav/crm_caldav_setup.xml
+++ b/addons/crm_caldav/crm_caldav_setup.xml
@@ -29,7 +29,7 @@
         <field name="calendar_id" ref="basic_calendar_meetings0"/>
         <field name="domain">[('user_id','=', dctx_user_id)]</field>
         <field name="name">vevent</field>
-        <field name="object_id" ref="crm.model_crm_meeting"/>
+        <field name="object_id" ref="base_calendar.model_crm_meeting"/>
     </record>
 
 
@@ -103,7 +103,7 @@
     <record id="basic_calendar_fields_12" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_event_organizer"/>
         <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" ref="crm.field_crm_meeting_organizer"/>
+        <field name="field_id" ref="base_calendar.field_crm_meeting_organizer"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_13" model="basic.calendar.fields">
@@ -127,7 +127,7 @@
     <record id="basic_calendar_fields_16" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_event_attendee"/>
         <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" ref="crm.field_crm_meeting_attendee_ids"/>
+        <field name="field_id" ref="base_calendar.field_crm_meeting_attendee_ids"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_17" model="basic.calendar.fields">
@@ -163,7 +163,7 @@
     <record id="basic_calendar_fields_22" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_event_status"/>
         <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" ref="crm.field_crm_meeting_state"/>
+        <field name="field_id" ref="base_calendar.field_crm_meeting_state"/>
         <field name="mapping">{'tentative': 'draft', 'confirmed': 'open', 'cancelled': 'cancel'}</field>
         <field name="fn">field</field>
     </record>
@@ -176,7 +176,7 @@
     <record id="basic_calendar_fields_24" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_event_dtstamp"/>
         <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" ref="crm.field_crm_meeting_write_date"/>
+        <field name="field_id" ref="base_calendar.field_crm_meeting_write_date"/>
         <field name="fn">datetime_utc</field>
     </record>
     <record id="basic_calendar_fields_25" model="basic.calendar.fields">

From c5d9158a292c6439d4192cbd2601b15ae9ee51b5 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 5 Jul 2012 14:38:30 +0530
Subject: [PATCH 155/239] [IMP]event: remove conflict

bzr revid: kjo@tinyerp.com-20120705090830-trou4tqk01ylqqqh
---
 addons/event/event_view.xml | 51 ++++---------------------------------
 1 file changed, 5 insertions(+), 46 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 34b3b6b71ad..1019706f8db 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -462,9 +462,8 @@
                     <field name="state" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
                 </header>
                 <sheet string="Registration">
-<<<<<<< TREE
-                   <label for="event_id" class="oe_edit_only"/>
-                   <h1>
+                    <label for="event_id" class="oe_edit_only"/>
+                    <h1>
                             <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]" nolabel="1" class="oe_inline"/>
                             <label string="(" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
                             <field name="duration" widget="float_time" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
@@ -478,36 +477,8 @@
                             <group col="2">
                                 <field name="email" nolabel="1" class="oe_inline"/>
                                 <button string="Send New Email"
-=======
-                    <group col="6" colspan="4">
-                        <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]"/>
-                        <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/>
-                        <field name="nb_register"/>
-                        <field name="user_id" attrs="{'readonly':[('state','!=', 'draft')]}"/>
-                        <field name="origin"/>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Additional Information">
-                            <group colspan="2" col="2">
-                                <separator string="Contact Information" colspan="2"/>
-                                <field name="name"/>
-                                <field name="email"/>
-                                <field name="phone"/>
-                            </group>
-                            <group colspan="2" col="2" groups="base.group_no_one">
-                                <separator string="Dates" colspan="2"/>
-                                <field name="create_date"/>
-                                <field name="date_closed"/>
-                                <field name="event_begin_date" />
-                                <field name="event_end_date" />
-                            </group>
-                        </page>
-                        <page string="Emails">
-                            <button string="Send New Email"
->>>>>>> MERGE-SOURCE
                                 name="%(mail.action_email_compose_message_wizard)d"
-<<<<<<< TREE
-                                icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action" class="oe_inline"/>
+                                context= '{"default_email_to":email}' type="action" class="oe_inline"/>
                             </group>
                         </group>
                         <group colspan="2">
@@ -525,26 +496,14 @@
                     <group colspan="2" col="2">
                         <field name="phone"/>
                     </group>
-                   <group colspan="2" col="2" groups="base.group_no_one">
+                    <group colspan="2" col="2" groups="base.group_no_one">
                         <field name="create_date"/>
                         <field name="date_closed"/>
                     </group>
                 </sheet>
                 <footer>
-                    <div class="oe_sheet_width">
-                        <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                    </div>
+                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                 </footer>
-=======
-                                icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action"/>
-                           </page>
-
-                    </notebook>
-                    </sheet>
-                    <footer>
-                        <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
-                    </footer>
->>>>>>> MERGE-SOURCE
                 </form>
             </field>
         </record>

From 50dbf218c2b47962b299753ca60d9291b78a3623 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 5 Jul 2012 11:14:43 +0200
Subject: [PATCH 156/239] [FIX] crm: fix stupid test (wrong search on ir.model)

bzr revid: rco@openerp.com-20120705091443-2lkfftu0slyb6dl4
---
 addons/crm/test/process/action_rule.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/crm/test/process/action_rule.yml b/addons/crm/test/process/action_rule.yml
index b13c9b086cc..d394e65ac29 100644
--- a/addons/crm/test/process/action_rule.yml
+++ b/addons/crm/test/process/action_rule.yml
@@ -2,10 +2,9 @@
   I create a record rule.
 -
   !python {model: base.action.rule}: |
-    modle_id = self.pool.get("ir.model").search(cr, uid, [('name', '=', 'crm.lead')])
+    model_ids = self.pool.get("ir.model").search(cr, uid, [('model', '=', 'crm.lead')])
     from datetime import datetime
-    new_id = self.create(cr, uid, {'name': 'New Rule', 'model_id': modle_id[0],  'trg_user_id': ref('base.user_root'), 'trg_partner_id': ref('base.res_partner_asus'), 'act_user_id': ref('base.user_demo') })
-    lead_obj = self.pool.get("crm.lead")
+    new_id = self.create(cr, uid, {'name': 'New Rule', 'model_id': model_ids[0],  'trg_user_id': ref('base.user_root'), 'trg_partner_id': ref('base.res_partner_asus'), 'act_user_id': ref('base.user_demo') })
     self._check(cr, uid)
 -
   I create new lead to check record rule.

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 157/239] [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 0c4816aa7e1d88909031b36a17dc41d3710bd3ab Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 5 Jul 2012 15:03:11 +0530
Subject: [PATCH 158/239] [IMP]event: set indentation

bzr revid: kjo@tinyerp.com-20120705093311-pxcn4do73mtcd2mg
---
 addons/event/event_view.xml | 270 ++++++++++++++++++------------------
 1 file changed, 132 insertions(+), 138 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 1019706f8db..a982af9d6af 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -96,108 +96,109 @@
             <field name="model">event.event</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Events" version="7.0">
-                <header>
-                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" class="oe_highlight"/>
-                    <button string="Event Ended" name="button_done" states="confirm" type="object" class="oe_highlight"/>
-                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" />
-                    <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object"/>
-                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
-                </header>
-                <sheet>
-                	<div class="oe_right oe_button_box">
-	                    <button name="%(event.act_event_list_register_event)d" type="action" string="Registration" icon="gtk-index" help="Register with this event"/>
-	                </div>
-                
-                <div class="oe_title" style="width: 650px" >
-	            	<label for="name" class="oe_edit_only"/>
-		            <group colspan="6" col="6">
-		            	<group colspan="2"><h1><field name="name"/></h1></group>
-	                    <group colspan="4"><h1><label string="(" attrs="{'invisible': [('type', '=', '')]}" /><field name="type" nolabel="1" on_change="onchange_event_type(type,context)" class="oe_inline"/><label string=")" attrs="{'invisible': [('type', '=', '')]}" /></h1></group>
-		            </group>  
-		        </div> 
-                <div>
-                	<h2>From <field name="date_begin" class="oe_inline" /> to <field name="date_end" class="oe_inline"/></h2>
-                    <group>
-                        <group>
-                            <label for="address_id" string="Location Address"/>
-                            <div>
-                                <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}"/>
-                            	<field name="street" placeholder="Street..."/>                            
-                            	<div>
-                            	     <field name="zip" class="oe_inline" placeholder="Zip"/>
-                                     <field name="city" class="oe_inline" placeholder="City"/>
-                                </div>
-                            </div>
-                        </group>
-                        <group>
-	                      	<field name="register_min"/>
-	                       	<field name="register_max"/>
-	                   	</group>
-                     </group>
-                </div>
-                <!-- <div class="oe_right" style="height: 200px"></div> -->
-                <notebook>
-                    <page string="Event Description">
-                        <field name="note" colspan="4" nolabel="1"/>
-                    </page>
-                    <page string="Internal Data">
-                      <group>
-                          <group class="oe_group_label_border">
-                            <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
-                            <field name="speaker_confirmed"/>
-                          </group>
-                          <group class="oe_group_label_border">
-                            <field name="register_current"/>
-                            <field name="register_prospect"/>
-                          </group> 
-                      </group>
-                      <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
-                            <tree string="Registration" editable="top">
-                                <field name="name" />
-                                <field name="email" />
-                                <field name="phone"/>
-                                <field name="nb_register" />
-                                <field name="state"/>
-                                <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                                <button name="button_reg_close" string="Attented the Event" states="open" type="object" icon="gtk-jump-to"/>
-                                <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
-                            </tree>
-                            <form string="Registration">
-                                <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)" />
-                                <field name="name"/>
-                                <group colspan="4" col="4">
-                                <field name="email"/>
-                                <field name="phone"/>
+                <form string="Events" version="7.0">
+                    <header>
+                        <button string="Confirm Event" name="button_confirm" states="draft" type="object" class="oe_highlight"/>
+                        <button string="Event Ended" name="button_done" states="confirm" type="object" class="oe_highlight"/>
+                        <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" />
+                        <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
+                    </header>
+                    <sheet>
+                    	<div class="oe_right oe_button_box">
+	                        <button name="%(event.act_event_list_register_event)d" type="action" string="Registration" icon="gtk-index" help="Register with this event"/>
+	                    </div>
+                    
+                        <div class="oe_title" style="width: 650px" >
+	                    	<label for="name" class="oe_edit_only"/>
+		                    <group colspan="6" col="6">
+		                    	<group colspan="2"><h1><field name="name"/></h1></group>
+	                            <group colspan="4"><h1><label string="(" attrs="{'invisible': [('type', '=', '')]}" /><field name="type" nolabel="1" on_change="onchange_event_type(type,context)" class="oe_inline"/><label string=")" attrs="{'invisible': [('type', '=', '')]}" /></h1></group>
+		                    </group>  
+		                </div> 
+                        <div>
+                        	<h2>From <field name="date_begin" class="oe_inline" /> to <field name="date_end" class="oe_inline"/>
+                        	</h2>
+                            <group>
+                                <group>
+                                    <label for="address_id" string="Location Address"/>
+                                    <div>
+                                        <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}"/>
+                                    	<field name="street" placeholder="Street..."/>                            
+                                    	<div>
+                                    	     <field name="zip" class="oe_inline" placeholder="Zip"/>
+                                             <field name="city" class="oe_inline" placeholder="City"/>
+                                        </div>
+                                    </div>
                                 </group>
-                                <group colspan="4" col="4">
-                                    <field name="nb_register"/>
-                                </group>
-                                <group colspan="4" col="4">
-                                </group>
-                                    <group col="8" colspan="4">
-                                        <separator string="" colspan="4"/>
-                                        <newline/>
-                                        <field name="state" colspan="2"/>
-                                        <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                                        <button name="button_reg_close" string="Attended the Event" states="open" type="object" icon="gtk-jump-to"/>
-                                        <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
-                                    </group>
-                            </form>
-                            </field>
-                            <group class="oe_subtotal_footer oe_right" colspan="2" name="regi_total">
-                                <field name="register_current"/>
-                                <field name="register_prospect"/>
-                                <field name="register_attended" class="oe_subtotal_footer_separator" />
+                                <group>
+	                              	<field name="register_min"/>
+	                               	<field name="register_max"/>
+	                           	</group>
                             </group>
-                        <separator string="" class="oe_clear"/>
-                    </page>
-                    </notebook>
+                        </div>
+                        <!-- <div class="oe_right" style="height: 200px"></div> -->
+                        <notebook>
+                            <page string="Event Description">
+                                <field name="note" colspan="4" nolabel="1"/>
+                            </page>
+                            <page string="Internal Data">
+                              <group>
+                                  <group class="oe_group_label_border">
+                                    <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
+                                    <field name="speaker_confirmed"/>
+                                  </group>
+                                  <group class="oe_group_label_border">
+                                    <field name="register_current"/>
+                                    <field name="register_prospect"/>
+                                  </group> 
+                              </group>
+                              <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
+                                    <tree string="Registration" editable="top">
+                                        <field name="name" />
+                                        <field name="email" />
+                                        <field name="phone"/>
+                                        <field name="nb_register" />
+                                        <field name="state"/>
+                                        <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                                        <button name="button_reg_close" string="Attented the Event" states="open" type="object" icon="gtk-jump-to"/>
+                                        <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                                    </tree>
+                                    <form string="Registration">
+                                        <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)" />
+                                        <field name="name"/>
+                                        <group colspan="4" col="4">
+                                        <field name="email"/>
+                                        <field name="phone"/>
+                                        </group>
+                                        <group colspan="4" col="4">
+                                            <field name="nb_register"/>
+                                        </group>
+                                        <group colspan="4" col="4">
+                                        </group>
+                                            <group col="8" colspan="4">
+                                                <separator string="" colspan="4"/>
+                                                <newline/>
+                                                <field name="state" colspan="2"/>
+                                                <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                                                <button name="button_reg_close" string="Attended the Event" states="open" type="object" icon="gtk-jump-to"/>
+                                                <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                                            </group>
+                                    </form>
+                                    </field>
+                                    <group class="oe_subtotal_footer oe_right" colspan="2" name="regi_total">
+                                        <field name="register_current"/>
+                                        <field name="register_prospect"/>
+                                        <field name="register_attended" class="oe_subtotal_footer_separator" />
+                                    </group>
+                                <separator string="" class="oe_clear"/>
+                            </page>
+                        </notebook>
                     </sheet>
                     <footer>
                         <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                     </footer>
-            </form>
+                </form>
             </field>
         </record>
 
@@ -454,56 +455,49 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form version="7.0">
-                <header>
-                    <button name="registration_open" string="Confirm" states="draft" type="object" class="oe_highlight"/>
-                    <button name="button_reg_close" string="Attended" states="open" type="object" class="oe_highlight"/>
-                    <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object" />
-                    <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/>
-                    <field name="state" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
-                </header>
-                <sheet string="Registration">
-                    <label for="event_id" class="oe_edit_only"/>
-                    <h1>
+                    <header>
+                        <button name="registration_open" string="Confirm" states="draft" type="object" class="oe_highlight"/>
+                        <button name="button_reg_close" string="Attended" states="open" type="object" class="oe_highlight"/>
+                        <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object" />
+                        <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/>
+                        <field name="state" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
+                    </header>
+                    <sheet string="Registration">
+                        <label for="event_id" class="oe_edit_only"/>
+                        <h1>
                             <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]" nolabel="1" class="oe_inline"/>
                             <label string="(" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
                             <field name="duration" widget="float_time" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
                             <label string=")" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
-	                </h1>   
-                    <group colspan="4" col="4">
-                        <group colspan="2">
-                            <field name="name" invisible="1"/>
-                            <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/>
-                            <label for="email" string="E-Mail"/>
-                            <group col="2">
-                                <field name="email" nolabel="1" class="oe_inline"/>
-                                <button string="Send New Email"
-                                name="%(mail.action_email_compose_message_wizard)d"
-                                context= '{"default_email_to":email}' type="action" class="oe_inline"/>
+	                    </h1>   
+                        <group colspan="4" col="4">
+                            <group colspan="2">
+                                <field name="name" invisible="1"/>
+                                <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/>
+                                <label for="email" string="E-Mail"/>
+                                <group col="2">
+                                    <field name="email" nolabel="1" class="oe_inline"/>
+                                    <button string="Send New Email"
+                                    name="%(mail.action_email_compose_message_wizard)d"
+                                    context= '{"default_email_to":email}' type="action" class="oe_inline"/>
+                                </group>
+                            </group>
+                            <group colspan="2">
+                                <field name="user_id" attrs="{'readonly':[('state','!=', 'draft')]}"/>
+                                <field name="nb_register"/>
                             </group>
                         </group>
-                        <group colspan="2">
-                            <field name="user_id" attrs="{'readonly':[('state','!=', 'draft')]}"/>
-                            <field name="nb_register"/>
+                        <group colspan="2" col="2">
+                            <field name="phone"/>
                         </group>
-                    </group>
-                    <group colspan="4" col="4">
-                        <group colspan="2">
-                            
+                        <group colspan="2" col="2" groups="base.group_no_one">
+                            <field name="create_date"/>
+                            <field name="date_closed"/>
                         </group>
-                        <group colspan="2">
-                        </group>
-                    </group>
-                    <group colspan="2" col="2">
-                        <field name="phone"/>
-                    </group>
-                    <group colspan="2" col="2" groups="base.group_no_one">
-                        <field name="create_date"/>
-                        <field name="date_closed"/>
-                    </group>
-                </sheet>
-                <footer>
-                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
-                </footer>
+                    </sheet>
+                    <footer>
+                        <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
+                    </footer>
                 </form>
             </field>
         </record>

From 9102ef13d89629520df449d8803a1d1db0ef90a1 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 5 Jul 2012 15:28:26 +0530
Subject: [PATCH 159/239] [IMP]remove tab

bzr revid: kjo@tinyerp.com-20120705095826-1pzoelsdmmhbm50h
---
 addons/event/event_view.xml | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index a982af9d6af..276842c4d4a 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -105,36 +105,36 @@
                         <field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
                     </header>
                     <sheet>
-                    	<div class="oe_right oe_button_box">
-	                        <button name="%(event.act_event_list_register_event)d" type="action" string="Registration" icon="gtk-index" help="Register with this event"/>
-	                    </div>
+                        <div class="oe_right oe_button_box">
+                            <button name="%(event.act_event_list_register_event)d" type="action" string="Registration" icon="gtk-index" help="Register with this event"/>
+                        </div>
                     
                         <div class="oe_title" style="width: 650px" >
-	                    	<label for="name" class="oe_edit_only"/>
-		                    <group colspan="6" col="6">
-		                    	<group colspan="2"><h1><field name="name"/></h1></group>
-	                            <group colspan="4"><h1><label string="(" attrs="{'invisible': [('type', '=', '')]}" /><field name="type" nolabel="1" on_change="onchange_event_type(type,context)" class="oe_inline"/><label string=")" attrs="{'invisible': [('type', '=', '')]}" /></h1></group>
-		                    </group>  
-		                </div> 
+                            <label for="name" class="oe_edit_only"/>
+                            <group colspan="6" col="6">
+                                <group colspan="2"><h1><field name="name"/></h1></group>
+                                <group colspan="4"><h1><label string="(" attrs="{'invisible': [('type', '=', '')]}" /><field name="type" nolabel="1" on_change="onchange_event_type(type,context)" class="oe_inline"/><label string=")" attrs="{'invisible': [('type', '=', '')]}" /></h1></group>
+                            </group>  
+                        </div> 
                         <div>
-                        	<h2>From <field name="date_begin" class="oe_inline" /> to <field name="date_end" class="oe_inline"/>
-                        	</h2>
+                            <h2>From <field name="date_begin" class="oe_inline" /> to <field name="date_end" class="oe_inline"/>
+                            </h2>
                             <group>
                                 <group>
                                     <label for="address_id" string="Location Address"/>
                                     <div>
                                         <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}"/>
-                                    	<field name="street" placeholder="Street..."/>                            
-                                    	<div>
-                                    	     <field name="zip" class="oe_inline" placeholder="Zip"/>
+                                        <field name="street" placeholder="Street..."/>                            
+                                        <div>
+                                             <field name="zip" class="oe_inline" placeholder="Zip"/>
                                              <field name="city" class="oe_inline" placeholder="City"/>
                                         </div>
                                     </div>
                                 </group>
                                 <group>
-	                              	<field name="register_min"/>
-	                               	<field name="register_max"/>
-	                           	</group>
+                                      <field name="register_min"/>
+                                       <field name="register_max"/>
+                                   </group>
                             </group>
                         </div>
                         <!-- <div class="oe_right" style="height: 200px"></div> -->
@@ -469,7 +469,7 @@
                             <label string="(" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
                             <field name="duration" widget="float_time" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
                             <label string=")" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
-	                    </h1>   
+                        </h1>   
                         <group colspan="4" col="4">
                             <group colspan="2">
                                 <field name="name" invisible="1"/>

From 4a692bf7989f70b45b80fb0c6d63a5c0c90eb78b Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Thu, 5 Jul 2012 16:48:53 +0530
Subject: [PATCH 160/239] [IMP]Improving description

bzr revid: tch@tinyerp.com-20120705111853-1bxqbiihsez0t9oa
---
 addons/mail/__openerp__.py | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index cc161baa1ec..f0aa2cc3dff 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -25,20 +25,32 @@
     'category':'Social Network',
     "sequence": 2,
     'description': """
-A business oriented Social Network stands with message storage, queuing 
-and feeds.                    
-===================================================================
-This Social Network service enables users to send, share and read posts via 
-feeds and provides an unified social network you can use in a global feed or
-in all application. 
+A bussiness oriented Social Networking with a fully-integrated email 
+and message management.
+=====================================================================
+The Social Networking module provides an unified social network
+abstraction layer allowing applications to display a complete 
+communication history on documents.It gives the users the possibility
+to read and send messages and emails in an unified way.
 
-With this feature: 
-    * Track all the notification of the system.
-    * Send emails to your colleagues and/or your customers.
-    * Share your ideas by adding message.
-    * Add comments on your colleague's post.
-    * Add and follow discussion group.
+It also provides a wall combined to a subscription mechanism, that 
+allows to follow documents, and to be constantly updated about recent
+news.
+        
+The main features of the module are :
 
+    * A clean and renewed communication history for any OpenERP
+      document that can act as a discussion topic,       
+    * discussion mean on documents,
+    * A follow mechanism to be updated about new messages on 
+      interesting documents,
+    * An unified feeds page to see recent messages and activity 
+      on followed documents,
+    * User communication through the feeds page,
+    * A threaded discussion design,
+    * Relying on the global outgoing mail server, an integrated email
+      management system allowing to send emails with a configurable 
+      schedulerbased processing.
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',

From 37b6165dd4eed6c23963d2eff511aa3f62618d13 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 5 Jul 2012 13:55:21 +0200
Subject: [PATCH 161/239] [REM] hr_recruitment: remove unused wizard
 hr.recruitment.job2phonecall

bzr revid: rco@openerp.com-20120705115521-ox4hpbqfbrfcsbd0
---
 addons/hr_recruitment/__openerp__.py          |   1 -
 addons/hr_recruitment/wizard/__init__.py      |   1 -
 .../wizard/hr_recruitment_phonecall.py        | 126 ------------------
 .../wizard/hr_recruitment_phonecall_view.xml  |  40 ------
 4 files changed, 168 deletions(-)
 delete mode 100644 addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
 delete mode 100644 addons/hr_recruitment/wizard/hr_recruitment_phonecall_view.xml

diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index b83a482e1c1..a340cc18dc7 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -46,7 +46,6 @@ system to store and search in your CV base.
         'fetchmail',
     ],
     'update_xml': [
-        'wizard/hr_recruitment_phonecall_view.xml',
         'wizard/hr_recruitment_employee_hired.xml',
         'wizard/hr_recruitment_create_partner_job_view.xml',
         'hr_recruitment_view.xml',
diff --git a/addons/hr_recruitment/wizard/__init__.py b/addons/hr_recruitment/wizard/__init__.py
index acabd219857..fde7df63456 100644
--- a/addons/hr_recruitment/wizard/__init__.py
+++ b/addons/hr_recruitment/wizard/__init__.py
@@ -20,7 +20,6 @@
 ##############################################################################
 
 
-import hr_recruitment_phonecall
 import hr_recruitment_create_partner_job
 import hr_recruitment_employee_hired
 
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py b/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
deleted file mode 100644
index 12c294c20bc..00000000000
--- a/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
+++ /dev/null
@@ -1,126 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-import time
-
-from osv import osv, fields
-from tools.translate import _
-
-class job2phonecall(osv.osv_memory):
-    _name = 'hr.recruitment.job2phonecall'
-    _description = 'Schedule Phone Call'
-    _columns = {
-        'user_id': fields.many2one('res.users', 'Assign To'),
-        'deadline': fields.datetime('Planned Date'),
-        'note': fields.text('Goals'),
-        'category_id': fields.many2one('crm.case.categ', 'Category', required=True),
-    }
-
-    def _date_user(self, cr, uid, context=None):
-        case_obj = self.pool.get('hr.applicant')
-        if context is None:
-            context = {}
-        case = case_obj.browse(cr, uid, context.get('active_id', False), context=context)
-        return case.user_id and case.user_id.id or False
-
-    def _date_category(self, cr, uid, context=None):
-        case_obj = self.pool.get('hr.applicant')
-        if context is None:
-            context = {}
-        case = case_obj.browse(cr, uid, context.get('active_id', False), context=context)
-        categ_id = self.pool.get('crm.case.categ').search(cr, uid, [('name','=','Outbound')], context=context)
-        return categ_id and categ_id[0] or case.categ_id and case.categ_id.id or False
-
-    def _get_note(self, cr, uid, context=None):
-        mail_message = self.pool.get('mail.message')
-        if context is None:
-            context = {}
-        if context.get('active_id'):
-            case = self.pool.get('hr.applicant').browse(cr, uid, context['active_id'], context=context)
-            if case.description:
-                return case.description
-            else:
-                msg_ids = mail_message.search(cr, uid, [('model', '=', 'hr.applicant'), ('res_id', '=', case.id), ('email_from', '!=', ''), ('email_to', '!=', '')], limit=1)
-                if msg_ids:
-                    return mail_message.browse(cr, uid, msg_ids[0], context=context).body_text
-        return False
-
-
-    _defaults = {
-         'user_id': _date_user,
-         'category_id': _date_category,
-         'note': _get_note
-                 }
-
-    def make_phonecall(self, cr, uid, ids, context=None):
-        mod_obj = self.pool.get('ir.model.data')
-        job_case_obj = self.pool.get('hr.applicant')
-        data_obj = self.pool.get('ir.model.data')
-        phonecall_case_obj = self.pool.get('crm.phonecall')
-        if context is None:
-            context = {}
-        form = self.browse(cr, uid, ids, context=context)[0]
-        result = mod_obj._get_id(cr, uid, 'crm', 'view_crm_case_phonecalls_filter')
-        res = mod_obj.read(cr, uid, result, ['res_id'], context=context)
-        # Select the view
-
-        id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_tree_view')
-        id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_form_view')
-        if id2:
-            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-        if id3:
-            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-        new_phonecall_id = []
-        for job in job_case_obj.browse(cr, uid, context.get('active_ids', []), context=context):
-            #TODO: Take other info from job
-            new_phonecall_id = phonecall_case_obj.create(cr, uid, {
-                        'name': job.name,
-                        'user_id': form.user_id.id,
-                        'categ_id': form.category_id.id,
-                        'description': form.note,
-                        'date': form.deadline,
-                        'description': job.description,
-                        'partner_id': job.partner_id.id,
-                        'partner_phone': job.partner_phone,
-                        'partner_mobile': job.partner_mobile,
-                        'description': job.description,
-                        'date':job.date,
-                    }, context=context)
-            new_phonecall = phonecall_case_obj.browse(cr, uid, new_phonecall_id, context=context)
-            vals = {}
-            job_case_obj.write(cr, uid, [job.id], vals, context=context)
-#            job_case_obj.case_cancel(cr, uid, [job.id])
-            phonecall_case_obj.case_open(cr, uid, [new_phonecall_id])
-
-        return {
-            'name': _('Phone Call'),
-            'view_type': 'form',
-            'view_mode': 'tree,form',
-            'res_model': 'crm.phonecall',
-            'res_id': new_phonecall_id,
-            'views': [(id3,'form'), (id2,'tree'), (False,'calendar'), (False,'graph')],
-            'type': 'ir.actions.act_window',
-            'search_view_id': res['res_id']
-        }
-
-job2phonecall()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_phonecall_view.xml b/addons/hr_recruitment/wizard/hr_recruitment_phonecall_view.xml
deleted file mode 100644
index 8537186ac6f..00000000000
--- a/addons/hr_recruitment/wizard/hr_recruitment_phonecall_view.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="view_hr_recruitment_phonecall" model="ir.ui.view">
-            <field name="name">hr.recruitment.job2phonecall.form</field>
-            <field name="model">hr.recruitment.job2phonecall</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-            <form string="Schedule Phone Call" version="7.0">
-                <header>
-                    <button name="make_phonecall" string="Schedule Phone Call" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
-                <group col="4" colspan="6">
-                    <separator string="Phone Call Description" colspan="4" />
-                    <newline />
-                    <field name='user_id' />
-                    <field name='deadline' />
-                    <newline />
-                    <field name='note' colspan="4"/>
-                    <newline />
-                    <field name='category_id' domain="[('object_id.model', '=', 'crm.phonecall')]"/>
-                </group>
-            </form>
-            </field>
-        </record>
-
-        <record id="action_hr_recruitment_phonecall" model="ir.actions.act_window">
-            <field name="name">Schedule Phone Call</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">hr.recruitment.job2phonecall</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
-    </data>
-</openerp>

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 162/239] 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 163/239] 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 164/239] [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 16dd3b0b0875e108b7cecd2369a714e60d5af33c Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 5 Jul 2012 14:20:15 +0200
Subject: [PATCH 165/239] [FIX] hr_recruitment: remove test about removed
 wizard

bzr revid: rco@openerp.com-20120705122015-qcjhrkpbatjlfkmx
---
 addons/hr_recruitment/test/recruitment_process.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/addons/hr_recruitment/test/recruitment_process.yml b/addons/hr_recruitment/test/recruitment_process.yml
index 38b84fccab2..841a49dc866 100644
--- a/addons/hr_recruitment/test/recruitment_process.yml
+++ b/addons/hr_recruitment/test/recruitment_process.yml
@@ -50,13 +50,6 @@
 -
   !python {model: hr.applicant}: |
     self.write(cr, uid, [ref('hr_case_programmer')], {'job_id':ref('hr.job_developer')})
--
-  I start communication with applicant, first schedule phonecall.
--
-  !python {model: hr.recruitment.job2phonecall}: |
-     context.update({'active_model': 'hr.applicant', 'active_id': ref("hr_case_programmer"), 'active_ids': [ref("hr_case_programmer")], 'survey_id': ref("survey_job_0")})
-     id = self.create(cr, uid, {}, context=context)
-     self.make_phonecall(cr, uid, [id], context=context)
 -
   I schedule meeting with applicant for interview.
 -

From b891603849e11580a4983d5269bf5465ee88157c Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 5 Jul 2012 14:21:40 +0200
Subject: [PATCH 166/239] [REM] hr_recruitment: remove unused action

bzr revid: rco@openerp.com-20120705122140-oeqtb9kagobt9qtw
---
 addons/hr_recruitment/hr_recruitment_view.xml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 00b300cb6f6..f3585b2e0ac 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -16,18 +16,6 @@
             view_mode="tree,form,calendar,graph"
             view_type="form"/>
 
-    # ------------------------------------------------------
-    # Job Categories
-    # ------------------------------------------------------
-
-    <record id="hr_job_categ_action" model="ir.actions.act_window">
-        <field name="name">Applicant Categories</field>
-        <field name="res_model">crm.case.categ</field>
-        <field name="view_type">form</field>
-        <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
-        <field name="domain">[('object_id.model', '=', 'hr.applicant')]</field>
-        <field name="context" eval="{'object_id': ref('model_hr_applicant')}"/>
-    </record>
     # ------------------------------------------------------
     # Stage
     # ------------------------------------------------------

From c407fa45ce7171ca47e11854eb6a45460f1c3dfd Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 5 Jul 2012 14:22:07 +0200
Subject: [PATCH 167/239] [FIX] hr_recruitment: fix default value of company_id

bzr revid: rco@openerp.com-20120705122207-cs730asuew9w7vxz
---
 addons/hr_recruitment/hr_recruitment.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 21aa1b4327d..32bebef3dc0 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -235,7 +235,7 @@ class hr_applicant(base_stage, osv.Model):
         'stage_id': lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c),
         'department_id': lambda s, cr, uid, c: s._get_default_department_id(cr, uid, c),
         'priority': lambda *a: '',
-        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c),
+        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'hr.applicant', context=c),
         'color': 0,
     }
 

From a11440cd40b22d64f0c0eacd69abf8cf043ec587 Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Thu, 5 Jul 2012 18:13:05 +0530
Subject: [PATCH 168/239] [IMP]survey-kanban-view

bzr revid: pna@tinyerp.com-20120705124305-am3bqq8v0yrqrc12
---
 addons/survey/static/src/css/survey.css | 27 ++-----------
 addons/survey/survey.py                 |  1 +
 addons/survey/survey_view.xml           | 53 ++++++++++++++-----------
 3 files changed, 34 insertions(+), 47 deletions(-)

diff --git a/addons/survey/static/src/css/survey.css b/addons/survey/static/src/css/survey.css
index 0102dc1ade6..6964e4c2f3e 100644
--- a/addons/survey/static/src/css/survey.css
+++ b/addons/survey/static/src/css/survey.css
@@ -1,20 +1,3 @@
-.oe_module_survey{
-    font-size: 12px;
-    border-style:dotted;
-    border-radius: 15px;
-    text-align: left;
-    height:145px;
-    width:220px;
-}
-
-.oe_survey_title{
-    font-size: 15px;
-    height: auto;
-    font-size: 16px;
-    font-weight:bold;
-    width: 205px;
-}
-
 .oe_survey_responsible{
     height: auto;
     width: 200px;
@@ -26,12 +9,10 @@
     width: 200px;
     font-size: 14px;
 }
-
-.oe_survey_fill{
-	align:right;
-	padding: 1px 165px;
-}
-
 .oe_survey_rate{
     font-size: 14px;
 }
+.oe_kanban_survey {
+    width: 300px;
+}
+
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 40f13b226f8..1c1c8b6df91 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -68,6 +68,7 @@ class survey(osv.osv):
         'users': fields.many2many('res.users', 'survey_users_rel', 'sid', 'uid', 'Users'),
         'send_response': fields.boolean('Email Notification on Answer'),
         'type': fields.many2one('survey.type', 'Type'),
+        'color': fields.integer('Color Index'),
         'invited_user_ids': fields.many2many('res.users', 'survey_invited_user_rel', 'sid', 'uid', 'Invited User'),
     }
     _defaults = {
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index dedb044eee9..bdba67738d0 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -313,32 +313,37 @@
                 <kanban>
                     <field name="title"/>
                     <field name="date_open"/>
+                    <field name="color"/>
                     <templates>
                         <t t-name="kanban-box">
-                          <div class="oe_module_survey">
-                            <a class="oe_module_icon">
-                               <div class="oe_survey_title"><t t-esc="record.title.raw_value.toString()"/></div><br/>
-                               <div class="oe_survey_responsible">
-                                   <t t-if="record.responsible_id.raw_value">By: <field name="responsible_id"/></t>
-                               </div><br/>
-                               <div class="oe_survey_start_date">
-                                  Open From:
-                                   <t t-if="record.date_open.raw_value">
-                                       <t t-esc="record.date_open.raw_value.getDate()"/>
-                                       <t t-esc="record.date_open.raw_value.toString('MMM')"/>, 
-                                       <t t-esc="record.date_open.raw_value.getFullYear()"/>
-                                   </t>
-                               </div><br/>
-                               <div class="oe_survey_rate">
-                                   Rate:
-                                <div class="oe_survey_fill" >
-                                   <button type="object" name="fill_survey" class="">
-                                       <span>Fill</span>
-                                   </button>
-                               </div>                                   
-                               </div>
-                            </a>
-                          </div>  
+                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_survey oe_kanban_auto_height">
+                                <div class="oe_dropdown_toggle oe_dropdown_kanban">
+                                    <span class="oe_e">i</span>
+                                    <ul class="oe_dropdown_menu">
+                                        <li><a type="edit">Edit...</a></li>
+                                        <li><a type="delete">Delete</a></li>
+                                        <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
+                                    </ul>
+                                </div>
+                                <div class="oe_kanban_content">
+                                    <h3 class="oe_kanban_ellipsis"><field name="title"/></h3>
+                                    <div class="oe_survey_responsible">
+                                       <t t-if="record.responsible_id.raw_value">By: <field name="responsible_id"/></t>
+                                   </div><br/>
+                                   <div class="oe_survey_start_date">
+                                      Open From:
+                                       <t t-if="record.date_open.raw_value">
+                                           <t t-esc="record.date_open.raw_value.getDate()"/>
+                                           <t t-esc="record.date_open.raw_value.toString('MMM')"/>,
+                                           <t t-esc="record.date_open.raw_value.getFullYear()"/>
+                                       </t>
+                                   </div><br/>
+                                   <div class="oe_survey_rate">
+                                       Rate:
+                                        <a name="fill_survey" type="object">Fill</a>
+                                   </div>
+                                </div>
+                            </div>
                         </t>
                     </templates>
                 </kanban>

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 169/239] [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 a47b42cd69dec5ef4fde79ba94cb21f86691f870 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 5 Jul 2012 18:32:58 +0530
Subject: [PATCH 170/239] [IMP] remove extra class

bzr revid: dbr@tinyerp.com-20120705130258-0fmma20qwhv2vssg
---
 addons/survey/survey_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index c1e0355073c..a8a8c59f24b 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -316,7 +316,7 @@
                     <field name="color"/>
                     <templates>
                         <t t-name="kanban-box">
-                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_survey oe_kanban_auto_height">
+                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_survey">
                                 <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                     <span class="oe_e">i</span>
                                     <ul class="oe_dropdown_menu">

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 171/239] [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 58549bc503cd715589c4da32e9c4dbde4e419b6a Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 5 Jul 2012 18:46:54 +0530
Subject: [PATCH 172/239] [IMP]String imp

bzr revid: dbr@tinyerp.com-20120705131654-fy1c092kne3bwftj
---
 addons/survey/survey_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index a8a8c59f24b..8aeec213648 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -331,8 +331,8 @@
                                        <t t-if="record.responsible_id.raw_value">By: <field name="responsible_id"/></t>
                                    </div><br/>
                                    <div class="oe_survey_start_date">
-                                      Open From:
                                        <t t-if="record.date_open.raw_value">
+                                           Opened at
                                            <t t-esc="record.date_open.raw_value.getDate()"/>
                                            <t t-esc="record.date_open.raw_value.toString('MMM')"/>,
                                            <t t-esc="record.date_open.raw_value.getFullYear()"/>

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 173/239] [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 174/239] [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 175/239] [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 176/239] [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 177/239] [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 178/239] [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 179/239] [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 180/239] [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 181/239] 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 182/239] [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 183/239] [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 184/239] 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 185/239] 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

From 55aace115f8781a7ba26001e393ef9e6006eb77e Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Fri, 6 Jul 2012 10:53:21 +0530
Subject: [PATCH 186/239] [IMP]event: remove name_get method

bzr revid: kjo@tinyerp.com-20120706052321-fcxb95cckpfwsyvo
---
 addons/event/event.py | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 51e067e7d66..5e075d4bd30 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -51,27 +51,6 @@ class event_event(osv.osv):
     _order = 'date_begin'
     _inherit = ['ir.needaction_mixin','mail.thread']
 
-    def name_get(self, cr, uid, ids, context=None):
-        if not ids:
-              return []
-        res = []
-        for record in self.browse(cr, uid, ids, context=context):
-            date = record.date_begin.split(" ")
-            date = date[0]
-            registers=''
-            if record.register_max !=0:
-                register_max = str(record.register_max)
-                register_tot = record.register_current+record.register_prospect
-                register_tot = str(register_tot)
-                registers = register_tot+'/'+register_max
-            name = record.name+' ('+date+') '+registers
-            res.append((record['id'], name))
-        return res
-
-    def _name_get_fnc(self, cr, uid, ids,prop,unknow, context=None):
-        res = self.name_get(cr, uid, ids, context=context)
-        return dict(res)
-
     def create(self, cr, uid, vals, context=None):
         obj_id = super(event_event, self).create(cr, uid, vals, context)
         self.create_send_note(cr, uid, [obj_id], context=context)
@@ -211,7 +190,6 @@ class event_event(osv.osv):
             help='If event is created, the state is \'Draft\'.If event is confirmed for the particular dates the state is set to \'Confirmed\'. If the event is over, the state is set to \'Done\'.If event is cancelled the state is set to \'Cancelled\'.'),
         'email_registration_id' : fields.many2one('email.template','Registration Confirmation Email', help='This field contains the template of the mail that will be automatically sent each time a registration for this event is confirmed.'),
         'email_confirmation_id' : fields.many2one('email.template','Event Confirmation Email', help="If you set an email template, each participant will receive this email announcing the confirmation of the event."),
-        'full_name' : fields.function(_name_get_fnc, type="char", string='Name'),
         'reply_to': fields.char('Reply-To Email', size=64, readonly=False, states={'done': [('readonly', True)]}, help="The email address of the organizer is likely to be put here, with the effect to be in the 'Reply-To' of the mails sent automatically at event or registrations confirmation. You can also put the email address of your mail gateway if you use one."),
         'main_speaker_id': fields.many2one('res.partner','Main Speaker', readonly=False, states={'done': [('readonly', True)]}, help="Speaker who will be giving speech at the event."),
         'address_id': fields.many2one('res.partner','Location Address', readonly=False, states={'done': [('readonly', True)]}),

From f9cfe908cfebceed95c6cbf10b4d0290aa9a8b70 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Fri, 6 Jul 2012 12:20:05 +0530
Subject: [PATCH 187/239] [IMP]event: remove oe_subtotal_footer oe_right class

bzr revid: kjo@tinyerp.com-20120706065005-agkoyvnja05apcvq
---
 addons/event/event_view.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 276842c4d4a..6fc0a149cf3 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -151,6 +151,7 @@
                                   <group class="oe_group_label_border">
                                     <field name="register_current"/>
                                     <field name="register_prospect"/>
+                                    <field name="register_attended"/>
                                   </group> 
                               </group>
                               <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
@@ -186,11 +187,6 @@
                                             </group>
                                     </form>
                                     </field>
-                                    <group class="oe_subtotal_footer oe_right" colspan="2" name="regi_total">
-                                        <field name="register_current"/>
-                                        <field name="register_prospect"/>
-                                        <field name="register_attended" class="oe_subtotal_footer_separator" />
-                                    </group>
                                 <separator string="" class="oe_clear"/>
                             </page>
                         </notebook>

From f323d4209d818b944e894024fa97d192f011ba9e Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 6 Jul 2012 09:30:30 +0200
Subject: [PATCH 188/239] [IMP] width of sheet in a variable

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

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index ac767243e75..863dbb80044 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1674,7 +1674,7 @@
 }
 .openerp .oe_form footer {
   min-width: 650px;
-  max-width: 960px;
+  max-width: 860px;
   margin: 0 auto;
 }
 .openerp ul.oe_form_steps {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index cdb14123666..be1e8b6c08e 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -6,6 +6,7 @@ $facets-border: #afafb6
 $facets-border-selected: #a6a6fe
 $hover-background: #f0f0fa
 $colour4: #8a89ba
+$sheet-max-width: 860px
 // }}}
 // Mixins {{{
 @font-face
@@ -1307,7 +1308,7 @@ $colour4: #8a89ba
                 float: right
         footer
             min-width: 650px
-            max-width: 960px
+            max-width: $sheet-max-width
             margin: 0 auto
     ul.oe_form_steps
         height: 30px
@@ -1362,7 +1363,7 @@ $colour4: #8a89ba
             border-bottom: 1px solid #ddd 
         .oe_form_sheet_width
             min-width: 650px
-            max-width: 860px
+            max-width: $sheet-max-width
             margin: 0 auto
         .oe_form_sheet
             background: white

From 47fd55c8b4a446b10e555a0f616334bba1c83eb8 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 6 Jul 2012 10:00:17 +0200
Subject: [PATCH 189/239] [IMP] removed EDI specific css

bzr revid: fp@tinyerp.com-20120706080017-vqlq69nj8p5vrdrv
---
 addons/edi/static/src/css/edi.css | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/addons/edi/static/src/css/edi.css b/addons/edi/static/src/css/edi.css
index 1601151ae1f..6385959c036 100644
--- a/addons/edi/static/src/css/edi.css
+++ b/addons/edi/static/src/css/edi.css
@@ -24,21 +24,6 @@ button.oe_edi_action_print img {
     height: 32px;
 }
 
-.openerp input.invalid {
-    background-color: #F66 !important;
-    border: 1px solid #D00 !important;
-    color: #000;
-}
-/* following browse-specific hacks need to be separate rules, as browsers are
-   required to ignore rules with unknown selectors. At time of writing, there
-   is no standard way to style HTML5 placeholders */
-.openerp input.invalid:-moz-placeholder {
-    color: #FFF;
-}
-.openerp input.invalid::-webkit-input-placeholder {
-    color: #FFF;
-}
-
 /** EDI Sidebar **/
 .oe_edi_sidebar_title {
     border-bottom: 1px solid #D2CFCF;
@@ -81,9 +66,6 @@ button.oe_edi_action_print img {
 
 
 /** Paperbox, from http://www.sitepoint.com/pure-css3-paper-curl/ **/
-body {
-    background: #EEE; /* contrast with paper */
-}
 .oe_edi_paperbox {
     position: relative;
     width: 700px;
@@ -225,4 +207,4 @@ table.oe_edi_data, .oe_edi_doc_title {
 .python .nu0 {color: #ff4500;}
 .python .me1 {color: black;}
 .python span.xtra { display:block; }
-.python ol { padding: 0px; }
\ No newline at end of file
+.python ol { padding: 0px; }

From 788b670b2027cf46971ab40d94ec4dd10648f513 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 6 Jul 2012 10:24:16 +0200
Subject: [PATCH 190/239] [FIX] hr_holidays: change onchange method name

bzr revid: rco@openerp.com-20120706082416-hi7fqtdevepvzwbk
---
 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 1237cdb14f4..c22c4add718 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -119,7 +119,7 @@
                             <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}"/>
+                            <field name="holiday_status_id" on_change="onchange_status_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" class="oe_inline"/> - 
@@ -178,7 +178,7 @@
                             <field name="department_id" attrs="{'readonly':['|', ('holiday_type','=','category'), ('state','not in' ,('draft', 'confirm'))]}"/>
                         </group>
                         <group>
-                            <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
+                            <field name="holiday_status_id" on_change="onchange_status_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
                             <field name="number_of_days_temp"/>
                         </group>
                     </group>

From 84c6ee9a3b4763e8130e82ce7684c19a0a9522fa Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 6 Jul 2012 10:42:39 +0200
Subject: [PATCH 191/239] [IMP] hr: usability, removal of employee_ids field in
 hr.job form view

bzr revid: qdp-launchpad@openerp.com-20120706084239-kzuur6c9956bhnfc
---
 addons/hr/hr_view.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 750b83d6700..1797f32e9ce 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -370,10 +370,6 @@
                             <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>
-                            <field name="employee_ids" widget="many2many_tags" mode="tree,form"/>
-                        </h2>
                         <group>
                             <group>
                                 <field name="no_of_employee"/>

From 6f70dc88c6f5ce3e7472087f61435fa475f727fc Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Fri, 6 Jul 2012 17:43:44 +0530
Subject: [PATCH 192/239] [IMP]event: change registration view

bzr revid: kjo@tinyerp.com-20120706121344-330s2e44t11epg5o
---
 addons/event/event.py       | 6 ------
 addons/event/event_view.xml | 7 +++----
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 5e075d4bd30..376fc122120 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -310,7 +310,6 @@ class event_registration(osv.osv):
         'phone': fields.char('Phone', size=64),
         'name': fields.char('Name', size=128, select=True),
         'active': fields.boolean('Active'),
-        'duration': fields.float('Duration'),
     }
 
     _defaults = {
@@ -410,14 +409,9 @@ class event_registration(osv.osv):
             return {}
         event_obj = self.pool.get('event.event')
         data_event =  event_obj.browse(cr, uid, event_id, context=context)
-        start = datetime.strptime(data_event.date_begin, "%Y-%m-%d %H:%M:%S")
-        end = datetime.strptime(data_event.date_end, "%Y-%m-%d %H:%M:%S")
-        diff = end - start
-        duration = float(diff.days)* 24 + (float(diff.seconds) / 3600)
         value ['value']= {'event_begin_date': data_event.date_begin,
                      'event_end_date': data_event.date_end,
                      'company_id': data_event.company_id and data_event.company_id.id or False,
-                     'duration': round(duration, 2),
                }
         return value
 
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 6fc0a149cf3..6dbad5fcd88 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -463,7 +463,9 @@
                         <h1>
                             <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]" nolabel="1" class="oe_inline"/>
                             <label string="(" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
-                            <field name="duration" widget="float_time" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
+                            <field name="event_begin_date" class="oe_inline" attrs="{'invisible': [('event_id', '=', '')]}"/>
+                            <label string="-" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
+                            <field name="event_end_date" class="oe_inline" attrs="{'invisible': [('event_id', '=', '')]}"/>
                             <label string=")" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
                         </h1>   
                         <group colspan="4" col="4">
@@ -473,9 +475,6 @@
                                 <label for="email" string="E-Mail"/>
                                 <group col="2">
                                     <field name="email" nolabel="1" class="oe_inline"/>
-                                    <button string="Send New Email"
-                                    name="%(mail.action_email_compose_message_wizard)d"
-                                    context= '{"default_email_to":email}' type="action" class="oe_inline"/>
                                 </group>
                             </group>
                             <group colspan="2">

From c30e22e91ac6e58afdcafaaa23d37b645a196fa6 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 6 Jul 2012 14:19:11 +0200
Subject: [PATCH 193/239] [IMP] document: attchment form view

bzr revid: qdp-launchpad@openerp.com-20120706121911-n6k0smzsud3d45db
---
 addons/document/document_view.xml | 37 ++++++++++++++++---------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 28c0a35879a..b03e547cbd0 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -244,7 +244,7 @@
                     <label for="name" class="oe_edit_only"/>
                     <h1>
                         <field name="name" class="oe_inline"/>
-                        (<field name="type" class="oe_inline"/>)
+                        <label string=", " class="oe_inline oe_edit_only"/><field name="type" class="oe_inline oe_edit_only"/>
                     </h1>
                     <label for="datas" class="oe_edit_only" attrs="{'invisible':[('type','=','url')]}"/>
                     <label for="url" class="oe_edit_only" attrs="{'invisible':[('type','=','binary')]}"/>
@@ -254,33 +254,34 @@
                         <field name="url" widget="url" attrs="{'invisible':[('type','=','binary')]}" class="oe_inline"/>
                     </h2>
                     <group>
-                        <group>
+                        <group string="Document Information">
                             <field name="user_id"/>
                             <field name="parent_id"/>
+                            <field name="partner_id"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            <field name="index_content" string="Tab Indexed Content"/>
+                        </group>
+                        <group groups="base.group_no_one" string="History">
+                            <label for="create_uid" string="Creation"/>
+                            <div>
+                                <field name="create_uid" readonly="1" class="oe_inline"/> on 
+                                <field name="create_date" readonly="1" class="oe_inline"/>
+                            </div>
+                            <label for="write_uid" string="Modification"/>
+                            <div>
+                                <field name="write_uid" readonly="1" class="oe_inline"/> on 
+                                <field name="write_date" readonly="1" class="oe_inline"/>
+                            </div>
                         </group>
                         <group>
                             <field name="res_id" invisible="True"/>
                             <field name="res_model" readonly="True" invisible="True" attrs="{'invisible': [('res_id','=',0)]}"/>
                             <field name="res_name" readonly="1" attrs="{'invisible': [('res_id','=',0)]}"/>
-                            <field name="partner_id"/>
+                        </group>
+                        <group string="Indexed Content" colspan="4">
+                            <field name="index_content" nolabel="1"/>
                         </group>
                     </group>
-                    <notebook>
-                        <page string="History">
-                            <group>
-                                <group groups="base.group_no_one" string="Created">
-                                    <field name="create_uid" readonly="1"/>
-                                    <field name="create_date" readonly="1"/>
-                                </group>
-                                <group groups="base.group_no_one" string="Modified">
-                                    <field name="write_uid" readonly="1"/>
-                                    <field name="write_date" readonly="1"/>
-                                </group>
-                            </group>
-                        </page>
-                    </notebook>
+
                 </sheet>
             </form>
         </field>

From d177d9a2a9ffffb105f3d06e280ce53c81059a8f Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 6 Jul 2012 14:29:59 +0200
Subject: [PATCH 194/239] [IMP] move the views of crm.meeting in base_calendar,
 adapt xml ids in xml, and improve the code that opens those views

bzr revid: rco@openerp.com-20120706122959-o8clpxqvewpyha0k
---
 addons/base_calendar/__openerp__.py           |   3 +-
 addons/base_calendar/crm_meeting_view.xml     | 371 ++++++++++++++++++
 addons/crm/board_crm_view.xml                 |   4 +-
 addons/crm/crm_demo.xml                       |   2 +-
 addons/crm/crm_lead.py                        |  50 +--
 addons/crm/crm_meeting_menu.xml               |  93 -----
 addons/crm/crm_meeting_shortcut_data.xml      |   2 +-
 addons/crm/crm_meeting_view.xml               | 361 +----------------
 addons/crm/crm_phonecall.py                   |  55 +--
 addons/crm/res_partner_view.xml               |   2 +-
 addons/crm/wizard/crm_phonecall_to_meeting.py |  67 +---
 addons/hr_recruitment/hr_recruitment.py       |  57 +--
 addons/hr_recruitment/hr_recruitment_view.xml |  10 +-
 .../sync_google_calendar_view.xml             |   4 +-
 14 files changed, 461 insertions(+), 620 deletions(-)
 create mode 100644 addons/base_calendar/crm_meeting_view.xml

diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index d3a9d9e533d..3f6ca129f6f 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -46,7 +46,8 @@ If you need to manage your meetings, you should install the CRM module.
         'security/calendar_security.xml',
         'security/ir.model.access.csv',
         'wizard/base_calendar_invite_attendee_view.xml',
-        'base_calendar_view.xml'
+        'base_calendar_view.xml',
+        'crm_meeting_view.xml',
     ],
     "test" : ['test/base_calendar_test.yml'],
     "installable": True,
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
new file mode 100644
index 00000000000..b6365ebc53c
--- /dev/null
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -0,0 +1,371 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+    <!-- Read/Unread actions -->
+
+    <record id="actions_server_crm_meeting_read" model="ir.actions.server">
+        <field name="name">Mark read</field>
+        <field name="condition">True</field>
+        <field name="type">ir.actions.server</field>
+        <field name="model_id" ref="model_crm_meeting"/>
+        <field name="state">code</field>
+        <field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
+    </record>
+    <record id="action_crm_meeting_read" model="ir.values">
+        <field name="name">action_crm_meeting_read</field>
+        <field name="action_id" ref="actions_server_crm_meeting_read"/>
+        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_meeting_read'))" />
+        <field name="key">action</field>
+        <field name="model_id" ref="model_crm_meeting" />
+        <field name="model">crm.meeting</field>
+        <field name="key2">client_action_multi</field>
+    </record>
+
+    <record id="actions_server_crm_meeting_unread" model="ir.actions.server">
+        <field name="name">Mark unread</field>
+        <field name="condition">True</field>
+        <field name="type">ir.actions.server</field>
+        <field name="model_id" ref="model_crm_meeting"/>
+        <field name="state">code</field>
+        <field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
+    </record>
+    <record id="action_crm_meeting_unread" model="ir.values">
+        <field name="name">action_crm_meeting_unread</field>
+        <field name="action_id" ref="actions_server_crm_meeting_unread"/>
+        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_meeting_unread'))" />
+        <field name="key">action</field>
+        <field name="model_id" ref="model_crm_meeting" />
+        <field name="model">crm.meeting</field>
+        <field name="key2">client_action_multi</field>
+    </record>
+
+    <!-- CRM Meetings Types Form View -->
+
+    <record id="view_crm_meeting_type_tree" model="ir.ui.view">
+        <field name="name">Meeting Types Tree</field>
+        <field name="model">crm.meeting.type</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Meeting Types" editable="bottom">
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="action_crm_meeting_type" model="ir.actions.act_window">
+        <field name="name">Meeting Types</field>
+        <field name="res_model">crm.meeting.type</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="view_crm_meeting_type_tree"/>
+        <field name="help">Create different meeting categories to better organize and classify your meetings.</field>
+    </record>
+
+    <menuitem id="menu_crm_meeting_type" parent="base.menu_calendar_configuration" sequence="1"
+        action="action_crm_meeting_type" groups="base.group_no_one"/>
+
+    <!-- CRM Meetings Form View -->
+
+    <record model="ir.ui.view" id="view_crm_meeting_form">
+        <field name="name">CRM - Meetings Form</field>
+        <field name="model">crm.meeting</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Meetings" version="7.0">
+                <header>
+                    <button name="case_open" string="Confirm" type="object" class="oe_highlight"
+                            states="draft"/>
+                    <button name="case_close" string="Done" type="object" class="oe_highlight"
+                            states="open"/>
+                    <button name="case_reset" string="Reset to Unconfirmed" type="object" 
+                            states="cancel,done"/>
+                    <button name="case_cancel" string="Cancel" type="object"
+                            states="draft,open"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,open,done"/>
+                </header>
+                <sheet>
+                    <div class="oe_title">
+                        <div class="oe_edit_only">
+                            <label for="name" string="Title"/> 
+                            (<field name="allday" on_change="onchange_dates(date,False,False,allday)" class="oe_inline"/>
+                            <label for="allday" string="All Day?"/>)
+                        </div>
+                        <h1>
+                            <field name="name"/>
+                        </h1>
+                        <h2>
+                            <label for="date" string="Starting at"/>
+                            <field name="date" required="1" class="oe_inline"/>
+                            <label for="location" string="in" class="oe_inline" attrs="{'invisible': [('location', '=', False)]}"/>
+                            <field name="location" placeholder="Specify the location here" class="oe_inline"/>
+                        </h2>
+                        <h2>
+                            <label for="duration" string="Duration" />
+                            <field name="duration" widget="float_time"
+                                on_change="onchange_dates(date,duration,False,allday)"
+                                class="oe_inline"/> ( 
+                            <field name="date_deadline" 
+                                string="End Date" required="1"
+                                on_change="onchange_dates(date,False,date_deadline)"                            
+                                class="oe_inline"/> )
+                        </h2>
+                    </div>
+                    <group>
+                        <group>
+                            <field name="user_id" />
+                            <field name="organizer"/>
+                        </group>
+                        <group>
+                            <field name="alarm_id" string="Reminder" widget="selection" />
+                            <field name="class" string="Privacy"/>
+                            <field name="show_as" string="Show Time as"/>
+                            <field name="recurrency" string="Recurrence" attrs="{'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}"/>
+                        </group>
+                        <group>
+                            <field name="partner_id" string="Partner"
+                                on_change="onchange_partner_id(partner_id)" />
+                            <field name="email_from"/>
+                        </group>
+                        <group>
+                            <field name="categ_id" widget="selection"/>
+                            <field name="rrule" invisible="1" readonly="1"/>
+                            <field name="recurrent_id" invisible="1"/>
+                            <field name="recurrent_uid" invisible="1"/>
+                        </group>
+                    </group>
+                    <separator string="Description"/>
+                    <field name="description"/>
+                    <notebook>
+                        <page string="Invitation Detail">
+                            <button string="Invite People"
+                                name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
+                                icon="terp-partner" type="action"
+                                attrs="{'readonly': [('state', '=', 'done')]}"
+                                context="{'model' : 'crm.meeting', 'attendee_field':'attendee_ids'}" colspan="2"/>
+                            <field name="attendee_ids" widget="one2many" mode="tree">
+                                <tree string="Invitation details" editable="top">
+                                    <field name="sent_by_uid" string="From"/>
+                                    <field name="user_id" string="To"/>
+                                    <field name="email" string="Mail To"/>
+                                    <field name="role" />
+                                    <field name="state" />
+                                    <button name="do_tentative"
+                                        states="needs-action,declined,accepted"
+                                        string="Uncertain" type="object"
+                                        icon="terp-crm" />
+                                    <button name="do_accept" string="Accept"
+                                        states="needs-action,tentative,declined"
+                                        type="object" icon="gtk-apply" />
+                                    <button name="do_decline" string="Decline"
+                                        states="needs-action,tentative,accepted"
+                                        type="object" icon="gtk-cancel" />
+                                    <button
+                                        name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
+                                        string="Delegate" type="action"
+                                        icon="gtk-sort-descending"
+                                        states="needs-action,tentative,declined,accepted"
+                                        context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
+                                </tree>
+                                <form string="Invitation details" version="7.0">
+                                    <header>
+                                        <button name="do_tentative" type="object"
+                                            states="needs-action,declined,accepted"
+                                            string="Uncertain" icon="terp-crm" />
+                                        <button name="do_accept" type="object"
+                                            states="needs-action,tentative,declined"
+                                            string="Accept" icon="gtk-apply" />
+                                        <button name="do_decline" type="object"
+                                            states="needs-action,tentative,accepted"
+                                            string="Decline" icon="gtk-cancel" />
+                                        <button name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d" type="action"
+                                            states="needs-action,tentative,declined,accepted"
+                                            string="Delegate" icon="gtk-sort-descending"
+                                            context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
+                                        <field name="state" widget="statusbar" statusbar_visible="draft,open,done"/>
+                                    </header>
+                                    <group>
+                                        <group>
+                                            <field name="email" />
+                                            <field name="rsvp" />
+                                            <field name="cutype" />
+                                            <field name="role" />
+                                        </group>
+                                        <group>
+                                            <field name="user_id"/>
+                                        </group>
+                                    </group>
+                                </form>
+                            </field>
+                        </page>
+                        <page string="Recurrence Options"><!-- attrs="{'invisible': [('recurrency','=',False)], 'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">-->
+                            <group col="4" colspan="4" name="rrule">
+                                <group col="4" colspan="4">
+                                    <field name="rrule_type" string=" Recurrence Pattern" />
+                                    <field name="interval" />
+                                    <field name="end_type" />
+                                    <label string=" " colspan="2" />
+                                    <newline />
+                                    <field name="count" attrs="{'invisible' : [('end_type', '!=', 'count')] }"/>
+                                    <label string=" " colspan="2" />
+                                    <newline />
+                                    <field name="end_date" attrs="{'invisible' : [('end_type', '!=', 'end_date')], 'required': [('end_type', '=', 'end_date')]}"/>
+                                    <newline />
+                                </group>
+                                <group col="8" colspan="4" name="Select weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly'])]}">
+                                    <separator string="Choose day where repeat the meeting" colspan="8"/>
+                                    <field name="mo" colspan="1" />
+                                    <field name="tu" colspan="1" />
+                                    <field name="we" colspan="1" />
+                                    <field name="th" colspan="1" />
+                                    <newline/>
+                                    <field name="fr" colspan="1" />
+                                    <field name="sa" colspan="1"  />
+                                    <field name="su" colspan="1"  />
+                                    <newline />
+                                </group>
+                                <group col="10" colspan="4"
+                                    attrs="{'invisible' : [('rrule_type','!=','monthly')]}">
+                                    <separator string="Choose day in the month where repeat the meeting" colspan="12"/>
+                                    <group col="2" colspan="1">
+                                        <field name="select1" />
+                                    </group>
+                                    <group col="2" colspan="1">
+                                        <field name="day"
+                                            attrs="{'required' : [('select1','=','date'), ('rrule_type','=','monthly')],
+                                                'invisible' : [('select1','=','day')]}" />
+                                    </group>
+                                    <group col="3" colspan="1">
+                                        <field name="byday" string="The"
+                                            attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')], 'invisible' : [('select1','=','date')]}" />
+                                        <field name="week_list" nolabel="1"
+                                            attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')], 'invisible' : [('select1','=','date')]}" />
+                                    </group>
+                                </group>
+                            </group>
+                        </page>
+                    </notebook>
+                </sheet>
+                <footer>
+                    <field name="message_ids" widget="mail_thread"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+
+    <!-- CRM Meeting Tree View  -->
+
+    <record model="ir.ui.view" id="view_crm_meeting_tree">
+        <field name="name">CRM - Meetings Tree</field>
+        <field name="model">crm.meeting</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Meetings" fonts="bold:needaction_pending==True"
+                colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
+                <field name="name" string="Subject" />
+                <field name="user_id"/>
+                <field name="date"/>
+                <field name="state"/>
+                <field name="duration" />
+                <field name="partner_id" string="Partner" />
+                <field name="location" />
+                <field name="categ_id"/>
+                <field name="needaction_pending" invisible="1"/>
+            </tree>
+        </field>
+    </record>
+
+    <!-- CRM Meeting Calendar -->
+
+    <record model="ir.ui.view" id="view_crm_meeting_calendar">
+        <field name="name">CRM - Meetings Calendar</field>
+        <field name="model">crm.meeting</field>
+        <field name="type">calendar</field>
+        <field name="priority" eval="2"/>
+        <field name="arch" type="xml">
+            <calendar string="Meetings" date_start="date" color="user_id" date_stop="date_deadline" date_delay="duration">
+                <field name="name"/>
+                <field name="partner_id"/>
+            </calendar>
+        </field>
+    </record>
+
+    <!-- CRM Meeting Gantt  -->
+
+    <record id="view_crm_meeting_gantt" model="ir.ui.view">
+        <field name="name">CRM - Meetings Gantt</field>
+        <field name="model">crm.meeting</field>
+        <field name="type">gantt</field>
+        <field name="arch" type="xml">
+            <gantt date_delay="duration" date_start="date" string="Meetings"/>
+        </field>
+    </record>
+
+    <!-- CRM Meeting Search View  -->
+
+    <record id="view_crm_meeting_search" model="ir.ui.view">
+        <field name="name">CRM - Meetings Search</field>
+        <field name="model">crm.meeting</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Search Meetings">
+                <group>
+                    <field name="name" string="Meeting / Partner"
+                        filter_domain="['|',('name','ilike',self),('partner_id','ilike', self)]"/>
+                    <filter string="Inbox" help="Unread messages" icon="terp-mail-message-new"
+                        name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <separator orientation="vertical"/>
+                    <filter string="My Meetings" help="My Meetings" icon="terp-personal"
+                        domain="[('user_id','=',uid)]"/>
+                    <separator orientation="vertical"/>
+                    <field name="user_id"/>
+                    <field name="partner_id"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <!-- CRM Meetings action and menu -->
+
+    <record id="action_crm_meeting" model="ir.actions.act_window">
+        <field name="name">Meetings</field>
+        <field name="res_model">crm.meeting</field>
+        <field name="view_mode">calendar,tree,form,gantt</field>
+        <field name="view_id" ref="view_crm_meeting_calendar"/>
+        <field name="search_view_id" ref="view_crm_meeting_search"/>
+        <field name="context">{"calendar_default_user_id": uid}</field>
+        <field name="help">
+            The meeting calendar is shared between the sales teams and fully integrated with other applications
+            such as the employee holidays or the business opportunities.
+            You can also synchronize meetings with your mobile phone using the caldav interface.
+        </field>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_view_crm_meeting_calendar">
+        <field name="act_window_id" ref="action_crm_meeting"/>
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">calendar</field>
+        <field name="view_id" ref="view_crm_meeting_calendar"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_view_crm_meeting_tree">
+        <field name="act_window_id" ref="action_crm_meeting"/>
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="view_crm_meeting_tree"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_view_crm_meeting_form">
+        <field name="act_window_id" ref="action_crm_meeting"/>
+        <field name="sequence" eval="3"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="view_crm_meeting_form"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_view_crm_meeting_gantt">
+        <field name="act_window_id" ref="action_crm_meeting"/>
+        <field name="sequence" eval="4"/>
+        <field name="view_mode">gantt</field>
+        <field name="view_id" ref="view_crm_meeting_gantt"/>
+    </record>
+
+    <menuitem id="menu_crm_meeting" parent="base.menu_sales" sequence="8"
+        name="Meetings" action="action_crm_meeting"/>
+
+    </data>
+</openerp>
diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index 1b8148fe43b..d73939c759e 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -69,10 +69,10 @@
             <field name="name">Meetings</field>
             <field name="res_model">crm.meeting</field>
             <field name="view_mode">calendar,tree,form,gantt</field>
-            <field name="view_id" ref="crm.crm_case_tree_view_meet"/>
+            <field name="view_id" ref="base_calendar.view_crm_meeting_tree"/>
             <field name="context">{"calendar_default_user_id":uid}</field>
             <field name="domain">[('state','=','open'),('date','&gt;',datetime.date.today().strftime("%Y-%m-%d %H:%M:%S"))]</field>
-            <field name="search_view_id" ref="view_crm_case_meetings_filter"/>
+            <field name="search_view_id" ref="base_calendar.view_crm_meeting_search"/>
         </record>
 
         <record model="ir.ui.view" id="board_crm_statistical_form">
diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml
index e98b88e60fa..89da8d357f7 100644
--- a/addons/crm/crm_demo.xml
+++ b/addons/crm/crm_demo.xml
@@ -9,7 +9,7 @@
         <field name="name">Meetings</field>
         <field name="resource">ir.ui.menu</field>
         <field name="user_id" ref="base.user_demo"/>
-        <field name="res_id" ref="crm.menu_crm_case_categ_meet"/>
+        <field name="res_id" ref="base_calendar.menu_crm_meeting"/>
     </record>
 
     <record model="crm.case.section" id="section_sales_marketing_department">
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 015fa10c27f..adf15e93a89 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -764,43 +764,21 @@ class crm_lead(base_stage, osv.osv):
         }
 
     def action_makeMeeting(self, cr, uid, ids, context=None):
+        """ This opens Meeting's calendar view to schedule meeting on current Opportunity
+            @return : Dictionary value for created Meeting view
         """
-        This opens Meeting's calendar view to schedule meeting on current Opportunity
-        @return : Dictionary value for created Meeting view
-        """
-        if context is None:
-            context = {}
-        value = {}
-        data_obj = self.pool.get('ir.model.data')
-        for opp in self.browse(cr, uid, ids, context=context):
-            # Get meeting views
-            tree_view = data_obj.get_object_reference(cr, uid, 'crm', 'crm_case_tree_view_meet')
-            form_view = data_obj.get_object_reference(cr, uid, 'crm', 'crm_case_form_view_meet')
-            calander_view = data_obj.get_object_reference(cr, uid, 'crm', 'crm_case_calendar_view_meet')
-            search_view = data_obj.get_object_reference(cr, uid, 'crm', 'view_crm_case_meetings_filter')
-            context.update({
-                'default_opportunity_id': opp.id,
-                'default_partner_id': opp.partner_id and opp.partner_id.id or False,
-                'default_user_id': uid,
-                'default_section_id': opp.section_id and opp.section_id.id or False,
-                'default_email_from': opp.email_from,
-                'default_state': 'open',
-                'default_name': opp.name
-            })
-            value = {
-                'name': _('Meetings'),
-                'context': context,
-                'view_type': 'form',
-                'view_mode': 'calendar,form,tree',
-                'res_model': 'crm.meeting',
-                'view_id': False,
-                'views': [(calander_view and calander_view[1] or False, 'calendar'), (form_view and form_view[1] or False, 'form'), (tree_view and tree_view[1] or False, 'tree')],
-                'type': 'ir.actions.act_window',
-                'search_view_id': search_view and search_view[1] or False,
-                'nodestroy': True
-            }
-        return value
-
+        opportunity = self.browse(cr, uid, ids[0], context)
+        res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'base_calendar', 'action_crm_meeting', context)
+        res['context'] = {
+            'default_opportunity_id': opportunity.id,
+            'default_partner_id': opportunity.partner_id and opportunity.partner_id.id or False,
+            'default_user_id': uid,
+            'default_section_id': opportunity.section_id and opportunity.section_id.id or False,
+            'default_email_from': opportunity.email_from,
+            'default_state': 'open',
+            'default_name': opportunity.name,
+        }
+        return res
 
     def unlink(self, cr, uid, ids, context=None):
         for lead in self.browse(cr, uid, ids, context):
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 3da817e8611..aec88a5748e 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -1,102 +1,9 @@
 <?xml version="1.0"?>
 <openerp>
 <data>
-    <act_window
-        id="crm_case_categ_meet_create_partner"
-        name="Schedule a Meeting"
-        res_model="crm.meeting"
-        view_mode="calendar,tree,form,gantt"
-        context="{'default_partner_id': active_id, 'default_duration': 4.0}"
-    />
-
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet_partner">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view_meet"/>
-        <field name="act_window_id" ref="crm_case_categ_meet_create_partner"/>
-    </record>
-
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_meet_partner">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view_meet"/>
-        <field name="act_window_id" ref="crm_case_categ_meet_create_partner"/>
-    </record>
-
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_meet_partner">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="crm_case_form_view_meet"/>
-        <field name="act_window_id" ref="crm_case_categ_meet_create_partner"/>
-    </record>
-
-    <record model="ir.actions.act_window.view" id="action_crm_tag_gantt_meet_partner">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">gantt</field>
-        <field name="view_id" ref="crm_case_gantt_view_meet"/>
-        <field name="act_window_id" ref="crm_case_categ_meet_create_partner"/>
-    </record>
-
-    <record model="ir.actions.act_window" id="crm_case_categ_meet">
-        <field name="name">Meetings</field>
-        <field name="res_model">crm.meeting</field>
-        <field name="view_mode">calendar,tree,form,gantt</field>
-        <field name="view_id" ref="crm_case_calendar_view_meet"/>
-        <field name="context">{"calendar_default_user_id":uid}</field>
-        <field name="search_view_id" ref="view_crm_case_meetings_filter"/>
-        <field name="help">The meeting calendar is shared between the sales teams and fully integrated with other applications such as the employee holidays or the business opportunities. You can also synchronize meetings with your mobile phone using the caldav interface.
-        </field>
-    </record>
-
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view_meet"/>
-        <field name="act_window_id" ref="crm_case_categ_meet"/>
-    </record>
-
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_meet">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view_meet"/>
-        <field name="act_window_id" ref="crm_case_categ_meet"/>
-    </record>
-
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form__meet">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="crm_case_form_view_meet"/>
-        <field name="act_window_id" ref="crm_case_categ_meet"/>
-    </record>
-
-    <record model="ir.actions.act_window.view" id="action_crm_tag_gantt_meet">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">gantt</field>
-        <field name="view_id" ref="crm_case_gantt_view_meet"/>
-        <field name="act_window_id" ref="crm_case_categ_meet"/>
-    </record>
-
-<!-- ALL MEETINGS -->
 
     <menuitem name="Import &amp; Synchronize" id="base.menu_import_crm"
         parent="base.menu_base_partner"/>
 
-    <menuitem name="Meetings" id="menu_crm_case_categ_meet"
-        action="crm_case_categ_meet" parent="base.menu_sales"
-        sequence="8" />
-
-    <record id="action_view_attendee_form" model="ir.actions.act_window">
-         <field name="name">Meeting Invitations</field>
-         <field name="type">ir.actions.act_window</field>
-         <field name="res_model">calendar.attendee</field>
-         <field name="view_type">form</field>
-         <field name="view_mode">tree,form</field>
-         <field name="view_id" ref="base_calendar.base_calendar_attendee_tree_view" />
-        <field name="domain">[('ref','like','crm.meeting,')]</field>
-         <field name="context">{"search_default_toreview":1, "search_default_user_id":uid}</field>
-        <field name="help">With Meeting Invitations you can create and manage the meeting invitations sent/to be sent to your colleagues/partners. You can not only invite OpenERP users, but also external parties, such as a customer.</field>
-     </record>
-
-
 </data>
 </openerp>
diff --git a/addons/crm/crm_meeting_shortcut_data.xml b/addons/crm/crm_meeting_shortcut_data.xml
index 0f75c9e91ab..45488da8a82 100644
--- a/addons/crm/crm_meeting_shortcut_data.xml
+++ b/addons/crm/crm_meeting_shortcut_data.xml
@@ -6,7 +6,7 @@
             <field name="name">Meetings</field>
             <field name="resource">ir.ui.menu</field>
             <field name="user_id" ref="base.user_root"/>
-            <field name="res_id" ref="crm.menu_crm_case_categ_meet"/>
+            <field name="res_id" ref="base_calendar.menu_crm_meeting"/>
         </record>
 
     </data>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index b76876b8bac..f7c2ada05f2 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -2,367 +2,48 @@
 <openerp>
     <data>
 
-    <!-- Read/Unread actions -->
-    <record id="actions_server_crm_meeting_unread" model="ir.actions.server">
-        <field name="name">Mark unread</field>
-        <field name="condition">True</field>
-        <field name="type">ir.actions.server</field>
-        <field name="model_id" ref="model_crm_meeting"/>
-        <field name="state">code</field>
-        <field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
-    </record>
-    <record id="action_crm_meeting_unread" model="ir.values">
-        <field name="name">action_crm_meeting_unread</field>
-        <field name="action_id" ref="actions_server_crm_meeting_unread"/>
-        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_meeting_unread'))" />
-        <field name="key">action</field>
-        <field name="model_id" ref="model_crm_meeting" />
-        <field name="model">crm.meeting</field>
-        <field name="key2">client_action_multi</field>
-    </record>
-
-    <record id="actions_server_crm_meeting_read" model="ir.actions.server">
-        <field name="name">Mark read</field>
-        <field name="condition">True</field>
-        <field name="type">ir.actions.server</field>
-        <field name="model_id" ref="model_crm_meeting"/>
-        <field name="state">code</field>
-        <field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
-    </record>
-    <record id="action_crm_meeting_read" model="ir.values">
-        <field name="name">action_crm_meeting_read</field>
-        <field name="action_id" ref="actions_server_crm_meeting_read"/>
-        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_meeting_read'))" />
-        <field name="key">action</field>
-        <field name="model_id" ref="model_crm_meeting" />
-        <field name="model">crm.meeting</field>
-        <field name="key2">client_action_multi</field>
-    </record>
-
-    <!-- CRM Meetings Types Form View -->
-
-    <record id="crm_meeting_type_tree" model="ir.ui.view">
-        <field name="name">Meeting Types Tree</field>
-        <field name="model">crm.meeting.type</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Meeting Types" editable="bottom">
-                <field name="name"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="crm_meeting_categ_action" model="ir.actions.act_window">
-        <field name="name">Meeting Types</field>
-        <field name="res_model">crm.meeting.type</field>
-        <field name="view_type">form</field>
-        <field name="view_id" ref="crm_meeting_type_tree"/>
-        <field name="help">Create different meeting categories to better organize and classify your meetings.</field>
-    </record>
-
-    <menuitem id="menu_crm_case_meeting-act" parent="base.menu_calendar_configuration" sequence="1"
-        action="crm_meeting_categ_action" groups="base.group_no_one"/>
-
     <!-- CRM Meetings Form View -->
 
-    <record model="ir.ui.view" id="crm_case_form_view_meet">
+    <record model="ir.ui.view" id="view_crm_meeting_form">
         <field name="name">CRM - Meetings Form</field>
         <field name="model">crm.meeting</field>
         <field name="type">form</field>
+        <field name="inherit_id" ref="base_calendar.view_crm_meeting_form"/>
         <field name="arch" type="xml">
-            <form string="Meetings" version="7.0">
-                <header>
-                    <button name="case_open" string="Confirm" type="object" class="oe_highlight"
-                            states="draft"/>
-                    <button name="case_close" string="Done" type="object" class="oe_highlight"
-                            states="open"/>
-                    <button name="case_reset" string="Reset to Unconfirmed" type="object" 
-                            states="cancel,done"/>
-                    <button name="case_cancel" string="Cancel" type="object"
-                            states="draft,open"/>
-                    <field name="state" widget="statusbar" statusbar_visible="draft,open,done"/>
-                </header>
-                <sheet>
-                    <div class="oe_title">
-                        <div class="oe_edit_only">
-                            <label for="name" string="Title"/> 
-                            (<field name="allday" on_change="onchange_dates(date,False,False,allday)" class="oe_inline"/>
-                            <label for="allday" string="All Day?"/>)
-                        </div>
-                        <h1>
-                            <field name="name"/>
-                        </h1>
-                    </div>
-                    <group>
-                        <h2>
-                            <label for="date" string="Starting at"/>
-                            <field name="date" required="1" class="oe_inline"/>
-                            <label string="in" class="oe_inline" attrs="{'invisible': [('location', '=', False)]}"/> <field name="location" placeholder="Specify the location here" class="oe_inline"/>
-                        </h2>
-                    </group>
-                    <group>
-                        <h2>
-                            <label for="duration" string="Duration" />
-                            <field name="duration" widget="float_time"
-                                on_change="onchange_dates(date,duration,False,allday)"
-                                class="oe_inline"/> ( 
-                            <field name="date_deadline" 
-                                string="End Date" required="1"
-                                on_change="onchange_dates(date,False,date_deadline)"                            
-                                class="oe_inline"/> )
-                        </h2>
-                    </group>
-                <group colspan="4" col="4">
-                    <group colspan="2">
-                        <field name="user_id" />
-                        <field name="organizer"/>
-                        <field name="section_id" widget="selection"/>
-                    </group>
-                    <group colspan="2">
-                        <field name="alarm_id" string="Reminder" widget="selection" />
-                        <field name="class" string="Privacy"/>
-                        <field name="show_as" string="Show Time as"/>
-                        <field name="recurrency" string="Recurrence" attrs="{'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}"/>
-                    </group>
-                    <group colspan="2">
-                        <field name="partner_id" string="Partner"
-                            on_change="onchange_partner_id(partner_id)" />
-                        <field name="email_from"/>
-                    </group>
-                    <group colspan="2">
-                        <field name="categ_id" widget="selection"/>
-                        <field name="rrule" invisible="1" readonly="1"/>
-                        <field name="recurrent_id" invisible="1"/>
-                        <field name="recurrent_uid" invisible="1"/>
-                    </group>
-                </group>
-                <separator string="Description" colspan="4" />
-                <field name="description" nolabel="1" colspan="4" />
-                <notebook>
-                    <page string="Invitation Detail">
-                        <button string="Invite People"
-                            name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                            icon="terp-partner" type="action"
-                            attrs="{'readonly': [('state', '=', 'done')]}"
-                            context="{'model' : 'crm.meeting', 'attendee_field':'attendee_ids'}" colspan="2"/>
-                        <field name="attendee_ids" colspan="4"
-                            nolabel="1" widget="one2many" mode="tree">
-                            <tree string="Invitation details" editable="top">
-                                <field name="sent_by_uid" string="From"/>
-                                <field name="user_id" string="To"/>
-                                <field name="email" string="Mail To"/>
-                                <field name="role" />
-                                <field name="state" />
-                                <button name="do_tentative"
-                                    states="needs-action,declined,accepted"
-                                    string="Uncertain" type="object"
-                                    icon="terp-crm" />
-                                <button name="do_accept" string="Accept"
-                                    states="needs-action,tentative,declined"
-                                    type="object" icon="gtk-apply" />
-                                <button name="do_decline" string="Decline"
-                                    states="needs-action,tentative,accepted"
-                                    type="object" icon="gtk-cancel" />
-                                <button
-                                    name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                                    string="Delegate" type="action"
-                                    icon="gtk-sort-descending"
-                                    states="needs-action,tentative,declined,accepted"
-                                    context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
-                            </tree>
-                            <form string="Invitation details" version="7.0">
-                                <notebook colspan="4">
-                                    <page string="Details">
-                                        <field name="email" />
-                                        <field name="rsvp" />
-                                        <field name="cutype" />
-                                        <field name="role" />
-                                        <separator colspan="4" string="" />
-                                        <group col="6" colspan="4">
-                                            <field name="state" />
-                                            <button name="do_tentative"
-                                                states="needs-action,declined,accepted"
-                                                string="Uncertain"
-                                                type="object"
-                                                icon="terp-crm" />
-                                            <button name="do_accept"
-                                                string="Accept"
-                                                states="needs-action,tentative,declined"
-                                                type="object"
-                                                icon="gtk-apply" />
-                                            <button name="do_decline"
-                                                string="Decline"
-                                                states="needs-action,tentative,accepted"
-                                                type="object"
-                                                icon="gtk-cancel" />
-                                            <button
-                                                name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                                                string="Delegate"
-                                                type="action"
-                                                icon="gtk-sort-descending"
-                                                states="needs-action,tentative,declined,accepted"
-                                                context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
-                                        </group>
-                                    </page>
-                                    <page string="Other">
-                                        <field name="user_id"/>
-                                        <newline />
-                                    </page>
-                                </notebook>
-                            </form>
-                        </field>
-                    </page>
-                    <page string="Recurrence Options"><!-- attrs="{'invisible': [('recurrency','=',False)], 'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">-->
-                        <group col="4" colspan="4" name="rrule">
-                            <group col="4" colspan="4">
-                                <field name="rrule_type" string=" Recurrence Pattern" />
-                                <field name="interval" />
-                                <field name="end_type" />
-                                <label string=" " colspan="2" />
-                                <newline />
-                                <field name="count" attrs="{'invisible' : [('end_type', '!=', 'count')] }"/>
-                                <label string=" " colspan="2" />
-                                <newline />
-                                <field name="end_date" attrs="{'invisible' : [('end_type', '!=', 'end_date')], 'required': [('end_type', '=', 'end_date')]}"/>
-                                <newline />
-
-
-                            </group>
-                            <group col="8" colspan="4" name="Select weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly'])]}">
-                                <separator string="Choose day where repeat the meeting" colspan="8"/>
-                                <field name="mo" colspan="1" />
-                                <field name="tu" colspan="1" />
-                                <field name="we" colspan="1" />
-                                <field name="th" colspan="1" />
-                                <newline/>
-                                <field name="fr" colspan="1" />
-                                <field name="sa" colspan="1"  />
-                                <field name="su" colspan="1"  />
-                                <newline />
-                            </group>
-                            <group col="10" colspan="4"
-                                attrs="{'invisible' : [('rrule_type','!=','monthly')]}">
-                                <separator string="Choose day in the month where repeat the meeting" colspan="12"/>
-                                <group col="2" colspan="1">
-                                    <field name="select1" />
-                                </group>
-                                <group col="2" colspan="1">
-                                    <field name="day"
-                                        attrs="{'required' : [('select1','=','date'), ('rrule_type','=','monthly')],
-                                            'invisible' : [('select1','=','day')]}" />
-                                </group>
-                                <group col="3" colspan="1">
-                                    <field name="byday" string="The"
-                                        attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')], 'invisible' : [('select1','=','date')]}" />
-                                    <field name="week_list" nolabel="1"
-                                        attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')], 'invisible' : [('select1','=','date')]}" />
-                                </group>
-                            </group>
-                        </group>
-
-                    </page>
-                </notebook>
-                </sheet>
-                <footer>
-                    <field name="message_ids" widget="mail_thread"/>
-                </footer>
-            </form>
-        </field>
-    </record>
-
-    <!-- CRM Meeting Tree View  -->
-
-    <record model="ir.ui.view" id="crm_case_tree_view_meet">
-        <field name="name">CRM - Meetings Tree</field>
-        <field name="model">crm.meeting</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Meetings" fonts="bold:needaction_pending==True"
-                colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
-                <field name="name" string="Subject" />
-                <field name="user_id"/>
-                <field name="date"/>
-                <field name="state"/>
-                <field name="duration" />
-                <field name="partner_id" string="Partner" />
-                <field name="location" />
-                <field name="categ_id"/>
-                <field name="needaction_pending" invisible="1"/>
-            </tree>
+            <field name="organizer" position="after">
+                <field name="section_id" widget="selection"/>
+            </field>
         </field>
     </record>
 
     <!-- CRM Meeting Calendar -->
 
-    <record model="ir.ui.view" id="crm_case_calendar_view_meet">
+    <record model="ir.ui.view" id="view_crm_meeting_calendar">
         <field name="name">CRM - Meetings Calendar</field>
         <field name="model">crm.meeting</field>
         <field name="type">calendar</field>
+        <field name="inherit_id" ref="base_calendar.view_crm_meeting_calendar"/>
         <field name="priority" eval="2"/>
         <field name="arch" type="xml">
-            <calendar string="Meetings" date_start="date" color="user_id" date_stop="date_deadline" date_delay="duration">
-                <field name="name"/>
-                <field name="partner_id"/>
+            <field name="partner_id" position="after">
                 <field name="section_id" widget="selection"/>
-            </calendar>
-        </field>
-    </record>
-
-    <!-- CRM Meeting Gantt  -->
-
-    <record id="crm_case_gantt_view_meet" model="ir.ui.view">
-        <field name="name">CRM - Meetings Gantt</field>
-        <field name="model">crm.meeting</field>
-        <field name="type">gantt</field>
-        <field name="arch" type="xml">
-            <gantt date_delay="duration" date_start="date" string="Meetings">
-            </gantt>
-        </field>
-    </record>
-
-    <!-- CRM Meeting Search View  -->
-
-    <record id="view_crm_case_meetings_filter" model="ir.ui.view">
-        <field name="name">CRM - Meetings Search</field>
-        <field name="model">crm.meeting</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-                <search string="Search Meetings">
-                       <group>
-                            <filter icon="terp-mail-message-new"
-			                   string="Inbox" help="Unread messages"
-			                   name="needaction_pending"
-			                   domain="[('needaction_pending','=',True)]"/>
-                           <separator orientation="vertical"/>
-                           <field name="name" string="Meeting / Partner"
-                               filter_domain="['|',('name','ilike',self),('partner_id','ilike', self)]"/>
-                           <separator orientation="vertical"/>
-                           <filter string="My Meetings"
-                                   icon="terp-personal"
-                                   domain="[('user_id','=',uid)]"
-                                   help="My Meetings" />
-                           <separator orientation="vertical"/>   
-                           <field name="user_id"/>
-                           <field name="partner_id"/>
-                       </group>
-                </search>
             </field>
-        </record>
+        </field>
+    </record>
 
-        <!-- Calendar Attendee Form View -->
+    <!-- Calendar Attendee Form View -->
 
-        <record id="attendee_form_view_inherit" model="ir.ui.view">
-                <field name="name">calendar.attendee.form.inherit</field>
-                <field name="model">calendar.attendee</field>
-                <field name="type">form</field>
-                <field name="inherit_id" ref="base_calendar.base_calendar_attendee_form_view"/>
-                <field name="arch" type="xml">
-                    <field name="ref" position="after">
-                        <field name="categ_id" string="Event Type"/>
-                    </field>
+    <record id="attendee_form_view_inherit" model="ir.ui.view">
+            <field name="name">calendar.attendee.form.inherit</field>
+            <field name="model">calendar.attendee</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base_calendar.base_calendar_attendee_form_view"/>
+            <field name="arch" type="xml">
+                <field name="ref" position="after">
+                    <field name="categ_id" string="Event Type"/>
                 </field>
-        </record>
-
+            </field>
+    </record>
 
     </data>
 </openerp>
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 13991245eda..facd0baba8a 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -241,49 +241,20 @@ class crm_phonecall(base_state, osv.osv):
         return opportunity_dict
 
     def action_make_meeting(self, cr, uid, ids, context=None):
+        """ This opens Meeting's calendar view to schedule meeting on current Phonecall
+            @return : Dictionary value for created Meeting view
         """
-        This opens Meeting's calendar view to schedule meeting on current Phonecall
-        @return : Dictionary value for created Meeting view
-        """
-        value = {}
-        for phonecall in self.browse(cr, uid, ids, context=context):
-            data_obj = self.pool.get('ir.model.data')
-
-            # Get meeting views
-            result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
-            res = data_obj.read(cr, uid, result, ['res_id'])
-            id1 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_view_meet')
-            id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_meet')
-            id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_meet')
-            if id1:
-                id1 = data_obj.browse(cr, uid, id1, context=context).res_id
-            if id2:
-                id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-            if id3:
-                id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-
-            context = {
-                        'default_phonecall_id': phonecall.id,
-                        'default_partner_id': phonecall.partner_id and phonecall.partner_id.id or False,
-                        'default_email': phonecall.email_from ,
-                        'default_name': phonecall.name
-                    }
-
-            value = {
-                'name': _('Meetings'),
-                'domain' : "[('user_id','=',%s)]" % (uid),
-                'context': context,
-                'view_type': 'form',
-                'view_mode': 'calendar,form,tree',
-                'res_model': 'crm.meeting',
-                'view_id': False,
-                'views': [(id1, 'calendar'), (id2, 'form'), (id3, 'tree')],
-                'type': 'ir.actions.act_window',
-                'search_view_id': res['res_id'],
-                'nodestroy': True
-                }
-
-        return value
+        phonecall = self.browse(cr, uid, ids[0], context)
+        res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'base_calendar', 'action_crm_meeting', context)
+        res['context'] = {
+            'default_phonecall_id': phonecall.id,
+            'default_partner_id': phonecall.partner_id and phonecall.partner_id.id or False,
+            'default_user_id': uid,
+            'default_email_from': phonecall.email_from,
+            'default_state': 'open',
+            'default_name': phonecall.name,
+        }
+        return res
     
     # ----------------------------------------
     # OpenChatter
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 69f71c95405..49361097308 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -127,7 +127,7 @@
                 <xpath expr="//div[@name='buttons']" position="inside">
                     <button type="action"
                         string="Schedule a Meeting"
-                        name="%(crm.crm_case_categ_meet_create_partner)d"
+                        name="%(base_calendar.action_crm_meeting)d"
                         context="{'search_default_partner_id': active_id, 'default_duration': 4.0}"/>
                     <button type="action" string="Schedule a Call" 
                         name="%(crm.crm_case_categ_phone_create_partner)d" 
diff --git a/addons/crm/wizard/crm_phonecall_to_meeting.py b/addons/crm/wizard/crm_phonecall_to_meeting.py
index 9e902142c94..a01765220b8 100644
--- a/addons/crm/wizard/crm_phonecall_to_meeting.py
+++ b/addons/crm/wizard/crm_phonecall_to_meeting.py
@@ -41,58 +41,23 @@ class crm_phonecall2meeting(osv.osv_memory):
         return {'type':'ir.actions.act_window_close'}
 
     def action_make_meeting(self, cr, uid, ids, context=None):
+        """ This opens Meeting's calendar view to schedule meeting on current Phonecall
+            @return : Dictionary value for created Meeting view
         """
-        This opens Meeting's calendar view to schedule meeting on current Phonecall
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Phonecall to Meeting IDs
-        @param context: A standard dictionary for contextual values
-
-        @return : Dictionary value for created Meeting view
-        """
-        value = {}
-        record_id = context and context.get('active_id', False) or False
-
-        if record_id:
-            phonecall_obj = self.pool.get('crm.phonecall')
-            data_obj = self.pool.get('ir.model.data')
-
-            # Get meeting views
-            result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
-            res = data_obj.read(cr, uid, result, ['res_id'])
-            id1 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_view_meet')
-            id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_meet')
-            id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_meet')
-            if id1:
-                id1 = data_obj.browse(cr, uid, id1, context=context).res_id
-            if id2:
-                id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-            if id3:
-                id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-
-            phonecall = phonecall_obj.browse(cr, uid, record_id, context=context)
-            context = {
-                        'default_phonecall_id': phonecall.id,
-                        'default_partner_id': phonecall.partner_id and phonecall.partner_id.id or False,
-                        'default_email': phonecall.email_from ,
-                        'default_name': phonecall.name
-                    }
-
-            value = {
-                'name': _('Meetings'),
-                'domain' : "[('user_id','=',%s)]" % (uid),
-                'context': context,
-                'view_type': 'form',
-                'view_mode': 'calendar,form,tree',
-                'res_model': 'crm.meeting',
-                'view_id': False,
-                'views': [(id1, 'calendar'), (id2, 'form'), (id3, 'tree')],
-                'type': 'ir.actions.act_window',
-                'search_view_id': res['res_id']
-                }
-
-        return value
+        res = {}
+        phonecall_id = context and context.get('active_id', False) or False
+        if phonecall_id:
+            phonecall = self.pool.get('crm.phonecall').browse(cr, uid, phonecall_id, context)
+            res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'base_calendar', 'action_crm_meeting', context)
+            res['context'] = {
+                'default_phonecall_id': phonecall.id,
+                'default_partner_id': phonecall.partner_id and phonecall.partner_id.id or False,
+                'default_user_id': uid,
+                'default_email_from': phonecall.email_from,
+                'default_state': 'open',
+                'default_name': phonecall.name,
+            }
+        return res
 
 crm_phonecall2meeting()
 
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index cf04fb918df..a3cd2f3a629 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -289,49 +289,22 @@ class hr_applicant(base_stage, osv.Model):
         return False
 
     def action_makeMeeting(self, cr, uid, ids, context=None):
+        """ This opens Meeting's calendar view to schedule meeting on current applicant
+            @return: Dictionary value for created Meeting view
         """
-        This opens Meeting's calendar view to schedule meeting on current Opportunity
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Opportunity to Meeting IDs
-        @param context: A standard dictionary for contextual values
-
-        @return: Dictionary value for created Meeting view
-        """
-        data_obj = self.pool.get('ir.model.data')
-        if context is None:
-            context = {}
-        value = {}
-        for opp in self.browse(cr, uid, ids, context=context):
-            # Get meeting views
-            search_view = data_obj.get_object(cr, uid, 'crm', 'view_crm_case_meetings_filter', context)
-            calendar_view = data_obj.get_object(cr, uid, 'crm', 'crm_case_calendar_view_meet', context)
-            form_view = data_obj.get_object(cr, uid, 'crm', 'crm_case_form_view_meet', context)
-            tree_view = data_obj.get_object(cr, uid, 'crm', 'crm_case_tree_view_meet', context)
-            category = data_obj.get_object(cr, uid, 'hr_recruitment', 'categ_meet_interview', context)
-            context.update({
-                'default_applicant_id': opp.id,
-                'default_partner_id': opp.partner_id and opp.partner_id.id or False,
-                'default_email_from': opp.email_from,
-                'default_state': 'open',
-                'default_categ_id': category.id,
-                'default_name': opp.name,
-            })
-            value = {
-                'name': ('Meetings'),
-                'domain': "[('user_id','=',%s)]" % (uid),
-                'context': context,
-                'view_type': 'form',
-                'view_mode': 'calendar,form,tree',
-                'res_model': 'crm.meeting',
-                'view_id': False,
-                'views': [(calendar_view.id, 'calendar'), (form_view.id, 'form'), (tree_view.id, 'tree')],
-                'type': 'ir.actions.act_window',
-                'search_view_id': search_view.id,
-                'nodestroy': True,
-            }
-        return value
+        applicant = self.browse(cr, uid, ids[0], context)
+        category = self.pool.get('ir.model.data').get_object(cr, uid, 'hr_recruitment', 'categ_meet_interview', context)
+        res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'base_calendar', 'action_crm_meeting', context)
+        res['context'] = {
+            'default_applicant_id': applicant.id,
+            'default_partner_id': applicant.partner_id and applicant.partner_id.id or False,
+            'default_user_id': uid,
+            'default_email_from': applicant.email_from,
+            'default_state': 'open',
+            'default_name': applicant.name,
+            'default_categ_id': category.id,
+        }
+        return res
 
     def action_print_survey(self, cr, uid, ids, context=None):
         """
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 7e683970fb9..9118fb05ea1 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -505,21 +505,15 @@
             action="hr_recruitment_source_action"
             sequence="10" groups="base.group_no_one"/>
 
-    <record model="ir.ui.view" id="crm_meeting_form_view">
+    <record model="ir.ui.view" id="view_crm_meeting_form">
         <field name="name">CRM - Meetings Form</field>
         <field name="model">crm.meeting</field>
         <field name="type">form</field>
-        <field name="inherit_id" ref="crm.crm_case_form_view_meet"/>
+        <field name="inherit_id" ref="base_calendar.view_crm_meeting_form"/>
         <field name="arch" type="xml">
             <field name="partner_id" position="before">
                 <field name="applicant_id" attrs="{'invisible': [('categ_id','!=',%(hr_recruitment.categ_meet_interview)d)]}"/>
             </field>
-            <field name="partner_id" position="attributes">
-                <attribute name="attrs">{'invisible': [('categ_id','=',%(hr_recruitment.categ_meet_interview)d)]}</attribute>
-            </field>
-            <field name="section_id" position="attributes">
-                <attribute name="attrs">{'invisible': [('categ_id','=',%(hr_recruitment.categ_meet_interview)d)]}</attribute>
-            </field>
         </field>
     </record>
 
diff --git a/addons/import_google/sync_google_calendar_view.xml b/addons/import_google/sync_google_calendar_view.xml
index 84f0176c5ec..bbcf297068e 100644
--- a/addons/import_google/sync_google_calendar_view.xml
+++ b/addons/import_google/sync_google_calendar_view.xml
@@ -5,7 +5,7 @@
             <field name="name">CRM - Meetings Form (Inherited)</field>
             <field name="model">crm.meeting</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="crm.crm_case_form_view_meet"/>
+            <field name="inherit_id" ref="base_calendar.view_crm_meeting_form"/>
             <field name="arch" type="xml">
                 <field name="categ_id" position="replace">
                    <field name="categ_id" widget="selection"
@@ -19,7 +19,7 @@
             <field name="name">CRM - Meetings Tree (Inherited)</field>
             <field name="model">crm.meeting</field>
             <field name="type">tree</field>
-            <field name="inherit_id" ref="crm.crm_case_tree_view_meet"/>
+            <field name="inherit_id" ref="base_calendar.view_crm_meeting_tree"/>
             <field name="arch" type="xml">
                <field name="categ_id" position="replace">
                    <field name="categ_id" widget="selection"

From 9195edf76ca1eff140e05b54fba03ce3ceecdf35 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 6 Jul 2012 14:43:14 +0200
Subject: [PATCH 195/239] [FIX] import_google: adapt extension of
 crm.meeting.type

bzr revid: rco@openerp.com-20120706124314-n8qinysgh9wjf3rn
---
 addons/import_google/partner.py               |  8 ++++----
 .../sync_google_calendar_view.xml             | 20 ++-----------------
 addons/import_google/wizard/import_google.py  |  8 ++++----
 3 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/addons/import_google/partner.py b/addons/import_google/partner.py
index 232f18d06a3..e7aa4dd8ca7 100644
--- a/addons/import_google/partner.py
+++ b/addons/import_google/partner.py
@@ -21,11 +21,11 @@
 
 from osv import fields,osv
 
-class crm_case_categ(osv.osv):
-    """ Category of Case """
-    _inherit = "crm.case.categ"
+class crm_meeting_type(osv.osv):
+    """ Meeting Types """
+    _inherit = "crm.meeting.type"
     _columns = {
         'user_id': fields.many2one('res.users', 'User')
     }
-crm_case_categ()
+
 # vim:expandtab:smartindent:toabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/import_google/sync_google_calendar_view.xml b/addons/import_google/sync_google_calendar_view.xml
index bbcf297068e..626d803d4df 100644
--- a/addons/import_google/sync_google_calendar_view.xml
+++ b/addons/import_google/sync_google_calendar_view.xml
@@ -1,30 +1,14 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-        <record model="ir.ui.view" id="crm_case_form_view_meet_inherit">
+        <record model="ir.ui.view" id="view_crm_meeting_form">
             <field name="name">CRM - Meetings Form (Inherited)</field>
             <field name="model">crm.meeting</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base_calendar.view_crm_meeting_form"/>
             <field name="arch" type="xml">
                 <field name="categ_id" position="replace">
-                   <field name="categ_id" widget="selection"
-                          string="Meeting Type"
-                          domain="[('object_id.model', '=', 'crm.meeting'),('user_id','in',[uid, False])]" />
-                </field>
-            </field>
-        </record>
-        
-        <record model="ir.ui.view" id="crm_case_tree_view_meet_inherit">
-            <field name="name">CRM - Meetings Tree (Inherited)</field>
-            <field name="model">crm.meeting</field>
-            <field name="type">tree</field>
-            <field name="inherit_id" ref="base_calendar.view_crm_meeting_tree"/>
-            <field name="arch" type="xml">
-               <field name="categ_id" position="replace">
-                   <field name="categ_id" widget="selection"
-                          string="Meeting Type"
-                          domain="[('object_id.model', '=', 'crm.meeting'),('user_id','in',[uid, False])]" />
+                    <field name="categ_id" widget="selection" domain="[('user_id', 'in', [uid, False])]"/>
                 </field>
             </field>
         </record>
diff --git a/addons/import_google/wizard/import_google.py b/addons/import_google/wizard/import_google.py
index 9a9b2802826..c34a14e224d 100644
--- a/addons/import_google/wizard/import_google.py
+++ b/addons/import_google/wizard/import_google.py
@@ -235,10 +235,10 @@ class google_import(import_framework):
 
 
     def get_event_category(self, val, name):
-        fields = ['name', 'object_id']
-        nameid = 'event_category_'+name
-        data = [name, 'crm.meeting']
-        return self.import_object(fields, data, 'crm.case.categ', "crm_case_categ", nameid, [('name', 'ilike', name)])
+        nameid = 'event_category_' + name
+        fields = ['name']
+        data = [name]
+        return self.import_object(fields, data, 'crm.meeting.type', "crm_meeting_type", nameid, [('name', 'ilike', name)])
 
     def get_rec(self, val):
         if val.get("recurrency"):

From b52e4ce84035f56184f00843f4fd4fb9f62ecbb4 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 6 Jul 2012 15:09:20 +0200
Subject: [PATCH 196/239] [IMP] hr_recruitment, import_google: remove
 dependency on module crm

bzr revid: rco@openerp.com-20120706130920-wj44bogblyt6kenq
---
 addons/hr_recruitment/__openerp__.py               | 2 +-
 addons/hr_recruitment/security/ir.model.access.csv | 3 +--
 addons/import_google/__openerp__.py                | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index a340cc18dc7..e5df8cf2bf3 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -42,7 +42,7 @@ system to store and search in your CV base.
         'decimal_precision',
         'hr',
         'survey',
-        'crm',
+        'base_calendar',
         'fetchmail',
     ],
     'update_xml': [
diff --git a/addons/hr_recruitment/security/ir.model.access.csv b/addons/hr_recruitment/security/ir.model.access.csv
index 6bbc30b7b41..7d082070be5 100644
--- a/addons/hr_recruitment/security/ir.model.access.csv
+++ b/addons/hr_recruitment/security/ir.model.access.csv
@@ -6,7 +6,6 @@ access_hr_recruitment_degree,hr.recruitment.degree,model_hr_recruitment_degree,b
 access_mail_message_user,mail.message.user,mail.model_mail_message,base.group_hr_user,1,1,1,1
 access_res_partner_hr_user,res.partner.user,base.model_res_partner,base.group_hr_user,1,1,1,1
 access_survey_hr_user,survey.hr.user,survey.model_survey,base.group_hr_user,1,1,1,0
-access_crm_phonecall_hruser,crm.phonecall hruser,crm.model_crm_phonecall,base.group_hr_user,1,1,1,1
-access_crm_meeting_hruser,crm.meeting.hruser,crm.model_crm_meeting,base.group_hr_user,1,1,1,1
+access_crm_meeting_hruser,crm.meeting.hruser,base_calendar.model_crm_meeting,base.group_hr_user,1,1,1,1
 access_hr_recruitment_source_hr_officer,hr.recruitment.source,model_hr_recruitment_source,base.group_hr_user,1,1,1,1
 access_hr_recruitment_source_all,hr.recruitment.source,model_hr_recruitment_source,,1,0,0,0
diff --git a/addons/import_google/__openerp__.py b/addons/import_google/__openerp__.py
index 5c538e5912f..5242633747f 100644
--- a/addons/import_google/__openerp__.py
+++ b/addons/import_google/__openerp__.py
@@ -26,7 +26,7 @@
     'description': """The module adds google contact in partner address and add google calendar events details in Meeting""",
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'depends': ['base', 'import_base', 'google_base_account','crm'],
+    'depends': ['base', 'import_base', 'google_base_account', 'base_calendar'],
     'init_xml': [],
     'update_xml': ['security/ir.model.access.csv',
                 'sync_google_calendar_view.xml',

From 10083459d02a9ab8e48ccf7cb788ac5cfe02f11a Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 6 Jul 2012 16:07:49 +0200
Subject: [PATCH 197/239] [IMP] base: usability, review of attachment form view

bzr revid: qdp-launchpad@openerp.com-20120706140749-m3v5soqchjgcbep6
---
 openerp/addons/base/ir/ir.xml | 54 +++++++++++++++++------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index 88843b207f9..4de12d8bfeb 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -756,34 +756,34 @@
             <field name="arch" type="xml">
                 <form string="Attachments" version="7.0">
                    <sheet>
-                    <group col="4">
-                        <field name="name" />
-                        <field name="type"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    </group>
-                    <notebook>
-                    <page string="Attachment">
-                        <group>
-                            <group attrs="{'invisible':[('type','=','url')]}" string="Data">
-                                <field name="datas" filename="datas_fname"/>
-                                <field name="datas_fname"/>
-                                <field name="url" widget="url" attrs="{'invisible':[('type','=','binary')]}"/>
-                            </group>
-                            <group string="Attached To">
-                                <field name="res_model"/>
-                                <field name="res_id"/>
-                                <field name="res_name"/>
-                            </group>
-                            <group groups="base.group_no_one" string="Created">
-                                <field name="create_uid"/>
-                                <field name="create_date"/>
-                            </group>
+                    <label for="name" class="oe_edit_only"/>
+                    <h1>
+                        <field name="name"/>
+                    </h1>
+                    <group>
+                        <group string="Data">
+                            <field name="type"/>
+                            <field name="datas" filename="datas_fname" attrs="{'invisible':[('type','=','url')]}"/>
+                            <field name="datas_fname" invisible="1" attrs="{'invisible':[('type','=','url')]}" class="oe_inline oe_right"/>
+                            <field name="url" widget="url" attrs="{'invisible':[('type','=','binary')]}"/>
                         </group>
-                    </page>
-                    <page string="Notes">
-                        <field name="description"/>
-                    </page>
-                    </notebook>
+                        <group string="Attached To">
+                            <field name="res_model"/>
+                            <field name="res_id"/>
+                            <field name="res_name"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        </group>
+                        <group groups="base.group_no_one" string="History">
+                            <label for="create_uid" string="Creation"/>
+                            <div name="creation_div">
+                                <field name="create_uid" readonly="1" class="oe_inline"/> on 
+                                <field name="create_date" readonly="1" class="oe_inline"/>
+                            </div>
+                        </group>
+                        <group name="description_group" string="Description" colspan="4">
+                            <field name="description" nolabel="1"/>
+                        </group>
+                    </group>
                   </sheet>
                 </form>
             </field>

From 4031d0148132ce621118c22990ff9365882c05e2 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 6 Jul 2012 16:09:08 +0200
Subject: [PATCH 198/239] [IMP] document: usability, review of attachment form
 view + made it inheriting from the base view

bzr revid: qdp-launchpad@openerp.com-20120706140908-w1y8tcfybfcn9h9r
---
 addons/document/document_view.xml | 65 ++++++++++---------------------
 1 file changed, 20 insertions(+), 45 deletions(-)

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index b03e547cbd0..de9d422edab 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -238,52 +238,27 @@
         <field name="model">ir.attachment</field>
         <field name="priority" eval="1"/>
         <field name="type">form</field>
+        <field name="inherit_id" ref="base.view_attachment_form"/>
         <field name="arch" type="xml">
-            <form string="Documents" version="7.0">
-                <sheet>
-                    <label for="name" class="oe_edit_only"/>
-                    <h1>
-                        <field name="name" class="oe_inline"/>
-                        <label string=", " class="oe_inline oe_edit_only"/><field name="type" class="oe_inline oe_edit_only"/>
-                    </h1>
-                    <label for="datas" class="oe_edit_only" attrs="{'invisible':[('type','=','url')]}"/>
-                    <label for="url" class="oe_edit_only" attrs="{'invisible':[('type','=','binary')]}"/>
-                    <h2>
-                        <field name="datas" filename="datas_fname" attrs="{'invisible':[('type','=','url')]}" class="oe_inline"/>
-                        <field name="datas_fname" invisible="1" attrs="{'invisible':[('type','=','url')]}" class="oe_inline oe_right"/>
-                        <field name="url" widget="url" attrs="{'invisible':[('type','=','binary')]}" class="oe_inline"/>
-                    </h2>
-                    <group>
-                        <group string="Document Information">
-                            <field name="user_id"/>
-                            <field name="parent_id"/>
-                            <field name="partner_id"/>
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                        </group>
-                        <group groups="base.group_no_one" string="History">
-                            <label for="create_uid" string="Creation"/>
-                            <div>
-                                <field name="create_uid" readonly="1" class="oe_inline"/> on 
-                                <field name="create_date" readonly="1" class="oe_inline"/>
-                            </div>
-                            <label for="write_uid" string="Modification"/>
-                            <div>
-                                <field name="write_uid" readonly="1" class="oe_inline"/> on 
-                                <field name="write_date" readonly="1" class="oe_inline"/>
-                            </div>
-                        </group>
-                        <group>
-                            <field name="res_id" invisible="True"/>
-                            <field name="res_model" readonly="True" invisible="True" attrs="{'invisible': [('res_id','=',0)]}"/>
-                            <field name="res_name" readonly="1" attrs="{'invisible': [('res_id','=',0)]}"/>
-                        </group>
-                        <group string="Indexed Content" colspan="4">
-                            <field name="index_content" nolabel="1"/>
-                        </group>
-                    </group>
-
-                </sheet>
-            </form>
+            <field name="url" position="after">
+                <field name="user_id"/>
+            </field>
+            <field name="company_id" position="before">
+                <field name="parent_id"/>
+                <field name="partner_id"/>
+            </field>
+            <xpath expr="//div[@name='creation_div']" position='after'>
+                <label for="write_uid" string="Modification"/>
+                <div>
+                    <field name="write_uid" readonly="1" class="oe_inline"/> on 
+                    <field name="write_date" readonly="1" class="oe_inline"/>
+                </div>
+            </xpath>
+            <xpath expr="//group[@name='description_group']" position='after'>
+                <group string="Indexed Content" colspan="4">
+                    <field name="index_content" nolabel="1"/>
+                </group>
+            </xpath>
         </field>
     </record>
 

From ad95dd8c96d70da8d65f9a8a2ce21de385046636 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 6 Jul 2012 16:10:03 +0200
Subject: [PATCH 199/239] [IMP] sale: removed duplicated field pricelist_id in
 sale order form view

bzr revid: qdp-launchpad@openerp.com-20120706141003-7j7luq6r4nrm3khh
---
 addons/sale/sale_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index b840fd3b2d3..f586305573b 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -175,7 +175,6 @@
                             <field domain="[('parent_id','=',partner_id)]" name="partner_invoice_id" groups="sale.group_delivery_invoice_address"/>
                             <field domain="[('parent_id','=',partner_id)]" name="partner_shipping_id" groups="sale.group_delivery_invoice_address"/>
 
-                            <field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>
                             <field name="project_id" context="{'partner_id':partner_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="sale.group_analytic_accounting" domain="[('type','in',['view','normal','contract'])]"/>
                         </group>
                         <group>

From e93b1c9dbf244add009a7995d4bac00737928166 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 6 Jul 2012 16:40:19 +0200
Subject: [PATCH 200/239] [IMP] hr_contract: usability, review of hr.contract
 form view

bzr revid: qdp-launchpad@openerp.com-20120706144019-lf4avjk3kc6vcapk
---
 addons/hr_contract/hr_contract_view.xml | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 66f486dc9cc..ae6789ea234 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -71,19 +71,18 @@
                     <sheet>
                     <div class="oe_title">
                         <h1>
-                            <field name="name" class="oe_inline"/>, <field name="employee_id" class="oe_inline"/>
+                            <field name="name" placeholder="Contract Reference"/>
                         </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>
+                    <group>
+                        <group>
+                            <field name="employee_id"/>
+                            <field name="job_id"/>
+                        </group>
+                        <group>
+                            <field name="type_id"/>
+                        </group>
+                    </group>
                     <notebook>
                         <page string="Information" name="information">
                             <group>

From 9bf667b700fd186ace741d49332fa68fef9a65e3 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 6 Jul 2012 16:54:10 +0200
Subject: [PATCH 201/239] [IMP] config wizards: remove sheet element in their
 form

bzr revid: rco@openerp.com-20120706145410-bfw9z4324kjmw19j
---
 addons/account/res_config_view.xml    |  3 +-
 addons/base_setup/res_config_view.xml | 56 +++++++++++++--------------
 addons/hr/res_config_view.xml         | 48 +++++++++++------------
 addons/knowledge/res_config_view.xml  | 22 +++++------
 addons/mrp/res_config_view.xml        | 36 ++++++++---------
 addons/project/res_config_view.xml    | 38 +++++++++---------
 addons/purchase/res_config_view.xml   | 32 +++++++--------
 addons/stock/res_config_view.xml      | 54 +++++++++++++-------------
 8 files changed, 136 insertions(+), 153 deletions(-)

diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index c6bd026882a..d7eda0a2692 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -21,7 +21,7 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <sheet>
+
                     <field name="has_default_company" invisible="1" />
                     <field name="has_chart_of_accounts" invisible="1"/>
                     <field name="complete_tax_set" invisible="1"/>
@@ -134,7 +134,6 @@
 
                         <group name="analytic_accounting" invisible="1" string="Analytic Accounting"/>
                     </group>
-                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 85a20bddf52..8607e671085 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -12,29 +12,27 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <sheet>
-                        <group string="Company Settings">
-                            <group>
-                                <field name="module_multi_company"/>
-                            </group>
-                            <group>
-                                <div>
-                                    You will also find several configuration options on your company data:
-                                    address for the header and footer, overdue payments texts, etc.
-                                </div>
-                                <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute"/>
-                            </group>
+                    <group string="Company Settings">
+                        <group>
+                            <field name="module_multi_company"/>
                         </group>
-                        <group string="External Accesses">
-                            <field name="module_share"/>
-                            <field name="module_portal"/>
+                        <group>
+                            <div>
+                                You will also find several configuration options on your company data:
+                                address for the header and footer, overdue payments texts, etc.
+                            </div>
+                            <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute"/>
                         </group>
-                        <group string="Others">
-                            <label for="id" string="Outgoing Mail Servers"/>
-                            <button type="action" name="%(base.action_ir_mail_server_list)d"
-                                string="Configure" icon="gtk-execute"/>
-                        </group>
-                    </sheet>
+                    </group>
+                    <group string="External Accesses">
+                        <field name="module_share"/>
+                        <field name="module_portal"/>
+                    </group>
+                    <group string="Others">
+                        <label for="id" string="Outgoing Mail Servers"/>
+                        <button type="action" name="%(base.action_ir_mail_server_list)d"
+                            string="Configure" icon="gtk-execute"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -60,15 +58,13 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <sheet>
-                        <field name="module_crm" invisible="1"/>
-                        <group name="config_sale"/>
-                        <group name="config_fetchmail" string="Emails" attrs="{'invisible': [('module_crm','=',False)]}">
-                            <field name="module_plugin_thunderbird"/>
-                            <field name="module_plugin_outlook"/>
-                        </group>
-                        <group name="config_crm"/>
-                    </sheet>
+                    <field name="module_crm" invisible="1"/>
+                    <group name="config_sale"/>
+                    <group name="config_fetchmail" string="Emails" attrs="{'invisible': [('module_crm','=',False)]}">
+                        <field name="module_plugin_thunderbird"/>
+                        <field name="module_plugin_outlook"/>
+                    </group>
+                    <group name="config_crm"/>
                 </form>
             </field>
         </record>
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index b41ccd0e935..3285f4c32a6 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -20,34 +20,32 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <sheet>
-                        <group string="Additional Features">
-                            <group>
-                                <field name="module_hr_expense"/>
-                                <field name="module_hr_evaluation"/>
-                                <field name="module_hr_holidays"/>
-                            </group>
-                            <group>
-                                <field name="module_hr_recruitment"/>
-                                <field name="module_hr_contract"/>
-                                <label for="module_hr_payroll"/>
-                                <div>
-                                    <field name="module_hr_payroll"/>
-                                    <button name="%(open_payroll_modules)d" type="action"
-                                        string="Install Country-Specific Payroll" icon="gtk-go-forward"
-                                        attrs="{'invisible': [('module_hr_payroll','=',False)]}"/>
-                                </div>
-                            </group>
+                    <group string="Additional Features">
+                        <group>
+                            <field name="module_hr_expense"/>
+                            <field name="module_hr_evaluation"/>
+                            <field name="module_hr_holidays"/>
                         </group>
                         <group>
-                            <group string="Timesheets">
-                                <field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)"/>
-                                <field name="module_hr_timesheet" on_change="onchange_hr_timesheet(module_hr_timesheet)"/>
-                                <field name="module_hr_timesheet_sheet"/>
-                            </group>
-                            <group name="config_recruitment"/>
+                            <field name="module_hr_recruitment"/>
+                            <field name="module_hr_contract"/>
+                            <label for="module_hr_payroll"/>
+                            <div>
+                                <field name="module_hr_payroll"/>
+                                <button name="%(open_payroll_modules)d" type="action"
+                                    string="Install Country-Specific Payroll" icon="gtk-go-forward"
+                                    attrs="{'invisible': [('module_hr_payroll','=',False)]}"/>
+                            </div>
                         </group>
-                    </sheet>
+                    </group>
+                    <group>
+                        <group string="Timesheets">
+                            <field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)"/>
+                            <field name="module_hr_timesheet" on_change="onchange_hr_timesheet(module_hr_timesheet)"/>
+                            <field name="module_hr_timesheet_sheet"/>
+                        </group>
+                        <group name="config_recruitment"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index ad3488deb98..0cec5899c41 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -13,19 +13,17 @@
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
 
                     </header>
-                    <sheet>
-                        <group>
-                            <group string="Wiki">
-                                <field name="module_wiki_faq"/>
-                                <field name="module_wiki_quality_manual"/>
-                            </group>
-                            <group string="Documents">
-                                <field name="module_document"/>
-                                <field name="module_document_ftp"/>
-                                <field name="module_document_webdav"/>
-                            </group>
+                    <group>
+                        <group string="Wiki">
+                            <field name="module_wiki_faq"/>
+                            <field name="module_wiki_quality_manual"/>
                         </group>
-                    </sheet>
+                        <group string="Documents">
+                            <field name="module_document"/>
+                            <field name="module_document_ftp"/>
+                            <field name="module_document_webdav"/>
+                        </group>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 48938972f60..db337c9b178 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -12,25 +12,23 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <sheet>
-                        <group string="Manufacturing Order">
-                            <field name="module_mrp_operations"/>
-                            <field name="module_stock_planning"/>
-                            <field name="module_mrp_subproduct"/>
-                            <field name="module_mrp_repair"/>
-                        </group>
-                        <group string="Logistics">
-                            <field name="module_mrp_jit"/>
-                            <field name="module_stock_no_autopicking"/>
-                        </group>
-                        <group string="Bill Of Material">
-                            <field name="group_mrp_routings"/>
-                            <field name="group_mrp_properties"/>
-                        </group>
-                        <group string="Products">
-                            <field name="module_product_manufacturer"/>
-                        </group>
-                    </sheet>
+                    <group string="Manufacturing Order">
+                        <field name="module_mrp_operations"/>
+                        <field name="module_stock_planning"/>
+                        <field name="module_mrp_subproduct"/>
+                        <field name="module_mrp_repair"/>
+                    </group>
+                    <group string="Logistics">
+                        <field name="module_mrp_jit"/>
+                        <field name="module_stock_no_autopicking"/>
+                    </group>
+                    <group string="Bill Of Material">
+                        <field name="group_mrp_routings"/>
+                        <field name="group_mrp_properties"/>
+                    </group>
+                    <group string="Products">
+                        <field name="module_product_manufacturer"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index ff1511d49f2..b6497e56d62 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -12,28 +12,26 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <sheet>
-                        <group string="Project">
-                            <group>
-                                <field name="module_project_mrp"/>
-                                <field name="module_project_timesheet"/>
-                                <field name="module_pad"/>
-                            </group>
-                            <group>
-                                <field name="group_tasks_work_on_tasks"/>
-                                <field name="group_time_work_estimation_tasks"/>
-                                <field name="group_manage_delegation_task"/>
-                                <field name="time_unit" domain="[('category_id.name','=','Working Time')]"/>
-                            </group>
+                    <group string="Project">
+                        <group>
+                            <field name="module_project_mrp"/>
+                            <field name="module_project_timesheet"/>
+                            <field name="module_pad"/>
                         </group>
-                        <group string="Planning">
-                            <field name="module_project_long_term"/>
+                        <group>
+                            <field name="group_tasks_work_on_tasks"/>
+                            <field name="group_time_work_estimation_tasks"/>
+                            <field name="group_manage_delegation_task"/>
+                            <field name="time_unit" domain="[('category_id.name','=','Working Time')]"/>
                         </group>
-                        <group string="Helpdesk and Support" name="support">
-                            <field name="module_project_issue"/>
-                            <field name="module_project_issue_sheet"/>
-                        </group>
-                    </sheet>
+                    </group>
+                    <group string="Planning">
+                        <field name="module_project_long_term"/>
+                    </group>
+                    <group string="Helpdesk and Support" name="support">
+                        <field name="module_project_issue"/>
+                        <field name="module_project_issue_sheet"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 06b06c7bae4..1e8588bf618 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -12,25 +12,23 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <sheet>
-                        <group string="Invoicing">
-                            <field name="default_invoice_method"/>
-                            <field name="decimal_precision"/>
+                    <group string="Invoicing">
+                        <field name="default_invoice_method"/>
+                        <field name="decimal_precision"/>
+                    </group>
+                    <group string="Purchase Order">
+                        <group>
+                            <field name="group_purchase_pricelist"/>
+                            <field name="group_uom"/>
+                            <field name="group_purchase_delivery_address"/>
                         </group>
-                        <group string="Purchase Order">
-                            <group>
-                                <field name="group_purchase_pricelist"/>
-                                <field name="group_uom"/>
-                                <field name="group_purchase_delivery_address"/>
-                            </group>
-                            <group>
-                                <field name="module_purchase_double_validation"/>
-                                <field name="module_purchase_requisition"/>
-                                <field name="module_warning"/>
-                                <field name="module_purchase_analytic_plans"/>
-                            </group>
+                        <group>
+                            <field name="module_purchase_double_validation"/>
+                            <field name="module_purchase_requisition"/>
+                            <field name="module_warning"/>
+                            <field name="module_purchase_analytic_plans"/>
                         </group>
-                    </sheet>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index 64c151af33c..f6638f22002 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -13,38 +13,36 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <sheet>
-                        <group string="Traceability">
-                            <field name="group_stock_production_lot"/>
-                            <field name="group_stock_tracking_lot"/>
-                            <field name="module_product_expiry"
-                                attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
+                    <group string="Traceability">
+                        <field name="group_stock_production_lot"/>
+                        <field name="group_stock_tracking_lot"/>
+                        <field name="module_product_expiry"
+                            attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
+                    </group>
+                    <group string="Logistics">
+                        <group>
+                            <field name="group_stock_multiple_locations"/>
+                            <field name="module_stock_invoice_directly"/>
                         </group>
-                        <group string="Logistics">
-                            <group>
-                                <field name="group_stock_multiple_locations"/>
-                                <field name="module_stock_invoice_directly"/>
-                            </group>
-                            <group>
-                                <field name="module_stock_location"/>
-                                <field name="decimal_precision"/>
-                            </group>
+                        <group>
+                            <field name="module_stock_location"/>
+                            <field name="decimal_precision"/>
                         </group>
-                        <group string="Products">
-                            <group>
-                                <field name="group_stock_packaging"/>
-                                <field name="group_uom"/>
-                                <field name="group_uos"/>
-                            </group>
-                            <group>
-                                <field name="group_stock_inventory_valuation"/>
-                                <field name="group_product_variant"/>
-                            </group>
+                    </group>
+                    <group string="Products">
+                        <group>
+                            <field name="group_stock_packaging"/>
+                            <field name="group_uom"/>
+                            <field name="group_uos"/>
                         </group>
-                        <group string="Partners">
-                            <field name="module_claim_from_delivery"/>
+                        <group>
+                            <field name="group_stock_inventory_valuation"/>
+                            <field name="group_product_variant"/>
                         </group>
-                    </sheet>
+                    </group>
+                    <group string="Partners">
+                        <field name="module_claim_from_delivery"/>
+                    </group>
                 </form>
             </field>
         </record>

From 0267ed32bbb7ed75246e48e2ab28af0912e0387f Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Fri, 6 Jul 2012 18:43:57 +0200
Subject: [PATCH 202/239] Many improvements

bzr revid: mit@openerp.com-20120706164357-c6p6z3ytoqbhmjjn
---
 addons/web/static/src/css/base.css            | 108 ++++++++++++++++--
 addons/web/static/src/css/base.sass           | 103 +++++++++++++----
 addons/web_kanban/static/src/css/kanban.css   |  33 +++++-
 addons/web_kanban/static/src/css/kanban.sass  |  22 ++--
 .../web_kanban/static/src/xml/web_kanban.xml  |  19 +--
 5 files changed, 233 insertions(+), 52 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 443563a096b..7bc210298db 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -91,7 +91,7 @@
   list-style-type: none;
 }
 .openerp input, .openerp textarea, .openerp select {
-  padding: 1px 4px;
+  padding: 2px 4px;
   border: 1px solid #cccccc;
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
@@ -187,15 +187,97 @@
   background: #f0f0fa;
 }
 .openerp.ui-dialog {
-  border: 13px solid rgba(0, 0, 0, 0.3);
-  -moz-border-radius: 16px;
-  -webkit-border-radius: 16px;
-  border-radius: 16px;
+  display: none;
+  position: fixed;
+  padding: 6px;
+  top: 50%;
+  left: 50%;
+  z-index: 1050;
+  width: 560px;
+  margin: -150px 0 0 -280px;
+  background-color: rgba(60, 60, 60, 0.7);
+  border: 1px solid;
+  border-color: #888888 #555555 #444444;
+  -moz-border-radius: 8px;
+  -webkit-border-radius: 8px;
+  border-radius: 8px;
+  -moz-box-shadow: 0 1px 12px rgba(0, 0, 0, 0.6);
+  -webkit-box-shadow: 0 1px 12px rgba(0, 0, 0, 0.6);
+  box-shadow: 0 1px 12px rgba(0, 0, 0, 0.6);
+  -webkit-background-clip: padding-box;
   -moz-background-clip: padding-box;
-  -webkit-background-clip: padding;
   background-clip: padding-box;
-  box-shadow: 0px 0px 1px 1px rgba(0, 0, 0, 0.6);
-  -webkit-box-shadow: 0px 0px 1px 0px rgba(0, 0, 0, 0.2);
+}
+.openerp.ui-dialog .ui-dialog-titlebar, .openerp.ui-dialog .ui-dialog-content, .openerp.ui-dialog .ui-dialog-buttonpane {
+  padding: 16px;
+}
+.openerp.ui-dialog .ui-dialog-titlebar {
+  border-bottom: 1px solid #cacaca;
+  -moz-border-radius: 2px 2px 0 0;
+  -webkit-border-radius: 2px 2px 0 0;
+  border-radius: 2px 2px 0 0;
+  background-color: #fcfcfc;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede));
+  background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede);
+  background-image: -moz-linear-gradient(top, #fcfcfc, #dedede);
+  background-image: -ms-linear-gradient(top, #fcfcfc, #dedede);
+  background-image: -o-linear-gradient(top, #fcfcfc, #dedede);
+  background-image: linear-gradient(to bottom, #fcfcfc, #dedede);
+}
+.openerp.ui-dialog .ui-dialog-titlebar .ui-dialog-title {
+  margin: 0;
+  padding: 0;
+}
+.openerp.ui-dialog .ui-widget-header {
+  border: none;
+}
+.openerp.ui-dialog .ui-dialog-content {
+  background: white;
+}
+.openerp.ui-dialog .ui-dialog-buttonpane {
+  border-top: 1px solid #e0e0e0;
+  background: #f5f7f9;
+  padding: 8px;
+  margin: 0;
+  -moz-border-radius: 0 0 2px 2px;
+  -webkit-border-radius: 0 0 2px 2px;
+  border-radius: 0 0 2px 2px;
+}
+.openerp.ui-dialog .ui-dialog-buttonpane button {
+  margin-left: 8px;
+}
+.openerp.ui-dialog .ui-dialog-titlebar-close {
+  padding: 0;
+}
+.openerp.ui-dialog .ui-dialog-titlebar-close .ui-icon-closethick {
+  display: none;
+}
+.openerp.ui-dialog .ui-dialog-titlebar-close:before {
+  content: "×";
+  font-size: 18px;
+  font-weight: bold;
+  line-height: 16px;
+  color: black;
+  text-shadow: 0 1px 0 white;
+  padding: 0;
+  cursor: pointer;
+  background: transparent;
+  border: 0;
+}
+.openerp.ui-dialog .ui-dialog-titlebar-close:before:hover {
+  color: black;
+  text-decoration: none;
+}
+.openerp .modal-backdrop {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1040;
+  background-color: black;
+  filter: alpha(opacity=30);
+  opacity: 0.3;
 }
 .openerp .oe_i {
   font-family: "mnmliconsRegular" !important;
@@ -352,17 +434,17 @@
 .openerp .oe_button.oe_link span:hover {
   text-decoration: underline;
 }
-.openerp .oe_star_on, .openerp .oe_star_off {
+.openerp .oe_webclient .oe_star_on, .openerp .oe_webclient .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 {
+.openerp .oe_webclient .oe_star_on:hover, .openerp .oe_webclient .oe_star_off:hover {
   text-decoration: none;
 }
-.openerp .oe_star_on {
+.openerp .oe_webclient .oe_star_on {
   color: gold;
 }
 .openerp.oe_tooltip {
@@ -453,6 +535,10 @@
   position: relative;
   cursor: pointer;
 }
+.openerp .oe_dropdown_toggle {
+  color: #888888;
+  font-weight: normal;
+}
 .openerp .oe_dropdown_hover:hover .oe_dropdown_menu, .openerp .oe_dropdown_menu.oe_opened {
   display: block;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 61b7d267551..d5d271fe07d 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -143,7 +143,7 @@ $colour4: #8a89ba
     li
         list-style-type: none
     input, textarea, select
-        padding: 1px 4px
+        padding: 2px 4px
         border: 1px solid #ccc
         @include radius(3px)
         background: white
@@ -200,14 +200,75 @@ $colour4: #8a89ba
             width: auto
             a.ui-state-active
                 background: #f0f0fa
+
+    // Modal box
     &.ui-dialog
-        border: 13px solid rgba(0, 0, 0, 0.3)
-        @include radius(16px)
-        -moz-background-clip: padding-box
-        -webkit-background-clip: padding
-        background-clip: padding-box
-        box-shadow: 0px 0px 1px 1px rgba(0, 0, 0, 0.6)
-        -webkit-box-shadow: 0px 0px 1px 0px rgba(0, 0, 0, 0.2)
+        display: none
+        position: fixed
+        padding: 6px
+        top: 50%
+        left: 50%
+        z-index: 1050
+        width: 560px
+        margin: -150px 0 0 -280px
+        //overflow: hidden
+        background-color: rgba(60,60,60,0.7)
+        border: 1px solid
+        border-color: #888 #555 #444
+        //overflow: hidden
+        @include radius(8px)
+        @include box-shadow(0 1px 12px rgba(0, 0, 0, 0.6))
+        @include background-clip()
+        .ui-dialog-titlebar, .ui-dialog-content, .ui-dialog-buttonpane
+            padding: 16px
+        .ui-dialog-titlebar
+            border-bottom: 1px solid #cacaca
+            @include radius(2px 2px 0 0)
+            @include vertical-gradient(#FCFCFC, #DEDEDE)
+            .ui-dialog-title
+                margin: 0
+                padding: 0
+        .ui-widget-header
+            border: none
+        .ui-dialog-content
+            background: white
+        .ui-dialog-buttonpane
+            border-top: 1px solid #e0e0e0
+            background: #f5f7f9
+            padding: 8px
+            margin: 0
+            @include radius(0 0 2px 2px)
+            button
+                margin-left: 8px
+        .ui-dialog-titlebar-close
+            padding: 0
+            .ui-icon-closethick
+                display: none
+            &:before
+                content: "×"
+                font-size: 18px
+                font-weight: bold
+                line-height: 16px
+                color: black
+                text-shadow: 0 1px 0 white
+                padding: 0
+                cursor: pointer
+                background: transparent
+                border: 0
+                &:hover
+                    color: black
+                    text-decoration: none
+
+    .modal-backdrop
+        position: fixed
+        top: 0
+        right: 0
+        bottom: 0
+        left: 0
+        z-index: 1040
+        background-color: black
+        @include opacity(.3)
+
     // }}}
     // Generic classes {{{
     .oe_i
@@ -287,18 +348,17 @@ $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_webclient
+        .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 
     // }}}
@@ -370,6 +430,9 @@ $colour4: #8a89ba
     .oe_dropdown, .oe_dropdown_hover, .oe_dropdown_toggle
         position: relative
         cursor: pointer
+    .oe_dropdown_toggle
+        color: #888
+        font-weight: normal
     .oe_dropdown_hover:hover .oe_dropdown_menu, .oe_dropdown_menu.oe_opened
         display: block
     .oe_dropdown_menu
diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 6919947b093..5d0ac9ea8f3 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -15,6 +15,19 @@
 .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;
 }
@@ -26,13 +39,23 @@
   height: inherit;
   width: 100%;
 }
+.openerp .oe_kanban_view .oe_kanban_header:hover .oe_dropdown_kanban {
+  display: inline-block;
+}
+.openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_menu {
+  font-weight: normal;
+  font-size: 13px;
+}
 .openerp .oe_kanban_view .oe_kanban_group_title {
-  margin-bottom: 4px;
   font-size: 16px;
   font-weight: bold;
   color: #333333;
   text-shadow: 0 1px 0 white;
 }
+.openerp .oe_kanban_view .oe_kanban_group_title > span {
+  float: left;
+  margin-right: 4px;
+}
 .openerp .oe_kanban_view .oe_kanban_column, .openerp .oe_kanban_view .oe_kanban_group_header {
   vertical-align: top;
   padding: 6px 7px 0 6px;
@@ -93,12 +116,14 @@
   background: url(/web_kanban/static/src/img/minus-icon.png) no-repeat;
 }
 .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: relative;
   top: -8px;
 }
+.openerp .oe_kanban_view .oe_kanban_add {
+  float: right;
+}
 .openerp .oe_kanban_view .oe_kanban_quick_create {
   overflow: hidden;
   margin-bottom: 4px;
@@ -112,6 +137,7 @@
 }
 .openerp .oe_kanban_view .oe_kanban_quick_create input {
   display: block;
+  margin: 0 0 8px 0;
   font-size: 13px;
   box-sizing: border-box;
   width: 100%;
@@ -393,14 +419,13 @@
   top: -8px;
   right: 3px;
   display: none;
-  color: #4c4c4c;
   cursor: pointer;
 }
 .openerp .oe_kanban_view .oe_dropdown_kanban:hover {
   text-decoration: none;
 }
 .openerp .oe_kanban_view .oe_dropdown_kanban .oe_dropdown_menu {
-  right: -140px;
+  left: 0;
   min-width: 160px;
 }
 .openerp .oe_kanban_view .oe_kanban_colorpicker {
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 4ff2fc37d75..872d694c4db 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -53,12 +53,21 @@
     .oe_kanban_groups
         height: inherit
         width: 100%
+    .oe_kanban_header
+        &:hover
+            .oe_dropdown_kanban
+                display: inline-block
+        .oe_dropdown_menu
+            font-weight: normal
+            font-size: 13px
     .oe_kanban_group_title
-        margin-bottom: 4px
         font-size: 16px
         font-weight: bold
         color: #333333
         text-shadow: 0 1px 0 white
+        > span
+            float: left
+            margin-right: 4px
 
     .oe_kanban_column, .oe_kanban_group_header
         vertical-align: top
@@ -117,14 +126,12 @@
     // }}}
     // KanbanQuickCreate {{{
     .oe_kanban_add, .oe_kanban_header .oe_dropdown_toggle
-        float: right
         margin-left: 4px
         cursor: pointer
         position: relative
         top: -8px
-        //right: 6px
-        //width: 16px
-        //height: 16px
+    .oe_kanban_add
+        float: right
 
     .oe_kanban_quick_create
         overflow: hidden
@@ -136,7 +143,7 @@
         padding: 10px
     .oe_kanban_quick_create input
         display: block
-        // margins within width
+        margin: 0 0 8px 0
         font-size: 13px
         box-sizing: border-box
         width: 100%
@@ -340,12 +347,11 @@
         top: -8px
         right: 3px
         display: none
-        color: #4c4c4c
         cursor: pointer
         &:hover
             text-decoration: none
         .oe_dropdown_menu
-            right: -140px
+            left: 0
             min-width: 160px
     // }}}
     // KanbanColorPicker {{{
diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml
index b71f50d8731..7eb453371b2 100644
--- a/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@ -23,22 +23,23 @@
     <td class="oe_kanban_group_header">
         <t t-if="widget.view.group_by">
             <div class="oe_kanban_header">
-                <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 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' : ''}">
-                        <t t-esc="widget.title"/>
+                        <span><t t-esc="widget.title"/></span>
                         <span class="oe_kanban_group_length">(<t t-esc="widget.group.length"/>)</span>
+                        <div class="oe_dropdown_toggle oe_dropdown_kanban">
+                          <span class="oe_e">í</span>
+                          <ul class="oe_dropdown_menu">
+                            <li><a data-type="fold" href="#" class="">Fold</a></li>
+                            <li><a data-type="edit" href="#" class="">Edit</a></li>
+                            <li><a data-type="delete" href="#" class="">Delete</a></li>
+                          </ul>
+                        </div>
                     </div>
+                    <div class="oe_clear"/>
                     <ul class="oe_kanban_aggregates">
                         <li t-foreach="widget.aggregates" t-as="aggregate">
                             <span><t t-esc="aggregate"/>:</span> <t t-esc="aggregate_value"/>

From 32c99c4f68bd3444a18ced05147855030af6baa1 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sat, 7 Jul 2012 05:24:56 +0000
Subject: [PATCH 203/239] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120707052456-ju2u0te6xoc2tj1h
---
 addons/web_calendar/i18n/fr_CA.po | 141 ++++++++++++++++++++++++++++++
 1 file changed, 141 insertions(+)
 create mode 100644 addons/web_calendar/i18n/fr_CA.po

diff --git a/addons/web_calendar/i18n/fr_CA.po b/addons/web_calendar/i18n/fr_CA.po
new file mode 100644
index 00000000000..abb95727fbb
--- /dev/null
+++ b/addons/web_calendar/i18n/fr_CA.po
@@ -0,0 +1,141 @@
+# French (Canada) translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+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-07-06 19:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (Canada) <fr_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-07-07 05:24+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:12
+msgid "Calendar"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:73
+msgid "Filter"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:139
+msgid "Today"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:140
+msgid "Day"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:141
+msgid "Week"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:142
+msgid "Month"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:143
+msgid "New event"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:144
+msgid "Save"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:145
+msgid "Cancel"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:146
+msgid "Details"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:147
+msgid "Edit"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:148
+msgid "Delete"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:150
+msgid "Event will be deleted permanently, are you sure?"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:151
+#: addons/web_calendar/static/src/js/calendar.js:164
+msgid "Description"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:152
+msgid "Time period"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:153
+msgid "Full day"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:156
+msgid "Do you want to edit the whole set of repeated events?"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:157
+msgid "Repeat event"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:158
+msgid "Disabled"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:159
+msgid "Enabled"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:162
+#: addons/web_calendar/static/src/js/calendar.js:170
+msgid "Agenda"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:163
+msgid "Date"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:167
+msgid "Year"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/xml/web_calendar.xml:8
+#: addons/web_calendar/static/src/xml/web_calendar.xml:9
+msgid "&nbsp;"
+msgstr ""

From 4d2255a2b3390653f58a17502f7be37b5ec15089 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Mon, 9 Jul 2012 04:50:53 +0000
Subject: [PATCH 204/239] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120708044629-hi6utb4bvynt3rkr
bzr revid: launchpad_translations_on_behalf_of_openerp-20120707051248-jntdabtha4f8hq6f
bzr revid: launchpad_translations_on_behalf_of_openerp-20120708044114-bhzndip4ovw142i5
bzr revid: launchpad_translations_on_behalf_of_openerp-20120709045053-xwfg6fb3w7euf83f
---
 addons/web/i18n/bg.po          | 1549 ++++++++++++++++++++++++++++++++
 openerp/addons/base/i18n/de.po |  125 ++-
 openerp/addons/base/i18n/ja.po |   60 +-
 3 files changed, 1659 insertions(+), 75 deletions(-)
 create mode 100644 addons/web/i18n/bg.po

diff --git a/addons/web/i18n/bg.po b/addons/web/i18n/bg.po
new file mode 100644
index 00000000000..8b79aadbabc
--- /dev/null
+++ b/addons/web/i18n/bg.po
@@ -0,0 +1,1549 @@
+# Bulgarian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+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-07-07 10:52+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-07-08 04:46+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:170
+#: addons/web/static/src/js/chrome.js:196
+#: addons/web/static/src/js/chrome.js:364
+#: addons/web/static/src/js/view_form.js:531
+#: addons/web/static/src/js/view_form.js:1665
+#: addons/web/static/src/xml/base.xml:1641
+msgid "Ok"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:178
+msgid "Send OpenERP Enterprise Report"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:192
+msgid "Dont send"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:212
+#: addons/web/static/src/js/chrome.js:914
+msgid "Client Error"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:253
+#, python-format
+msgid "Loading (%d)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:276
+msgid "Invalid database name"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:402
+msgid "Backed"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:402
+msgid "Database backed up successfully"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:442
+msgid "Restored"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:442
+msgid "Database restored successfully"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:735
+#: addons/web/static/src/xml/base.xml:259
+#: addons/web/static/src/xml/base.xml:367
+msgid "Change Password"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:809
+#: addons/web/static/src/xml/base.xml:326
+msgid "Preferences"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:812
+msgid "Change password"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:813
+#: addons/web/static/src/js/view_editor.js:96
+#: addons/web/static/src/js/view_editor.js:832
+#: addons/web/static/src/js/view_editor.js:960
+#: addons/web/static/src/js/view_form.js:1660
+#: addons/web/static/src/xml/base.xml:1468
+#: addons/web/static/src/xml/base.xml:1478
+msgid "Cancel"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:814
+#: addons/web/static/src/js/view_editor.js:74
+#: addons/web/static/src/js/views.js:899 addons/web/static/src/xml/base.xml:687
+#: addons/web/static/src/xml/base.xml:1384
+#: addons/web/static/src/xml/base.xml:1472
+msgid "Save"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:839
+msgid "About"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:856
+msgid "OpenERP - Unsupported/Community Version"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/coresetup.js:619
+msgid "less than a minute ago"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/coresetup.js:620
+msgid "about a minute ago"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/coresetup.js:621
+#, python-format
+msgid "%d minutes ago"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/coresetup.js:622
+msgid "about an hour ago"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/coresetup.js:623
+#, python-format
+msgid "%d hours ago"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/coresetup.js:624
+msgid "a day ago"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/coresetup.js:625
+#, python-format
+msgid "%d days ago"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/coresetup.js:626
+msgid "about a month ago"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/coresetup.js:627
+#, python-format
+msgid "%d months ago"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/coresetup.js:628
+msgid "about a year ago"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/coresetup.js:629
+#, python-format
+msgid "%d years ago"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_export.js:6
+msgid "Export Data"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_export.js:19
+#: addons/web/static/src/js/data_import.js:70
+#: addons/web/static/src/js/view_editor.js:49
+#: addons/web/static/src/js/view_editor.js:399
+#: addons/web/static/src/js/view_form.js:891
+#: addons/web/static/src/js/view_form.js:3901
+#: addons/web/static/src/js/views.js:900
+msgid "Close"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_export.js:20
+msgid "Export To File"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_export.js:125
+msgid "Please enter save field list name"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_export.js:360
+msgid "Please select fields to save export list..."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_export.js:373
+msgid "Please select fields to export..."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_import.js:34
+msgid "Import Data"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_import.js:71
+msgid "Import File"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_import.js:106
+msgid "External ID"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_import.js:346
+msgid ""
+"Destination fields should only be selected once, some fields are selected "
+"more than once:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_import.js:383
+msgid "*Required Fields are not selected :"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/formats.js:141
+#, python-format
+msgid "(%d records)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/formats.js:327
+#: addons/web/static/src/js/view_form.js:4301
+msgid "Download"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/formats.js:332
+#, python-format
+msgid "Download \"%s\""
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:798
+msgid "Invalid Search"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:798
+msgid "triggered from search view"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:839
+#, python-format
+msgid "Incorrect value for field %(fieldname)s: [%(value)s] is %(message)s"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:948
+#, python-format
+msgid "Filter on: %s"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:999
+msgid "Filter"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1108
+#, python-format
+msgid "Group by: %s"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1132
+msgid "GroupBy"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1267
+#, python-format
+msgid "Search %(field)s for: %(value)s"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1301
+msgid "not a valid integer"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1315
+msgid "not a valid number"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1398
+#: addons/web/static/src/xml/base.xml:840
+msgid "Yes"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1399
+msgid "No"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1416
+#, python-format
+msgid "Search %(field)s at: %(value)s"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1622
+#: addons/web/static/src/xml/base.xml:1229
+msgid "Filters"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1762
+msgid "Advanced"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1853
+#, python-format
+msgid "%(field)s %(operator)s \"%(value)s\""
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1888
+msgid "contains"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1889
+msgid "doesn't contain"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1890
+#: addons/web/static/src/js/search.js:1900
+#: addons/web/static/src/js/search.js:1928
+#: addons/web/static/src/js/search.js:1952
+msgid "is equal to"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1891
+#: addons/web/static/src/js/search.js:1901
+#: addons/web/static/src/js/search.js:1929
+#: addons/web/static/src/js/search.js:1953
+msgid "is not equal to"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1902
+#: addons/web/static/src/js/search.js:1930
+#: addons/web/static/src/js/search.js:1954
+msgid "greater than"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1903
+#: addons/web/static/src/js/search.js:1931
+#: addons/web/static/src/js/search.js:1955
+msgid "less than"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1904
+#: addons/web/static/src/js/search.js:1932
+#: addons/web/static/src/js/search.js:1956
+msgid "greater or equal than"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1905
+#: addons/web/static/src/js/search.js:1933
+#: addons/web/static/src/js/search.js:1957
+msgid "less or equal than"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1947
+#: addons/web/static/src/js/search.js:1973
+msgid "is"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1974
+msgid "is not"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1988
+msgid "is true"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1989
+msgid "is false"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:20
+#, python-format
+msgid "Manage Views (%s)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:46
+#: addons/web/static/src/js/view_list.js:17
+#: addons/web/static/src/xml/base.xml:121
+#: addons/web/static/src/xml/base.xml:164
+#: addons/web/static/src/xml/base.xml:684
+msgid "Create"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:47
+#: addons/web/static/src/xml/base.xml:456
+#: addons/web/static/src/xml/base.xml:683
+msgid "Edit"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:48
+#: addons/web/static/src/xml/base.xml:1595
+msgid "Remove"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:72
+#, python-format
+msgid "Create a view (%s)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:169
+msgid "Do you really want to remove this view?"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:365
+#, python-format
+msgid "View Editor %d - %s"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:368
+msgid "Inherited View"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:372
+msgid "Do you really wants to create an inherited view here?"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:382
+msgid "Preview"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:502
+msgid "Do you really want to remove this node?"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:811
+#: addons/web/static/src/js/view_editor.js:937
+msgid "Properties"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:814
+#: addons/web/static/src/js/view_editor.js:940
+msgid "Update"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:43
+msgid "Form"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:147
+#: addons/web/static/src/js/view_list.js:358
+#: addons/web/static/src/xml/base.xml:1653
+msgid "Delete"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:148
+msgid "Duplicate"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:149
+#: addons/web/static/src/js/view_form.js:885
+msgid "Set Default"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:643
+msgid "Do you really want to delete this record?"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:657
+msgid ""
+"Warning, the record has been modified, your changes will be discarded."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:892
+msgid "Save default"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:1402
+#, python-format
+msgid "Unknown operator %s in domain %s"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:1410
+#, python-format
+msgid "Unknown field %s in domain %s"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:1448
+#, python-format
+msgid "Unsupported operator %s in domain %s"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:1657
+msgid "Confirm"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:2478
+msgid "<em>   Search More...</em>"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:2488
+#, python-format
+msgid "<em>   Create \"<strong>%s</strong>\"</em>"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:2494
+msgid "<em>   Create and Edit...</em>"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:2527
+msgid "Search: "
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:2527
+#: addons/web/static/src/js/view_form.js:3210
+msgid "Create: "
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:2596
+#: addons/web/static/src/js/view_form.js:3125
+#: addons/web/static/src/js/view_form.js:3238
+#: addons/web/static/src/js/view_form.js:3586
+#: addons/web/static/src/js/view_form.js:3702
+msgid "Open: "
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:3517
+#: addons/web/static/src/js/view_form.js:3644
+#: addons/web/static/src/xml/base.xml:1184
+#: addons/web/static/src/xml/base.xml:1594
+msgid "Add"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:3566
+#: addons/web/static/src/js/view_form.js:3684
+msgid "Add: "
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:4230
+msgid "Save As..."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:4230
+msgid "The field is empty, there's nothing to save !"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_list.js:8
+msgid "List"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_list.js:338
+msgid "Unlimited"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_list.js:356
+#: addons/web/static/src/xml/base.xml:622
+#: addons/web/static/src/xml/base.xml:1657
+msgid "Import"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_list.js:357
+#: addons/web/static/src/xml/base.xml:1554
+msgid "Export"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_list.js:436
+msgid "Group"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_list.js:623
+msgid "Do you really want to remove these records?"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_list.js:716
+#: addons/web/static/src/js/views.js:820
+msgid "Warning"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_list.js:716
+msgid "You must select at least one record."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_list.js:1332
+msgid "Undefined"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_list.js:1428
+#, python-format
+msgid "%(page)d/%(page_count)d"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_tree.js:11
+msgid "Tree"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:566 addons/web/static/src/xml/base.xml:452
+msgid "Fields View Get"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:574
+#, python-format
+msgid "View Log (%s)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:604
+#, python-format
+msgid "Model %s fields"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:614 addons/web/static/src/xml/base.xml:455
+msgid "Manage Views"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:615
+msgid "Could not find current view declaration"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:716
+msgid "Print"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:717
+msgid "Attachment"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:718 addons/web/static/src/xml/base.xml:276
+msgid "More"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:726
+msgid "Translate"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:726
+msgid "Technical translation"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:820
+msgid "You must choose at least one record."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:875
+msgid "Uploading..."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:885
+msgid "Do you really want to delete this attachment ?"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:894
+msgid "Translations"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:9
+msgid "Loading..."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:48
+msgid ""
+"Your version of OpenERP is unsupported. Support & maintenance services are "
+"available here:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:48
+msgid "OpenERP Entreprise"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:53
+msgid "OpenERP Enterprise Contract."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:54
+msgid "Your report will be sent to the OpenERP Enterprise team."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:56
+msgid "Summary:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:60
+msgid "Description:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:64
+msgid "What you did:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:80
+msgid "Invalid username or password"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:84 addons/web/static/src/xml/base.xml:174
+#: addons/web/static/src/xml/base.xml:200
+msgid "Database:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:89
+msgid "Username"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:91 addons/web/static/src/xml/base.xml:125
+msgid "Password"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:93
+msgid "Log in"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:97
+msgid "Manage Databases"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:98 addons/web/static/src/xml/base.xml:389
+msgid "Powered by"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:98 addons/web/static/src/xml/base.xml:334
+msgid "OpenERP"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:122
+#: addons/web/static/src/xml/base.xml:189
+msgid "Drop"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:123
+#: addons/web/static/src/xml/base.xml:215
+msgid "Backup"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:124
+#: addons/web/static/src/xml/base.xml:237
+msgid "Restore"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:126
+msgid "Back to Login"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:131
+msgid "CREATE DATABASE"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:134
+#: addons/web/static/src/xml/base.xml:247
+msgid "Master password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:138
+#: addons/web/static/src/xml/base.xml:233
+msgid "New database name:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:142
+msgid "Load Demonstration data:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:146
+msgid "Default language:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:156
+msgid "Admin password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:160
+msgid "Confirm password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:171
+msgid "DROP DATABASE"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:185
+#: addons/web/static/src/xml/base.xml:211
+#: addons/web/static/src/xml/base.xml:229
+msgid "Master Password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:197
+msgid "BACKUP DATABASE"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:222
+msgid "RESTORE DATABASE"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:225
+msgid "File:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:244
+msgid "CHANGE MASTER PASSWORD"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:251
+msgid "New master password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:255
+msgid "Confirm new master password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:325
+msgid "About OpenERP"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:327
+msgid "Log out"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:333
+msgid "Activate the developer mode"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:335
+msgid "Version"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:336
+msgid "Copyright © 2004-TODAY OpenERP SA. All Rights Reserved."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:337
+msgid "OpenERP is a trademark of the"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:338
+msgid "OpenERP SA Company"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:340
+msgid "Licenced under the terms of"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:341
+msgid "GNU Affero General Public License"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:343
+msgid "For more information visit"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:344
+msgid "OpenERP.com"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:352
+msgid "Old Password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:357
+msgid "New Password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:362
+msgid "Confirm Password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:390
+msgid "Open"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:390
+msgid "ERP"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:448
+msgid "Debug View#"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:449
+msgid "View Log (perm_read)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:450
+msgid "Toggle Form Layout Outline"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:451
+msgid "View Fields"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:453
+#: addons/web/static/src/xml/base.xml:1242
+msgid "Manage Filters"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:456
+msgid "View"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:457
+msgid "Edit SearchView"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:458
+msgid "Edit Action"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:459
+msgid "Edit Workflow"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:464
+msgid "ID:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:467
+msgid "XML ID:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:470
+msgid "Creation User:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:473
+msgid "Creation Date:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:476
+msgid "Latest Modification by:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:479
+msgid "Latest Modification Date:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:518
+msgid "Delete this attachment"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:523
+msgid "/web/binary/upload_attachment"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:527
+msgid "Add..."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:622
+#: addons/web/static/src/xml/base.xml:687
+msgid "or"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:687
+msgid "Discard"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:704
+msgid "Default:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:721
+msgid "Condition:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:740
+msgid "Only you"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:747
+msgid "All users"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:797
+msgid "Unhandled widget"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:803
+msgid "(nolabel)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:808
+msgid "Field:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:812
+msgid "Object:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:816
+msgid "Type:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:820
+msgid "Widget:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:824
+msgid "Size:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:828
+msgid "Context:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:832
+msgid "Domain:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:836
+msgid "Modifiers:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:840
+msgid "Change default:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:844
+msgid "On change:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:848
+msgid "Relation:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:852
+msgid "Selection:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:895
+msgid "Open this resource"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:922
+msgid "Select date"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:948
+msgid "Open Resource"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1026
+#: addons/web/static/src/xml/base.xml:1067
+msgid "Set Image"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1030
+#: addons/web/static/src/xml/base.xml:1082
+#: addons/web/static/src/xml/base.xml:1084
+msgid "Clear"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1035
+#: addons/web/static/src/xml/base.xml:1092
+msgid "Uploading ..."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1066
+msgid "width: 83px;"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1069
+#: addons/web/static/src/xml/base.xml:1467
+msgid "Select"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1075
+#: addons/web/static/src/xml/base.xml:1077
+msgid "Save As"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1126
+msgid "Button"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1129
+msgid "(no string)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1136
+msgid "Special:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1141
+msgid "Button Type:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1145
+msgid "Method:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1149
+msgid "Action ID:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1159
+msgid "Field"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1205
+msgid "Advanced Search..."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1230
+msgid "-- Filters --"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1239
+msgid "-- Actions --"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1240
+msgid "Add Advanced Filter"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1241
+msgid "Save Filter"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1247
+msgid "Filter Name:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1249
+msgid "(Any existing filter with the same name will be replaced)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1376
+msgid "Custom Filters"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1379
+msgid "Save current filter"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1381
+msgid "Filter name"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1383
+msgid "Share with all users"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1392
+msgid "Add to Dashboard"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1394
+msgid "Title of new Dashboard item"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1395
+msgid "save"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1399
+msgid "Select Dashboard to add this filter to"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1406
+msgid "Advanced Search"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1411
+msgid "Add a condition"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1412
+msgid "Apply"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1475
+msgid "Save & New"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1476
+msgid "Save & Close"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1559
+msgid ""
+"This wizard will export all data that matches the current search criteria to "
+"a CSV file.\n"
+"            You can export all data or only the fields that can be "
+"reimported after modification."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1566
+msgid "Export Type:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1568
+msgid "Import Compatible Export"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1569
+msgid "Export all Data"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1572
+msgid "Export Formats"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1578
+msgid "Available fields"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1580
+msgid "Fields to export"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1582
+msgid "Save fields list"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1596
+msgid "Remove All"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1607
+msgid "Name"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1639
+msgid "Save as:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1645
+msgid "Saved exports:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1663
+msgid "1. Import a .CSV file"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1664
+msgid ""
+"Select a .CSV file to import. If you need a sample of file to import,\n"
+"       you should use the export tool with the \"Import Compatible\" option."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1668
+msgid "CSV File:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1671
+msgid "2. Check your file format"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1674
+msgid "Import Options"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1678
+msgid "Does your file have titles?"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1684
+msgid "Separator:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1686
+msgid "Delimiter:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1690
+msgid "Encoding:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1693
+msgid "UTF-8"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1694
+msgid "Latin 1"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1697
+msgid "Lines to skip"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1697
+msgid ""
+"For use if CSV files have titles on multiple lines, skips more than a single "
+"line during import"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1713
+msgid "--- Don't Import ---"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1724
+msgid "The import failed due to:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1726
+msgid "Here is a preview of the file we could not import:"
+msgstr ""
diff --git a/openerp/addons/base/i18n/de.po b/openerp/addons/base/i18n/de.po
index 1331257e9f3..e4d2feeccac 100644
--- a/openerp/addons/base/i18n/de.po
+++ b/openerp/addons/base/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:44+0000\n"
-"PO-Revision-Date: 2012-02-09 21:06+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+"PO-Revision-Date: 2012-07-06 21:06+0000\n"
+"Last-Translator: Rudolf Schnapka <rs@techno-flex.de>\n"
 "Language-Team: German <kde-i18n-doc@kde.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:42+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-07 05:12+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -25,12 +25,12 @@ msgstr "Sankt Helena"
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Other Configuration"
-msgstr "Andere Konfigurationen"
+msgstr "Sonstige Konfiguration"
 
 #. module: base
 #: selection:ir.property,type:0
 msgid "DateTime"
-msgstr "Datum mit Uhrzeit"
+msgstr "Datum/Zeit"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_mailgate
@@ -44,14 +44,14 @@ msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
 "%s, which is not a valid SQL table name."
 msgstr ""
-"Das zweite Argument des many2many Feldes %s sollte eine SQL Tabelle sein! "
-"Sie benutzen  %s, welches keine gültige SQL Tabellenbezeichnung ist."
+"Das zweite Argument des m:n Feldes %s muss eine SQL Tabelle sein! Das von "
+"Ihnen benutzte %s ist kein gültiger Tabellenname."
 
 #. module: base
 #: field:ir.ui.view,arch:0
 #: field:ir.ui.view.custom,arch:0
 msgid "View Architecture"
-msgstr "Ansicht Aufbau"
+msgstr "Aufbau ansehen"
 
 #. module: base
 #: model:ir.module.module,description:base.module_project
@@ -76,7 +76,7 @@ msgstr ""
 #. module: base
 #: field:base.language.import,code:0
 msgid "Code (eg:en__US)"
-msgstr "Kurzbez. (z.B.: de__DE)"
+msgstr "Länderkennung (z.B.: de_DE)"
 
 #. module: base
 #: view:workflow:0
@@ -121,7 +121,9 @@ msgstr "Zeige Menütips"
 #: help:ir.cron,model:0
 msgid ""
 "Model name on which the method to be called is located, e.g. 'res.partner'."
-msgstr "Modellname, für die diese Methode gilt (zB res.partner)."
+msgstr ""
+"Modellname des Modells auf das diese Methode angewandt werden soll (z. B. "
+"res.partner)."
 
 #. module: base
 #: view:ir.module.module:0
@@ -135,8 +137,8 @@ msgid ""
 "You can not write in this document (%s) ! Be sure your user belongs to one "
 "of these groups: %s."
 msgstr ""
-"Sie haben keine Schreibrechte für den Beleg (%s) ! Stellen Sie sicher, dass "
-"Sie der folgenden Gruppe zugeordnet sind: %s."
+"Sie haben keine Schreibrechte für das Dokument (%s)! Stellen Sie sicher, "
+"dass Sie einer der folgenden Gruppen zugeordnet sind: %s."
 
 #. module: base
 #: model:ir.module.module,description:base.module_event_project
@@ -147,6 +149,11 @@ msgid ""
 "\n"
 "This module allows you to create retro planning for managing your events.\n"
 msgstr ""
+"\n"
+"Organisation und Verwaltung von Veranstaltungen.\n"
+"===========================================\n"
+"\n"
+"Dieses Modul dient der Verwaltung von Veranstaltungen mittels Retroplanung.\n"
 
 #. module: base
 #: help:ir.model.fields,domain:0
@@ -167,12 +174,12 @@ msgstr "Referenz"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_be_invoice_bba
 msgid "Belgium - Structured Communication"
-msgstr "Beligen - strukturierte Kommunikaiton"
+msgstr "Belgien - strukturierte Kommunikation"
 
 #. module: base
 #: field:ir.actions.act_window,target:0
 msgid "Target Window"
-msgstr "Ziel Fenster"
+msgstr "Zielzeitraum"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_analytic_plans
@@ -237,7 +244,7 @@ msgstr "erstellt."
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_tr
 msgid "Turkey - Accounting"
-msgstr ""
+msgstr "Türkei - Kontenführung"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_mrp_subproduct
@@ -578,7 +585,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_layout
 msgid "Sales Orders Print Layout"
-msgstr ""
+msgstr "Drucklayout für Kundenaufträge"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -693,7 +700,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_mx
 msgid "Mexico - Accounting"
-msgstr ""
+msgstr "Mexiko - Kontenführung"
 
 #. module: base
 #: help:ir.actions.server,action_id:0
@@ -757,7 +764,7 @@ msgstr "Eritrea"
 #. module: base
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Der Unternehmensname muss eindeutig sein!"
 
 #. module: base
 #: view:res.config:0
@@ -774,7 +781,7 @@ msgstr "Automatische Aktionen"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ro
 msgid "Romania - Accounting"
-msgstr ""
+msgstr "Rumänien - Kontenführung"
 
 #. module: base
 #: view:partner.wizard.ean.check:0
@@ -893,6 +900,8 @@ msgid ""
 "The module adds google contact in partner address and add google calendar "
 "events details in Meeting"
 msgstr ""
+"Das Modul fügt Google-Kontakte zu den Partneradressen hinzu und zeigt Google-"
+"Kalendereinträge bei den Treffen an."
 
 #. module: base
 #: view:res.users:0
@@ -989,7 +998,7 @@ msgstr "Niue"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_membership
 msgid "Membership Management"
-msgstr ""
+msgstr "Mitgliederverwaltung"
 
 #. module: base
 #: selection:ir.module.module,license:0
@@ -1016,7 +1025,7 @@ msgstr "Anfrage Bezug Typen"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_google_base_account
 msgid "Google Users"
-msgstr ""
+msgstr "Google-Benutzer"
 
 #. module: base
 #: help:ir.server.object.lines,value:0
@@ -1084,7 +1093,7 @@ msgstr "Typ"
 #. module: base
 #: field:ir.mail_server,smtp_user:0
 msgid "Username"
-msgstr ""
+msgstr "Benutzername"
 
 #. module: base
 #: code:addons/orm.py:398
@@ -1113,7 +1122,7 @@ msgstr ""
 #: code:addons/base/ir/ir_mail_server.py:192
 #, python-format
 msgid "Connection test failed!"
-msgstr ""
+msgstr "Verbindungstest fehlgeschlagen!"
 
 #. module: base
 #: selection:ir.actions.server,state:0
@@ -1235,12 +1244,12 @@ msgstr "Spanish (GT) / Español (GT)"
 #. module: base
 #: field:ir.mail_server,smtp_port:0
 msgid "SMTP Port"
-msgstr ""
+msgstr "SMTP-Port"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_import_sugarcrm
 msgid "SugarCRM Import"
-msgstr ""
+msgstr "von SugarCRM importieren"
 
 #. module: base
 #: view:res.lang:0
@@ -1257,12 +1266,12 @@ msgstr ""
 #: code:addons/base/module/wizard/base_language_install.py:55
 #, python-format
 msgid "Language Pack"
-msgstr ""
+msgstr "Sprachpaket"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_tests
 msgid "Tests"
-msgstr ""
+msgstr "Tests"
 
 #. module: base
 #: field:ir.ui.view_sc,res_id:0
@@ -1342,7 +1351,7 @@ msgstr "Zum Exportieren einer neuen Sprache wähle keine Sprachdatei aus."
 #: model:ir.module.module,shortdesc:base.module_document
 #: model:ir.module.module,shortdesc:base.module_knowledge
 msgid "Document Management System"
-msgstr ""
+msgstr "Dokumentenverwaltungssystem"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_claim
@@ -1450,6 +1459,9 @@ msgid ""
 "        OpenERP Web gantt chart view.\n"
 "        "
 msgstr ""
+"\n"
+"        OpenERP Web Gantt-Diagramm Ansicht.\n"
+"        "
 
 #. module: base
 #: report:ir.module.reference.graph:0
@@ -1568,7 +1580,7 @@ msgstr "Login"
 #: model:ir.actions.act_window,name:base.action_wizard_update_translations
 #: model:ir.ui.menu,name:base.menu_wizard_update_translations
 msgid "Synchronize Terms"
-msgstr ""
+msgstr "Begriffe abgleichen"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -1642,7 +1654,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_lu
 msgid "Luxembourg - Accounting"
-msgstr ""
+msgstr "Luxemburg - Kontoführung"
 
 #. module: base
 #: model:res.country,name:base.tp
@@ -1833,7 +1845,7 @@ msgstr "Tage"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_rpc
 msgid "OpenERP Web web"
-msgstr ""
+msgstr "OpenERP Web Netz"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_html_view
@@ -1858,7 +1870,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_evaluation
 msgid "Employee Appraisals"
-msgstr ""
+msgstr "Personalbeurteilung"
 
 #. module: base
 #: selection:ir.actions.server,state:0
@@ -1897,7 +1909,7 @@ msgstr "Übergeordneter Partner"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_mrp
 msgid "Create Tasks on SO"
-msgstr ""
+msgstr "Aufgaben der Auftragserfassung"
 
 #. module: base
 #: field:ir.attachment,res_model:0
@@ -1907,7 +1919,7 @@ msgstr "Angehängte Vorlage"
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
-msgstr ""
+msgstr "Berichtsanzeige"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_cn
@@ -1918,6 +1930,10 @@ msgid ""
 "        ============================================================\n"
 "    "
 msgstr ""
+"\n"
+"        ? some mess might need check ?\n"
+"Hier stimmt wohl etwas nicht - bitte mal prüfen.\n"
+"    "
 
 #. module: base
 #: model:ir.model,name:base.model_ir_model_access
@@ -2106,6 +2122,8 @@ msgid ""
 "Display this bank account on the footer of printed documents like invoices "
 "and sales orders."
 msgstr ""
+"Dieses Bankkonto in der Fusszeile von gedruckten Dokumenten wie Rechnungen "
+"und Bestellungen anzeigen."
 
 #. module: base
 #: view:base.language.import:0
@@ -2179,7 +2197,7 @@ msgstr "Logo"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_cr
 msgid "Costa Rica - Accounting"
-msgstr ""
+msgstr "Costa-Rica - Kontenführung"
 
 #. module: base
 #: view:ir.module.module:0
@@ -2278,7 +2296,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_setup
 msgid "Initial Setup Tools"
-msgstr ""
+msgstr "Werkzeuge zur Erstinstallation"
 
 #. module: base
 #: field:ir.actions.act_window,groups_id:0
@@ -2540,7 +2558,7 @@ msgstr "Modul Übersicht"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_product_margin
 msgid "Margins by Products"
-msgstr ""
+msgstr "Gewinnspannen nach Produkten"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_invoiced
@@ -2856,7 +2874,7 @@ msgstr "Bangladesch"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_retro_planning
 msgid "Project Retro-planning"
-msgstr ""
+msgstr "Projekt Retro-Planung"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_stock_planning
@@ -3176,7 +3194,7 @@ msgstr "OpenERP Web Diagramm Ansicht"
 #. module: base
 #: model:res.groups,name:base.group_hr_user
 msgid "HR Officer"
-msgstr ""
+msgstr "Personalleitung"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_contract
@@ -3234,7 +3252,7 @@ msgstr "Partner Kontaktanrede"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_product_manufacturer
 msgid "Products Manufacturers"
-msgstr ""
+msgstr "Produktehersteller"
 
 #. module: base
 #: code:addons/base/ir/ir_mail_server.py:217
@@ -3472,7 +3490,7 @@ msgstr "Objekte"
 #. module: base
 #: help:ir.mail_server,smtp_host:0
 msgid "Hostname or IP of SMTP server"
-msgstr ""
+msgstr "Hostname oder IP-Adresse des SMTP-Servers"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -3793,7 +3811,7 @@ msgstr "USt-IdNr. / UID"
 #. module: base
 #: field:res.users,new_password:0
 msgid "Set password"
-msgstr ""
+msgstr "Passwort setzen"
 
 #. module: base
 #: view:res.lang:0
@@ -3917,7 +3935,7 @@ msgstr "Montenegro"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_document_ics
 msgid "iCal Support"
-msgstr ""
+msgstr "iCal Unterstützung"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_fetchmail
@@ -4026,6 +4044,17 @@ msgid ""
 "    * Cheque Register\n"
 "    "
 msgstr ""
+"\n"
+"Das Belege-Modul enthält alle Erfordernisse für Buchungsbelege der Bank, "
+"Kassenquittungen, \n"
+"Belege für Verkauf, Einkauf, Spesen, Gutschriften usw.\n"
+"============================================================================="
+"======\n"
+"\n"
+"    * Belegeingabe\n"
+"    * Belegerhalt\n"
+"    * Scheckeingang\n"
+"    "
 
 #. module: base
 #: field:res.partner,ean13:0
@@ -4246,6 +4275,14 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul hilft bei der Einrichtung des Systems bei installation einer "
+"neuen Datenbank.\n"
+"==========================================================================\n"
+"\n"
+"Es zeigt Ihnen eine Liste der installierbaren Anwendungs-Merkmale.\n"
+"\n"
+"    "
 
 #. module: base
 #: field:ir.actions.report.xml,report_sxw_content:0
diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index 0d47ef31298..ed37324ec10 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/addons/base/i18n/ja.po
@@ -8,13 +8,13 @@ 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-07-06 04:01+0000\n"
+"PO-Revision-Date: 2012-07-08 22:23+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-06 04:58+0000\n"
+"X-Launchpad-Export-Date: 2012-07-09 04:50+0000\n"
 "X-Generator: Launchpad (build 15558)\n"
 
 #. module: base
@@ -885,7 +885,7 @@ msgstr "アルバニア語 / Shqip"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_crm_config_opportunity
 msgid "Opportunities"
-msgstr "オポチュニティ"
+msgstr "商談"
 
 #. module: base
 #: model:ir.model,name:base.model_base_language_export
@@ -2042,7 +2042,7 @@ msgstr "優先度"
 #. module: base
 #: field:workflow.transition,act_from:0
 msgid "Source Activity"
-msgstr "ソースアクティビティ"
+msgstr "元の活動"
 
 #. module: base
 #: view:ir.sequence:0
@@ -2435,7 +2435,7 @@ msgstr "一般的な説明"
 #. module: base
 #: view:workflow.activity:0
 msgid "Workflow Activity"
-msgstr "ワークフローアクティビティ"
+msgstr "ワークフロー活動"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
@@ -2704,7 +2704,7 @@ msgstr "アイデア"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_crm
 msgid "Opportunity to Quotation"
-msgstr "オポチュニティから見積り"
+msgstr "商談から見積り"
 
 #. module: base
 #: model:ir.module.module,description:base.module_sale_analytic_plans
@@ -4776,9 +4776,9 @@ msgstr ""
 "============================================================================="
 "=========================\n"
 "\n"
-"このモジュールを使うことで、あなたのオポチュニティを地理的ローカル化できます。\n"
+"このモジュールを使うことで、あなたの商談を地理的ローカル化できます。\n"
 "\n"
-"オポチュニティをパートナに割り当てる場合に地理的ローカル化を使います。\n"
+"商談をパートナに割り当てる場合に、地理的ローカル化を使います。\n"
 "パートナの住所によるGPS座標を決定します。\n"
 "最も適切なパートナの割り当てが可能です。\n"
 "また、GPS座標なしでも地理的ローカル化はできます。\n"
@@ -5871,8 +5871,8 @@ msgid ""
 "will automatically attach incoming emails to the right partner."
 msgstr ""
 "顧客は会社または組織といったビジネス対象の存在です。会社で働く人々のため顧客は複数のコンタクト者や住所を管理できます。顧客と関係する全てのトランザクション"
-"をたどるために履歴タブが利用できます：受注、Eメール、オポチュニティ、クレームなど。もし、OutlookやThunderbirdプラグインのEメールゲート"
-"ウェイを使う場合、ゲートウェイが自動的に入ってくるEメールを正しいパートナに結びつけるように各コンタクトにEメールを登録することを忘れないで下さい。"
+"をたどるために履歴タブが利用できます：受注、Eメール、商談、クレームなど。もし、OutlookやThunderbirdプラグインのEメールゲートウェイを使"
+"う場合、ゲートウェイが自動的に入ってくるEメールを正しいパートナに結びつけるように各コンタクトにEメールを登録することを忘れないで下さい。"
 
 #. module: base
 #: field:ir.actions.report.xml,name:0
@@ -6002,7 +6002,7 @@ msgstr "南極大陸"
 msgid ""
 "Source activity. When this activity is over, the condition is tested to "
 "determine if we can start the ACT_TO activity."
-msgstr "ソースアクティビティ。そのアクティビティを終えた時に、ACT_TO活動を始めるかどうか条件がテストされます。"
+msgstr "元の活動。その活動を終えた時に、ACT_TO活動を始めるかどうか条件がテストされます。"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_3
@@ -7933,7 +7933,7 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"このモジュールはCRMに１つあるいは幾つかのオポチュニティに近道を加えます。\n"
+"このモジュールはCRMに１つあるいは幾つかの商談に近道を加えます。\n"
 "===========================================================================\n"
 "\n"
 "この方法は選択されたケースに基づき受注オーダーを作成します。\n"
@@ -8676,7 +8676,7 @@ msgstr ""
 "===========================================================================\n"
 "\n"
 "所定のメールボックスに到着した新しいEメールを元にタスクの生成を許します。\n"
-"CRMアプリケーションがリード / オポチュニティを持つものも同様です。\n"
+"CRMアプリケーションがリード / 商談を持つものも同様です。\n"
 "メールボックス統合の設定のために２つの共通の選択肢があります：\n"
 "\n"
 " ・ fetchmailモジュールをインストールし、新しいメールボックスを設定し、それから\n"
@@ -8874,7 +8874,7 @@ msgstr ""
 #. module: base
 #: field:workflow.transition,act_to:0
 msgid "Destination Activity"
-msgstr "行先のアクティビティ"
+msgstr "宛先の活動"
 
 #. module: base
 #: help:res.currency,position:0
@@ -9068,7 +9068,7 @@ msgid ""
 msgstr ""
 "顧客（システムの他のエリアではパートナと呼ばれる）は、彼らが見込み客、顧客であるのか、仕入先であるのかどうか会社の住所録の管理するのを手助けします。パート"
 "ナのフォームは、会社のアドレスから、価格リストなどの多くの情報、パートナの連絡先まで相互に必要なすべての情報を追跡し、記録することができます。\r\n"
-"CRMをインストールした場合は、履歴タブでパートナと共にオポチュニティ、電子メール、発行された受注など全ての対話を追跡することができます。"
+"CRMをインストールした場合は、履歴タブでパートナと共に商談、電子メール、発行された受注など全ての対話を追跡することができます。"
 
 #. module: base
 #: model:res.country,name:base.ph
@@ -11064,7 +11064,7 @@ msgstr ""
 "以下のような多くの電子メール対応のOpenERPドキュメントのために、電子メールベースの\n"
 "ワークフローを簡単に作成するために利用することができます：\n"
 "\n"
-"・ CRMのリード / オポチュニティ\n"
+"・ CRMのリード / 商談\n"
 "・ CRMのクレーム\n"
 "・ プロジェクトの問題\n"
 "・ プロジェクトのタスク\n"
@@ -11312,7 +11312,7 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"CRMのリードとオポチュニティのためのToDoリスト\n"
+"CRMのリードと商談のためのToDoリスト\n"
 "    "
 
 #. module: base
@@ -11626,7 +11626,7 @@ msgstr "Googleインポート"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_12
 msgid "Segmentation"
-msgstr "分割"
+msgstr "分類"
 
 #. module: base
 #: field:res.lang,thousands_sep:0
@@ -12203,7 +12203,7 @@ msgstr "モジュール更新結果"
 #: view:workflow.activity:0
 #: field:workflow.workitem,act_id:0
 msgid "Activity"
-msgstr "アクティビティ"
+msgstr "活動"
 
 #. module: base
 #: view:res.partner:0
@@ -12489,8 +12489,7 @@ msgstr ""
 "さまざまな画面のアクションを自動的にトリガーする自動アクションの使用ができます。\n"
 "\n"
 "例：特定のユーザにより作成されたリードは自動的に特定のセールスチームにセットされたり、\n"
-"あるいは14日以上保留状態であるオポチュニティは自動的にリマインダー電子メールの\n"
-"トリガーになります。\n"
+"あるいは14日以上保留状態である商談は自動的に通知電子メールのトリガーになります。\n"
 "    "
 
 #. module: base
@@ -12748,9 +12747,8 @@ msgid ""
 "            \"Contacts\", \"Employees\", Meetings, Phonecalls, Emails, and "
 "Project, Project Tasks Data into OpenERP Module."
 msgstr ""
-"このモジュールはSugarCRMの以下のデータをOpenERPモジュールにインポートします：\n"
-"　　リード、オポチュニティ、ユーザ、会計、コンタクト、従業員、ミーティング、\n"
-"　　電話、Eメール、プロジェクト、プロジェクトタスク"
+"このモジュールはSugarCRMの以下のデータをOpenERPモジュールの中にインポートします：\n"
+"　　リード、商談、ユーザ、会計、コンタクト、従業員、ミーティング、電話、Eメール、プロジェクト、プロジェクトタスク"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_publisher_warranty_contract_add_wizard
@@ -15655,7 +15653,7 @@ msgstr ""
 #: view:workflow:0
 #: field:workflow,activities:0
 msgid "Activities"
-msgstr "アクティビティ"
+msgstr "活動"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_product
@@ -15867,7 +15865,7 @@ 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
@@ -16388,7 +16386,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_crm_config_lead
 msgid "Leads & Opportunities"
-msgstr "リードとオポチュニティ"
+msgstr "リードと商談"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -17199,7 +17197,7 @@ msgstr ""
 "一般的なOpenERPのCRM（Customer Relationship Management）\n"
 "=====================================================\n"
 "\n"
-"このシステムは人々のグループがリード、オポチュニティ、ミーティング、電話他を知的に効果的に\n"
+"このシステムは人々のグループがリード、商談、ミーティング、電話他を知的に効果的に\n"
 "管理することを可能にします。これはコミュニケーション、身分証明、優先度付け、割り当て、\n"
 "問題解決、通知といった主要なタスクを管理します。\n"
 "\n"
@@ -17216,8 +17214,8 @@ msgstr ""
 "Eメールゲートウェイを持ちます。\n"
 "\n"
 "CRMのために作成されるダッシュボードは次のものを含みます：\n"
-"　・ 分類別のオポチュニティ（グラフ）\n"
-"　・ 工程別のオポチュニティ（グラフ）\n"
+"　・ 分類別の商談（グラフ）\n"
+"　・ 工程別の商談（グラフ）\n"
 "　・ 工程とユーザ別の計画収益（グラフ）\n"
 
 #. module: base
@@ -17630,7 +17628,7 @@ msgstr "ウィジットの検索"
 msgid ""
 "Manage relations with prospects and customers using leads, opportunities, "
 "requests or issues."
-msgstr "リード、オポチュニティ、リクエスト、問題を使って、見込み客や顧客との関係を管理することができます。"
+msgstr "リード、商談、リクエスト、問題を使って、見込み客や顧客との関係を管理することができます。"
 
 #. module: base
 #: selection:res.partner.address,type:0

From e9c288b4bf9b82e505ee94a44b5c0e5dfd1f45f8 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Mon, 9 Jul 2012 04:51:13 +0000
Subject: [PATCH 205/239] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120707051326-0nn73he814pbmz14
bzr revid: launchpad_translations_on_behalf_of_openerp-20120708044140-ev3j10bquy9p89t7
bzr revid: launchpad_translations_on_behalf_of_openerp-20120709045113-mh0kg5l420xs8ux4
---
 addons/account/i18n/ja.po            |   2 +-
 addons/base_action_rule/i18n/ja.po   |  10 +-
 addons/base_tools/i18n/mn.po         |  32 +
 addons/crm/i18n/ja.po                | 989 ++++++++++++++-------------
 addons/crm_claim/i18n/ja.po          |   6 +-
 addons/crm_fundraising/i18n/ja.po    |   6 +-
 addons/crm_helpdesk/i18n/ja.po       |   2 +-
 addons/crm_partner_assign/i18n/ja.po |  24 +-
 addons/crm_profiling/i18n/ja.po      |   2 +-
 addons/crm_todo/i18n/ja.po           |  10 +-
 addons/edi/i18n/ar.po                |   2 +-
 addons/import_google/i18n/ar.po      | 217 ++++++
 addons/import_google/i18n/ja.po      |   8 +-
 addons/project/i18n/hr.po            |   6 +-
 addons/sale_crm/i18n/ja.po           |  12 +-
 addons/survey/i18n/ja.po             |   2 +-
 addons/web_livechat/i18n/mn.po       |  28 +
 17 files changed, 846 insertions(+), 512 deletions(-)
 create mode 100644 addons/base_tools/i18n/mn.po
 create mode 100644 addons/import_google/i18n/ar.po
 create mode 100644 addons/web_livechat/i18n/mn.po

diff --git a/addons/account/i18n/ja.po b/addons/account/i18n/ja.po
index d71bbe0de56..dba1cdf30fa 100644
--- a/addons/account/i18n/ja.po
+++ b/addons/account/i18n/ja.po
@@ -14,7 +14,7 @@ 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-06 04:58+0000\n"
+"X-Launchpad-Export-Date: 2012-07-07 05:13+0000\n"
 "X-Generator: Launchpad (build 15558)\n"
 
 #. module: account
diff --git a/addons/base_action_rule/i18n/ja.po b/addons/base_action_rule/i18n/ja.po
index e25e5039751..7462f5a06b6 100644
--- a/addons/base_action_rule/i18n/ja.po
+++ b/addons/base_action_rule/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-08 02:21+0000\n"
+"PO-Revision-Date: 2012-07-07 21:07+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:39+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-08 04:41+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -31,7 +31,7 @@ msgstr "パートナを思い出させる"
 #. module: base_action_rule
 #: field:base.action.rule,trg_partner_categ_id:0
 msgid "Partner Category"
-msgstr "取引先分類"
+msgstr "パートナ分類"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_mail_to_watchers:0
@@ -156,7 +156,7 @@ msgid ""
 "14 days might trigger an automatic reminder email."
 msgstr ""
 "多種の画面のために自動的なアクションを自動的にトリガー実行するために使います。例えば、特定のユーザにより作成されたリードには自動的に特定の営業チームを設定"
-"したり、オポチュニティが保留中になって14日を経過したので、自動的に通知Eメールの送信をトリガーしたりできます。"
+"したり、商談が保留中になって14日を経過したので、自動的に通知Eメールの送信をトリガーしたりできます。"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_email:0
diff --git a/addons/base_tools/i18n/mn.po b/addons/base_tools/i18n/mn.po
new file mode 100644
index 00000000000..fd9a1ec8f59
--- /dev/null
+++ b/addons/base_tools/i18n/mn.po
@@ -0,0 +1,32 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2012-07-08 19:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mongolian <mn@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-09 04:51+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
+
+#. module: base_tools
+#: model:ir.module.module,shortdesc:base_tools.module_meta_information
+msgid "Common base for tools modules"
+msgstr "Багажийн модулиудын ерөнхий суурь"
+
+#. module: base_tools
+#: model:ir.module.module,description:base_tools.module_meta_information
+msgid ""
+"\n"
+"    "
+msgstr ""
+"\n"
+"    "
diff --git a/addons/crm/i18n/ja.po b/addons/crm/i18n/ja.po
index 3454896c55a..7d5b564951c 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-07-06 04:15+0000\n"
+"PO-Revision-Date: 2012-07-09 04:50+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-06 04:58+0000\n"
+"X-Launchpad-Export-Date: 2012-07-09 04:51+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
@@ -41,7 +41,7 @@ msgstr "月次"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_stage
 msgid "Stage of case"
-msgstr "案件のステージ"
+msgstr "案件の段階"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -71,7 +71,7 @@ msgstr "本日"
 #. module: crm
 #: view:crm.lead2opportunity.partner:0 view:crm.merge.opportunity:0
 msgid "Select Opportunities"
-msgstr "オポチュニティを選択"
+msgstr "商談を選択"
 
 #. module: crm
 #: view:crm.meeting:0 view:crm.phonecall2opportunity:0
@@ -82,12 +82,12 @@ 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
 msgid "Previous Stage"
-msgstr "前のステージ"
+msgstr "前の段階"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_add_note.py:28
@@ -98,7 +98,7 @@ msgstr "注記を追加することは出来ません。"
 #. module: crm
 #: field:crm.case.stage,name:0
 msgid "Stage Name"
-msgstr "ステージ名"
+msgstr "段階名"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_report
@@ -120,23 +120,23 @@ msgstr "営業チームのコードは固有である必要があります。"
 #: code:addons/crm/crm_lead.py:553
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
-msgstr "リード %s はオポチュニティに変換されました。"
+msgstr "リード %s は商談に変換されました。"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:294
 #, python-format
 msgid "The lead '%s' has been closed."
-msgstr ""
+msgstr "リード %s は閉じられました。"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Exp. Closing"
-msgstr ""
+msgstr "見込完了"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Yearly"
-msgstr "毎年"
+msgstr "年次"
 
 #. module: crm
 #: help:crm.lead.report,creation_day:0
@@ -163,17 +163,17 @@ msgstr "キャンペーン"
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Opportunities"
-msgstr "オポチュニティを検索"
+msgstr "商談を検索"
 
 #. module: crm
 #: help:crm.lead.report,deadline_month:0
 msgid "Expected closing month"
-msgstr "契約月"
+msgstr "見込完了月"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Assigned Opportunities to"
-msgstr ""
+msgstr "商談の割当先"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,partner_id:0 view:crm.lead.report:0
@@ -202,30 +202,30 @@ msgstr "主催者"
 #: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.phonecall_to_phonecall_act
 msgid "Schedule Other Call"
-msgstr ""
+msgstr "他の電話をスケジュール"
 
 #. module: crm
 #: code:addons/crm/crm_phonecall.py:216
 #: model:crm.case.categ,name:crm.categ_meet3 view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
-msgstr ""
+msgstr "通話"
 
 #. module: crm
 #: field:crm.lead,optout:0
 msgid "Opt-Out"
-msgstr ""
+msgstr "オプトアウト"
 
 #. module: crm
 #: field:crm.meeting,end_type:0
 msgid "Recurrence termination"
-msgstr ""
+msgstr "定期の終了"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:323
 #, python-format
 msgid "The opportunity '%s' has been marked as lost."
-msgstr ""
+msgstr "商談 %s は失注としてマークされています。"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_lead
@@ -235,16 +235,18 @@ msgid ""
 "sort out your leads analysis by different groups to get accurate grained "
 "analysis."
 msgstr ""
+"リード分析は異なるCRMの関連情報を確認することができます。取り扱いの遅延、与えられた回答の番号、送信されたEメールをチェックします。正確な粒度の分析を得"
+"るために、異なったグループによるリード分析を並べ変えることができます。"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
-msgstr "新規メールを送信"
+msgstr "新規Eメール送信"
 
 #. module: crm
 #: field:crm.segmentation,segmentation_line:0
 msgid "Criteria"
-msgstr ""
+msgstr "基準"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -254,12 +256,12 @@ msgstr "回答を除く"
 #. module: crm
 #: field:crm.case.stage,section_ids:0
 msgid "Sections"
-msgstr ""
+msgstr "セクション"
 
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "_Merge"
-msgstr ""
+msgstr "統合"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -304,12 +306,12 @@ msgstr "日付"
 msgid ""
 "If opt-out is checked, this contact has refused to receive emails or "
 "unsubscribed to a campaign."
-msgstr ""
+msgstr "オプトアウトをチェックした場合、この連絡先はEメールの受信を拒否するか、またはキャンペーンには未参加となります。"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
 msgid "Prospect Partner"
-msgstr ""
+msgstr "予想パートナ"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:735
@@ -328,7 +330,7 @@ msgstr "Google アドワーズ ２"
 #: selection:crm.lead2partner,action:0
 #: selection:crm.phonecall2partner,action:0
 msgid "Link to an existing partner"
-msgstr ""
+msgstr "既存パートナにリンク"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,contact_id:0 view:crm.meeting:0
@@ -351,33 +353,33 @@ msgstr "="
 #. module: crm
 #: field:base.action.rule,regex_history:0
 msgid "Regular Expression on Case History"
-msgstr ""
+msgstr "案件の履歴の正規表現"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:274
 #, python-format
 msgid "The lead '%s' has been opened."
-msgstr ""
+msgstr "%s のリードが開かれました。"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
 msgid "Opportunity Meeting"
-msgstr "オポチュニティ ミーティング"
+msgstr "商談ミーティング"
 
 #. module: crm
 #: help:crm.lead.report,delay_close:0 help:crm.phonecall.report,delay_close:0
 msgid "Number of Days to close the case"
-msgstr ""
+msgstr "案件を閉じるための日数"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_opportunities0
 msgid "When a real project/opportunity is detected"
-msgstr ""
+msgstr "実プロジェクト / 商談が見つかった時に"
 
 #. module: crm
 #: view:res.partner:0 field:res.partner,opportunity_ids:0
 msgid "Leads and Opportunities"
-msgstr "リードとオポチュニティ"
+msgstr "リードと商談"
 
 #. module: crm
 #: view:crm.lead:0
@@ -410,7 +412,7 @@ msgstr "アクションを選択"
 msgid ""
 "This percentage depicts the default/average probability of the Case for this "
 "stage to be a success"
-msgstr ""
+msgstr "この割合は、成功のための、この段階の案件のデフォルト/ 平均確率を示します。"
 
 #. module: crm
 #: field:base.action.rule,trg_categ_id:0 view:crm.lead:0
@@ -425,12 +427,12 @@ msgstr "分類"
 #. module: crm
 #: view:crm.lead:0
 msgid "Opportunity / Customer"
-msgstr "オポチュニティ / 顧客"
+msgstr "商談 / 顧客"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "#Opportunities"
-msgstr "#オポチュニティ"
+msgstr "商談の数"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -447,6 +449,9 @@ msgid ""
 "Revenue\" and the \"Expected Closing Date.\" You should also have a look at "
 "the tooltip of the field \"Change Probability Automatically\"."
 msgstr ""
+"ステージは販売員が簡単にどのように特定の商談が販売サイクルの中に位置づけられるのかを追跡できます。効率的に販売パイプラインを管理するために、次のステップに"
+"行くための条件を定義することは重要です。例：資格ありとして商談はセットされます。予想売上と予想終了日を設定する必要があります。同じく自動可能性変更の項目の"
+"ヒントを見るべきです。"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -461,29 +466,29 @@ msgstr "イベント場所"
 #. module: crm
 #: field:crm.meeting,rrule:0
 msgid "Recurrent Rule"
-msgstr ""
+msgstr "定期ルール"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
 msgid "Normal or phone meeting for opportunity"
-msgstr ""
+msgstr "商談のための通常または電話ミーティング"
 
 #. module: crm
 #: view:crm.case.section:0
 msgid "Mail Gateway"
-msgstr ""
+msgstr "メールゲートウェイ"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_leads0
 msgid "Very first contact with new prospect"
-msgstr ""
+msgstr "新規見込み客との最初の接触"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0 view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_view_crm_partner2opportunity
 #: model:ir.actions.act_window,name:crm.crm_partner2opportunity
 msgid "Create Opportunity"
-msgstr "オポチュニティ作成"
+msgstr "商談作成"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -501,7 +506,7 @@ msgstr "拡大"
 #. module: crm
 #: view:crm.lead:0
 msgid "Mailings"
-msgstr ""
+msgstr "郵便物"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -518,12 +523,12 @@ msgstr "6月"
 #. module: crm
 #: selection:crm.segmentation,state:0
 msgid "Not Running"
-msgstr ""
+msgstr "停止中"
 
 #. module: crm
 #: field:crm.lead,email:0
 msgid "E-Mail"
-msgstr "メール"
+msgstr "Eメール"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -545,7 +550,7 @@ msgstr "回答を含む："
 #. module: crm
 #: help:crm.meeting,email_from:0 help:crm.phonecall,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "これらの人がEメールを受け取ります。"
 
 #. module: crm
 #: view:crm.meeting:0 field:crm.meeting,name:0
@@ -555,19 +560,19 @@ msgstr "要約"
 #. module: crm
 #: view:crm.segmentation:0
 msgid "State of Mind Computation"
-msgstr ""
+msgstr "精神状態の計算"
 
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
-msgstr "ケース分類"
+msgstr "案件分類"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_default:0
 msgid ""
 "Default state of mind for period preceeding the 'Max Interval' computation. "
 "This is the starting state of mind by default if the partner has no event."
-msgstr ""
+msgstr "最大間隔の計算前の期間のためのデフォルトの精神状態。パートナがイベントを持たない場合、これがデフォルトによる開始時の精神状態です。"
 
 #. module: crm
 #: field:crm.lead,partner_address_name:0
@@ -587,30 +592,30 @@ msgstr "スケジュール / 通話記録"
 #. module: crm
 #: constraint:base.action.rule:0
 msgid "Error: The mail is not well formated"
-msgstr "エラー：メールをフォーマットできませんでした。"
+msgstr "エラー：メールが上手くフォーマットされていません。"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
-msgstr ""
+msgstr "プロファイリングオプション"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "#Phone calls"
-msgstr "#通話"
+msgstr "通話番号"
 
 #. module: crm
 #: help:crm.segmentation,categ_id:0
 msgid ""
 "The partner category that will be added to partners that match the "
 "segmentation criterions after computation."
-msgstr ""
+msgstr "パートナの分類は、計算後に分類基準に一致するパートナに追加されます。"
 
 #. module: crm
 #: code:addons/crm/crm_meeting.py:93
 #, python-format
 msgid "The meeting '%s' has been confirmed."
-msgstr ""
+msgstr "ミーティング %s は確認されました。"
 
 #. module: crm
 #: selection:crm.add.note,state:0 selection:crm.lead,state:0
@@ -622,7 +627,7 @@ msgstr "進行中"
 msgid ""
 "The email address put in the 'Reply-To' of all emails sent by OpenERP about "
 "cases in this sales team"
-msgstr ""
+msgstr "Eメールアドレスはこの営業チームの中の案件についてOpenERPにより送信された全てのEメールのReply-Toに置かれます。"
 
 #. module: crm
 #: field:crm.lead.report,creation_month:0
@@ -638,7 +643,7 @@ msgstr "作業時間"
 #. module: crm
 #: view:crm.segmentation.line:0
 msgid "Partner Segmentation Lines"
-msgstr ""
+msgstr "パートナ分類行"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.meeting:0
@@ -650,17 +655,17 @@ msgstr "詳細"
 msgid ""
 "Defines a rule or repeating pattern of time to exclude from the recurring "
 "rule."
-msgstr ""
+msgstr "ルールまたは反復ルールから除外する時間の繰り返しパターンを定義します。"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Form"
-msgstr ""
+msgstr "リードフォーム"
 
 #. module: crm
 #: view:crm.segmentation:0 model:ir.model,name:crm.model_crm_segmentation
 msgid "Partner Segmentation"
-msgstr ""
+msgstr "パートナの分類"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_meet
@@ -671,16 +676,19 @@ msgid ""
 "using the caldav interface.\n"
 "        "
 msgstr ""
+"ミーティングカレンダは営業チーム間で共有され、従業員休暇やビジネス商談のような他のアプリケーションに完全に統合されています。ミーティングはCalDAVイン"
+"タフェースを使って、携帯電話と同期させることもできます。\n"
+"        "
 
 #. module: crm
 #: field:crm.lead2opportunity.partner.mass,user_ids:0
 msgid "Salesmans"
-msgstr "営業"
+msgstr "販売員"
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
 msgid "Probable Revenue"
-msgstr ""
+msgstr "見込売上"
 
 #. module: crm
 #: help:crm.lead.report,creation_month:0
@@ -690,12 +698,12 @@ msgstr "作成月"
 #. module: crm
 #: help:crm.segmentation,name:0
 msgid "The name of the segmentation."
-msgstr ""
+msgstr "分類の名前"
 
 #. module: crm
 #: field:crm.case.stage,probability:0 field:crm.lead,probability:0
 msgid "Probability (%)"
-msgstr "確率 (%)"
+msgstr "確率（%）"
 
 #. module: crm
 #: field:crm.lead,company_currency:0
@@ -705,7 +713,7 @@ msgstr "会社の通貨"
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Generation"
-msgstr ""
+msgstr "リード生成"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_view_form_installer
@@ -716,6 +724,8 @@ msgid ""
 "opportunities, you can assign the following stage to the team: Territory, "
 "Qualified, Qualified Sponsors, Proposition, Negociaton, Won/Lost."
 msgstr ""
+"営業組織を構築するために営業チームを定義し、ユーザを各チームに割り当てます。各チームに営業段階を定義する必要があります。例として、あなたが商談を追跡するた"
+"めに提案型営業技法を使用する場合、チームに次の段階を割り当てることができます：関心、資格、資格スポンサー、提案、交渉、受注 / 失注。"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:718 view:crm.lead:0 selection:crm.lead,type:0
@@ -723,32 +733,32 @@ msgstr ""
 #: field:crm.meeting,opportunity_id:0
 #, python-format
 msgid "Opportunity"
-msgstr ""
+msgstr "商談"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities created in last month"
-msgstr ""
+msgstr "先月作成されたリード / 商談"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
-msgstr ""
+msgstr "テレビ"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Stop Process"
-msgstr ""
+msgstr "処理の中止"
 
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "月-1"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Search Phonecalls"
-msgstr ""
+msgstr "通話の検索"
 
 #. module: crm
 #: view:crm.lead2partner:0 view:crm.phonecall2partner:0
@@ -758,27 +768,27 @@ msgstr "続行"
 #. module: crm
 #: field:crm.segmentation,som_interval:0
 msgid "Days per Period"
-msgstr ""
+msgstr "期間毎の日数"
 
 #. module: crm
 #: field:crm.meeting,byday:0
 msgid "By day"
-msgstr ""
+msgstr "日別"
 
 #. module: crm
 #: field:base.action.rule,act_section_id:0
 msgid "Set Team to"
-msgstr ""
+msgstr "チーム設定先"
 
 #. module: crm
 #: view:calendar.attendee:0 field:calendar.attendee,categ_id:0
 msgid "Event Type"
-msgstr ""
+msgstr "イベントタイプ"
 
 #. module: crm
 #: field:crm.segmentation,exclusif:0
 msgid "Exclusive"
-msgstr ""
+msgstr "排他"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:832
@@ -786,13 +796,13 @@ msgstr ""
 msgid ""
 "You cannot delete lead '%s'; it must be in state 'Draft' to be deleted. You "
 "should better cancel it, instead of deleting it."
-msgstr ""
+msgstr "リード %s は削除できません；削除するためにはドラフト状態である必要があります。削除の代わりにキャンセルする必要があります。"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:451
 #, python-format
 msgid "From %s : %s"
-msgstr "%s : %sから"
+msgstr "%s から：%s"
 
 #. module: crm
 #: field:crm.lead.report,creation_year:0
@@ -813,17 +823,17 @@ msgstr ""
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Sales Purchase"
-msgstr ""
+msgstr "売買"
 
 #. module: crm
 #: help:crm.case.section,resource_calendar_id:0
 msgid "Used to compute open days"
-msgstr ""
+msgstr "開始日数を計算するために使用"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule Meeting"
-msgstr ""
+msgstr "ミーティングのスケジュール"
 
 #. module: crm
 #: view:crm.case.stage:0 field:crm.case.stage,requirements:0
@@ -835,22 +845,22 @@ msgstr ""
 msgid ""
 "This property defines the list of date/time exceptions for a recurring "
 "calendar component."
-msgstr ""
+msgstr "このプロパティは定期的なカレンダーコンポーネントのために日付 / 時刻の例外のリストを定義します。"
 
 #. module: crm
 #: view:crm.phonecall2opportunity:0
 msgid "Convert To Opportunity "
-msgstr ""
+msgstr "商談に変換 "
 
 #. module: crm
 #: help:crm.meeting,recurrency:0
 msgid "Recurrent Meeting"
-msgstr ""
+msgstr "定期ミーティング"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Unassigned Phonecalls"
-msgstr ""
+msgstr "未割当の通話"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead2opportunity.partner,opportunity_ids:0
@@ -860,18 +870,18 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_opp
 #: model:process.node,name:crm.process_node_opportunities0
 msgid "Opportunities"
-msgstr ""
+msgstr "商談"
 
 #. module: crm
 #: field:crm.segmentation,categ_id:0
 msgid "Partner Category"
-msgstr ""
+msgstr "パートナ分類"
 
 #. module: crm
 #: view:crm.add.note:0
 #: model:ir.actions.act_window,name:crm.action_crm_add_note
 msgid "Add Note"
-msgstr ""
+msgstr "メモの追加"
 
 #. module: crm
 #: field:crm.lead,is_supplier_add:0
@@ -881,7 +891,7 @@ msgstr "仕入先"
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Won"
-msgstr ""
+msgstr "受注とマーク"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -891,7 +901,7 @@ msgstr "仕入高"
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Lost"
-msgstr ""
+msgstr "失注とマーク"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -911,7 +921,7 @@ msgstr "警告"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls made in current year"
-msgstr ""
+msgstr "今年になされた通話"
 
 #. module: crm
 #: field:crm.lead,day_open:0
@@ -921,12 +931,12 @@ msgstr "開始日"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Show Time as"
-msgstr ""
+msgstr "時間として表示"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
 msgid "Create Partner"
-msgstr ""
+msgstr "パートナの作成"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
@@ -941,7 +951,7 @@ msgstr "携帯電話"
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
-msgstr "次へ"
+msgstr "次の段階"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -951,12 +961,12 @@ msgstr "私のミーティング"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Todays's Phonecalls"
-msgstr ""
+msgstr "本日の通話"
 
 #. module: crm
 #: view:board.board:0
 msgid "Statistics Dashboard"
-msgstr ""
+msgstr "統計ダッシュボード"
 
 #. module: crm
 #: field:crm.lead,ref:0
@@ -966,7 +976,7 @@ msgstr "参照"
 #. module: crm
 #: field:crm.lead,optin:0
 msgid "Opt-In"
-msgstr ""
+msgstr "オプトイン"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:814 code:addons/crm/crm_phonecall.py:296
@@ -984,24 +994,24 @@ msgstr "ミーティング"
 #: field:crm.lead,date_action_next:0 field:crm.lead,title_action:0
 #: field:crm.meeting,date_action_next:0 field:crm.phonecall,date_action_next:0
 msgid "Next Action"
-msgstr "次の作業"
+msgstr "次のアクション"
 
 #. module: crm
 #: field:crm.meeting,end_date:0
 msgid "Repeat Until"
-msgstr ""
+msgstr "繰り返し（まで）"
 
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
-msgstr "期限"
+msgstr "締切"
 
 #. module: crm
 #: help:crm.meeting,active:0
 msgid ""
 "If the active field is set to          true, it will allow you to hide the "
 "event alarm information without removing it."
-msgstr ""
+msgstr "アクティブ項目をTrueに設定した場合，イベントアラーム情報を削除することなく，非表示にできます。"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1011,7 +1021,7 @@ msgstr "色の変更"
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
-msgstr ""
+msgstr "パートナの分類"
 
 #. module: crm
 #: field:crm.meeting,user_id:0 view:crm.phonecall:0
@@ -1022,7 +1032,7 @@ msgstr "担当"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Show only opportunity"
-msgstr ""
+msgstr "商談のみ表示"
 
 #. module: crm
 #: view:res.partner:0
@@ -1032,12 +1042,12 @@ msgstr "前へ"
 #. module: crm
 #: view:crm.lead:0
 msgid "New Leads"
-msgstr "新規見込み客"
+msgstr "新規リード"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Statistics"
-msgstr ""
+msgstr "統計"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1047,7 +1057,7 @@ msgstr "差出人"
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Convert into Opportunities"
-msgstr ""
+msgstr "商談に変換"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1062,17 +1072,17 @@ msgstr "次へ"
 #. module: crm
 #: view:crm.lead:0
 msgid "Stage:"
-msgstr "段階"
+msgstr "段階："
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead5 view:crm.lead:0
 msgid "Won"
-msgstr "勝利"
+msgstr "受注"
 
 #. module: crm
 #: field:crm.lead.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr "期限を過ぎる。"
+msgstr "締切超過"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_department
@@ -1082,7 +1092,7 @@ msgstr "営業部"
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
 msgid "State of Mind"
-msgstr ""
+msgstr "精神の状態"
 
 #. module: crm
 #: field:crm.lead,type:0 field:crm.lead.report,type:0
@@ -1093,12 +1103,12 @@ msgstr "タイプ"
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Compute Segmentation"
-msgstr ""
+msgstr "分類の計算"
 
 #. module: crm
 #: field:crm.case.stage,on_change:0
 msgid "Change Probability Automatically"
-msgstr ""
+msgstr "自動確率変更"
 
 #. module: crm
 #: field:crm.lead,create_date:0 field:crm.meeting,create_date:0
@@ -1115,17 +1125,17 @@ msgstr "私の商談"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Need a Website Design"
-msgstr ""
+msgstr "Webサイトデザインが必要"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Year of call"
-msgstr ""
+msgstr "通話年"
 
 #. module: crm
 #: field:crm.meeting,recurrent_uid:0
 msgid "Recurrent ID"
-msgstr ""
+msgstr "定期ID"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.meeting:0 view:res.partner:0
@@ -1135,7 +1145,7 @@ msgstr "標題"
 #. module: crm
 #: field:crm.meeting,tu:0
 msgid "Tue"
-msgstr "火曜日"
+msgstr "火"
 
 #. module: crm
 #: view:crm.case.stage:0 view:crm.lead:0 field:crm.lead,stage_id:0
@@ -1151,37 +1161,37 @@ msgstr "履歴情報"
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
-msgstr "パートナへ送付する。"
+msgstr "パートナへ送付"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Call Details"
-msgstr ""
+msgstr "通話詳細"
 
 #. module: crm
 #: field:crm.meeting,class:0
 msgid "Mark as"
-msgstr ""
+msgstr "マーク"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Log call"
-msgstr "通話記録"
+msgstr "通話ログ"
 
 #. module: crm
 #: help:crm.meeting,rrule_type:0
 msgid "Let the event automatically repeat at that interval"
-msgstr ""
+msgstr "イベントをその間隔で自動的に繰り返します。"
 
 #. module: crm
 #: view:base.action.rule:0
 msgid "Condition Case Fields"
-msgstr ""
+msgstr "案件項目の状態"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in pending state"
-msgstr ""
+msgstr "保留中状態の通話"
 
 #. module: crm
 #: view:crm.case.section:0 field:crm.case.section,stage_ids:0
@@ -1197,14 +1207,14 @@ msgstr "段階"
 #: field:crm.partner2opportunity,planned_revenue:0
 #: field:crm.phonecall2opportunity,planned_revenue:0
 msgid "Expected Revenue"
-msgstr ""
+msgstr "見込売上"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
 msgid ""
 "Create specific phone call categories to better define the type of calls "
 "tracked in the system."
-msgstr ""
+msgstr "システム内の通話追跡をより良くするタイプの定義として、特定の通話分類を作成します。"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -1216,14 +1226,14 @@ msgstr "9月"
 #. module: crm
 #: field:crm.segmentation,partner_id:0
 msgid "Max Partner ID processed"
-msgstr ""
+msgstr "パートナIDが処理される最大"
 
 #. module: crm
 #: help:crm.case.stage,on_change:0
 msgid ""
 "Setting this stage will change the probability automatically on the "
 "opportunity."
-msgstr ""
+msgstr "この段階の設定は商談により自動的に確率が変更されます。"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_report_crm_phonecall
@@ -1235,17 +1245,17 @@ msgstr "通話分析"
 #: field:crm.lead.report,opening_date:0
 #: field:crm.phonecall.report,opening_date:0
 msgid "Opening Date"
-msgstr ""
+msgstr "開始日"
 
 #. module: crm
 #: help:crm.phonecall,duration:0
 msgid "Duration in Minutes"
-msgstr ""
+msgstr "分による期間"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
-msgstr ""
+msgstr "チャネル名"
 
 #. module: crm
 #: field:crm.partner2opportunity,name:0 field:crm.phonecall2opportunity,name:0
@@ -1255,7 +1265,7 @@ msgstr "商談名"
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
-msgstr "受注見込日"
+msgstr "見込完了日"
 
 #. module: crm
 #: help:crm.case.section,active:0
@@ -1274,12 +1284,12 @@ msgstr "番地"
 msgid ""
 "If you check this field, this stage will be proposed by default on each "
 "sales team. It will not assign this stage to existing teams."
-msgstr ""
+msgstr "この項目をチェックした場合、この段階が各営業チームにデフォルトで提案されます。既存のチームにはこの段階を割り当てることはありません。"
 
 #. module: crm
 #: field:crm.meeting,fr:0
 msgid "Fri"
-msgstr "金曜日"
+msgstr "金"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead
@@ -1294,24 +1304,24 @@ msgstr "記入日"
 #. module: crm
 #: view:crm.meeting:0
 msgid "End of Recurrency"
-msgstr ""
+msgstr "定期の終了"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Reminder"
-msgstr "リマインダー"
+msgstr "通知"
 
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
 msgid ""
 "Check if you want to use this tab as part of the segmentation rule. If not "
 "checked, the criteria beneath will be ignored"
-msgstr ""
+msgstr "分類ルールの部分としてのこのタブを使うことを望む場合はチェックします。チェックしない場合、以下の基準は無視されます。"
 
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
-msgstr ""
+msgstr "イベントが発生する前に今回アラームを設定します。"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
@@ -1329,7 +1339,7 @@ msgstr "パートナを作成"
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
-msgstr ""
+msgstr "実行ステータス"
 
 #. module: crm
 #: help:crm.phonecall,state:0
@@ -1342,6 +1352,10 @@ msgid ""
 "       \n"
 "If the call needs to be done then the state is set to 'Not Held'."
 msgstr ""
+"案件が作成された時に、状態はToDoにセットされます。\n"
+"案件が進行中の時に、状態は開くにセットされます。\n"
+"通話が終了した時に、状態は保留にセットされます。\n"
+"通話が行われる必要がある場合は、状態は未保留にセットされます。"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
@@ -1351,7 +1365,7 @@ msgstr "月曜日"
 #. module: crm
 #: field:crm.lead,day_close:0
 msgid "Days to Close"
-msgstr "契約日"
+msgstr "終了日"
 
 #. module: crm
 #: field:crm.case.section,complete_name:0
@@ -1362,12 +1376,12 @@ msgstr "不明"
 #: code:addons/crm/crm_lead.py:296
 #, python-format
 msgid "The case '%s' has been closed."
-msgstr ""
+msgstr "案件は %s は閉じられました。"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_partner2opportunity
 msgid "Partner To Opportunity"
-msgstr ""
+msgstr "パートナから商談へ"
 
 #. module: crm
 #: field:crm.meeting,date:0 field:crm.opportunity2phonecall,date:0
@@ -1379,12 +1393,12 @@ msgstr "日付"
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "拡張フィルタ…"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in closed state"
-msgstr ""
+msgstr "閉じた状態の通話"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -1394,12 +1408,12 @@ msgstr "検索"
 #. module: crm
 #: view:board.board:0
 msgid "Opportunities by Categories"
-msgstr "商談"
+msgstr "分類別商談"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_marketing_department
 msgid "Sales Marketing Department"
-msgstr ""
+msgstr "営業マーケティング部"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -1410,34 +1424,34 @@ msgstr "通話日"
 #: help:crm.lead,section_id:0
 msgid ""
 "When sending mails, the default email address is taken from the sales team."
-msgstr ""
+msgstr "メールを送信する時、デフォルトEメールアドレスは営業チームのものが使われます。"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Choose day in the month where repeat the meeting"
-msgstr ""
+msgstr "ミーティングを定期的に行う場合は月の日を選択します。"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
-msgstr ""
+msgstr "分類の説明"
 
 #. module: crm
 #: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_meet_create_partner
 msgid "Schedule a Meeting"
-msgstr "ミーティング予定"
+msgstr "ミーティングのスケジュール"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:431
 #, python-format
 msgid "Merged opportunities"
-msgstr ""
+msgstr "統合された商談"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_view_form_installer
 msgid "Define Sales Team"
-msgstr ""
+msgstr "営業チームの定義"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
@@ -1446,31 +1460,33 @@ msgid ""
 "better manage your interactions with them. The segmentation tool is able to "
 "assign categories to partners according to criteria you set."
 msgstr ""
+"パートナとの間のより良い相互作用を管理するために、特別のパートナ分類の作成をして、それをパートナに割り当てることができます。分類ツールはあなたが設定した基"
+"準にしたがってパートナに分類を割り当てることができます。"
 
 #. module: crm
 #: field:crm.case.section,code:0
 msgid "Code"
-msgstr ""
+msgstr "コード"
 
 #. module: crm
 #: field:crm.case.section,child_ids:0
 msgid "Child Teams"
-msgstr ""
+msgstr "子のチーム"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in draft and open state"
-msgstr ""
+msgstr "ドラフトで開いた状態の通話"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead1
 msgid "Telesales"
-msgstr ""
+msgstr "電話セールス"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "References"
-msgstr ""
+msgstr "参照"
 
 #. module: crm
 #: code:addons/crm/crm.py:441 view:crm.lead:0
@@ -1480,7 +1496,7 @@ msgstr ""
 #: view:crm.phonecall2partner:0 view:res.partner:0
 #, python-format
 msgid "Cancel"
-msgstr ""
+msgstr "キャンセル"
 
 #. module: crm
 #: model:ir.model,name:crm.model_res_users
@@ -1490,91 +1506,91 @@ msgstr ""
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in pending state"
-msgstr ""
+msgstr "リード / 商談は保留中状態です。"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
 msgid "Merge two Opportunities"
-msgstr ""
+msgstr "２つの商談を統合"
 
 #. module: crm
 #: field:crm.meeting,exrule:0
 msgid "Exception Rule"
-msgstr ""
+msgstr "例外ルール"
 
 #. module: crm
 #: help:base.action.rule,act_mail_to_partner:0
 msgid "Check this if you want the rule to send an email to the partner."
-msgstr ""
+msgstr "パートナにEメールを送信するルールを望む場合は、これをチェックします。"
 
 #. module: crm
 #: field:crm.phonecall,opportunity_id:0
 msgid "Lead/Opportunity"
-msgstr ""
+msgstr "リード / 商談"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Mail"
-msgstr ""
+msgstr "手紙"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
 msgid "Phonecall Categories"
-msgstr ""
+msgstr "通話分類"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in open state"
-msgstr ""
+msgstr "リード / 商談は開いています。"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_categ
 msgid "Opportunities By Categories"
-msgstr ""
+msgstr "分類別商談"
 
 #. module: crm
 #: help:crm.lead,partner_name:0
 msgid ""
 "The name of the future partner that will be created while converting the "
 "lead into opportunity"
-msgstr ""
+msgstr "将来のパートナの名前はリードから商談に変換する間に作成されます。"
 
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
-msgstr ""
+msgstr "エラー。再帰的な関係の営業チームは作成できません。"
 
 #. module: crm
 #: selection:crm.opportunity2phonecall,action:0
 #: selection:crm.phonecall2phonecall,action:0
 msgid "Log a call"
-msgstr ""
+msgstr "通話のログ"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
 msgid "Do not link to a partner"
-msgstr ""
+msgstr "パートナとリンクしない"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Search Meetings"
-msgstr ""
+msgstr "ミーティングの検索"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
 msgid "Sale Amount"
-msgstr ""
+msgstr "販売金額"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Choose day where repeat the meeting"
-msgstr ""
+msgstr "定例ミーティングの日を選択します。"
 
 #. module: crm
 #: selection:crm.meeting,state:0
 msgid "Unconfirmed"
-msgstr ""
+msgstr "未確定"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
@@ -1585,17 +1601,19 @@ msgid ""
 "mainly used by the sales manager in order to do the periodic review with the "
 "teams of the sales pipeline."
 msgstr ""
+"商談分析は予想売上高、計画コスト、締切超過、または商談毎の相互作用の数といった情報とともに、即座にあなたの商談にアクセスすることができます。このレポートは"
+"営業パイプラインのチームと周期的なレビューを行うために営業マネジャにより主に使用されます。"
 
 #. module: crm
 #: field:crm.case.categ,name:0 field:crm.lead,name:0
 #: field:crm.segmentation,name:0
 msgid "Name"
-msgstr ""
+msgstr "名称"
 
 #. module: crm
 #: field:crm.meeting,alarm_id:0 field:crm.meeting,base_calendar_alarm_id:0
 msgid "Alarm"
-msgstr ""
+msgstr "アラーム"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
@@ -1604,53 +1622,55 @@ msgid ""
 "organise their sales pipeline. Stages will allow them to easily track how a "
 "specific lead or opportunity is positioned in the sales cycle."
 msgstr ""
+"リードと商談に特定の段階を追加することは、営業のために営業パイプラインのより良い組織化を実現します。段階は営業サイクルの中にどのように特定のリードと商談を"
+"配置されるのかを簡単に追跡することができます。"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_crm_send_mass_convert
 msgid "Convert opportunities"
-msgstr ""
+msgstr "商談の変換"
 
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
 msgid "My Case(s)"
-msgstr ""
+msgstr "私の案件"
 
 #. module: crm
 #: field:crm.lead,birthdate:0
 msgid "Birthdate"
-msgstr ""
+msgstr "生年月日"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "The"
-msgstr ""
+msgstr "・"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.phonecall:0
 msgid "Creation"
-msgstr ""
+msgstr "作成"
 
 #. module: crm
 #: selection:crm.lead,priority:0 selection:crm.lead.report,priority:0
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "High"
-msgstr ""
+msgstr "高い"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
-msgstr ""
+msgstr "ビジネスパートナとして見込み客に変換"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Meeting / Partner"
-msgstr ""
+msgstr "ミーティング / パートナ"
 
 #. module: crm
 #: view:crm.phonecall2opportunity:0
 msgid "_Convert"
-msgstr ""
+msgstr "変換"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_view_attendee_form
@@ -1659,198 +1679,200 @@ msgid ""
 "sent/to be sent to your colleagues/partners. You can not only invite OpenERP "
 "users, but also external parties, such as a customer."
 msgstr ""
+"ミーティング招待は同僚やパートナにミーティングの招待を送信する / "
+"されるための作成と管理ができます。OpenERPユーザのみならず、顧客といった外部の関係者を招待することができます。"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Saturday"
-msgstr ""
+msgstr "土曜"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Fifth"
-msgstr ""
+msgstr "第５"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in done state"
-msgstr ""
+msgstr "リード / 商談は完了状態です。"
 
 #. module: crm
 #: field:crm.lead.report,delay_close:0
 msgid "Delay to Close"
-msgstr ""
+msgstr "締めを延期する"
 
 #. module: crm
 #: field:crm.meeting,we:0
 msgid "Wed"
-msgstr ""
+msgstr "水"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor6
 msgid "Potential Reseller"
-msgstr ""
+msgstr "リセラーの候補"
 
 #. module: crm
 #: help:crm.case.section,change_responsible:0
 msgid ""
 "When escalating to this team override the saleman with the team leader."
-msgstr ""
+msgstr "このチームに拡大する時、チームリーダとともに販売員を置き換えます。"
 
 #. module: crm
 #: field:crm.lead.report,planned_revenue:0
 msgid "Planned Revenue"
-msgstr ""
+msgstr "計画売上高"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.lead.report:0 view:crm.phonecall:0
 #: view:crm.phonecall.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "グループ化…"
 
 #. module: crm
 #: help:crm.lead,partner_id:0
 msgid "Optional linked partner, usually after conversion of the lead"
-msgstr ""
+msgstr "通常はリードの変換後のオプションのリンクされたパートナ"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invitation details"
-msgstr ""
+msgstr "招待詳細"
 
 #. module: crm
 #: field:crm.case.section,parent_id:0
 msgid "Parent Team"
-msgstr ""
+msgstr "親チーム"
 
 #. module: crm
 #: field:crm.lead,date_action:0
 msgid "Next Action Date"
-msgstr ""
+msgstr "次のアクションの日付"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
 msgid "Running"
-msgstr ""
+msgstr "実行中"
 
 #. module: crm
 #: field:crm.lead,zip:0
 msgid "Zip"
-msgstr ""
+msgstr "郵便番号"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
 #, python-format
 msgid "The case '%s' has been opened."
-msgstr ""
+msgstr "案件 %s は開いています。"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
-msgstr ""
+msgstr "受信"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Month of call"
-msgstr ""
+msgstr "通話の月"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 #: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_phonecall_new
 msgid "Phone calls"
-msgstr ""
+msgstr "通話"
 
 #. module: crm
 #: selection:crm.meeting,show_as:0
 msgid "Free"
-msgstr ""
+msgstr "空き"
 
 #. module: crm
 #: field:crm.case.section,allow_unlink:0
 msgid "Allow Delete"
-msgstr ""
+msgstr "削除を許可"
 
 #. module: crm
 #: field:crm.meeting,mo:0
 msgid "Mon"
-msgstr ""
+msgstr "月"
 
 #. module: crm
 #: selection:crm.lead,priority:0 selection:crm.lead.report,priority:0
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "Highest"
-msgstr ""
+msgstr "最高"
 
 #. module: crm
 #: help:crm.lead.report,creation_year:0
 msgid "Creation year"
-msgstr ""
+msgstr "作成年"
 
 #. module: crm
 #: view:crm.case.section:0 view:crm.lead:0 field:crm.lead,description:0
 #: view:crm.opportunity2phonecall:0
 msgid "Notes"
-msgstr ""
+msgstr "注記"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_value:0
 msgid "Value"
-msgstr ""
+msgstr "値"
 
 #. module: crm
 #: help:crm.lead,type:0 help:crm.lead.report,type:0
 msgid "Type is used to separate Leads and Opportunities"
-msgstr ""
+msgstr "リードと商談を区別するためにタイプを使います。"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.lead.report:0
 msgid "Opportunity by Categories"
-msgstr ""
+msgstr "分類別商談"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,partner_name:0
 msgid "Customer Name"
-msgstr ""
+msgstr "顧客名"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
-msgstr ""
+msgstr "通話から商談へ"
 
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "返信先"
 
 #. module: crm
 #: view:crm.case.section:0
 msgid "Select Stages for this Sales Team"
-msgstr ""
+msgstr "この営業チームの段階を選択"
 
 #. module: crm
 #: view:board.board:0
 msgid "Opportunities by Stage"
-msgstr ""
+msgstr "段階別の商談"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Recurrency Option"
-msgstr ""
+msgstr "定期のオプション"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead / Customer"
-msgstr ""
+msgstr "リード / 顧客"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadpartner0
 msgid "Prospect is converting to business partner"
-msgstr ""
+msgstr "見込みはビジネスパートナに変換されています。"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert To Opportunity"
-msgstr ""
+msgstr "商談に変換"
 
 #. module: crm
 #: view:crm.case.channel:0
@@ -1858,31 +1880,31 @@ msgstr ""
 #: model:ir.model,name:crm.model_crm_case_channel
 #: model:ir.ui.menu,name:crm.menu_crm_case_channel
 msgid "Channels"
-msgstr ""
+msgstr "チャネル"
 
 #. module: crm
 #: view:crm.phonecall:0 selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0 selection:crm.phonecall.report,state:0
 #: view:res.partner:0
 msgid "Held"
-msgstr ""
+msgstr "保留"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "ドラフトに再設定"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Extra Info"
-msgstr ""
+msgstr "追加情報"
 
 #. module: crm
 #: view:crm.merge.opportunity:0
 #: model:ir.actions.act_window,name:crm.action_merge_opportunities
 #: model:ir.actions.act_window,name:crm.merge_opportunity_act
 msgid "Merge Opportunities"
-msgstr ""
+msgstr "商談の統合"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead5
@@ -1897,115 +1919,115 @@ msgstr ""
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead3
 msgid "Mail Campaign 2"
-msgstr ""
+msgstr "メールキャンペーン2"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead2
 msgid "Mail Campaign 1"
-msgstr ""
+msgstr "メールキャンペーン1"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Create"
-msgstr ""
+msgstr "作成"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:849
 #, python-format
 msgid "Changed Stage to: %s"
-msgstr ""
+msgstr "段階を変更： %s"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,priority:0 view:crm.lead.report:0
 #: field:crm.lead.report,priority:0 field:crm.phonecall,priority:0
 #: view:crm.phonecall.report:0 field:crm.phonecall.report,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "優先度"
 
 #. module: crm
 #: field:crm.segmentation,sales_purchase_active:0
 msgid "Use The Sales Purchase Rules"
-msgstr ""
+msgstr "売買ルールを使用"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner
 msgid "Lead To Opportunity Partner"
-msgstr ""
+msgstr "リードからパートナの商談へ"
 
 #. module: crm
 #: field:crm.lead,location_id:0 field:crm.meeting,location:0
 msgid "Location"
-msgstr ""
+msgstr "場所"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner_mass
 msgid "Mass Lead To Opportunity Partner"
-msgstr ""
+msgstr "大量のリードからパートナの商談へ"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Reply"
-msgstr ""
+msgstr "返信"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_meeting0
 msgid "Schedule a normal or phone meeting"
-msgstr ""
+msgstr "通常または電話ミーティングのスケジュール"
 
 #. module: crm
 #: code:addons/crm/crm.py:430
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "エラー"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_meeting_categ_action
 msgid ""
 "Create different meeting categories to better organize and classify your "
 "meetings."
-msgstr ""
+msgstr "ミーティングをより良く構成したり分類するための異なるミーティング分類を作成します。"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_segmentation_line
 msgid "Segmentation line"
-msgstr ""
+msgstr "分類行"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Planned Date"
-msgstr ""
+msgstr "予定日"
 
 #. module: crm
 #: field:crm.meeting,base_calendar_url:0
 msgid "Caldav URL"
-msgstr ""
+msgstr "CalDAVのURL"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Expected Revenues"
-msgstr ""
+msgstr "見込売上"
 
 #. module: crm
 #: field:crm.lead,contact_name:0
 msgid "Contact Name"
-msgstr ""
+msgstr "連絡先名"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads creating during last 7 days"
-msgstr ""
+msgstr "過去7日間で作成されたリード"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
 msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
+msgstr "この通話を元に、本当にパートナを作成したいのですか？"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "July"
-msgstr ""
+msgstr "7月"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_act
@@ -2016,72 +2038,74 @@ msgid ""
 "The opportunities and sales order displayed, will automatically be filtered "
 "according to his team."
 msgstr ""
+"独立したチームに異なる販売員や営業部門を組織化するための営業チームを定義します。各チームは独自の商談、受注オーダーなどのリストにより活動します。各ユーザは"
+"そのユーザ設定の中にデフォルトのチームを設定することができます。表示された商談と受注オーダーはそのチームにしたがって自動的にフィルタされます。"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Show only lead"
-msgstr ""
+msgstr "リードのみ表示"
 
 #. module: crm
 #: help:crm.meeting,count:0
 msgid "Repeat x times"
-msgstr ""
+msgstr "ｘ回繰り返し"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act
 #: model:ir.model,name:crm.model_crm_case_section
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_act
 msgid "Sales Teams"
-msgstr ""
+msgstr "営業チーム"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2partner
 msgid "Lead to Partner"
-msgstr ""
+msgstr "リードからパートナへ"
 
 #. module: crm
 #: view:crm.segmentation:0 field:crm.segmentation.line,segmentation_id:0
 #: model:ir.actions.act_window,name:crm.crm_segmentation-act
 msgid "Segmentation"
-msgstr ""
+msgstr "分類"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Team"
-msgstr ""
+msgstr "チーム"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in New state"
-msgstr ""
+msgstr "新規状態にあるリード / 商談"
 
 #. module: crm
 #: view:crm.phonecall:0 selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0 view:res.partner:0
 msgid "Not Held"
-msgstr ""
+msgstr "未保留"
 
 #. module: crm
 #: field:crm.lead.report,probability:0
 msgid "Probability"
-msgstr ""
+msgstr "確信度"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Pending Opportunities"
-msgstr ""
+msgstr "保留中商談"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:491
 #, python-format
 msgid "Please select more than one opportunity from the list view."
-msgstr ""
+msgstr "リストビューから１つ以上の商談を選択して下さい。"
 
 #. module: crm
 #: view:crm.lead.report:0 field:crm.meeting,month_list:0
 #: view:crm.phonecall.report:0 field:crm.phonecall.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "月"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2089,7 +2113,7 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_leads
 #: model:process.node,name:crm.process_node_leads0
 msgid "Leads"
-msgstr ""
+msgstr "リード"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
@@ -2104,6 +2128,10 @@ msgid ""
 "email gateway: new emails may create leads, each of them automatically gets "
 "the history of the conversation with the prospect."
 msgstr ""
+"リードは製品やサービスに興味を見せる見込み客やパートナに対して全ての初期接触の管理と追跡を続けることを許します。リードは通常、営業サイクルの最初のステップ"
+"です。一度、資格を認められると、リードはビジネスの商談に変換することができます。と同時に、全てのリンクする活動をそれ以上詳細の追跡のために、関連するパート"
+"ナを作成します。見込みのデータベースのインポート、名刺の継続追跡、またはIpenERPリードとあなたのWebサイトの連絡先フォームの統合ができます。リード"
+"はEメールゲートウェイとの接続も可能です：新規Eメールはリードを作成し、それらの各々は自動的に見込みとともに会話の履歴を取得します。"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
@@ -2111,60 +2139,60 @@ msgstr ""
 #: selection:crm.lead2partner,action:0
 #: selection:crm.phonecall2partner,action:0
 msgid "Create a new partner"
-msgstr ""
+msgstr "新規パートナの作成"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
 msgid "Scheduled Calls"
-msgstr ""
+msgstr "予定された電話"
 
 #. module: crm
 #: view:crm.meeting:0 view:res.partner:0
 msgid "Start Date"
-msgstr ""
+msgstr "開始日"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Scheduled Phonecalls"
-msgstr ""
+msgstr "スケジュール済通話"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Decline"
-msgstr ""
+msgstr "拒否"
 
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "ユーザのEメール"
 
 #. module: crm
 #: help:crm.lead,optin:0
 msgid "If opt-in is checked, this contact has accepted to receive emails."
-msgstr ""
+msgstr "オプトインをチェックした場合、この連絡先はEメールの受信を許諾します。"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Reset to Unconfirmed"
-msgstr ""
+msgstr "未確認にリセット"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,note:0 field:crm.phonecall2phonecall,note:0
 msgid "Note"
-msgstr ""
+msgstr "注記"
 
 #. module: crm
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "選択した会社は、このユーザに許された会社ではありません。"
 
 #. module: crm
 #: selection:crm.lead,priority:0 selection:crm.lead.report,priority:0
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "Low"
-msgstr ""
+msgstr "低い"
 
 #. module: crm
 #: selection:crm.add.note,state:0 field:crm.lead,date_closed:0
@@ -2172,22 +2200,22 @@ msgstr ""
 #: selection:crm.lead.report,state:0 field:crm.meeting,date_closed:0
 #: field:crm.phonecall,date_closed:0
 msgid "Closed"
-msgstr ""
+msgstr "閉じた"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Total of Planned Revenue"
-msgstr ""
+msgstr "計画売上高合計"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Open Opportunities"
-msgstr ""
+msgstr "商談を開く"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet2
 msgid "Internal Meeting"
-msgstr ""
+msgstr "内部ミーティング"
 
 #. module: crm
 #: code:addons/crm/crm.py:454 selection:crm.add.note,state:0 view:crm.lead:0
@@ -2195,17 +2223,17 @@ msgstr ""
 #: selection:crm.lead.report,state:0 selection:crm.phonecall.report,state:0
 #, python-format
 msgid "Pending"
-msgstr ""
+msgstr "保留中"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet1
 msgid "Customer Meeting"
-msgstr ""
+msgstr "顧客ミーティング"
 
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
-msgstr ""
+msgstr "グローバルCC"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -2213,46 +2241,46 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone
 #: model:ir.ui.menu,name:crm.menu_crm_config_phonecall view:res.partner:0
 msgid "Phone Calls"
-msgstr ""
+msgstr "通話"
 
 #. module: crm
 #: view:crm.case.stage:0
 msgid "Stage Search"
-msgstr ""
+msgstr "段階の検索"
 
 #. module: crm
 #: help:crm.lead.report,delay_open:0 help:crm.phonecall.report,delay_open:0
 msgid "Number of Days to open the case"
-msgstr ""
+msgstr "当件を開くまでの日数"
 
 #. module: crm
 #: selection:crm.meeting,end_type:0
 msgid "Number of repetitions"
-msgstr ""
+msgstr "繰り返し数"
 
 #. module: crm
 #: field:crm.lead,phone:0 field:crm.opportunity2phonecall,phone:0
 #: field:crm.phonecall,partner_phone:0 field:crm.phonecall2phonecall,phone:0
 msgid "Phone"
-msgstr ""
+msgstr "電話"
 
 #. module: crm
 #: field:crm.case.channel,active:0 field:crm.case.section,active:0
 #: field:crm.lead,active:0 field:crm.meeting,active:0
 #: field:crm.phonecall,active:0
 msgid "Active"
-msgstr ""
+msgstr "アクティブ"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:856
 #, python-format
 msgid "The stage of opportunity '%s' has been changed to '%s'."
-msgstr ""
+msgstr "商談 %s の段階は %s に変更されました。"
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
-msgstr ""
+msgstr "必須の表現"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
@@ -2262,23 +2290,23 @@ msgstr ""
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Schedule Call"
-msgstr ""
+msgstr "電話のスケジュール"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Uncertain"
-msgstr ""
+msgstr "不確実"
 
 #. module: crm
 #: help:crm.case.stage,sequence:0
 msgid "Used to order stages."
-msgstr ""
+msgstr "オーダー段階で使用されます。"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:276
 #, python-format
 msgid "The opportunity '%s' has been opened."
-msgstr ""
+msgstr "商談 %s は開かれました。"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
@@ -2286,44 +2314,44 @@ msgstr ""
 #: field:crm.lead2partner,action:0 field:crm.opportunity2phonecall,action:0
 #: field:crm.phonecall2partner,action:0 field:crm.phonecall2phonecall,action:0
 msgid "Action"
-msgstr ""
+msgstr "アクション"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_decrease:0
 msgid "Decrease (0>1)"
-msgstr ""
+msgstr "減少（0>1）"
 
 #. module: crm
 #: field:crm.lead.report,deadline_day:0
 msgid "Exp. Closing Day"
-msgstr ""
+msgstr "見込完了日"
 
 #. module: crm
 #: field:crm.case.section,change_responsible:0
 msgid "Reassign Escalated"
-msgstr ""
+msgstr "拡大の再割当"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Weekly"
-msgstr ""
+msgstr "週次"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.action_report_crm_opportunity
 #: model:ir.ui.menu,name:crm.menu_report_crm_opportunities_tree
 msgid "Opportunities Analysis"
-msgstr ""
+msgstr "商談分析"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Misc"
-msgstr ""
+msgstr "その他"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.open_board_crm
 msgid "Sales"
-msgstr ""
+msgstr "受注"
 
 #. module: crm
 #: code:addons/crm/crm.py:430
@@ -2331,74 +2359,74 @@ msgstr ""
 msgid ""
 "You can not escalate, you are already at the top level regarding your sales-"
 "team category."
-msgstr ""
+msgstr "あなたは拡大できません。既にあなたの営業チームの分類は最高位にあります。"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8 view:crm.meeting:0
 msgid "Other"
-msgstr ""
+msgstr "その他"
 
 #. module: crm
 #: view:crm.meeting:0 selection:crm.meeting,state:0
 msgid "Done"
-msgstr ""
+msgstr "完了"
 
 #. module: crm
 #: help:crm.meeting,interval:0
 msgid "Repeat every (Days/Week/Month/Year)"
-msgstr ""
+msgstr "反復間隔（日 / 週 / 月 / 年）"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_max:0
 msgid "Max Interval"
-msgstr ""
+msgstr "最大間隔"
 
 #. module: crm
 #: code:addons/crm/crm.py:396 view:crm.lead:0 view:crm.lead.report:0
 #: selection:crm.lead.report,state:0 view:res.partner:0
 #, python-format
 msgid "Open"
-msgstr ""
+msgstr "開く"
 
 #. module: crm
 #: field:crm.lead,city:0
 msgid "City"
-msgstr ""
+msgstr "市"
 
 #. module: crm
 #: view:crm.lead:0 view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "履歴"
 
 #. module: crm
 #: selection:crm.meeting,show_as:0
 msgid "Busy"
-msgstr ""
+msgstr "割当済"
 
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
-msgstr ""
+msgstr "作成日"
 
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Repeat every"
-msgstr ""
+msgstr "反復（間隔）"
 
 #. module: crm
 #: field:crm.meeting,recurrency:0
 msgid "Recurrent"
-msgstr ""
+msgstr "定期"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls made in last month"
-msgstr ""
+msgstr "先月になされた通話"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_my_oppor
 msgid "My Open Opportunities"
-msgstr ""
+msgstr "私の開いている商談"
 
 #. module: crm
 #: field:base.action.rule,trg_max_history:0
@@ -2430,55 +2458,55 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0 view:res.partner:0
 msgid "End Date"
-msgstr ""
+msgstr "終了日"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Third"
-msgstr ""
+msgstr "第３"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_max:0
 msgid ""
 "The computation is made on all events that occured during this interval, the "
 "past X periods."
-msgstr ""
+msgstr "計算はこの期間と過去x期間の中で発生した全てのイベントで行われます。"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Opportunities"
-msgstr ""
+msgstr "未割当の商談"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# of Emails"
-msgstr ""
+msgstr "Eメール数"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Leads"
-msgstr ""
+msgstr "リードの検索"
 
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
 #: field:crm.phonecall.report,delay_open:0
 msgid "Delay to open"
-msgstr ""
+msgstr "開始を延期する"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Recurrency period"
-msgstr ""
+msgstr "定期の期間"
 
 #. module: crm
 #: field:crm.meeting,week_list:0
 msgid "Weekday"
-msgstr ""
+msgstr "平日"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Referrer"
-msgstr ""
+msgstr "参照元"
 
 #. module: crm
 #: field:crm.lead,id:0 field:crm.meeting,id:0 field:crm.phonecall,id:0
@@ -2490,153 +2518,153 @@ msgstr ""
 msgid ""
 "From which campaign (seminar, marketing campaign, mass mailing, ...) did "
 "this contact come from?"
-msgstr ""
+msgstr "この連絡先はどのキャンペーン（セミナー、マーケティングキャンペーン、大量のメールなど）から来ましたか？"
 
 #. module: crm
 #: model:ir.model,name:crm.model_calendar_attendee
 msgid "Attendee information"
-msgstr ""
+msgstr "出席者情報"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Test"
-msgstr ""
+msgstr "分類のテスト"
 
 #. module: crm
 #: field:crm.lead,user_login:0
 msgid "User Login"
-msgstr ""
+msgstr "ユーザログイン"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Continue Process"
-msgstr ""
+msgstr "処理の継続"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities created in current year"
-msgstr ""
+msgstr "今年作成されたリード / 商談"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2partner
 msgid "Phonecall to Partner"
-msgstr ""
+msgstr "通話からパートナへ"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,user_id:0
 #: field:crm.phonecall2phonecall,user_id:0
 msgid "Assign To"
-msgstr ""
+msgstr "割当先"
 
 #. module: crm
 #: field:crm.add.note,state:0
 msgid "Set New State To"
-msgstr ""
+msgstr "新規状態の設定先"
 
 #. module: crm
 #: field:crm.lead,date_action_last:0 field:crm.meeting,date_action_last:0
 #: field:crm.phonecall,date_action_last:0
 msgid "Last Action"
-msgstr ""
+msgstr "最終アクション"
 
 #. module: crm
 #: field:crm.meeting,duration:0 field:crm.phonecall,duration:0
 #: field:crm.phonecall.report,duration:0
 msgid "Duration"
-msgstr ""
+msgstr "期間"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Show countries"
-msgstr ""
+msgstr "国を表示"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Select Salesman"
-msgstr ""
+msgstr "販売員の選択"
 
 #. module: crm
 #: view:board.board:0
 msgid "Sales Dashboard"
-msgstr ""
+msgstr "受注ダッシュボード"
 
 #. module: crm
 #: field:crm.lead.report,nbr:0 field:crm.phonecall.report,nbr:0
 msgid "# of Cases"
-msgstr ""
+msgstr "案件の数"
 
 #. module: crm
 #: help:crm.meeting,section_id:0 help:crm.phonecall,section_id:0
 msgid "Sales team to which Case belongs to."
-msgstr ""
+msgstr "案件が属する営業チーム"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Sunday"
-msgstr ""
+msgstr "日曜"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Fourth"
-msgstr ""
+msgstr "第４"
 
 #. module: crm
 #: selection:crm.add.note,state:0
 msgid "Unchanged"
-msgstr ""
+msgstr "未変更"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_segmentation_tree-act
 #: model:ir.ui.menu,name:crm.menu_crm_segmentation-act
 msgid "Partners Segmentation"
-msgstr ""
+msgstr "パートナ分類"
 
 #. module: crm
 #: field:crm.lead,fax:0
 msgid "Fax"
-msgstr ""
+msgstr "FAX"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities created in current month"
-msgstr ""
+msgstr "今月作成されたリード / 商談"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Assignment"
-msgstr ""
+msgstr "割当"
 
 #. module: crm
 #: field:crm.lead,company_id:0 view:crm.lead.report:0
 #: field:crm.lead.report,company_id:0 field:crm.phonecall,company_id:0
 #: view:crm.phonecall.report:0 field:crm.phonecall.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "会社"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Friday"
-msgstr ""
+msgstr "金曜"
 
 #. module: crm
 #: field:crm.meeting,allday:0
 msgid "All Day"
-msgstr ""
+msgstr "終日"
 
 #. module: crm
 #: field:crm.segmentation.line,operator:0
 msgid "Mandatory / Optional"
-msgstr ""
+msgstr "必須 / オプション"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Leads"
-msgstr ""
+msgstr "見割当リード"
 
 #. module: crm
 #: field:crm.lead,subjects:0
 msgid "Subject of Email"
-msgstr ""
+msgstr "Eメールの標題"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_view_attendee_form
@@ -2649,77 +2677,77 @@ msgstr ""
 #: view:crm.phonecall.report:0 selection:crm.phonecall.report,state:0
 #: view:res.partner:0
 msgid "Todo"
-msgstr ""
+msgstr "ToDo"
 
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
-msgstr ""
+msgstr "オブジェクト名"
 
 #. module: crm
 #: help:crm.lead,email_from:0
 msgid "E-mail address of the contact"
-msgstr ""
+msgstr "連絡先のEメールアドレス"
 
 #. module: crm
 #: field:crm.lead,referred:0
 msgid "Referred by"
-msgstr ""
+msgstr "参照先"
 
 #. module: crm
 #: view:crm.lead:0 model:ir.model,name:crm.model_crm_add_note
 msgid "Add Internal Note"
-msgstr ""
+msgstr "内部注記を追加"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:853
 #, python-format
 msgid "The stage of lead '%s' has been changed to '%s'."
-msgstr ""
+msgstr "リード %s の段階は %s に変更されました。"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
-msgstr ""
+msgstr "最後"
 
 #. module: crm
 #: field:crm.lead,message_ids:0 field:crm.meeting,message_ids:0
 #: field:crm.phonecall,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "メッセージ"
 
 #. module: crm
 #: help:crm.lead,channel_id:0
 msgid "Communication channel (mail, direct, phone, ...)"
-msgstr ""
+msgstr "通信チャネル（メール、直接、電話など）"
 
 #. module: crm
 #: code:addons/crm/crm_action_rule.py:61
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "エラー"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,name:0 field:crm.phonecall2phonecall,name:0
 msgid "Call summary"
-msgstr ""
+msgstr "通話の概要"
 
 #. module: crm
 #: selection:crm.add.note,state:0 selection:crm.lead,state:0
 #: selection:crm.lead.report,state:0 selection:crm.meeting,state:0
 #: selection:crm.phonecall,state:0 selection:crm.phonecall.report,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "キャンセル済"
 
 #. module: crm
 #: field:crm.add.note,body:0
 msgid "Note Body"
-msgstr ""
+msgstr "注記本文"
 
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
-msgstr ""
+msgstr "段階別私の計画売上高"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
@@ -2736,16 +2764,22 @@ msgid ""
 "opportunities, convert them into quotations, manage related documents, track "
 "all customer related activities, and much more."
 msgstr ""
+"商談とともに見込み営業を継続するために特定の顧客または見込みに関係する営業ドキュメントを作成することで営業パイプラインの管理と追跡の継続が可能です。予想売"
+"上、商談の段階、予想終了日、通信履歴などの情報を保存することができます。商談はEメールゲートウェイと接続しています：新規Eメールは商談を作成し、それらの各"
+"々は顧客の通信履歴を自動的に取得します。\n"
+"\n"
+"あなたとあなたのチームは、商談からミーティングや電話の計画を行い、それらを見積りに変換し、関係ドキュメントを管理し、全ての顧客に関連する活動を追跡すること"
+"などが可能です。"
 
 #. module: crm
 #: field:crm.lead,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "カラーインデックス"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Links"
-msgstr ""
+msgstr "リンク"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_categ_action
@@ -2755,13 +2789,15 @@ msgid ""
 "instance reflect your product structure or the different types of sales you "
 "do."
 msgstr ""
+"より良い分類とリードや商談を分析するために、会社の活動に適合する特定の分類を作成します。それらの分類は、例えば商品構造やあなたの行う異なったタイプの営業を"
+"反映します。"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
 msgid ""
 "If the partner has not purchased (or bought) during a period, decrease the "
 "state of mind by this factor. It's a multiplication"
-msgstr ""
+msgstr "パートナは期間中に仕入れや購入しなかった場合は、この要因により、精神状態が低下します。それは乗算されます。"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
@@ -2771,21 +2807,23 @@ msgid ""
 "several criteria and drill down the information, by adding more groups in "
 "the report."
 msgstr ""
+"このレポートから、通話を基準としたあなたの営業チームの成績の分析ができます。より多くのグループをレポートに追加することで、幾つかの基準と情報のドリルダウン"
+"による情報のクループ化やフィルタができます。"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Mails"
-msgstr ""
+msgstr "メールの数"
 
 #. module: crm
 #: field:crm.phonecall,name:0 view:res.partner:0
 msgid "Call Summary"
-msgstr ""
+msgstr "通話の概要"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Todays' Leads"
-msgstr ""
+msgstr "本日のリード"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
@@ -2796,86 +2834,89 @@ msgid ""
 "customer. You can also import a .CSV file with a list of calls to be done by "
 "your sales team."
 msgstr ""
+"スケジュールされた通話はあなたの営業チームにより行われた全ての通話をリストします。販売員はフォームビューの中の通話についての情報を記録できます。この情報は"
+"あなたと顧客とが行った全てのコンタクトを追跡するため、パートナフォームの中に保存することができます。あなたの営業チームにより行われた通話のリストのCSVフ"
+"ァイルをインポートすることもできます。"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_operator:0
 msgid "Operator"
-msgstr ""
+msgstr "演算子"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2phonecall
 msgid "Phonecall To Phonecall"
-msgstr ""
+msgstr "通話から通話へ"
 
 #. module: crm
 #: view:crm.lead:0
 #: model:ir.actions.act_window,name:crm.opportunity2phonecall_act
 msgid "Schedule/Log Call"
-msgstr ""
+msgstr "電話のスケジュール / ログ"
 
 #. module: crm
 #: selection:crm.meeting,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "確認済"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
-msgstr ""
+msgstr "ユーザと段階別計画売上高"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
-msgstr ""
+msgstr "確認"
 
 #. module: crm
 #: field:crm.meeting,su:0
 msgid "Sun"
-msgstr ""
+msgstr "日"
 
 #. module: crm
 #: field:crm.phonecall.report,section_id:0
 msgid "Section"
-msgstr ""
+msgstr "セクション"
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Optional Expression"
-msgstr ""
+msgstr "オプションの式"
 
 #. module: crm
 #: selection:crm.meeting,select1:0
 msgid "Day of month"
-msgstr ""
+msgstr "月の日"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_my_oppor_stage
 msgid "Planned Revenue By Stage"
-msgstr ""
+msgstr "段階別計画売上高"
 
 #. module: crm
 #: selection:crm.add.note,state:0 model:crm.case.stage,name:crm.stage_lead1
 #: view:crm.lead:0 selection:crm.lead,state:0 view:crm.lead.report:0
 msgid "New"
-msgstr ""
+msgstr "新規"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,email_from:0 field:crm.meeting,email_from:0
 #: field:crm.phonecall,email_from:0
 msgid "Email"
-msgstr ""
+msgstr "Eメール"
 
 #. module: crm
 #: view:crm.case.channel:0 view:crm.lead:0 field:crm.lead,channel_id:0
 #: view:crm.lead.report:0 field:crm.lead.report,channel_id:0
 msgid "Channel"
-msgstr ""
+msgstr "チャネル"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.lead.report:0 view:crm.meeting:0
 #: view:crm.phonecall:0 view:crm.phonecall.report:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "私の営業チーム"
 
 #. module: crm
 #: help:crm.segmentation,exclusif:0
@@ -2885,119 +2926,121 @@ msgid ""
 "If checked, remove the category from partners that doesn't match "
 "segmentation criterions"
 msgstr ""
+"分類が分類基準に一致するパートナに限定される場合はチェックします。\n"
+"チェックした場合、分類l基準一致しないパートナからはその分類が削除されます。"
 
 #. module: crm
 #: field:crm.meeting,exdate:0
 msgid "Exception Date/Times"
-msgstr ""
+msgstr "例外の日付 / 時間"
 
 #. module: crm
 #: help:crm.meeting,date_deadline:0
 msgid ""
 "Deadline Date is automatically                         computed from Start "
 "Date + Duration"
-msgstr ""
+msgstr "締切日は 開始日 + 期間 から自動的に計算されます。"
 
 #. module: crm
 #: field:crm.lead,state_id:0
 msgid "Fed. State"
-msgstr ""
+msgstr "都道府県"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadopportunity0
 msgid "Creating business opportunities from Leads"
-msgstr ""
+msgstr "リードからビジネス商談の作成"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.open_board_statistical_dash
 #: model:ir.ui.menu,name:crm.menu_board_statistics_dash
 msgid "CRM Dashboard"
-msgstr ""
+msgstr "CRMダッシュボード"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor4
 msgid "Need Information"
-msgstr ""
+msgstr "情報が必要"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadopportunity0
 msgid "Prospect Opportunity"
-msgstr ""
+msgstr "商談の見込み"
 
 #. module: crm
 #: field:base.action.rule,act_categ_id:0
 msgid "Set Category to"
-msgstr ""
+msgstr "分類の設定先"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Mail To"
-msgstr ""
+msgstr "メール宛先"
 
 #. module: crm
 #: field:crm.meeting,th:0
 msgid "Thu"
-msgstr ""
+msgstr "木"
 
 #. module: crm
 #: view:crm.add.note:0 view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2opportunity:0
 #: view:crm.phonecall2phonecall:0
 msgid "_Cancel"
-msgstr ""
+msgstr "キャンセル"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Daily"
-msgstr ""
+msgstr "日次"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_stage_form_installer
 msgid "Review Sales Stages"
-msgstr ""
+msgstr "営業段階のレビュー"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead2
 msgid "Qualification"
-msgstr ""
+msgstr "資格"
 
 #. module: crm
 #: field:crm.lead,partner_address_email:0
 msgid "Partner Contact Email"
-msgstr ""
+msgstr "パートナの連絡先Eメール"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_partner.py:48
 #, python-format
 msgid "A partner is already defined."
-msgstr ""
+msgstr "パートナは既に定義済です。"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "First"
-msgstr ""
+msgstr "第１"
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
 msgid "Exp. Closing Month"
-msgstr ""
+msgstr "見込完了月"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "December"
-msgstr ""
+msgstr "12月"
 
 #. module: crm
 #: view:base.action.rule:0
 msgid "Condition on Communication History"
-msgstr ""
+msgstr "通信履歴の条件"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Date of Call"
-msgstr ""
+msgstr "通話日"
 
 #. module: crm
 #: help:crm.segmentation,som_interval:0
@@ -3010,87 +3053,91 @@ msgid ""
 "bought goods to another supplier.                  \n"
 "Use this functionality for recurring businesses."
 msgstr ""
+"期間はこの分類のための販売または購入の２つの周期の間の平均日数です。\n"
+"これは主に、パートナが長期間にわたり仕入れや購入しなかったことを検出するのに使用されます。\n"
+"それは、彼は他の仕入先から製品の購入をしているため、精神状態は低下しているものと考えられます。\n"
+"定期的なビジネスのためにこの機能を使用します。"
 
 #. module: crm
 #: field:crm.meeting,vtimezone:0
 msgid "Timezone"
-msgstr ""
+msgstr "タイムゾーン"
 
 #. module: crm
 #: field:crm.meeting,sa:0
 msgid "Sat"
-msgstr ""
+msgstr "土"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,user_id:0 view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "Salesman"
-msgstr ""
+msgstr "販売員"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,date_deadline:0
 msgid "Expected Closing"
-msgstr ""
+msgstr "見込完了"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity2phonecall
 msgid "Opportunity to Phonecall"
-msgstr ""
+msgstr "商談から通話へ"
 
 #. module: crm
 #: help:crm.case.section,allow_unlink:0
 msgid "Allows to delete non draft cases"
-msgstr ""
+msgstr "非ドラフト案件の削除を許可"
 
 #. module: crm
 #: field:crm.meeting,count:0
 msgid "Repeat"
-msgstr ""
+msgstr "繰り返し"
 
 #. module: crm
 #: field:crm.lead.report,deadline_year:0
 msgid "Ex. Closing Year"
-msgstr ""
+msgstr "前回終了年"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Partner Name"
-msgstr ""
+msgstr "パートナ名"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone2
 msgid "Outbound"
-msgstr ""
+msgstr "送信"
 
 #. module: crm
 #: field:crm.lead,date_open:0 field:crm.phonecall,date_open:0
 msgid "Opened"
-msgstr ""
+msgstr "開始済"
 
 #. module: crm
 #: view:crm.case.section:0 field:crm.case.section,member_ids:0
 msgid "Team Members"
-msgstr ""
+msgstr "チームメンバー"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.meeting:0 view:crm.phonecall:0
 msgid "Contacts"
-msgstr ""
+msgstr "コンタクト"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Interest in Computer"
-msgstr ""
+msgstr "コンピュータへの関心"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invitation Detail"
-msgstr ""
+msgstr "招待の詳細"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_default:0
 msgid "Default (0=None)"
-msgstr ""
+msgstr "デフォルト（0=なし）"
 
 #. module: crm
 #: help:crm.lead,email_cc:0
@@ -3098,36 +3145,36 @@ msgid ""
 "These email addresses will be added to the CC field of all inbound and "
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
-msgstr ""
+msgstr "これらのEメールアドレスは送受信するEメールの CC 欄に追加されます。複数のEメールアドレスの間をコンマで区切って下さい。"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
 msgid "Logged Calls"
-msgstr ""
+msgstr "ログ対象通話"
 
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
 msgid "Success Probability"
-msgstr ""
+msgstr "成功確率"
 
 #. module: crm
 #: code:addons/crm/crm.py:466 selection:crm.lead.report,state:0
 #: selection:crm.phonecall,state:0 selection:crm.phonecall.report,state:0
 #, python-format
 msgid "Draft"
-msgstr ""
+msgstr "ドラフト"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
 msgid "Cases by Sales Team"
-msgstr ""
+msgstr "営業チーム毎の案件"
 
 #. module: crm
 #: field:crm.meeting,attendee_ids:0
 msgid "Attendees"
-msgstr ""
+msgstr "出席者"
 
 #. module: crm
 #: view:crm.meeting:0 view:crm.phonecall:0
@@ -3135,150 +3182,150 @@ msgstr ""
 #: model:process.node,name:crm.process_node_meeting0
 #: model:res.request.link,name:crm.request_link_meeting
 msgid "Meeting"
-msgstr ""
+msgstr "ミーティング"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_categ
 msgid "Category of Case"
-msgstr ""
+msgstr "案件の分類"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.phonecall:0
 msgid "7 Days"
-msgstr ""
+msgstr "7日間"
 
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
-msgstr ""
+msgstr "段階とユーザ別計画売上高"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication & History"
-msgstr ""
+msgstr "通信と履歴"
 
 #. module: crm
 #: selection:crm.lead,priority:0 selection:crm.lead.report,priority:0
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "Normal"
-msgstr ""
+msgstr "標準"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:104
 #, python-format
 msgid "Closed/Cancelled Leads can not be converted into Opportunity"
-msgstr ""
+msgstr "閉じた / キャンセル済リードは商談に変換することはできません。"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_meeting_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_meeting-act
 msgid "Meeting Categories"
-msgstr ""
+msgstr "ミーティングの分類"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
 msgid "You may have to verify that this partner does not exist already."
-msgstr ""
+msgstr "このパートナが既に存在しないことを確認する必要があります。"
 
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
-msgstr ""
+msgstr "開始を延期する"
 
 #. module: crm
 #: field:crm.lead.report,user_id:0 field:crm.phonecall.report,user_id:0
 msgid "User"
-msgstr ""
+msgstr "ユーザ"
 
 #. module: crm
 #: code:addons/crm/crm.py:446
 #, python-format
 msgid "The case '%s' has been cancelled."
-msgstr ""
+msgstr "案件 %s はキャンセル済です。"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "November"
-msgstr ""
+msgstr "11月"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
 msgid "Opportunities By Stage"
-msgstr ""
+msgstr "段階別の商談"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "January"
-msgstr ""
+msgstr "1月"
 
 #. module: crm
 #: model:process.process,name:crm.process_process_contractprocess0
 msgid "Contract"
-msgstr ""
+msgstr "契約"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead4
 msgid "Twitter Ads"
-msgstr ""
+msgstr "Twitter広告"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:336
 #, python-format
 msgid "The opportunity '%s' has been been won."
-msgstr ""
+msgstr "商談 %s は受注されています。"
 
 #. module: crm
 #: field:crm.case.stage,case_default:0
 msgid "Common to All Teams"
-msgstr ""
+msgstr "全てのチームに共通"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:831 code:addons/crm/wizard/crm_add_note.py:28
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "エラー"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Planned Revenues"
-msgstr ""
+msgstr "計画売上高"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor7
 msgid "Need Consulting"
-msgstr ""
+msgstr "コンサルティングが必要"
 
 #. module: crm
 #: constraint:crm.segmentation:0
 msgid "Error ! You can not create recursive profiles."
-msgstr ""
+msgstr "エラー。再帰的なプロファイルの作成はできません。"
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
 msgid "Expected closing year"
-msgstr ""
+msgstr "見込完了年"
 
 #. module: crm
 #: field:crm.lead,partner_address_id:0 field:crm.meeting,partner_address_id:0
 #: field:crm.phonecall,partner_address_id:0
 msgid "Partner Contact"
-msgstr ""
+msgstr "パートナ連絡先"
 
 #. module: crm
 #: field:crm.meeting,recurrent_id:0
 msgid "Recurrent ID date"
-msgstr ""
+msgstr "定期ID日付"
 
 #. module: crm
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "同じログインでは２つのユーザを持てません。"
 
 #. module: crm
 #: code:addons/crm/crm.py:409 view:crm.lead:0 view:res.partner:0
@@ -3315,12 +3362,12 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,phonecall_id:0
 msgid "Phonecall"
-msgstr ""
+msgstr "通話"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Thursday"
-msgstr ""
+msgstr "木曜"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -3362,7 +3409,7 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls made in current month"
-msgstr ""
+msgstr "今月なされた通話"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -3379,7 +3426,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "New Opportunities"
-msgstr ""
+msgstr "新規商談"
 
 #. module: crm
 #: code:addons/crm/crm_action_rule.py:61
@@ -3400,7 +3447,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunities by User and Team"
-msgstr ""
+msgstr "ユーザとチーム別の商談"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -3415,7 +3462,7 @@ msgstr ""
 #. module: crm
 #: field:res.partner,phonecall_ids:0
 msgid "Phonecalls"
-msgstr ""
+msgstr "通話"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,is_customer_add:0
@@ -3472,12 +3519,12 @@ msgstr ""
 #: selection:crm.lead2opportunity.partner.mass,name:0 view:crm.phonecall:0
 #: view:res.partner:0
 msgid "Convert to Opportunity"
-msgstr ""
+msgstr "商談に変換"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Wednesday"
-msgstr ""
+msgstr "水曜"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
@@ -3487,6 +3534,8 @@ msgid ""
 "partner. From the phone call form, you can trigger a request for another "
 "call, a meeting or an opportunity."
 msgstr ""
+"このツールはその場であなたの着信通話をログに記録することができます。各通話はあなたとパートナが行った全てのコンタクトを追加するためにパートナフォーム上に表"
+"示されます。通話フォームから、他の通話、ミーティング、商談の要求を起動できます。"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -3508,7 +3557,7 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall_report
 msgid "Phone calls by user and section"
-msgstr ""
+msgstr "ユーザとセクション別通話"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_channel_action
@@ -3517,12 +3566,14 @@ msgid ""
 "channels that will be maintained at the creation of a document in the "
 "system. Some examples of channels can be: Website, Phone Call, Reseller, etc."
 msgstr ""
+"システム内のドキュメント作成において、維持管理される特定のチャネルの作成によって、リードと商談がどこから来るのかを追跡します。幾つかのチャネルの例：Web"
+"サイト、通話、リセラーなど。"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 msgid "Merge with existing Opportunity"
-msgstr ""
+msgstr "既存の商談の統合"
 
 #. module: crm
 #: field:crm.meeting,select1:0
@@ -3537,7 +3588,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
-msgstr ""
+msgstr "見込完了"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0 field:crm.meeting,sequence:0
@@ -3590,3 +3641,9 @@ msgstr "エラーです。再帰的な関係となる会員を作ることはで
 #: model:crm.case.resource.type,name:crm.type_lead8
 msgid "Newsletter"
 msgstr "ニュースレター"
+
+#~ msgid "Campaign 1"
+#~ msgstr "キャンペーン1"
+
+#~ msgid "Campaign 2"
+#~ msgstr "キャンペーン2"
diff --git a/addons/crm_claim/i18n/ja.po b/addons/crm_claim/i18n/ja.po
index 0d6587f3b09..c4736037adb 100644
--- a/addons/crm_claim/i18n/ja.po
+++ b/addons/crm_claim/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 00:36+0000\n"
-"PO-Revision-Date: 2012-07-06 04:04+0000\n"
+"PO-Revision-Date: 2012-07-07 21:23+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-06 04:58+0000\n"
+"X-Launchpad-Export-Date: 2012-07-08 04:41+0000\n"
 "X-Generator: Launchpad (build 15558)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
 msgid "# of Cases"
-msgstr "件数"
+msgstr "案件の数"
 
 #. module: crm_claim
 #: view:crm.claim:0
diff --git a/addons/crm_fundraising/i18n/ja.po b/addons/crm_fundraising/i18n/ja.po
index 0fbac12e0f4..2e87ece13d7 100644
--- a/addons/crm_fundraising/i18n/ja.po
+++ b/addons/crm_fundraising/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:36+0000\n"
-"PO-Revision-Date: 2012-07-06 04:05+0000\n"
+"PO-Revision-Date: 2012-07-08 22: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-07-06 04:58+0000\n"
+"X-Launchpad-Export-Date: 2012-07-09 04:51+0000\n"
 "X-Generator: Launchpad (build 15558)\n"
 
 #. module: crm_fundraising
@@ -324,7 +324,7 @@ msgid ""
 "Have a general overview of all fund raising activities by sorting them with "
 "specific criteria such as the estimated revenue, average success probability "
 "and delay to close."
-msgstr "予測金額、平均成功確率、締切の延期などの基準で分類して全ての資金調達の一覧を表示する。"
+msgstr "予測売上、平均成功確率、締切の延期などの特定の基準で分類することで、全ての資金調達活動の一般的な概要を持ちます。"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
diff --git a/addons/crm_helpdesk/i18n/ja.po b/addons/crm_helpdesk/i18n/ja.po
index 156399a8159..8a0e027baec 100644
--- a/addons/crm_helpdesk/i18n/ja.po
+++ b/addons/crm_helpdesk/i18n/ja.po
@@ -14,7 +14,7 @@ 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-06 04:58+0000\n"
+"X-Launchpad-Export-Date: 2012-07-07 05:13+0000\n"
 "X-Generator: Launchpad (build 15558)\n"
 
 #. module: crm_helpdesk
diff --git a/addons/crm_partner_assign/i18n/ja.po b/addons/crm_partner_assign/i18n/ja.po
index b3c1547c154..1deac08f254 100644
--- a/addons/crm_partner_assign/i18n/ja.po
+++ b/addons/crm_partner_assign/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:36+0000\n"
-"PO-Revision-Date: 2012-07-06 04:06+0000\n"
+"PO-Revision-Date: 2012-07-08 19:19+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-06 04:58+0000\n"
+"X-Launchpad-Export-Date: 2012-07-09 04:51+0000\n"
 "X-Generator: Launchpad (build 15558)\n"
 
 #. module: crm_partner_assign
@@ -329,7 +329,7 @@ msgstr "パートナの割当て"
 #. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
-msgstr "リードと機会を区別するためにタイプを使います。"
+msgstr "リードと商談を区別するためにタイプを使います。"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -362,7 +362,7 @@ msgstr "ジオロケーション"
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
-msgstr "好機割当て分析"
+msgstr "商談割当分析"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -409,7 +409,7 @@ msgstr "重量"
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
-msgstr "開始をを延期する"
+msgstr "開始を延期する"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -455,7 +455,7 @@ msgstr "分類"
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
-msgstr "好機の数"
+msgstr "商談の数"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
@@ -492,7 +492,7 @@ msgstr "パートナに大量に転送"
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
-msgstr "割り当てられた好機"
+msgstr "割当済商談"
 
 #. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
@@ -527,12 +527,12 @@ msgstr "6月"
 #. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
-msgstr "当件を開くまでの日数"
+msgstr "案件を開くまでの日数"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
-msgstr "開始をを延期する"
+msgstr "開始を延期する"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,send_to:0
@@ -566,7 +566,7 @@ msgstr "ジオ緯度"
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
-msgstr "好機の数"
+msgstr "商談の数"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -738,7 +738,7 @@ msgstr "住所"
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
-msgstr "好機"
+msgstr "商談"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
@@ -776,7 +776,7 @@ msgstr "メッセージの見出し"
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
-msgstr "好機に転換する"
+msgstr "商談に変換"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_bcc:0
diff --git a/addons/crm_profiling/i18n/ja.po b/addons/crm_profiling/i18n/ja.po
index 2f8aa5ef26c..dec5af0dce0 100644
--- a/addons/crm_profiling/i18n/ja.po
+++ b/addons/crm_profiling/i18n/ja.po
@@ -14,7 +14,7 @@ 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-06 04:58+0000\n"
+"X-Launchpad-Export-Date: 2012-07-07 05:13+0000\n"
 "X-Generator: Launchpad (build 15558)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_todo/i18n/ja.po b/addons/crm_todo/i18n/ja.po
index ffa0a726173..002d9e0acc3 100644
--- a/addons/crm_todo/i18n/ja.po
+++ b/addons/crm_todo/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-04-20 03:47+0000\n"
-"Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\n"
+"PO-Revision-Date: 2012-07-07 21: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-04-21 05:01+0000\n"
-"X-Generator: Launchpad (build 15120)\n"
+"X-Launchpad-Export-Date: 2012-07-08 04:41+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
@@ -82,7 +82,7 @@ msgstr "その他の情報"
 #. module: crm_todo
 #: field:project.task,lead_id:0
 msgid "Lead / Opportunity"
-msgstr "見込み客 / 商談"
+msgstr "リード / 商談"
 
 #. module: crm_todo
 #: view:crm.lead:0
diff --git a/addons/edi/i18n/ar.po b/addons/edi/i18n/ar.po
index 4a1208670d7..cf25f0186d5 100644
--- a/addons/edi/i18n/ar.po
+++ b/addons/edi/i18n/ar.po
@@ -14,7 +14,7 @@ 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-06 04:58+0000\n"
+"X-Launchpad-Export-Date: 2012-07-07 05:13+0000\n"
 "X-Generator: Launchpad (build 15558)\n"
 
 #. module: edi
diff --git a/addons/import_google/i18n/ar.po b/addons/import_google/i18n/ar.po
new file mode 100644
index 00000000000..1f6bda316dc
--- /dev/null
+++ b/addons/import_google/i18n/ar.po
@@ -0,0 +1,217 @@
+# Arabic translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <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:36+0000\n"
+"PO-Revision-Date: 2012-07-07 15:59+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-07-08 04:41+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
+
+#. module: import_google
+#: help:synchronize.google.import,group_name:0
+msgid "Choose which group to import, By default it takes all."
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import Google Calendar Events"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Import Events"
+msgstr "_جلب الأحداث"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:71
+#, python-format
+msgid ""
+"No Google Username or password Defined for user.\n"
+"Please define in user view"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:127
+#, python-format
+msgid ""
+"Invalid login detail !\n"
+" Specify Username/Password."
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,supplier:0
+msgid "Supplier"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import Options"
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,group_name:0
+msgid "Group Name"
+msgstr ""
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_crm_case_categ
+msgid "Category of Case"
+msgstr ""
+
+#. module: import_google
+#: model:ir.actions.act_window,name:import_google.act_google_login_contact_form
+#: model:ir.ui.menu,name:import_google.menu_sync_contact
+msgid "Import Google Contacts"
+msgstr "جلب اتصالات قوقل"
+
+#. module: import_google
+#: view:google.import.message:0
+msgid "Import Google Data"
+msgstr ""
+
+#. module: import_google
+#: view:crm.meeting:0
+msgid "Meeting Type"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google.py:38
+#: code:addons/import_google/wizard/import_google_data.py:28
+#, python-format
+msgid ""
+"Please install gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+msgstr ""
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_google_login
+msgid "Google Contact"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import contacts from a google account"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:133
+#, python-format
+msgid "Please specify correct user and password !"
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,customer:0
+msgid "Customer"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_synchronize_google_import
+msgid "synchronize.google.import"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Import Contacts"
+msgstr ""
+
+#. module: import_google
+#: model:ir.actions.act_window,name:import_google.act_google_login_form
+#: model:ir.ui.menu,name:import_google.menu_sync_calendar
+msgid "Import Google Calendar"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:50
+#, python-format
+msgid "Import google"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:127
+#: code:addons/import_google/wizard/import_google_data.py:133
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:71
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,create_partner:0
+msgid "Options"
+msgstr ""
+
+#. module: import_google
+#: view:google.import.message:0
+msgid "_Ok"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google.py:38
+#: code:addons/import_google/wizard/import_google_data.py:28
+#, python-format
+msgid "Google Contacts Import Error!"
+msgstr ""
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_google_import_message
+msgid "Import Message"
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,calendar_name:0
+msgid "Calendar Name"
+msgstr ""
+
+#. module: import_google
+#: help:synchronize.google.import,supplier:0
+msgid "Check this box to set newly created partner as Supplier."
+msgstr ""
+
+#. module: import_google
+#: selection:synchronize.google.import,create_partner:0
+msgid "Import only address"
+msgstr ""
+
+#. module: import_google
+#: field:crm.case.categ,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Partner Status for this Group:"
+msgstr ""
+
+#. module: import_google
+#: field:google.import.message,name:0
+msgid "Message"
+msgstr ""
+
+#. module: import_google
+#: selection:synchronize.google.import,create_partner:0
+msgid "Create partner for each contact"
+msgstr ""
+
+#. module: import_google
+#: help:synchronize.google.import,customer:0
+msgid "Check this box to set newly created partner as Customer."
+msgstr ""
diff --git a/addons/import_google/i18n/ja.po b/addons/import_google/i18n/ja.po
index ad1ab085495..dad8acc1860 100644
--- a/addons/import_google/i18n/ja.po
+++ b/addons/import_google/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-24 18:56+0000\n"
+"PO-Revision-Date: 2012-07-09 04:44+0000\n"
 "Last-Translator: Akira Hiyama <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-25 04:40+0000\n"
-"X-Generator: Launchpad (build 15288)\n"
+"X-Launchpad-Export-Date: 2012-07-09 04:51+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: import_google
 #: help:synchronize.google.import,group_name:0
@@ -70,7 +70,7 @@ msgstr "グループ名"
 #. module: import_google
 #: model:ir.model,name:import_google.model_crm_case_categ
 msgid "Category of Case"
-msgstr "ケースの分類"
+msgstr "案件の分類"
 
 #. module: import_google
 #: model:ir.actions.act_window,name:import_google.act_google_login_contact_form
diff --git a/addons/project/i18n/hr.po b/addons/project/i18n/hr.po
index 83182e409ef..d17da5727b3 100644
--- a/addons/project/i18n/hr.po
+++ b/addons/project/i18n/hr.po
@@ -7,13 +7,13 @@ 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: 2012-07-05 11:02+0000\n"
+"PO-Revision-Date: 2012-07-06 12:24+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-07-06 04:58+0000\n"
+"X-Launchpad-Export-Date: 2012-07-07 05:12+0000\n"
 "X-Generator: Launchpad (build 15558)\n"
 "Language: hr\n"
 
@@ -281,7 +281,7 @@ msgstr "Zadatak"
 #. module: project
 #: view:project.project:0
 msgid "Members"
-msgstr ""
+msgstr "Članovi"
 
 #. module: project
 #: view:board.board:0
diff --git a/addons/sale_crm/i18n/ja.po b/addons/sale_crm/i18n/ja.po
index 90dee9e022a..2c6e158a939 100644
--- a/addons/sale_crm/i18n/ja.po
+++ b/addons/sale_crm/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-06-08 09:02+0000\n"
-"Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\n"
+"PO-Revision-Date: 2012-07-06 21:31+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-09 05:39+0000\n"
-"X-Generator: Launchpad (build 15376)\n"
+"X-Launchpad-Export-Date: 2012-07-07 05:13+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
@@ -105,13 +105,13 @@ msgstr "オポチュニティ成立"
 #. module: sale_crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
-msgstr "状況による私の計画売上高"
+msgstr "段階別私の計画売上高"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:110
 #, python-format
 msgid "Opportunity  '%s' is converted to Quotation."
-msgstr "オポチュニティの'%s' は、見積りへ変わりました。"
+msgstr "オポチュニティの'%s' は、見積に変換されました。"
 
 #. module: sale_crm
 #: view:sale.order:0
diff --git a/addons/survey/i18n/ja.po b/addons/survey/i18n/ja.po
index b3670aba55e..66630dfe697 100644
--- a/addons/survey/i18n/ja.po
+++ b/addons/survey/i18n/ja.po
@@ -14,7 +14,7 @@ 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-06 04:58+0000\n"
+"X-Launchpad-Export-Date: 2012-07-07 05:13+0000\n"
 "X-Generator: Launchpad (build 15558)\n"
 
 #. module: survey
diff --git a/addons/web_livechat/i18n/mn.po b/addons/web_livechat/i18n/mn.po
new file mode 100644
index 00000000000..9ab220033ae
--- /dev/null
+++ b/addons/web_livechat/i18n/mn.po
@@ -0,0 +1,28 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <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-08 18:51+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mongolian <mn@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-09 04:51+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
+
+#. module: web_livechat
+#: sql_constraint:publisher_warranty.contract:0
+msgid "That contract is already registered in the system."
+msgstr "Энэ гэрээг системд өмнө нь бүртгэгдсэн байна."
+
+#. module: web_livechat
+#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
+msgid "publisher_warranty.contract"
+msgstr "publisher_warranty.contract"

From ee0ff9ce960d85e5dc9d76ef5c36413533f84f79 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 9 Jul 2012 11:09:33 +0530
Subject: [PATCH 206/239] [IMP]idea: Improve m2m field syntax

bzr revid: dbr@tinyerp.com-20120709053933-3mqv2hvwsl8fyy7g
---
 addons/idea/idea.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index cc2c11bdd8a..396040c8828 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -49,7 +49,7 @@ class idea_idea(osv.osv):
         'create_uid': fields.many2one('res.users', 'Creator', required=True, readonly=True),
         'name': fields.char('Idea Summary', size=64, required=True, readonly=True, oldname='title', states={'draft':[('readonly',False)]}),
         'description': fields.text('Description', help='Content of the idea', readonly=True, states={'draft':[('readonly',False)]}),
-        'category_ids': fields.many2many('idea.category', 'Tags', readonly=True, states={'draft':[('readonly',False)]}),
+        'category_ids': fields.many2many('idea.category', 'idea_category_ids','idea_category_name_id','name','Tags',readonly=True, states={'draft':[('readonly',False)]}),
         'state': fields.selection([('draft', 'New'),
             ('open', 'Accepted'),
             ('cancel', 'Refused'),

From 19614e357739cb4344ec863abe6f2eb115e9f777 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 9 Jul 2012 12:30:40 +0530
Subject: [PATCH 207/239] [IMP]idea: set string

bzr revid: dbr@tinyerp.com-20120709070040-r23926rx311uod68
---
 addons/idea/idea.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index 396040c8828..3be4dd2e28d 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -49,7 +49,7 @@ class idea_idea(osv.osv):
         'create_uid': fields.many2one('res.users', 'Creator', required=True, readonly=True),
         'name': fields.char('Idea Summary', size=64, required=True, readonly=True, oldname='title', states={'draft':[('readonly',False)]}),
         'description': fields.text('Description', help='Content of the idea', readonly=True, states={'draft':[('readonly',False)]}),
-        'category_ids': fields.many2many('idea.category', 'idea_category_ids','idea_category_name_id','name','Tags',readonly=True, states={'draft':[('readonly',False)]}),
+        'category_ids': fields.many2many('idea.category', string='Tags', readonly=True, states={'draft':[('readonly',False)]}),
         'state': fields.selection([('draft', 'New'),
             ('open', 'Accepted'),
             ('cancel', 'Refused'),

From bfbaeece0111828a97ba41fedc7eb97eb0bd2fac Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Mon, 9 Jul 2012 13:22:45 +0200
Subject: [PATCH 208/239] Fixed kanban header flickering and padding

bzr revid: mit@openerp.com-20120709112245-9p9piq9ewxlfgb2f
---
 addons/web_kanban/static/src/css/kanban.css  | 3 ++-
 addons/web_kanban/static/src/css/kanban.sass | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 5d0ac9ea8f3..39f22d8e542 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -49,6 +49,7 @@
 .openerp .oe_kanban_view .oe_kanban_group_title {
   font-size: 16px;
   font-weight: bold;
+  min-height: 30px;
   color: #333333;
   text-shadow: 0 1px 0 white;
 }
@@ -58,7 +59,7 @@
 }
 .openerp .oe_kanban_view .oe_kanban_column, .openerp .oe_kanban_view .oe_kanban_group_header {
   vertical-align: top;
-  padding: 6px 7px 0 6px;
+  padding: 4px;
 }
 .openerp .oe_kanban_view .oe_kanban_column.oe_kanban_grouped, .openerp .oe_kanban_view .oe_kanban_group_header {
   background: #f0eeee;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 872d694c4db..4823a5928e4 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -63,6 +63,7 @@
     .oe_kanban_group_title
         font-size: 16px
         font-weight: bold
+        min-height: 30px
         color: #333333
         text-shadow: 0 1px 0 white
         > span
@@ -71,7 +72,7 @@
 
     .oe_kanban_column, .oe_kanban_group_header
         vertical-align: top
-        padding: 6px 7px 0 6px
+        padding: 4px 
 
     .oe_kanban_column.oe_kanban_grouped, .oe_kanban_group_header
         background: #f0eeee

From b79f9b58074d0672737c8b84e07246991131b062 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 9 Jul 2012 13:57:27 +0200
Subject: [PATCH 209/239] [FIX] small problem with m2o

bzr revid: nicolas.vanhoren@openerp.com-20120709115727-gtxyt4kzg9c7tqot
---
 addons/web/static/src/js/view_form.js | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index d40a1760e81..63fd46dd440 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2553,6 +2553,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
         this.last_search = [];
         this.floating = false;
         this.inhibit_on_change = false;
+        this.current_display = null;
     },
     start: function() {
         this._super();
@@ -2605,10 +2606,13 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
 
         // some behavior for input
         this.$input.keyup(function() {
-            if (self.$input.val() === "") {
-                self.set({value: false});
-            } else {
-                self.floating = true;
+            if (self.current_display !== self.$input.val()) {
+                self.current_display = self.$input.val();
+                if (self.$input.val() === "") {
+                    self.set({value: false});
+                } else {
+                    self.floating = true;
+                }
             }
         });
         this.$drop_down.click(function() {
@@ -2646,7 +2650,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
                 }
                 self.floating = false;
             }
-            if (used) {
+            if (used && self.get("value") === false) {
                 tip_def.reject();
                 untip_def.reject();
                 tip_def = $.Deferred();
@@ -2701,7 +2705,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
         this.$input.autocomplete("widget").addClass("openerp");
         // used to correct a bug when selecting an element by pushing 'enter' in an editable list
         this.$input.keyup(function(e) {
-            if (e.which === 13) {
+            if (e.which === 13) { // ENTER
                 if (isSelecting)
                     e.stopPropagation();
             }
@@ -2733,6 +2737,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
         var self = this;
         if (!this.get("effective_readonly")) {
             this.$input.val(str.split("\n")[0]);
+            this.current_display = this.$input.val();
         } else {
             str = _.escape(str).split("\n").join("<br />");
             this.$element.find('a')

From ea076e054bbf95ce5454eae08f7c8a0defb628f1 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 9 Jul 2012 15:45:16 +0200
Subject: [PATCH 210/239] [IMP] removed js file arguments in debug mode to ease
 debugging

bzr revid: nicolas.vanhoren@openerp.com-20120709134516-bd1yabogwoomipkd
---
 addons/web/controllers/main.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index f1d44b0c885..412ea9abda2 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -194,7 +194,9 @@ class WebClient(openerpweb.Controller):
             if mods is not None:
                 path += '?mods=' + mods
             return [path]
-        return ['%s?debug=%s' % (wp, os.path.getmtime(fp)) for fp, wp in self.manifest_glob(req, mods, extension)]
+        # old code to force cache reloading
+        #return ['%s?debug=%s' % (wp, os.path.getmtime(fp)) for fp, wp in self.manifest_glob(req, mods, extension)]
+        return [el[1] for el in self.manifest_glob(req, mods, extension)]
 
     @openerpweb.jsonrequest
     def csslist(self, req, mods=None):

From fa3301735e9bf6b35a0c4a62e149e8a6781858c3 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 9 Jul 2012 16:58:32 +0200
Subject: [PATCH 211/239] [IMP] event: usability, code review of form views

bzr revid: qdp-launchpad@openerp.com-20120709145832-idr4x5f8v4dtq3ol
---
 addons/event/event.py                         | 37 +++++----
 addons/event/event_demo.yml                   |  6 +-
 addons/event/event_view.xml                   | 82 +++++++++----------
 .../event/report/report_event_registration.py |  4 +-
 addons/event_moodle/event_view.xml            | 15 ++--
 addons/event_sale/event_sale.py               |  1 -
 6 files changed, 74 insertions(+), 71 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 376fc122120..6a8cf9f8a0b 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -23,7 +23,6 @@ import time
 from osv import fields, osv
 from tools.translate import _
 import decimal_precision as dp
-from datetime import datetime, timedelta
 
 class event_type(osv.osv):
     """ Event Type """
@@ -51,6 +50,19 @@ class event_event(osv.osv):
     _order = 'date_begin'
     _inherit = ['ir.needaction_mixin','mail.thread']
 
+    def name_get(self, cr, uid, ids, context=None):
+        if not ids:
+              return []
+        res = []
+        for record in self.browse(cr, uid, ids, context=context):
+            date = record.date_begin.split(" ")[0]
+            date_end = record.date_end.split(" ")[0]
+            if date != date_end:
+                date += ' - ' + date_end
+            display_name = record.name + ' (' + date + ')'
+            res.append((record['id'], display_name))
+        return res
+
     def create(self, cr, uid, vals, context=None):
         obj_id = super(event_event, self).create(cr, uid, vals, context)
         self.create_send_note(cr, uid, [obj_id], context=context)
@@ -172,8 +184,8 @@ class event_event(osv.osv):
         'name': fields.char('Name', size=64, required=True, translate=True, readonly=False, states={'done': [('readonly', True)]}),
         'user_id': fields.many2one('res.users', 'Responsible User', readonly=False, states={'done': [('readonly', True)]}),
         'type': fields.many2one('event.type', 'Type of Event', readonly=False, states={'done': [('readonly', True)]}),
-        'register_max': fields.integer('Maximum Registration', help="You can for each event define a maximum registration level. If you have too much registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}),
-        'register_min': fields.integer('Minimum Registration', help="You can for each event define a minimum registration level. If you do not enough registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}),
+        'register_max': fields.integer('Maximum Registrations', help="You can for each event define a maximum registration level. If you have too much registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}),
+        'register_min': fields.integer('Minimum Registrations', help="You can for each event define a minimum registration level. If you do not enough registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}),
         'register_current': fields.function(_get_register, string='Confirmed Registrations', multi='register_numbers'),
         'register_avail': fields.function(_get_register, string='Available Registrations', multi='register_numbers',type='integer'),
         'register_prospect': fields.function(_get_register, string='Unconfirmed Registrations', multi='register_numbers'),
@@ -305,17 +317,14 @@ class event_registration(osv.osv):
                                     ('open', 'Confirmed'),
                                     ('done', 'Attended')], 'Status',
                                     size=16, readonly=True),
-        # Fields for address, due to separation from event.registration and res.partner
-        'email': fields.char('Email', size=240),
+        'email': fields.char('Email', size=64),
         'phone': fields.char('Phone', size=64),
         'name': fields.char('Name', size=128, select=True),
-        'active': fields.boolean('Active'),
     }
 
     _defaults = {
         'nb_register': 1,
         'state': 'draft',
-        'active': True,
     }
     _order = 'name, create_date desc'
 
@@ -387,33 +396,31 @@ class event_registration(osv.osv):
         return True
 
     def onchange_contact_id(self, cr, uid, ids, contact, partner, context=None):
-        data ={}
         if not contact:
-            return data
+            return {}
         addr_obj = self.pool.get('res.partner')
         contact_id =  addr_obj.browse(cr, uid, contact, context=context)
-        data = {
+        return {'value': {
             'email':contact_id.email,
             'name':contact_id.name,
             'phone':contact_id.phone,
-            }
-        return {'value': data}
+            }}
 
     def onchange_event(self, cr, uid, ids, event_id, context=None):
         """This function returns value of Product Name, Unit Price based on Event.
         """
-        value= {}
         if context is None:
             context = {}
         if not event_id:
             return {}
         event_obj = self.pool.get('event.event')
         data_event =  event_obj.browse(cr, uid, event_id, context=context)
-        value ['value']= {'event_begin_date': data_event.date_begin,
+        return {'value': 
+                    {'event_begin_date': data_event.date_begin,
                      'event_end_date': data_event.date_end,
                      'company_id': data_event.company_id and data_event.company_id.id or False,
+                    }
                }
-        return value
 
     def onchange_partner_id(self, cr, uid, ids, part, context=None):
         res_obj = self.pool.get('res.partner')
diff --git a/addons/event/event_demo.yml b/addons/event/event_demo.yml
index f4e5cf04495..5fe1fb4ef12 100644
--- a/addons/event/event_demo.yml
+++ b/addons/event/event_demo.yml
@@ -26,15 +26,15 @@
   !record {model: event.event, id: event_1}:
     name: 'Opera of Verdi'
     date_begin: !eval (datetime.today()+ timedelta(days=1)).strftime('%Y-%m-%d 18:00:00')
-    date_end: !eval (datetime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 21:00:00')
+    date_end: !eval (datetime.today()+ timedelta(days=1)).strftime('%Y-%m-%d 21:00:00')
     register_min: 50
     register_max: 350
     type: event_type_1
 -
   !record {model: event.event, id: event_2}:
     name: 'Conference on ERP Business'
-    date_begin: !eval (datetime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 14:00:00')
-    date_end: !eval (datetime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 16:30:00')
+    date_begin: !eval (datetime.today()+ timedelta(months=2)).strftime('%Y-%m-%d 14:00:00')
+    date_end: !eval (datetime.today()+ timedelta(months=2)).strftime('%Y-%m-%d 16:30:00')
     register_min: 50
     register_max: 350
     type: event_type_2
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 6dbad5fcd88..1526437ddd5 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -108,13 +108,9 @@
                         <div class="oe_right oe_button_box">
                             <button name="%(event.act_event_list_register_event)d" type="action" string="Registration" icon="gtk-index" help="Register with this event"/>
                         </div>
-                    
-                        <div class="oe_title" style="width: 650px" >
+                        <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
-                            <group colspan="6" col="6">
-                                <group colspan="2"><h1><field name="name"/></h1></group>
-                                <group colspan="4"><h1><label string="(" attrs="{'invisible': [('type', '=', '')]}" /><field name="type" nolabel="1" on_change="onchange_event_type(type,context)" class="oe_inline"/><label string=")" attrs="{'invisible': [('type', '=', '')]}" /></h1></group>
-                            </group>  
+                            <h1><field name="name"/></h1>
                         </div> 
                         <div>
                             <h2>From <field name="date_begin" class="oe_inline" /> to <field name="date_end" class="oe_inline"/>
@@ -124,7 +120,7 @@
                                     <label for="address_id" string="Location Address"/>
                                     <div>
                                         <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}"/>
-                                        <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"/>
@@ -132,8 +128,13 @@
                                     </div>
                                 </group>
                                 <group>
-                                      <field name="register_min"/>
+                                       <field name="type" on_change="onchange_event_type(type,context)"/>
+                                       <field name="register_min"/>
                                        <field name="register_max"/>
+                                       <label for="register_current" string="Current Registrations"/>
+                                       <div>
+                                           Confirmed: <field name="register_current" class="oe_inline"/>, Unconfirmed: <field name="register_prospect" class="oe_inline"/>
+                                       </div>
                                    </group>
                             </group>
                         </div>
@@ -143,18 +144,16 @@
                                 <field name="note" colspan="4" nolabel="1"/>
                             </page>
                             <page string="Internal Data">
-                              <group>
-                                  <group class="oe_group_label_border">
-                                    <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
-                                    <field name="speaker_confirmed"/>
-                                  </group>
-                                  <group class="oe_group_label_border">
-                                    <field name="register_current"/>
-                                    <field name="register_prospect"/>
-                                    <field name="register_attended"/>
-                                  </group> 
-                              </group>
-                              <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
+                                <group>
+                                    <group>
+                                        <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
+                                        <field name="speaker_confirmed"/>
+                                    </group>
+                                    <group>
+                                        <field name="register_attended"/>
+                                    </group> 
+                                </group>
+                                <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
                                     <tree string="Registration" editable="top">
                                         <field name="name" />
                                         <field name="email" />
@@ -186,8 +185,7 @@
                                                 <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
                                             </group>
                                     </form>
-                                    </field>
-                                <separator string="" class="oe_clear"/>
+                                </field>
                             </page>
                         </notebook>
                     </sheet>
@@ -461,33 +459,29 @@
                     <sheet string="Registration">
                         <label for="event_id" class="oe_edit_only"/>
                         <h1>
-                            <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]" nolabel="1" class="oe_inline"/>
-                            <label string="(" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
-                            <field name="event_begin_date" class="oe_inline" attrs="{'invisible': [('event_id', '=', '')]}"/>
-                            <label string="-" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
-                            <field name="event_end_date" class="oe_inline" attrs="{'invisible': [('event_id', '=', '')]}"/>
-                            <label string=")" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
-                        </h1>   
-                        <group colspan="4" col="4">
-                            <group colspan="2">
-                                <field name="name" invisible="1"/>
+                            <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]"/>
+                        </h1>
+                        <group>
+                            <group>
                                 <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/>
-                                <label for="email" string="E-Mail"/>
-                                <group col="2">
-                                    <field name="email" nolabel="1" class="oe_inline"/>
-                                </group>
+                                <field name="name"/>
+                                <field name="phone"/>
+                                <label for="email"/>
+                                <div>
+                                    <field name="email" class="oe_inline"/>
+                                    <button class="oe_inline oe_right" string="Send Email"
+                                      name="%(mail.action_email_compose_message_wizard)d"
+                                      icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action"/>
+                                </div>
                             </group>
-                            <group colspan="2">
+                            <group>
                                 <field name="user_id" attrs="{'readonly':[('state','!=', 'draft')]}"/>
                                 <field name="nb_register"/>
                             </group>
-                        </group>
-                        <group colspan="2" col="2">
-                            <field name="phone"/>
-                        </group>
-                        <group colspan="2" col="2" groups="base.group_no_one">
-                            <field name="create_date"/>
-                            <field name="date_closed"/>
+                            <group groups="base.group_no_one">
+                                <field name="create_date"/>
+                                <field name="date_closed"/>
+                            </group>
                         </group>
                     </sheet>
                     <footer>
diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py
index 8697f46d867..17472e0cc95 100644
--- a/addons/event/report/report_event_registration.py
+++ b/addons/event/report/report_event_registration.py
@@ -77,12 +77,10 @@ class report_event_registration(osv.osv):
                 r.state AS  registration_state
                 FROM
                 event_event e
-                
+
                 LEFT JOIN
                     event_registration r ON (e.id=r.event_id)
 
-                WHERE r.active = 'true'
-               
                GROUP BY
                 event_id,
                 user_id_registration,
diff --git a/addons/event_moodle/event_view.xml b/addons/event_moodle/event_view.xml
index 4fa0172c5f5..4324990a1d8 100644
--- a/addons/event_moodle/event_view.xml
+++ b/addons/event_moodle/event_view.xml
@@ -7,7 +7,12 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="event.view_event_registration_form" />
             <field name="arch" type="xml">
+                <xpath expr="//field[@name='user_id']" position="after">
+                    <field name="moodle_user_password" readonly='1'/>
+                    <field name="moodle_uid" readonly="1"/>
+                </xpath>
                 <field name="email" position="replace">
+                     <!-- set the email as required -->
                      <field name="email" nolabel="1" required="1" />
                 </field>
                 <field name="name" position="replace">
@@ -23,12 +28,12 @@
             <field name="inherit_id" ref="event.view_event_form" />
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='registration_ids']/tree/field[@name='name']" position="replace">
-                     <field name="moodle_username" on_change="onchange_moodle_name(moodle_user_password)"/>
-                     <field name="name" required="1" />
+                   <field name="moodle_username" on_change="onchange_moodle_name(moodle_user_password)"/>
+                   <field name="name" required="1" />
                 </xpath>
-                      <field name="email" position="replace">
-                          <field name="email" required="1" />
-                      </field>
+                <field name="email" position="replace">
+                    <field name="email" required="1" />
+                </field>
            </field>
         </record>
     </data>
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index 426c410dd99..9e65a034544 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -90,4 +90,3 @@ class sale_order_line(osv.osv):
                 message = _("The registration %s has been created from the Sale Order %s.") % (registration_id, order_line.order_id.name)
                 registration_obj.message_append_note(cr, uid, [registration_id], body=message, context=context)
         return super(sale_order_line, self).button_confirm(cr, uid, ids, context=context)
-    

From d6100f371f185189ae452d6cb785a1f1a989415b Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Mon, 9 Jul 2012 17:02:57 +0200
Subject: [PATCH 212/239] Changed popup overlay and added style for label in
 kanban vignette

bzr revid: mit@openerp.com-20120709150257-t50t470tyxmomrt4
---
 addons/web/static/src/css/base.css           |  6 ++++++
 addons/web/static/src/css/base.sass          |  3 +++
 addons/web_kanban/static/src/css/kanban.css  | 14 ++++++++++++--
 addons/web_kanban/static/src/css/kanban.sass | 15 +++++++++++----
 4 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 7bc210298db..a9c9508c4e5 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2348,3 +2348,9 @@
 .kitten-mode-activated > * {
   opacity: 0.7;
 }
+
+div.ui-widget-overlay {
+  background: black;
+  filter: alpha(opacity=30);
+  opacity: 0.3;
+}
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index d5d271fe07d..ba858ca8877 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1850,5 +1850,8 @@ $colour4: #8a89ba
         opacity: 0.70
 // }}}
 
+div.ui-widget-overlay
+    background: black
+    @include opacity(0.3)
 // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"
 // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker:
diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 39f22d8e542..1128d2cdaff 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -29,7 +29,7 @@
   color: gold;
 }
 .openerp .oe_kanban_view .oe_kanban_content div:first-child {
-  margin-right: 12px;
+  margin-right: 16px;
 }
 .openerp .oe_kanban_view .oe_kanban_button_new {
   color: white;
@@ -59,7 +59,7 @@
 }
 .openerp .oe_kanban_view .oe_kanban_column, .openerp .oe_kanban_view .oe_kanban_group_header {
   vertical-align: top;
-  padding: 4px;
+  padding: 6px 6px 6px 5px;
 }
 .openerp .oe_kanban_view .oe_kanban_column.oe_kanban_grouped, .openerp .oe_kanban_view .oe_kanban_group_header {
   background: #f0eeee;
@@ -375,6 +375,16 @@
   -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
   -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
 }
+.openerp .oe_kanban_view .oe_kanban_footer_left > span {
+  margin-top: 4px;
+  display: inline-block;
+  background: #e6e6e6;
+  border: 1px solid #b9b9b9;
+  padding: 1px 2px;
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  border-radius: 3px;
+}
 .openerp .oe_kanban_view .oe_kanban_status {
   display: inline-block;
   height: 12px;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 4823a5928e4..facdc32e326 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -44,7 +44,7 @@
         .oe_star_on
             color: gold
         div:first-child
-            margin-right: 12px
+            margin-right: 16px
     .oe_kanban_button_new
         color: white
         background: #DC5F59
@@ -72,7 +72,7 @@
 
     .oe_kanban_column, .oe_kanban_group_header
         vertical-align: top
-        padding: 4px 
+        padding: 6px 6px 6px 5px
 
     .oe_kanban_column.oe_kanban_grouped, .oe_kanban_group_header
         background: #f0eeee
@@ -318,8 +318,15 @@
     .oe_kanban_avatar
         @include radius(3px)
         @include box-shadow(0 1px 2px rgba(0,0,0,0.2))
-    //.oe_kanban_footer_left
-    //   float: left
+    .oe_kanban_footer_left
+        > span
+            margin-top: 4px
+            display: inline-block
+            background: #E6E6E6
+            border: 1px solid #B9B9B9
+            padding: 1px 2px
+            @include radius(3px)
+       
     .oe_kanban_status
         display: inline-block
         height: 12px

From 6c51450adb5bd2eca59ef8e6f8bd9f6ef3ed56e2 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 9 Jul 2012 17:17:57 +0200
Subject: [PATCH 213/239] [IMP] project: privacy/visibility field is required

bzr revid: qdp-launchpad@openerp.com-20120709151757-wl019ftl2xheb9o3
---
 addons/project/project.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 487daa834bb..5810f34ad4a 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -215,7 +215,7 @@ class project(osv.osv):
         'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Tasks Stages', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'task_count': fields.function(_task_count, type='integer', string="Open Tasks"),
         'color': fields.integer('Color Index'),
-        'privacy_visibility': fields.selection([('public','Public'), ('followers','Followers Only')], 'Privacy / Visibility'),
+        'privacy_visibility': fields.selection([('public','Public'), ('followers','Followers Only')], 'Privacy / Visibility', required=True),
         'state': fields.selection([('template', 'Template'),('draft','New'),('open','In Progress'), ('cancelled', 'Cancelled'),('pending','Pending'),('close','Closed')], 'Status', required=True,),
         'followers': fields.function(_get_followers, method=True, fnct_search=_search_followers,
                         type='many2many', relation='res.users', string='Followers'),
@@ -236,6 +236,7 @@ class project(osv.osv):
         'priority': 1,
         'sequence': 10,
         'type_ids': _get_type_common,
+        'privacy_visibility': 'public',
     }
 
     # TODO: Why not using a SQL contraints ?

From 8ba18ce67755810d87b343c95f19e90e6e4c4c9e Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 9 Jul 2012 18:41:17 +0200
Subject: [PATCH 214/239] [FIX] timedelta doesn't have a 'months' parameter

bzr revid: qdp-launchpad@openerp.com-20120709164117-bqjxqxeujhcdikim
---
 addons/event/event_demo.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/event/event_demo.yml b/addons/event/event_demo.yml
index 5fe1fb4ef12..6f843fd0965 100644
--- a/addons/event/event_demo.yml
+++ b/addons/event/event_demo.yml
@@ -33,8 +33,8 @@
 -
   !record {model: event.event, id: event_2}:
     name: 'Conference on ERP Business'
-    date_begin: !eval (datetime.today()+ timedelta(months=2)).strftime('%Y-%m-%d 14:00:00')
-    date_end: !eval (datetime.today()+ timedelta(months=2)).strftime('%Y-%m-%d 16:30:00')
+    date_begin: !eval (datetime.today()+ timedelta(days=20)).strftime('%Y-%m-%d 14:00:00')
+    date_end: !eval (datetime.today()+ timedelta(days=20)).strftime('%Y-%m-%d 16:30:00')
     register_min: 50
     register_max: 350
     type: event_type_2

From 3c67b48a2ae96df1d0474da292b5272e13fb4090 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Mon, 9 Jul 2012 19:08:07 +0200
Subject: [PATCH 215/239] Improvements to dropdown menu, form view buttons and
 kanban vignette

bzr revid: mit@openerp.com-20120709170807-f9x3v147bqamg7wd
---
 addons/web/static/src/css/base.css           | 12 ++++++++----
 addons/web/static/src/css/base.sass          | 11 +++++++----
 addons/web_kanban/static/src/css/kanban.css  | 10 +++++++++-
 addons/web_kanban/static/src/css/kanban.sass |  7 ++++++-
 4 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index a9c9508c4e5..a9e2ebaf6d0 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -386,8 +386,11 @@
   visibility: hidden;
 }
 .openerp .oe_button_box {
-  width: 200px;
-  text-align: center;
+  width: 38%;
+  text-align: right;
+}
+.openerp .oe_button_box button {
+  margin: 4px;
 }
 .openerp .oe_avatar {
   margin: 0 16px 0 0;
@@ -536,7 +539,7 @@
   cursor: pointer;
 }
 .openerp .oe_dropdown_toggle {
-  color: #888888;
+  color: #404040;
   font-weight: normal;
 }
 .openerp .oe_dropdown_hover:hover .oe_dropdown_menu, .openerp .oe_dropdown_menu.oe_opened {
@@ -545,7 +548,8 @@
 .openerp .oe_dropdown_menu {
   display: none;
   position: absolute;
-  top: 32px;
+  top: 26px;
+  left: 0;
   z-index: 1;
   border: 1px solid #afafb6;
   background: white;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index ba858ca8877..8d13bf8b046 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -329,8 +329,10 @@ $colour4: #8a89ba
         clear: both
         visibility: hidden
     .oe_button_box
-        width: 200px
-        text-align: center
+        width: 38%
+        text-align: right
+        button
+            margin: 4px
     .oe_avatar
         margin: 0 16px 0 0
         img
@@ -431,14 +433,15 @@ $colour4: #8a89ba
         position: relative
         cursor: pointer
     .oe_dropdown_toggle
-        color: #888
+        color: #404040
         font-weight: normal
     .oe_dropdown_hover:hover .oe_dropdown_menu, .oe_dropdown_menu.oe_opened
         display: block
     .oe_dropdown_menu
         display: none
         position: absolute
-        top: 32px
+        top: 26px
+        left: 0
         z-index: 1
         border: 1px solid #afafb6
         background: white
diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 1128d2cdaff..dc44c142683 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -375,8 +375,11 @@
   -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
   -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
 }
+.openerp .oe_kanban_view .oe_kanban_footer_left {
+  margin-top: 2px;
+}
 .openerp .oe_kanban_view .oe_kanban_footer_left > span {
-  margin-top: 4px;
+  margin-top: 2px;
   display: inline-block;
   background: #e6e6e6;
   border: 1px solid #b9b9b9;
@@ -385,6 +388,11 @@
   -webkit-border-radius: 3px;
   border-radius: 3px;
 }
+.openerp .oe_kanban_view .oe_kanban_bottom_right {
+  float: right;
+  position: relative;
+  top: 1px;
+}
 .openerp .oe_kanban_view .oe_kanban_status {
   display: inline-block;
   height: 12px;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index facdc32e326..d2aa0615f67 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -319,13 +319,18 @@
         @include radius(3px)
         @include box-shadow(0 1px 2px rgba(0,0,0,0.2))
     .oe_kanban_footer_left
+        margin-top: 2px
         > span
-            margin-top: 4px
+            margin-top: 2px
             display: inline-block
             background: #E6E6E6
             border: 1px solid #B9B9B9
             padding: 1px 2px
             @include radius(3px)
+    .oe_kanban_bottom_right
+        float: right
+        position: relative
+        top: 1px
        
     .oe_kanban_status
         display: inline-block

From a33b11a25a7deca87959b15dd40c600591794f94 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Mon, 9 Jul 2012 19:24:53 +0200
Subject: [PATCH 216/239] Added icons to kanban label for followers and
 messages

bzr revid: mit@openerp.com-20120709172453-tsvtcz007rzitvy1
---
 addons/crm/crm_lead_view.xml | 2 +-
 addons/mail/mail_thread.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 85f9a4aab5d..888764309ec 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -316,7 +316,7 @@
                                     <t t-if="record.date_action.raw_value"> : </t>
                                     <field name="title_action"/>
                                 </div>
-                                <div class="oe_right">
+                                <div class="oe_kanban_bottom_right">
                                     <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>
                                     <!--
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 5668709af17..ef26f823422 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -69,7 +69,7 @@ class mail_thread(osv.Model):
             subscriber_ids = self.message_get_subscribers(cr, uid, [id], context=context)
             res[id] = {
                 'message_ids': message_ids,
-                'message_summary': "<span>Msg: %d</span> . <span>Fol: %d</span>" % (len(message_ids), len(subscriber_ids)),
+                'message_summary': "<span><span class='oe_e'>9</span> %d</span> . <span><span class='oe_e'>+</span> %d</span>" % (len(message_ids), len(subscriber_ids)),
             }
         return res
 

From 6aa0da5204344f468ed7beb8330fa619c7e0e516 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Mon, 9 Jul 2012 19:25:59 +0200
Subject: [PATCH 217/239] Added icons to kanban label for followers and
 messages

bzr revid: mit@openerp.com-20120709172559-lu2oemfugcl2w3vx
---
 addons/web_kanban/static/src/css/kanban.css  | 7 ++++++-
 addons/web_kanban/static/src/css/kanban.sass | 6 +++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index dc44c142683..cbd122efc1d 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -383,11 +383,16 @@
   display: inline-block;
   background: #e6e6e6;
   border: 1px solid #b9b9b9;
-  padding: 1px 2px;
+  padding: 0 2px;
+  line-height: 22px;
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   border-radius: 3px;
 }
+.openerp .oe_kanban_view .oe_kanban_footer_left > span .oe_e {
+  line-height: 12px;
+  font-size: 22px;
+}
 .openerp .oe_kanban_view .oe_kanban_bottom_right {
   float: right;
   position: relative;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index d2aa0615f67..a42662e99d9 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -325,8 +325,12 @@
             display: inline-block
             background: #E6E6E6
             border: 1px solid #B9B9B9
-            padding: 1px 2px
+            padding: 0 2px
+            line-height: 22px
             @include radius(3px)
+            .oe_e
+                line-height: 12px
+                font-size: 22px
     .oe_kanban_bottom_right
         float: right
         position: relative

From 3aa9784262599721dc7c57a8ca495558581887e1 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Mon, 9 Jul 2012 19:28:19 +0200
Subject: [PATCH 218/239] alignement of avatar in kanban vignette

bzr revid: mit@openerp.com-20120709172819-1cvabrscs3a23n2d
---
 addons/web_kanban/static/src/css/kanban.css  | 2 +-
 addons/web_kanban/static/src/css/kanban.sass | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index cbd122efc1d..6d0ae1c3d3b 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -396,7 +396,7 @@
 .openerp .oe_kanban_view .oe_kanban_bottom_right {
   float: right;
   position: relative;
-  top: 1px;
+  top: 4px;
 }
 .openerp .oe_kanban_view .oe_kanban_status {
   display: inline-block;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index a42662e99d9..45f290fdd1e 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -334,7 +334,7 @@
     .oe_kanban_bottom_right
         float: right
         position: relative
-        top: 1px
+        top: 4px
        
     .oe_kanban_status
         display: inline-block

From 5866c10a70e6ba27ed837af1daf4e30e3764feaf Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 10 Jul 2012 05:41:20 +0000
Subject: [PATCH 219/239] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120710053402-w16hn5zrg0stasd4
bzr revid: launchpad_translations_on_behalf_of_openerp-20120710054120-gtxp31tv5y8ogdpr
---
 addons/account_asset/i18n/mn.po   | 793 ++++++++++++++++++++++++++++++
 addons/crm/i18n/ja.po             |  92 ++--
 addons/import_google/i18n/ja.po   |   2 +-
 addons/import_sugarcrm/i18n/ja.po |  89 ++--
 addons/project/i18n/ja.po         |  10 +-
 addons/project_issue/i18n/ja.po   |  16 +-
 addons/web_dashboard/i18n/bg.po   |  95 ++++
 addons/web_graph/i18n/bg.po       |  98 ++++
 addons/web_process/i18n/bg.po     | 118 +++++
 9 files changed, 1216 insertions(+), 97 deletions(-)
 create mode 100644 addons/account_asset/i18n/mn.po
 create mode 100644 addons/web_dashboard/i18n/bg.po
 create mode 100644 addons/web_graph/i18n/bg.po
 create mode 100644 addons/web_process/i18n/bg.po

diff --git a/addons/account_asset/i18n/mn.po b/addons/account_asset/i18n/mn.po
new file mode 100644
index 00000000000..8275f14ed6e
--- /dev/null
+++ b/addons/account_asset/i18n/mn.po
@@ -0,0 +1,793 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <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-10 03:13+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mongolian <mn@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-10 05:34+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in draft and open states"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,method_end:0
+#: field:account.asset.history,method_end:0 field:asset.modify,method_end:0
+msgid "Ending date"
+msgstr "Дуусах хугацаа"
+
+#. module: account_asset
+#: field:account.asset.asset,value_residual:0
+msgid "Residual Value"
+msgstr "Үлдэгдэл дүн"
+
+#. module: account_asset
+#: field:account.asset.category,account_expense_depreciation_id:0
+msgid "Depr. Expense Account"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Compute Asset"
+msgstr "Үндсэн хөрөнгө тооцоолох"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,gross_value:0
+msgid "Gross Amount"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 field:account.asset.asset,name:0
+#: field:account.asset.depreciation.line,asset_id:0
+#: field:account.asset.history,asset_id:0 field:account.move.line,asset_id:0
+#: view:asset.asset.report:0 field:asset.asset.report,asset_id:0
+#: model:ir.model,name:account_asset.model_account_asset_asset
+msgid "Asset"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,prorata:0 help:account.asset.category,prorata:0
+msgid ""
+"Indicates that the first depreciation entry for this asset have to be done "
+"from the purchase date instead of the first January"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,name:0
+msgid "History name"
+msgstr "Түүхийн нэр"
+
+#. module: account_asset
+#: field:account.asset.asset,company_id:0
+#: field:account.asset.category,company_id:0 view:asset.asset.report:0
+#: field:asset.asset.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Modify"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Running"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Depreciation Amount"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_asset_report
+#: model:ir.model,name:account_asset.model_asset_asset_report
+#: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report
+msgid "Assets Analysis"
+msgstr "Хөрөнгийн судалгаа шинжилгээ"
+
+#. module: account_asset
+#: field:asset.modify,name:0
+msgid "Reason"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_progress_factor:0
+#: field:account.asset.category,method_progress_factor:0
+msgid "Degressive Factor"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
+msgid "Asset Categories"
+msgstr "Хөрөнгийн зэрэглэл"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid ""
+"This wizard will post the depreciation lines of running assets that belong "
+"to the selected period."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,account_move_line_ids:0
+#: field:account.move.line,entry_ids:0
+#: model:ir.actions.act_window,name:account_asset.act_entries_open
+msgid "Entries"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,depreciation_line_ids:0
+msgid "Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,salvage_value:0
+msgid "It is the amount you plan to have that you cannot depreciate."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciation_date:0
+#: view:asset.asset.report:0 field:asset.asset.report,depreciation_date:0
+msgid "Depreciation Date"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,posted_value:0
+msgid "Posted Amount"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_finance_assets
+#: model:ir.ui.menu,name:account_asset.menu_finance_config_assets
+msgid "Assets"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_depreciation_id:0
+msgid "Depreciation Account"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+#: view:account.asset.history:0 view:asset.modify:0 field:asset.modify,note:0
+msgid "Notes"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_id:0
+msgid "Depreciation Entry"
+msgstr ""
+
+#. module: account_asset
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,nbr:0
+msgid "# of Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in draft state"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_end:0
+#: selection:account.asset.asset,method_time:0
+#: selection:account.asset.category,method_time:0
+#: selection:account.asset.history,method_time:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,code:0
+msgid "Reference"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Account Asset"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard
+#: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard
+msgid "Compute Assets"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,sequence:0
+msgid "Sequence of the depreciation"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_period:0
+#: field:account.asset.category,method_period:0
+#: field:account.asset.history,method_period:0
+#: field:asset.modify,method_period:0
+msgid "Period Length"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of asset purchase"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+msgid "Calculates Depreciation within specified interval"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Change Duration"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_analytic_id:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method:0 field:account.asset.category,method:0
+msgid "Computation Method"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "State here the time during 2 depreciations, in months"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid ""
+"Prorata temporis can be applied only for time method \"number of "
+"depreciations\"."
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.history,method_time:0
+msgid ""
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_value:0
+msgid "Gross value "
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid "Error ! You can not create recursive assets."
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.history,method_period:0
+msgid "Time in month between two depreciations"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.modify:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_modify
+#: model:ir.model,name:account_asset.model_asset_modify
+msgid "Modify Asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Other Information"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,salvage_value:0
+msgid "Salvage Value"
+msgstr ""
+
+#. module: account_asset
+#: field:account.invoice.line,asset_category_id:0 view:asset.asset.report:0
+msgid "Asset Category"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Close"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute
+msgid "Compute assets"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify
+msgid "Modify asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in closed state"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,parent_id:0
+msgid "Parent Asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.history:0
+#: model:ir.model,name:account_asset.model_account_asset_history
+msgid "Asset history"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in current year"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,state:0 field:asset.asset.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid ""
+"The selected account of your Journal Entry forces to provide a secondary "
+"currency. You should remove the secondary currency on the account or select "
+"a multi-currency view on the journal."
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Month"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation Board"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,unposted_value:0
+msgid "Unposted Amount"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_time:0
+#: field:account.asset.category,method_time:0
+#: field:account.asset.history,method_time:0
+msgid "Time Method"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Analytic Information"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Asset Durations to Modify"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,note:0 field:account.asset.category,note:0
+#: field:account.asset.history,note:0
+msgid "Note"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method:0 help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method_time:0
+#: help:account.asset.category,method_time:0
+msgid ""
+"Choose the method to use to compute the dates and number of depreciation "
+"lines.\n"
+"  * Number of Depreciations: Fix the number of depreciation lines and the "
+"time between 2 depreciations.\n"
+"  * Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in running state"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Closed"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,partner_id:0
+#: field:asset.asset.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,depreciation_value:0
+msgid "Amount of Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Posted depreciation lines"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,child_ids:0
+msgid "Children Assets"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of depreciation"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in current month"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:asset.depreciation.confirmation.wizard:0
+msgid "Compute"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Search Asset Category"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
+msgid "asset.depreciation.confirmation.wizard"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_close
+msgid "Close asset"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,parent_state:0
+msgid "State of Asset"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,name:0
+msgid "Depreciation Name"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 field:account.asset.asset,history_ids:0
+msgid "History"
+msgstr ""
+
+#. module: account_asset
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.depreciation.confirmation.wizard,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "General"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,prorata:0 field:account.asset.category,prorata:0
+msgid "Prorata Temporis"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Accounting Information"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form_normal
+msgid "Review Asset Categories"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0 view:asset.modify:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 selection:asset.asset.report,state:0
+msgid "Close"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_date:0 view:asset.asset.report:0
+#: field:asset.asset.report,purchase_date:0
+msgid "Purchase Date"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Degressive"
+msgstr ""
+
+#. module: account_asset
+#: help:asset.depreciation.confirmation.wizard,period_id:0
+msgid ""
+"Choose the period for which you want to automatically post the depreciation "
+"lines of running assets"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Current"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Amount to Depreciate"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,open_asset:0
+msgid "Skip Draft State"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+#: view:account.asset.history:0
+msgid "Depreciation Dates"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciated_value:0
+msgid "Amount Already Depreciated"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_check:0
+#: view:asset.asset.report:0 field:asset.asset.report,move_check:0
+msgid "Posted"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,state:0
+msgid ""
+"When an asset is created, the state is 'Draft'.\n"
+"If the asset is confirmed, the state goes in 'Running' and the depreciation "
+"lines can be posted in the accounting.\n"
+"You can manually close an asset when the depreciation is over. If the last "
+"line of depreciation is posted, the asset automatically goes in that state."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.category,open_asset:0
+msgid ""
+"Check this if you want to automatically confirm the assets of this category "
+"when created by invoices."
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Linear"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_asset_depreciation_line
+msgid "Asset depreciation line"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,category_id:0 view:account.asset.category:0
+#: field:asset.asset.report,asset_category_id:0
+#: model:ir.model,name:account_asset.model_account_asset_category
+msgid "Asset category"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in last month"
+msgstr ""
+
+#. module: account_asset
+#: code:addons/account_asset/wizard/wizard_asset_compute.py:49
+#, python-format
+msgid "Created Asset Moves"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,help:account_asset.action_asset_asset_report
+msgid ""
+"From this report, you can have an overview on all depreciation. The tool "
+"search can also be used to personalise your Assets reports and so, match "
+"this analysis to your needs;"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.category,method_period:0
+msgid "State here the time between 2 depreciations, in months"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_number:0
+#: selection:account.asset.asset,method_time:0
+#: field:account.asset.category,method_number:0
+#: selection:account.asset.category,method_time:0
+#: field:account.asset.history,method_number:0
+#: selection:account.asset.history,method_time:0
+#: field:asset.modify,method_number:0
+msgid "Number of Depreciations"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Create Move"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Post Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Confirm Asset"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree
+msgid "Asset Hierarchy"
+msgstr ""
diff --git a/addons/crm/i18n/ja.po b/addons/crm/i18n/ja.po
index 7d5b564951c..4281ea13d90 100644
--- a/addons/crm/i18n/ja.po
+++ b/addons/crm/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 01:37+0100\n"
-"PO-Revision-Date: 2012-07-09 04:50+0000\n"
+"PO-Revision-Date: 2012-07-09 05:13+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-09 04:51+0000\n"
+"X-Launchpad-Export-Date: 2012-07-10 05:33+0000\n"
 "X-Generator: Launchpad (build 15558)\n"
 
 #. module: crm
@@ -818,7 +818,7 @@ msgstr "作成日"
 #. module: crm
 #: field:crm.lead,ref2:0
 msgid "Reference 2"
-msgstr ""
+msgstr "参照2"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -838,7 +838,7 @@ msgstr "ミーティングのスケジュール"
 #. module: crm
 #: view:crm.case.stage:0 field:crm.case.stage,requirements:0
 msgid "Requirements"
-msgstr ""
+msgstr "必要事項"
 
 #. module: crm
 #: help:crm.meeting,exdate:0
@@ -1272,7 +1272,7 @@ msgstr "見込完了日"
 msgid ""
 "If the active field is set to true, it will allow you to hide the sales team "
 "without removing it."
-msgstr ""
+msgstr "アクティブ項目がTrueに設定されると、営業チームを削除することなく非表示にできます。"
 
 #. module: crm
 #: field:crm.lead,street2:0
@@ -2431,17 +2431,17 @@ msgstr "私の開いている商談"
 #. module: crm
 #: field:base.action.rule,trg_max_history:0
 msgid "Maximum Communication History"
-msgstr ""
+msgstr "通信履歴の最大"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invite People"
-msgstr ""
+msgstr "人を招待"
 
 #. module: crm
 #: view:crm.meeting:0 field:crm.meeting,categ_id:0
 msgid "Meeting Type"
-msgstr ""
+msgstr "ミーティングタイプ"
 
 #. module: crm
 #: help:crm.lead,state:0
@@ -2454,6 +2454,10 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
+"案件が作成されると、状態はドラフトにセットされます。\n"
+"案件が進行中になると、状態は開くにセットされます。\n"
+"案件が終了すると、状態は完了にセットされます。\n"
+"案件のレビューが必要な場合、状態は保留中にセットされます。"
 
 #. module: crm
 #: view:crm.meeting:0 view:res.partner:0
@@ -2670,7 +2674,7 @@ msgstr "Eメールの標題"
 #: model:ir.actions.act_window,name:crm.action_view_attendee_form
 #: model:ir.ui.menu,name:crm.menu_attendee_invitations
 msgid "Meeting Invitations"
-msgstr ""
+msgstr "会議への招待"
 
 #. module: crm
 #: view:crm.phonecall:0 selection:crm.phonecall,state:0
@@ -3097,7 +3101,7 @@ msgstr "繰り返し"
 #. module: crm
 #: field:crm.lead.report,deadline_year:0
 msgid "Ex. Closing Year"
-msgstr "前回終了年"
+msgstr "見込完了年"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3331,33 +3335,33 @@ msgstr "同じログインでは２つのユーザを持てません。"
 #: code:addons/crm/crm.py:409 view:crm.lead:0 view:res.partner:0
 #, python-format
 msgid "Close"
-msgstr ""
+msgstr "閉じる"
 
 #. module: crm
 #: selection:crm.opportunity2phonecall,action:0
 #: selection:crm.phonecall2phonecall,action:0
 msgid "Schedule a call"
-msgstr ""
+msgstr "電話のスケジュール"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.phonecall:0
 msgid "Categorization"
-msgstr ""
+msgstr "分類化"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Log Call"
-msgstr ""
+msgstr "通話ログ"
 
 #. module: crm
 #: model:ir.model,name:crm.model_base_action_rule
 msgid "Action Rules"
-msgstr ""
+msgstr "アクションルール"
 
 #. module: crm
 #: field:crm.meeting,rrule_type:0
 msgid "Recurrency"
-msgstr ""
+msgstr "定期的"
 
 #. module: crm
 #: field:crm.meeting,phonecall_id:0
@@ -3372,39 +3376,39 @@ msgstr "木曜"
 #. module: crm
 #: view:crm.meeting:0
 msgid "To"
-msgstr ""
+msgstr "宛先"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Create date"
-msgstr ""
+msgstr "作成日"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Private"
-msgstr ""
+msgstr "非公開"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Public for Employees"
-msgstr ""
+msgstr "従業員の一般"
 
 #. module: crm
 #: field:crm.lead,function:0
 msgid "Function"
-msgstr ""
+msgstr "機能"
 
 #. module: crm
 #: view:crm.add.note:0
 msgid "_Add"
-msgstr ""
+msgstr "追加"
 
 #. module: crm
 #: field:crm.case.section,note:0 view:crm.meeting:0
 #: field:crm.meeting,description:0 view:crm.phonecall:0
 #: field:crm.phonecall,description:0 field:crm.segmentation,description:0
 msgid "Description"
-msgstr ""
+msgstr "詳細"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -3416,12 +3420,12 @@ msgstr "今月なされた通話"
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "May"
-msgstr ""
+msgstr "5月"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor2
 msgid "Interest in Accessories"
-msgstr ""
+msgstr "アクセサリーへの関心"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3432,17 +3436,17 @@ msgstr "新規商談"
 #: code:addons/crm/crm_action_rule.py:61
 #, python-format
 msgid "No E-Mail Found for your Company address!"
-msgstr ""
+msgstr "会社の住所にEメールがありません。"
 
 #. module: crm
 #: field:crm.lead.report,email:0
 msgid "# Emails"
-msgstr ""
+msgstr "Eメールの数"
 
 #. module: crm
 #: field:crm.lead,street:0
 msgid "Street"
-msgstr ""
+msgstr "通り"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3452,12 +3456,12 @@ msgstr "ユーザとチーム別の商談"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Reset to Todo"
-msgstr ""
+msgstr "ToDoにリセット"
 
 #. module: crm
 #: field:crm.case.section,working_hours:0
 msgid "Working Hours"
-msgstr ""
+msgstr "労働時間"
 
 #. module: crm
 #: field:res.partner,phonecall_ids:0
@@ -3467,21 +3471,21 @@ msgstr "通話"
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,is_customer_add:0
 msgid "Customer"
-msgstr ""
+msgstr "顧客"
 
 #. module: crm
 #: selection:crm.lead,priority:0 selection:crm.lead.report,priority:0
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "Lowest"
-msgstr ""
+msgstr "最低"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "February"
-msgstr ""
+msgstr "2月"
 
 #. module: crm
 #: field:base.action.rule,trg_section_id:0 field:crm.case.categ,section_id:0
@@ -3494,23 +3498,23 @@ msgstr ""
 #: view:crm.phonecall.report:0 field:crm.phonecall2phonecall,section_id:0
 #: field:res.partner,section_id:0 field:res.users,context_section_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "営業チーム"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead6 view:crm.lead:0
 msgid "Lost"
-msgstr ""
+msgstr "失注"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Edit"
-msgstr ""
+msgstr "編集"
 
 #. module: crm
 #: field:crm.lead,country_id:0 view:crm.lead.report:0
 #: field:crm.lead.report,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "国"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.lead2opportunity.partner:0
@@ -3542,17 +3546,17 @@ msgstr ""
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "April"
-msgstr ""
+msgstr "4月"
 
 #. module: crm
 #: field:crm.case.resource.type,name:0
 msgid "Campaign Name"
-msgstr ""
+msgstr "キャンペーン名"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
-msgstr ""
+msgstr "プロファイリング"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall_report
@@ -3583,7 +3587,7 @@ msgstr "オプション"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead4
 msgid "Negotiation"
-msgstr ""
+msgstr "交渉"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3593,12 +3597,12 @@ msgstr "見込完了"
 #. module: crm
 #: field:crm.case.stage,sequence:0 field:crm.meeting,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "順序"
 
 #. module: crm
 #: model:ir.model,name:crm.model_mail_compose_message
 msgid "E-mail composition wizard"
-msgstr ""
+msgstr "Eメール作成ウィザード"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -3608,7 +3612,7 @@ msgstr "同意"
 #. module: crm
 #: field:crm.segmentation.line,expr_name:0
 msgid "Control Variable"
-msgstr ""
+msgstr "制御変数"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
diff --git a/addons/import_google/i18n/ja.po b/addons/import_google/i18n/ja.po
index dad8acc1860..75e4f08b159 100644
--- a/addons/import_google/i18n/ja.po
+++ b/addons/import_google/i18n/ja.po
@@ -14,7 +14,7 @@ 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-09 04:51+0000\n"
+"X-Launchpad-Export-Date: 2012-07-10 05:34+0000\n"
 "X-Generator: Launchpad (build 15558)\n"
 
 #. module: import_google
diff --git a/addons/import_sugarcrm/i18n/ja.po b/addons/import_sugarcrm/i18n/ja.po
index 811bd6016fb..6f67aed9ada 100644
--- a/addons/import_sugarcrm/i18n/ja.po
+++ b/addons/import_sugarcrm/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-09 09:19+0000\n"
-"Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\n"
+"PO-Revision-Date: 2012-07-09 18:11+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:15+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-07-10 05:34+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: import_sugarcrm
 #: code:addons/import_sugarcrm/import_sugarcrm.py:1105
@@ -28,7 +28,7 @@ msgstr "エラー"
 #: view:import.sugarcrm:0
 msgid ""
 "Use the SugarSoap API URL (read tooltip) and a full access SugarCRM login."
-msgstr ""
+msgstr "SugarSoap API URL（ツールヒントを参照）とフルアクセスのSugarCRMログインを使用します。"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
@@ -51,11 +51,12 @@ msgid ""
 "Choose data you want to import. Click 'Import' to get data manually or "
 "'Schedule Reccurent Imports' to get recurrently and automatically data."
 msgstr ""
+"インポートしたいデータを選択します。データを手動で取得するにはインポートを、データを繰り返し自動で取得するにはスケジュール反復インポートをクリックします。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,contact:0
 msgid "Contacts"
-msgstr "連絡先"
+msgstr "コンタクト"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
@@ -65,12 +66,12 @@ msgstr "人事"
 #. module: import_sugarcrm
 #: help:import.sugarcrm,bug:0
 msgid "Check this box to import sugarCRM Bugs into OpenERP project issues"
-msgstr ""
+msgstr "OpenERPのプロジェクト問題にSugarCRMのバグをインポートするには、このボックスをクリックします。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,instance_name:0
 msgid "Instance's Name"
-msgstr "事例の名前"
+msgstr "インスタンスの名前"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,project_task:0
@@ -80,7 +81,7 @@ msgstr "プロジェクトのタスク"
 #. module: import_sugarcrm
 #: field:import.sugarcrm,email_from:0
 msgid "Notify End Of Import To:"
-msgstr "へインポートの終了を通知する。"
+msgstr "インポート終了の通知先："
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,user:0
@@ -89,35 +90,37 @@ msgid ""
 "user with the same login exist in OpenERP, user information will be erase by "
 "sugarCRM user information"
 msgstr ""
+"OpenERPユーザにSugarCRMユーザをインポートするには、このボックスをチェックします。OpenERPの中に同じログインユーザが存在する場合は、S"
+"ugarCRMユーザ情報によりユーザ情報が消されることに注意して下さい。"
 
 #. module: import_sugarcrm
 #: code:addons/import_sugarcrm/sugarsoap_services.py:23
 #, python-format
 msgid "Please install SOAP for python - ZSI-2.0-rc3.tar.gz - python-zci"
-msgstr "Python SOAPをインストールしてください。- ZSI-2.0-rc3.tar.gz - python-zci"
+msgstr "Python SOAPをインストールして下さい。- ZSI-2.0-rc3.tar.gz - python-zci"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "_Schedule Recurrent Imports"
-msgstr ""
+msgstr "スケジュール反復インポート"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid ""
 "Do not forget the email address to be notified of the success of the import."
-msgstr "インポート完了を通知するEメールを忘れないで下さい。"
+msgstr "インポート完了を通知するEメールアドレスを忘れないで下さい。"
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,call:0
 msgid "Check this box to import sugarCRM Calls into OpenERP calls"
-msgstr ""
+msgstr "OpenERP通話にSugarCRM通話をインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid ""
 "If you make recurrent or ponctual import, data already  in OpenERP will be "
 "updated by SugarCRM data."
-msgstr ""
+msgstr "反復あるいは定時インポートをする場合、OpenERP内のデータはSugarCRMのデータによって更新されます。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,employee:0
@@ -132,12 +135,12 @@ msgstr "ドキュメント"
 #. module: import_sugarcrm
 #: help:import.sugarcrm,document:0
 msgid "Check this box to import sugarCRM Documents into OpenERP documents"
-msgstr "SugarCRMドキュメントをOpenERPドキュメントへインポートするには、このボックスをチェックしてください。"
+msgstr "SugarCRMドキュメントをOpenERPドキュメントへインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "Import Data From SugarCRM"
-msgstr "SugarCRMからデータをインポートする。"
+msgstr "SugarCRMからデータのインポート"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
@@ -149,7 +152,7 @@ msgstr "CRM"
 msgid ""
 "Data are importing, the process is running in the background, an email will "
 "be sent to the given email address if it was defined."
-msgstr ""
+msgstr "データインポートのプロセスはバックグラウンドで実行されます。それが定義されている場合、所定のEメールアドレスにEメールが送信されます。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,call:0
@@ -159,19 +162,19 @@ msgstr "通話"
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "Multi Instance Management"
-msgstr ""
+msgstr "複数インスタンスの管理"
 
 #. module: import_sugarcrm
 #: view:import.message:0
 msgid "_Ok"
-msgstr "_OK"
+msgstr "OK"
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,opportunity:0
 msgid ""
 "Check this box to import sugarCRM Leads and Opportunities into OpenERP Leads "
 "and Opportunities"
-msgstr ""
+msgstr "OpenERPのリードと商談の中に、SugarCRMのリードと商談をインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,email_history:0
@@ -186,6 +189,9 @@ msgid ""
 "application "
 "http://trial.sugarcrm.com/qbquyj4802/index.php?module=Home&action=index"
 msgstr ""
+"データを取得するためのWebサービスのURL。例：'http://example.com/sugarcrm/soap.php'、または、あなたのSugar"
+"CRMアプリケーションのアドレスをコピーします。 "
+"http://trial.sugarcrm.com/qbquyj4802/index.php?module=Home&action=index"
 
 #. module: import_sugarcrm
 #: model:ir.actions.act_window,name:import_sugarcrm.action_import_sugarcrm
@@ -196,7 +202,7 @@ msgstr "SugarCRMをインポート"
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "_Import"
-msgstr "インポート(_I)"
+msgstr "インポート"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,user:0
@@ -208,18 +214,18 @@ msgstr "ユーザ"
 #: code:addons/import_sugarcrm/import_sugarcrm.py:1131
 #, python-format
 msgid "%s data required %s Module to be installed, Please install %s module"
-msgstr ""
+msgstr "%s のデータは %s モジュールがインストールされていることを要求します。%s モジュールをインストールして下さい。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,claim:0
 msgid "Cases"
-msgstr "お問合せ"
+msgstr "案件"
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,meeting:0
 msgid ""
 "Check this box to import sugarCRM Meetings and Tasks into OpenERP meetings"
-msgstr ""
+msgstr "OpenERPミーティングにSugarCRMのミーティングとタスクをインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,email_history:0
@@ -227,6 +233,7 @@ msgid ""
 "Check this box to import sugarCRM Emails, Notes and Attachments into OpenERP "
 "Messages and Attachments"
 msgstr ""
+"OpenERPメッセージと添付ファイにSugarCRMのEメール、ノート、添付ファイルをインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,project:0
@@ -240,13 +247,13 @@ msgid ""
 "Please install SOAP for python - ZSI-2.0-rc3.tar.gz from "
 "http://pypi.python.org/pypi/ZSI/"
 msgstr ""
-"Python SOAPをインストールしてください。- ZSI-2.0-rc3.tar.gz from "
+"Python SOAPをインストールして下さい。- ZSI-2.0-rc3.tar.gz from "
 "http://pypi.python.org/pypi/ZSI/"
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,project:0
 msgid "Check this box to import sugarCRM Projects into OpenERP projects"
-msgstr ""
+msgstr "OpenERPプロジェクトにSugarCRMプロジェクトをインポートするには、このボックスをチェックして下さい。"
 
 #. module: import_sugarcrm
 #: code:addons/import_sugarcrm/import_sugarcrm.py:1098
@@ -263,12 +270,12 @@ msgstr "ミーティング"
 #. module: import_sugarcrm
 #: help:import.sugarcrm,employee:0
 msgid "Check this box to import sugarCRM Employees into OpenERP employees"
-msgstr ""
+msgstr "OpenERP従業員にSugarCRM従業員をインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,url:0
 msgid "SugarSoap Api url:"
-msgstr "SugarSoap Api url:"
+msgstr "SugarSoap API URL："
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
@@ -282,6 +289,8 @@ msgid ""
 "Authentication error !\n"
 "Bad Username or Password bad SugarSoap Api url !"
 msgstr ""
+"認証エラー。\n"
+"ユーザ名、パスワード、SugarSoap API URLの何れかに問題があります。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,bug:0
@@ -296,12 +305,12 @@ msgstr "プロジェクト"
 #. module: import_sugarcrm
 #: help:import.sugarcrm,project_task:0
 msgid "Check this box to import sugarCRM Project Tasks into OpenERP tasks"
-msgstr ""
+msgstr "OpenERPタスクにSugarCRMプロジェクトタスクをインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,opportunity:0
 msgid "Leads & Opp"
-msgstr "見込み客 ＆ 商談"
+msgstr "リード ＆ 商談"
 
 #. module: import_sugarcrm
 #: code:addons/import_sugarcrm/import_sugarcrm.py:79
@@ -310,6 +319,8 @@ msgid ""
 "Authentication error !\n"
 "Bad Username or Password or bad SugarSoap Api url !"
 msgstr ""
+"認証エラー。\n"
+"ユーザ名、パスワード、SugarSoap API URLの何れかに問題があります。"
 
 #. module: import_sugarcrm
 #: code:addons/import_sugarcrm/import_sugarcrm.py:79
@@ -330,12 +341,12 @@ msgstr "警告"
 msgid ""
 "Prefix of SugarCRM id to differentiate xml_id of SugarCRM models datas come "
 "from different server."
-msgstr ""
+msgstr "SugarCRMモデルデータの xml_id を区別するためのSugarCRM IDのサフィックス（接頭辞）は異なるサーバから来ます。"
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,contact:0
 msgid "Check this box to import sugarCRM Contacts into OpenERP addresses"
-msgstr ""
+msgstr "OpenERP住所録にSugarCRMコンタクトをインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,password:0
@@ -350,12 +361,12 @@ msgstr "ログイン情報"
 #. module: import_sugarcrm
 #: help:import.sugarcrm,claim:0
 msgid "Check this box to import sugarCRM Cases into OpenERP claims"
-msgstr ""
+msgstr "OpenERP苦情にSugarCRMケースをインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "Email Notification When Import is Finished"
-msgstr ""
+msgstr "インポート完了時にEメール通知"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,username:0
@@ -366,17 +377,17 @@ msgstr "ユーザ名"
 #: view:import.message:0
 #: model:ir.model,name:import_sugarcrm.model_import_message
 msgid "Import Message"
-msgstr "メッセージをインポートする。"
+msgstr "メッセージのインポート"
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,account:0
 msgid "Check this box to import sugarCRM Accounts into OpenERP partners"
-msgstr ""
+msgstr "OpenERPパートナにSugarCRMアカウントをインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "Online documentation:"
-msgstr ""
+msgstr "オンラインドキュメンテーション："
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,account:0
@@ -386,7 +397,7 @@ msgstr "顧客情報"
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "_Cancel"
-msgstr "キャンセル(_C)"
+msgstr "キャンセル"
 
 #. module: import_sugarcrm
 #: code:addons/import_sugarcrm/sugarsoap_services.py:23
@@ -403,4 +414,4 @@ msgstr "SugarCRMのデータをインポート"
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "Email Address to Notify"
-msgstr ""
+msgstr "通知のEメールアドレス"
diff --git a/addons/project/i18n/ja.po b/addons/project/i18n/ja.po
index 3fda3a1349c..68f60160a76 100644
--- a/addons/project/i18n/ja.po
+++ b/addons/project/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-06-20 17:12+0000\n"
-"Last-Translator: Akira Hiyama <Unknown>\n"
+"PO-Revision-Date: 2012-07-10 00:39+0000\n"
+"Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\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:36+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-10 05:33+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1825,7 +1825,7 @@ msgstr "タスク %s は閉じられました。"
 #. module: project
 #: field:project.task,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_history_burndown
diff --git a/addons/project_issue/i18n/ja.po b/addons/project_issue/i18n/ja.po
index fcd18045839..6ef4c5b71d2 100644
--- a/addons/project_issue/i18n/ja.po
+++ b/addons/project_issue/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 01:37+0100\n"
-"PO-Revision-Date: 2012-06-11 23:10+0000\n"
+"PO-Revision-Date: 2012-07-09 05:11+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-13 04:56+0000\n"
-"X-Generator: Launchpad (build 15389)\n"
+"X-Launchpad-Export-Date: 2012-07-10 05:33+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
@@ -398,7 +398,7 @@ msgstr "プロジェクトの問題"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Communication & History"
-msgstr "コミュニケーションと履歴"
+msgstr "通信と履歴"
 
 #. module: project_issue
 #: view:project.issue.report:0
@@ -836,10 +836,10 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
-"事象が作成されると、状態はドラフトにセットされます。\n"
-"事象が進行中になると、状態は開くにセットされます。\n"
-"事業が終了すると、状態は完了にセットされます。\n"
-"事象がレビューが必要な場合、状態は保留中にセットされます。"
+"案件が作成されると、状態はドラフトにセットされます。\n"
+"案件が進行中になると、状態は開くにセットされます。\n"
+"案件が終了すると、状態は完了にセットされます。\n"
+"案件のレビューが必要な場合、状態は保留中にセットされます。"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
diff --git a/addons/web_dashboard/i18n/bg.po b/addons/web_dashboard/i18n/bg.po
new file mode 100644
index 00000000000..6518b28a8b9
--- /dev/null
+++ b/addons/web_dashboard/i18n/bg.po
@@ -0,0 +1,95 @@
+# Bulgarian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+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-07-09 13:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-07-10 05:41+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/js/dashboard.js:61
+msgid "Edit Layout"
+msgstr "Редакция План"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/js/dashboard.js:107
+msgid "Are you sure you want to remove this item ?"
+msgstr "Сигурни ли сте, че искате да изтриете този елемент ?"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:4
+msgid "Reset Layout.."
+msgstr "Връщане в начално състояние Подредба.."
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:6
+msgid "Reset"
+msgstr "Връщане в начално състояние"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:8
+msgid "Change Layout.."
+msgstr "Смяна Подредба.."
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:10
+msgid "Change Layout"
+msgstr "Промяна Подредба"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:27
+msgid "&nbsp;"
+msgstr ""
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:28
+msgid "Create"
+msgstr "Създаване"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:39
+msgid "Choose dashboard layout"
+msgstr "Избери подредба на табло"
+
+#, python-format
+#~ msgid "Execute task \"%s\""
+#~ msgstr "Изпълни задача \"%s\""
+
+#~ msgid "Uncategorized"
+#~ msgstr "Без категория"
+
+#~ msgid "Remember to bookmark"
+#~ msgstr "Запомни като отметка"
+
+#~ msgid "This url"
+#~ msgstr "Този url"
+
+#~ msgid ""
+#~ "Click on the functionalites listed below to launch them and configure your "
+#~ "system"
+#~ msgstr ""
+#~ "Кликнете върху фунциите изброени по-долу за да ги изпълните и конфигурирате "
+#~ "системата"
+
+#~ msgid "Welcome to OpenERP"
+#~ msgstr "Добре дошли в OpenERP"
+
+#~ msgid "Your login:"
+#~ msgstr "Вашето потребителско име:"
+
+#~ msgid "progress:"
+#~ msgstr "обработка:"
+
+#~ msgid "Mark this task as done"
+#~ msgstr "Маркирай задачата като приключена"
diff --git a/addons/web_graph/i18n/bg.po b/addons/web_graph/i18n/bg.po
new file mode 100644
index 00000000000..fd0e3c82e83
--- /dev/null
+++ b/addons/web_graph/i18n/bg.po
@@ -0,0 +1,98 @@
+# Bulgarian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+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-07-09 12:54+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-07-10 05:41+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
+
+#. openerp-web
+#: addons/web_graph/static/src/js/graph.js:22
+msgid "Graph"
+msgstr "Диаграма"
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:5
+msgid "Graph Options"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:7
+msgid "Graph Mode"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:11
+msgid "Pie"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:12
+msgid "Bars"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:14
+msgid "Lines"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:15
+msgid "Areas"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:18
+msgid "Radar"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:20
+msgid "Legend"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:24
+msgid "Hidden"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:25
+msgid "Inside"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:26
+msgid "Top"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:28
+msgid "Actions"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:32
+msgid "Switch Axis"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:33
+msgid "Show Data"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:34
+msgid "Download as PNG"
+msgstr ""
diff --git a/addons/web_process/i18n/bg.po b/addons/web_process/i18n/bg.po
new file mode 100644
index 00000000000..d86858ec17e
--- /dev/null
+++ b/addons/web_process/i18n/bg.po
@@ -0,0 +1,118 @@
+# Bulgarian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+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-07-09 12:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-07-10 05:41+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
+
+#. openerp-web
+#: addons/web_process/static/src/js/process.js:261
+msgid "Cancel"
+msgstr "Отказ"
+
+#. openerp-web
+#: addons/web_process/static/src/js/process.js:262
+msgid "Save"
+msgstr "Запис"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:6
+msgid "Process View"
+msgstr "Изглед на процеса"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:19
+msgid "Documentation"
+msgstr "Документация"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:19
+msgid "Read Documentation Online"
+msgstr "Прочети документацията онлайн"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:25
+msgid "Forum"
+msgstr "Форум"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:25
+msgid "Community Discussion"
+msgstr "Обща дискусия"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:31
+msgid "Books"
+msgstr "Книги"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:31
+msgid "Get the books"
+msgstr "Вземи книгите"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:37
+msgid "OpenERP Enterprise"
+msgstr "OpenERP Enterprise"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:37
+msgid "Purchase OpenERP Enterprise"
+msgstr "Купи OpenERP Enterprise"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:52
+msgid "Process"
+msgstr "Процес"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:56
+msgid "Notes:"
+msgstr "Бележки"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:59
+msgid "Last modified by:"
+msgstr "Последно модифицирано от:"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:59
+msgid "N/A"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:62
+msgid "Subflows:"
+msgstr "Междинен поток"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:75
+msgid "Related:"
+msgstr "Свързани"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:88
+msgid "Select Process"
+msgstr "Избор Процес"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:98
+msgid "Select"
+msgstr "Избор"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:109
+msgid "Edit Process"
+msgstr "Редакция Процес"

From fe368d23c872c3db942ec2bdb6cc8a17423df6ae Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 10 Jul 2012 09:31:45 +0200
Subject: [PATCH 220/239] [IMP] padding between groups in forms

bzr revid: fp@tinyerp.com-20120710073145-l0rmppe2d7mpterz
---
 addons/web/static/src/css/base.css    | 5 ++++-
 addons/web/static/src/css/base.sass   | 5 ++++-
 addons/web/static/src/js/view_form.js | 4 ++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 1425162d833..848886dde0c 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1857,12 +1857,15 @@
   min-width: 120px;
 }
 .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell {
-  padding-left: 8px;
+  padding-left: 4px;
 }
 .openerp .oe_form .oe_form_group {
   width: 100%;
   margin: 4px 0 4px 0;
 }
+.openerp .oe_form .oe_form_group .oe_group_right > tbody > tr > td {
+  padding-left: 12px;
+}
 .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] {
   font-weight: bold;
   white-space: nowrap;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 82ed305a275..e789d116e95 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1449,10 +1449,13 @@ $sheet-max-width: 860px
                 display: block
                 min-width: 120px
         td.oe_form_group_cell + .oe_form_group_cell
-            padding-left: 8px
+            padding-left: 4px
         .oe_form_group
             width: 100%
             margin: 4px 0 4px 0
+            .oe_group_right
+                > tbody > tr > td
+                    padding-left: 12px
     // }}}
     // FormView.label {{{
     .oe_form
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 63fd46dd440..ae57d1dfb24 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1182,6 +1182,10 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
             if (!$tr || row_cols < colspan) {
                 $tr = $('<tr/>').addClass('oe_form_group_row').appendTo($table);
                 row_cols = cols;
+            } else if (tagName==='group') {
+                // When <group> <group/><group/> </group>, we need a spacing between the two groups
+                $child.addClass('oe_group_right')
+
             }
             row_cols -= colspan;
 

From 597835db3c790a8ac4c8fb68650a712172ca3631 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 10 Jul 2012 09:49:46 +0200
Subject: [PATCH 221/239] [IMP] form layout

bzr revid: fp@tinyerp.com-20120710074946-llxeomd8o5e83y9i
---
 addons/web/static/src/css/base.css  | 7 +++++--
 addons/web/static/src/css/base.sass | 6 ++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 848886dde0c..a87b6814ec6 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1733,6 +1733,9 @@
 .openerp .oe_form_readonly .oe_edit_only, .openerp .oe_form_readonly .oe_form_field:empty {
   display: none !important;
 }
+.openerp .oe_form_readonly .oe_form .oe_form_field_date {
+  width: auto;
+}
 .openerp .oe_form_nosheet {
   margin-left: 10px;
   margin-right: 10px;
@@ -1863,7 +1866,7 @@
   width: 100%;
   margin: 4px 0 4px 0;
 }
-.openerp .oe_form .oe_form_group .oe_group_right > tbody > tr > td {
+.openerp .oe_form .oe_form_group .oe_group_right > tbody > tr > td:first-child {
   padding-left: 12px;
 }
 .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] {
@@ -1965,7 +1968,7 @@
   width: 180px;
 }
 .openerp .oe_form .oe_form_field_date {
-  width: 7em;
+  width: 7.5em;
 }
 .openerp .oe_form .oe_form_field_datetime {
   width: 11em;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index e789d116e95..da1acbe2a5a 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1351,6 +1351,8 @@ $sheet-max-width: 860px
     .oe_form_readonly
         .oe_edit_only, .oe_form_field:empty
             display: none !important
+        .oe_form .oe_form_field_date
+            width: auto
     .oe_form_nosheet 
         margin-left: 10px
         margin-right: 10px
@@ -1454,7 +1456,7 @@ $sheet-max-width: 860px
             width: 100%
             margin: 4px 0 4px 0
             .oe_group_right
-                > tbody > tr > td
+                > tbody > tr > td:first-child
                     padding-left: 12px
     // }}}
     // FormView.label {{{
@@ -1538,7 +1540,7 @@ $sheet-max-width: 860px
         .oe_form_field_float
             width: 180px
         .oe_form_field_date
-            width: 7em
+            width: 7.5em
         .oe_form_field_datetime
             width: 11em
         input[type="text"], input[type="password"], input[type="file"], select

From 6917d464c9d185818d1eae3cb35a6706b57f7d86 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 10 Jul 2012 09:50:54 +0200
Subject: [PATCH 222/239] [IMP] form layout

bzr revid: fp@tinyerp.com-20120710075054-ftlm3g69yrsgni1u
---
 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 a87b6814ec6..faab67f4703 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1867,7 +1867,7 @@
   margin: 4px 0 4px 0;
 }
 .openerp .oe_form .oe_form_group .oe_group_right > tbody > tr > td:first-child {
-  padding-left: 12px;
+  padding-left: 18px;
 }
 .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] {
   font-weight: bold;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index da1acbe2a5a..e0d5847c7d8 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1457,7 +1457,7 @@ $sheet-max-width: 860px
             margin: 4px 0 4px 0
             .oe_group_right
                 > tbody > tr > td:first-child
-                    padding-left: 12px
+                    padding-left: 18px
     // }}}
     // FormView.label {{{
     .oe_form

From 2e02a7ab0bbf567b82b112f998ca02d0bdb87c20 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 10 Jul 2012 09:57:53 +0200
Subject: [PATCH 223/239] [IMP] form css

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

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index faab67f4703..36d26d10741 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1860,7 +1860,7 @@
   min-width: 120px;
 }
 .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell {
-  padding-left: 4px;
+  padding-left: 6px;
 }
 .openerp .oe_form .oe_form_group {
   width: 100%;
@@ -1872,7 +1872,7 @@
 .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] {
   font-weight: bold;
   white-space: nowrap;
-  padding-right: 8px;
+  padding-right: 6px;
 }
 .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
   font-size: 80%;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index e0d5847c7d8..2ba3b79c411 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1451,7 +1451,7 @@ $sheet-max-width: 860px
                 display: block
                 min-width: 120px
         td.oe_form_group_cell + .oe_form_group_cell
-            padding-left: 4px
+            padding-left: 6px
         .oe_form_group
             width: 100%
             margin: 4px 0 4px 0
@@ -1464,7 +1464,7 @@ $sheet-max-width: 860px
         .oe_form_label_help[for], .oe_form_label[for]
             font-weight: bold
             white-space: nowrap
-            padding-right: 8px
+            padding-right: 6px
             span
                 font-size: 80%
                 color: darkGreen

From f078da8a52092c406ebf5297418596a466b41e9d Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 10 Jul 2012 10:54:41 +0200
Subject: [PATCH 224/239] [IMP] make the m2o a little more complex

bzr revid: nicolas.vanhoren@openerp.com-20120710085441-dt2kn4z5rk2482sy
---
 addons/web/static/src/js/view_form.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index ae57d1dfb24..4d00db6ccea 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2614,6 +2614,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
                 self.current_display = self.$input.val();
                 if (self.$input.val() === "") {
                     self.set({value: false});
+                    self.floating = false;
                 } else {
                     self.floating = true;
                 }

From 24a54675ee2ba5be6e2f2e248587d89c93582d09 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 10 Jul 2012 11:18:21 +0200
Subject: [PATCH 225/239] [FIX] problem with css classes of view managers

bzr revid: nicolas.vanhoren@openerp.com-20120710091821-qpc49vwq60k1xt3f
---
 addons/web/static/src/js/view_form.js | 2 +-
 addons/web/static/src/js/views.js     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 4d00db6ccea..d629b8e9b3d 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2609,7 +2609,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
         });
 
         // some behavior for input
-        this.$input.keyup(function() {
+        this.$input.keydown(function() {
             if (self.current_display !== self.$input.val()) {
                 self.current_display = self.$input.val();
                 if (self.$input.val() === "") {
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 98df8a0af0d..6586807264d 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -146,7 +146,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
             this.dialog.dialog_title = action.name;
             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_viewmanager.$element.addClass("oe_view_manager_" + (action.target || 'current'));
             this.dialog.open();
         } else  {
             this.dialog_stop();
@@ -159,7 +159,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
             this.inner_action = action;
             this.inner_viewmanager = new instance.web.ViewManagerAction(this, action);
             this.inner_viewmanager.appendTo(this.$element);
-            this.inner_viewmanager.$element.addClass("oe_view_manager_" + action.target);
+            this.inner_viewmanager.$element.addClass("oe_view_manager_" + (action.target || 'current'));
         }
     },
     ir_actions_act_window_close: function (action, on_closed) {

From e2970d33eeb89dc760c9b22576d5f6901532c4ed Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 10 Jul 2012 11:42:50 +0200
Subject: [PATCH 226/239] [FIX] problem with mail widgets and o2m

bzr revid: nicolas.vanhoren@openerp.com-20120710094250-l8utds8f3wtpqlhc
---
 addons/mail/static/src/js/mail.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 0f68a548590..88f0b9ade43 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -540,7 +540,11 @@ openerp.mail = function(session) {
             this._super.apply(this, arguments);
             var self = this;
             this.reinit();
-            if (! this.view.datarecord.id) { this.$element.find('.oe_mail_thread').hide(); return; }
+            if (! this.view.datarecord.id ||
+                instance.web.BufferedDataSet.virtual_id_regex.test(this.view.datarecord.id)) {
+                this.$element.find('.oe_mail_thread').hide();
+                return;
+            }
             // fetch followers
             var fetch_sub_done = this.fetch_subscribers();
             // create and render Thread widget

From 7880aa4beb8067e7717ef62e6a571fd000350ea6 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 10 Jul 2012 11:44:31 +0200
Subject: [PATCH 227/239] [IMP] FormView: support for @style of fields

bzr revid: fme@openerp.com-20120710094431-tgsrrnkdyxlulkqt
---
 addons/web/static/src/xml/base.xml | 31 +++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 29a7a61aa30..ee0f22cc07d 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -863,7 +863,7 @@
     </ul>
 </t>
 <t t-name="FieldChar">
-    <span t-att-class="'oe_form_field '+widget.widget_class">
+    <span t-att-class="'oe_form_field '+widget.widget_class" t-att-style="widget.node.attrs.style">
         <t  t-if="!widget.get('effective_readonly')">
             <input t-att-type="widget.password ? 'password' : 'text'"
                 t-att-id="widget.id_for_label"
@@ -875,7 +875,7 @@
     </span>
 </t>
 <t t-name="FieldEmail">
-    <span class="oe_form_field oe_form_field_email oe_form_field_with_button">
+    <span class="oe_form_field oe_form_field_email oe_form_field_with_button" t-att-style="widget.node.attrs.style">
         <a t-if="widget.get('effective_readonly')" href="#" class="oe_form_uri" target="_blank"/>
         <t t-if="!widget.get('effective_readonly')">
             <div>
@@ -900,7 +900,7 @@
     </t>
 </t>
 <t t-name="FieldText">
-    <div class="oe_form_field oe_form_field_text">
+    <div class="oe_form_field oe_form_field_text" t-att-style="widget.node.attrs.style">
         <textarea rows="6"
             t-att-name="widget.name"
             class="field_text"
@@ -925,13 +925,13 @@
     </span>
 </t>
 <t t-name="FieldDate">
-    <span class="oe_form_field oe_datepicker_root oe_form_field_date"/>
+    <span class="oe_form_field oe_datepicker_root oe_form_field_date" t-att-style="widget.node.attrs.style"/>
 </t>
 <t t-name="FieldDatetime">
-    <span class="oe_form_field oe_datepicker_root oe_form_field_datetime"/>
+    <span class="oe_form_field oe_datepicker_root oe_form_field_datetime" t-att-style="widget.node.attrs.style"/>
 </t>
 <t t-name="FieldSelection">
-    <span class="oe_form_field oe_form_field_selection">
+    <span class="oe_form_field oe_form_field_selection" t-att-style="widget.node.attrs.style">
         <select t-if="!widget.get('effective_readonly')"
             t-att-name="widget.name"
             t-att-tabindex="widget.node.attrs.tabindex"
@@ -944,7 +944,7 @@
     </span>
 </t>
 <t t-name="FieldMany2One">
-    <span class="oe_form_field oe_form_field_many2one oe_form_field_with_button">
+    <span class="oe_form_field oe_form_field_many2one oe_form_field_with_button" t-att-style="widget.node.attrs.style">
         <a t-if="widget.get('effective_readonly')" href="#" class="oe_form_uri"/>
         <t t-if="!widget.get('effective_readonly')">
             <button class="oe_button oe_m2o_cm_button" title="Open Resource">
@@ -965,7 +965,7 @@
     </span>
 </t>
 <t t-name="FieldMany2ManyTags">
-    <div class="oe_form_field oe_form_field_many2manytags">
+    <div class="oe_form_field oe_form_field_many2manytags" t-att-style="widget.node.attrs.style">
         <t t-if="! widget.get('effective_readonly')">
             <textarea rows="1" style="width: 100%"
                 t-att-placeholder="widget.node.attrs.placeholder"></textarea>
@@ -982,7 +982,7 @@
     </t>
 </t>
 <t t-name="FieldReference">
-    <table class="oe_form_field oe_form_field_reference" border="0" cellpadding="0" cellspacing="0">
+    <table class="oe_form_field oe_form_field_reference" border="0" cellpadding="0" cellspacing="0" t-att-style="widget.node.attrs.style">
     <tr>
         <td t-attf-class="oe_form_frame_cell oe_form_selection">
             <span t-attf-class="oe_form_view_reference_selection"/>
@@ -994,7 +994,7 @@
     </table>
 </t>
 <t t-name="FieldBoolean">
-    <span class="oe_form_field oe_form_field_boolean">
+    <span class="oe_form_field oe_form_field_boolean" t-att-style="widget.node.attrs.style">
         <input type="checkbox"
             t-att-id="widget.id_for_label"
             t-att-name="widget.name"
@@ -1004,12 +1004,12 @@
     </span>
 </t>
 <t t-name="FieldProgressBar">
-    <span class="oe_form_field oe_form_field_progressbar" t-opentag="true">
+    <span class="oe_form_field oe_form_field_progressbar" t-att-style="widget.node.attrs.style">
         <span></span>
     </span>
 </t>
 <t t-name="FieldStatus">
-    <ul class="oe_form_steps"/>
+    <ul class="oe_form_steps" t-att-style="widget.node.attrs.style"/>
 </t>
 <t t-name="FieldStatus.content">
     <t t-set="size" t-value="widget.to_show.length"/>
@@ -1021,7 +1021,7 @@
     </t>
 </t>
 <t t-name="FieldBinaryImage">
-    <span class="oe_form_field oe_form_field_image">
+    <span class="oe_form_field oe_form_field_image" t-att-style="widget.node.attrs.style">
         <div class="oe_form_field_image_controls oe_edit_only">
             <t t-call="HiddenInputFile">
                 <t t-set="fileupload_id" t-value="widget.fileupload_id"/>
@@ -1049,7 +1049,7 @@
 </t>
 <t t-name="FieldBinaryFile">
     <t t-if="!widget.get('effective_readonly')">
-        <table class="oe_form_field oe_form_field_binary" cellpadding="0" cellspacing="0" border="0">
+        <table class="oe_form_field oe_form_field_binary" cellpadding="0" cellspacing="0" border="0" t-att-style="widget.node.attrs.style">
         <tr>
             <td>
                 <input type="text" size="1" readonly="readonly"
@@ -1097,7 +1097,7 @@
         </table>
     </t>
     <t t-if="widget.get('effective_readonly')">
-        <span>
+        <span t-att-style="widget.node.attrs.style">
             <a href="javascript:void(0)" class="oe_form_uri"/>
         </span>
     </t>
@@ -1116,6 +1116,7 @@
 </t>
 <t t-name="WidgetButton">
     <button type="button" class="oe_button oe_form_button"
+        t-att-style="widget.node.attrs.style"
         t-att-tabindex="widget.node.attrs.tabindex"
         t-att-autofocus="widget.node.attrs.autofocus">
         <img t-if="widget.node.attrs.icon" t-att-src="_s + '/web/static/src/img/icons/' + widget.node.attrs.icon + '.png'" width="16" height="16"/>

From a4072058fb9266648dcab37ca3dfa5f3edad4603 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 10 Jul 2012 12:11:06 +0200
Subject: [PATCH 228/239] [IMP] American addresses + better form lyout

bzr revid: fp@tinyerp.com-20120710101106-2zft32zeopyb17v0
---
 openerp/addons/base/res/res_partner_view.xml | 33 +++++++++-----------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 5159a7075cc..d8760384c2c 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -113,28 +113,21 @@
                         <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)]}">
-                            <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)"/>, 
-                            <field name="function" class="oe_inline" placeholder="Job Position"/>
-                        </h2>
                         <field name="category_id" widget="many2many_tags" placeholder="Tags..."/>
                     </div>
 
                     <group>
                         <group>
+                            <field name="parent_id"
+                                domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
+                                attrs="{'invisible': [('is_company','=', True)]}"
+                                on_change="onchange_address(use_parent_address, parent_id)"/>, 
                             <label for="type" attrs="{'invisible': [('parent_id','=', False)]}"/>
                             <div attrs="{'invisible': [('parent_id','=', False)]}">
                                 <field class="oe_inline"
                                     name="type"/>
-                                <label for="use_parent_address"/>
-                                <field name="use_parent_address"
-                                    class="oe_inline"
+                                <label for="use_parent_address" class="oe_edit_only"/>
+                                <field name="use_parent_address" class="oe_edit_only oe_inline"
                                     on_change="onchange_address(use_parent_address, parent_id)"/>
                             </div>
 
@@ -143,16 +136,18 @@
                                 <field name="street" placeholder="Street..."/>
                                 <field name="street2"/>
                                 <div>
-                                    <field name="zip" class="oe_inline" placeholder="ZIP"/>
-                                    <field name="city" class="oe_inline" placeholder="City"/>
+                                    <field name="city" placeholder="City" style="width: 45%% !important"/>
+                                    <field name="state_id" class="oe_no_button" placeholder="State" style="width: 20%% !important"/>
+                                    <field name="zip" placeholder="ZIP" style="width: 34%% !important"/>
                                 </div>
-                                <field name="state_id" placeholder="State"/>
-                                <field name="country_id" placeholder="Country"/>
+                                <field name="country_id" placeholder="Country" class="oe_no_button"/>
                             </div>
-                            <field name="website" widget="url" placeholder="www.openerp.com"/>
+                            <field name="website" widget="url" placeholder="e.g. www.openerp.com"/>
                         </group>
                         <group>
-                            <field name="phone" placeholder="+32.81.81.37.00"/>
+                            <field name="function" placeholder="Job Position"
+                                attrs="{'invisible': [('is_company','=', True)]}"/>
+                            <field name="phone" placeholder="e.g. +32.81.81.37.00"/>
                             <field name="mobile"/>
                             <field name="fax"/>
                             <field name="email" widget="email"/>

From cbc1ed31b3a1584cd3fac8dc78e66765fd2250fe Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 10 Jul 2012 12:12:05 +0200
Subject: [PATCH 229/239] [IMP] better form css

bzr revid: fp@tinyerp.com-20120710101205-y0im0xzehzw6jm9p
---
 addons/web/static/src/css/base.css  | 36 ++++++++++++++++-------------
 addons/web/static/src/css/base.sass | 32 ++++++++++++++-----------
 addons/web/static/src/xml/base.xml  |  7 +-----
 3 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 36d26d10741..0c4362f4436 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1857,7 +1857,7 @@
 .openerp .oe_form td.oe_form_group_cell_label label {
   line-height: 18px;
   display: block;
-  min-width: 120px;
+  min-width: 110px;
 }
 .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell {
   padding-left: 6px;
@@ -1929,9 +1929,10 @@
 }
 .openerp .oe_form .oe_form_field_char input,
 .openerp .oe_form .oe_form_field_url input,
+.openerp .oe_form .oe_form_field_email input,
 .openerp .oe_form .oe_form_field_text textarea,
 .openerp .oe_form .oe_form_field_selection select {
-  width: inherit;
+  width: 100%;
 }
 .openerp .oe_form .oe_form_field_text.oe_inline, .openerp .oe_form .oe_form_field_text.oe_inline > textarea {
   width: 500px;
@@ -2001,15 +2002,6 @@
   -webkit-border-radius: 0px;
   border-radius: 0px;
 }
-.openerp .oe_form .oe_form_field_many2one input, .openerp .oe_form .oe_form_field_binary input, .openerp .oe_form .oe_form_field_binary input, .openerp .oe_form .oe_form_field_url input {
-  border-right: none;
-  -webkit-border-top-right-radius: 0px;
-  -webkit-border-bottom-right-radius: 0px;
-  -moz-border-radius-topright: 0px;
-  -moz-border-radius-bottomright: 0px;
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
 .openerp .oe_form .oe_form_field_url button img {
   vertical-align: top;
 }
@@ -2073,10 +2065,19 @@
   right: 5px;
   top: 3px;
 }
-.openerp .oe_form .oe_form_field_with_button input {
-  width: 100%;
+.openerp .oe_form .oe_form_field_with_button.oe_no_button > .oe_button {
+  display: none;
 }
-.openerp .oe_form .oe_form_field_with_button > .oe_button {
+.openerp .oe_form .oe_form_field_with_button:not(.oe_no_button) input {
+  border-right: none;
+  -webkit-border-top-right-radius: 0px;
+  -webkit-border-bottom-right-radius: 0px;
+  -moz-border-radius-topright: 0px;
+  -moz-border-radius-bottomright: 0px;
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
+.openerp .oe_form .oe_form_field_with_button:not(.oe_no_button) > .oe_button {
   float: right;
   -moz-border-radius: 0;
   -webkit-border-radius: 0;
@@ -2084,6 +2085,9 @@
   border-bottom-left-radius: 0px;
   height: 22px;
 }
+.openerp .oe_form .oe_form_field_with_button input {
+  width: 100%;
+}
 .openerp .oe_form .oe_form_field_with_button > div {
   position: relative;
   overflow: hidden;
@@ -2138,8 +2142,8 @@
 }
 .openerp .oe_form_field_many2one span.oe_m2o_drop_down_button {
   position: absolute;
-  top: 3px;
-  right: 2px;
+  top: 1px;
+  right: 0px;
 }
 .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page {
   display: none;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 2ba3b79c411..fa71942c9da 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1449,7 +1449,7 @@ $sheet-max-width: 860px
             label
                 line-height: 18px
                 display: block
-                min-width: 120px
+                min-width: 110px
         td.oe_form_group_cell + .oe_form_group_cell
             padding-left: 6px
         .oe_form_group
@@ -1512,9 +1512,10 @@ $sheet-max-width: 860px
             width: 100%
         .oe_form_field_char input,
         .oe_form_field_url input,
+        .oe_form_field_email input,
         .oe_form_field_text textarea,
         .oe_form_field_selection select
-            width: inherit
+            width: 100%
         .oe_form_field_text.oe_inline, .oe_form_field_text.oe_inline > textarea
             width: 500px
         .oe_form_field_float input
@@ -1560,14 +1561,6 @@ $sheet-max-width: 860px
             padding-left: 8px
             @include box-shadow(none)
             @include radius(0px)
-        .oe_form_field_many2one input, .oe_form_field_binary input, .oe_form_field_binary input, .oe_form_field_url input
-            border-right: none
-            -webkit-border-top-right-radius: 0px
-            -webkit-border-bottom-right-radius: 0px
-            -moz-border-radius-topright: 0px
-            -moz-border-radius-bottomright: 0px
-            border-top-right-radius: 0px
-            border-bottom-right-radius: 0px
         .oe_form_field_url button img
             vertical-align: top
         .oe_form_field_date,
@@ -1618,14 +1611,25 @@ $sheet-max-width: 860px
             filter: alpha(opacity=50)
             right: 5px
             top: 3px
-        .oe_form_field_with_button
+        .oe_form_field_with_button.oe_no_button > .oe_button
+            display: none
+        .oe_form_field_with_button:not(.oe_no_button)
             input
-                width: 100%
+                border-right: none
+                -webkit-border-top-right-radius: 0px
+                -webkit-border-bottom-right-radius: 0px
+                -moz-border-radius-topright: 0px
+                -moz-border-radius-bottomright: 0px
+                border-top-right-radius: 0px
+                border-bottom-right-radius: 0px
             > .oe_button
                 float: right
                 @include radius(0)
                 border-bottom-left-radius: 0px
                 height: 22px
+        .oe_form_field_with_button
+            input
+                width: 100%
             > div
                 position: relative
                 overflow: hidden
@@ -1680,8 +1684,8 @@ $sheet-max-width: 860px
             position: relative
         span.oe_m2o_drop_down_button
             position: absolute
-            top: 3px
-            right: 2px
+            top: 1px
+            right: 0px
     // }}}
     // FormView.one2many {{{
     .oe_form .oe_form_field_one2many > .oe_view_manager
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index ee0f22cc07d..a8d7a061a81 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -875,7 +875,7 @@
     </span>
 </t>
 <t t-name="FieldEmail">
-    <span class="oe_form_field oe_form_field_email oe_form_field_with_button" t-att-style="widget.node.attrs.style">
+    <span class="oe_form_field oe_form_field_email" t-att-style="widget.node.attrs.style">
         <a t-if="widget.get('effective_readonly')" href="#" class="oe_form_uri" target="_blank"/>
         <t t-if="!widget.get('effective_readonly')">
             <div>
@@ -893,11 +893,6 @@
     <t t-jquery="span:first">
         this.removeClass('oe_form_field_email').addClass('oe_form_field_url');
     </t>
-    <t t-jquery="button.oe_button" t-operation="replace">
-        <button class="oe_button" tabindex="-1" type="button" title="Open this resource">
-            <img t-att-src='_s + "/web/static/src/img/icons/gtk-ok.png"'/>
-        </button>
-    </t>
 </t>
 <t t-name="FieldText">
     <div class="oe_form_field oe_form_field_text" t-att-style="widget.node.attrs.style">

From 4d7d5afce0042a909205a10ea22100b036c357dd Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 10 Jul 2012 12:12:37 +0200
Subject: [PATCH 230/239] [IMP] opporunity form small improvement in layout

bzr revid: fp@tinyerp.com-20120710101237-zzsi61hzwbxemi6b
---
 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 85f9a4aab5d..7e05f8cb579 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -468,7 +468,7 @@
                         <h2>
                             <field name="planned_revenue" class="oe_inline"/>
                             <field name="company_currency" class="oe_inline"/> at 
-                            <field name="probability" class="oe_inline"/> %% success rate
+                            <field name="probability" class="oe_inline"/>%% success rate
                         </h2>
                     </div>
                     <group>

From 16191491ebb7d36c6a914443c2ce06ef1e4ec4d5 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 10 Jul 2012 13:07:40 +0200
Subject: [PATCH 231/239] [IMP] tools: usability, review of form views

bzr revid: qdp-launchpad@openerp.com-20120710110740-rj2820hn4w9hmxdj
---
 addons/idea/idea_view.xml               | 16 +++--
 addons/lunch/lunch.py                   |  2 +-
 addons/lunch/lunch_view.xml             | 18 +++---
 addons/survey/static/src/css/survey.css |  4 --
 addons/survey/survey.py                 |  2 +-
 addons/survey/survey_view.xml           | 81 ++++++++++++-------------
 6 files changed, 54 insertions(+), 69 deletions(-)

diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 9dfbd859d4e..8d7a726f015 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -20,11 +20,9 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Category of Ideas" version="7.0">
-                    <sheet>
-                        <group>
-                            <field name="name"/>
-                        </group>
-                    </sheet>
+                    <group>
+                        <field name="name"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -77,10 +75,10 @@
                 <sheet>
                     <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
-                    <group>
-                        <field name="category_ids" widget="many2many_tags" string="Tags"/>
-                        <field name="description"/>
-                    </group>
+                    <label for="category_ids" class="oe_edit_only"/>
+                    <field name="category_ids" widget="many2many_tags"/>
+                    <label for="description"/><newline/>
+                    <field name="description"/>
                 </sheet>
                 <footer>
                     <field name="message_ids" widget="mail_thread"/>
diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py
index c771c42cfe1..8cca4ced465 100644
--- a/addons/lunch/lunch.py
+++ b/addons/lunch/lunch.py
@@ -135,7 +135,7 @@ class lunch_order(osv.osv):
             readonly=True, states={'draft':[('readonly', False)]}, change_default=True),
         'date': fields.date('Date', readonly=True, states={'draft':[('readonly', False)]}),
         'cashmove': fields.many2one('lunch.cashmove', 'Cash Move' , readonly=True),
-        'descript': fields.char('Description Order', readonly=True, size=250, \
+        'descript': fields.char('Comment', readonly=True, size=250, \
             states = {'draft':[('readonly', False)]}),
         'state': fields.selection([('draft', 'New'), ('confirmed', 'Confirmed'), ], \
             'Status', readonly=True, select=True),
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 8efb6566f7c..5e870c085c9 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -109,12 +109,10 @@
             <field name="model">lunch.cashbox</field>
             <field name="arch" type="xml">
                 <form string="Cashboxes" version="7.0">
-                    <sheet>
-                        <group>
-                            <field name="name"/>
-                            <field name="manager"/>
-                        </group>
-                    </sheet>
+                    <group colspan="4">
+                        <field name="name"/>
+                        <field name="manager"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -226,11 +224,9 @@
             <field name="model">lunch.category</field>
             <field name="arch" type="xml">
                 <form string="Category" version="7.0">
-                    <sheet>
-                        <group col="4">
-                            <field name="name"/>
-                        </group>
-                    </sheet>
+                    <group>
+                        <field name="name"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/survey/static/src/css/survey.css b/addons/survey/static/src/css/survey.css
index 6964e4c2f3e..c18f584c9ed 100644
--- a/addons/survey/static/src/css/survey.css
+++ b/addons/survey/static/src/css/survey.css
@@ -12,7 +12,3 @@
 .oe_survey_rate{
     font-size: 14px;
 }
-.oe_kanban_survey {
-    width: 300px;
-}
-
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 1c1c8b6df91..0ebaa2aa586 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -178,7 +178,7 @@ class survey_page(osv.osv):
     _columns = {
         'title': fields.char('Page Title', size=128, required=1),
         'survey_id': fields.many2one('survey', 'Survey', ondelete='cascade'),
-        'question_ids': fields.one2many('survey.question', 'page_id', 'Question'),
+        'question_ids': fields.one2many('survey.question', 'page_id', 'Questions'),
         'sequence': fields.integer('Page Nr'),
         'note': fields.text('Description'),
     }
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 8aeec213648..cfefc8f7dea 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -27,16 +27,14 @@
                 </header>
                 <sheet>
                     <div class="oe_button_box oe_right">
-                        <button name="122" states="open,draft,close,cancel" string="Test Survey" type="action" icon="gtk-new" context="{'active':True,'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}"/>
-                        <button name="106" states="open,draft,close,cancel" string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
-                        <button name="106" states="open,draft,close,cancel" string="Edit Survey" type="action" icon="gtk-edit" context="{'active':True,'edit' : True,'survey_id': active_id}" invisible="1"/>
+                        <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel" string="Test Survey" type="action" icon="gtk-new" context="{'active':True,'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}"/>
+                        <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel" string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
                     </div>
                     <label for="title" class="oe_edit_only"/>
                     <h1>
                         <field name="title" select="1" class="oe_inline"/>
-                        <label string="(" attrs="{'invisible':[('type','=',False)]}" class="oe_inline"/>
+                        <label string=", " attrs="{'invisible':[('type','=',False)]}" class="oe_inline"/>
                         <field name="type" class="oe_inline"/>
-                        <label string=")" attrs="{'invisible':[('type','=',False)]}" class="oe_inline"/>
                     </h1>
                     <group>
                         <group>
@@ -50,31 +48,29 @@
                         </group>
                      </group>
                      <notebook>
-                        <page string="Survey">
-                            <field name="page_ids" colspan="4" nolabel="1" mode="tree">
+                        <page string="Survey Details">
+                            <field name="note" colspan="4" placeholder="Survey description..."/>
+                            <label for="page_ids"/>
+                            <field name="page_ids" colspan="4" mode="tree">
                                 <form string="Survey Page" version="7.0">
                                     <sheet>
                                     <label for="title" class="oe_edit_only"/>
-                                    <h2>
-                                        <field name="title" select="1" class="oe_inline"/>
-                                        (<field name="sequence" groups="base.group_no_one" class="oe_inline"/>)
-                                    </h2>
-                                    <newline/>
+                                    <h1>
+                                        <field name="title"/>
+                                    </h1>
                                     <group>
-                                        <field name="note" placeholder="Add a description on the survey page" nolabel="1"/>
+                                        <field name="note" placeholder="Description on the survey page..." nolabel="1"/>
                                     </group>
                                     <newline/>
-                                    <group string="Survey Questions">
+                                    <group>
+                                        <label for="question_ids"/>
+                                        <newline/>
                                         <field name="question_ids" nolabel="1">
-                                            <form string="Survey Question" >
+                                            <form string="Survey Question">
                                                 <group>
                                                     <group>
-                                                    <field name="question" select="1"/>
-                                                    <field name="type" on_change="on_change_type(type)"/>
-                                                    </group>
-                                                    <group>
-                                                    <field name="sequence"/>
-                                                    <field name="tot_resp"/>
+                                                        <field name="question"/>
+                                                        <field name="type" on_change="on_change_type(type)"/>
                                                     </group>
                                                 </group>
                                                 <newline/>
@@ -206,7 +202,7 @@
                                             </form>
                                             <tree string="Survey Question">
                                                 <field name="sequence" string="Seq"/>
-                                                <field name="question" colspan="4" select="1"/>
+                                                <field name="question"/>
                                                 <field name="answer_choice_ids"/>
                                             </tree>
                                         </field>
@@ -215,26 +211,21 @@
                                     </form>
                                 </field>
                         </page>
-                        <page string="Other">
-
-                            <separator colspan="4" string="Survey Details"/>
-                            <field name="note" colspan="4" nolabel="1"/>
-                        </page>
                         <page string="Invited User">
-                            <field name="invited_user_ids" nolabel="1" readonly="1"/>
+                            <field name="invited_user_ids" readonly="1"/>
                         </page>
                         <page string="History">
                             <group>
                                 <group>
-                                    <field name="date_open" select="1"/>
+                                    <field name="date_open"/>
                                     <field name="date_close"/>
                                 </group>
                                 <group>
-                                    <field name="tot_start_survey" select="1"/>
-                                    <field name="tot_comp_survey" select="1"/>
+                                    <field name="tot_start_survey"/>
+                                    <field name="tot_comp_survey"/>
                                 </group>
                             </group>
-                            <field name="history" colspan="4" nolabel="1">
+                            <field name="history" colspan="4">
                                 <tree string="History">
                                     <field name="date"/>
                                     <field name="user_id"/>
@@ -244,7 +235,6 @@
                                     <field name="user_id"/>
                                 </form>
                            </field>
-
                         </page>
                     </notebook>
                 </sheet>
@@ -316,7 +306,7 @@
                     <field name="color"/>
                     <templates>
                         <t t-name="kanban-box">
-                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_survey">
+                            <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>
                                     <ul class="oe_dropdown_menu">
@@ -376,15 +366,20 @@
             <field name="arch" type="xml">
                 <form string="Survey Page" version="7.0">
                     <sheet>
-                        <group col="4">
-                            <field name="title" select="1"/>
-                            <field name="survey_id" select="1"/>
+                        <label for="title" class="oe_edit_only"/>
+                        <h1>
+                            <field name="title"/>
+                        </h1>
+                        <group colspan="4">
+                            <field name="survey_id"/>
                             <field name="sequence"/>
                         </group>
-                        <group col="4">
-                            <field name="note" nolabel="1" placeholder="Add a description on the survey page"/>
+                        <group colspan="4">
+                            <field name="note" nolabel="1" placeholder="Description on the survey page..."/>
                         </group>
                         <group col="4">
+                            <label for="question_ids"/>
+                            <newline/>
                             <field name="question_ids" nolabel="1">
                             <form string="Survey Question">
                                 <group>
@@ -393,8 +388,8 @@
                                         <field name="type" on_change="on_change_type(type)"/>
                                     </group>
                                     <group>
-                                        <field name="sequence"/>
-                                        <field name="tot_resp"/>
+                                        <field name="sequence" invisible="1"/>
+                                        <field name="tot_resp" invisible="1"/>
                                         <field name="in_visible_rating_weight" invisible="1"/>
                                         <field name="in_visible_menu_choice" invisible="1"/>
                                         <field name="in_visible_answer_type" invisible="1"/>
@@ -500,7 +495,7 @@
                                                         <field name="req_error_msg" colspan="4" nolabel="1"/>
                                                     </group>
                                                     <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
-                                                        <group colspan="2" >
+                                                        <group colspan="2">
                                                             <field name="numeric_required_sum"/>
                                                         </group>
                                                         <newline/>
@@ -523,7 +518,7 @@
                             </form>
                             <tree string="Survey Question">
                                 <field name="sequence" string="Seq"/>
-                                <field name="question" colspan="4" select="1"/>
+                                <field name="question"/>
                                 <field name="answer_choice_ids"/>
                             </tree>
                             </field>

From ece36066cee814c2eb608b09a5cdb7b648ebbcc3 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 10 Jul 2012 16:50:23 +0200
Subject: [PATCH 232/239] [FIX] typo in mail.js

bzr revid: nicolas.vanhoren@openerp.com-20120710145023-uqh8h8p2dbbfj6h9
---
 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 88f0b9ade43..2140bbe474a 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -541,7 +541,7 @@ openerp.mail = function(session) {
             var self = this;
             this.reinit();
             if (! this.view.datarecord.id ||
-                instance.web.BufferedDataSet.virtual_id_regex.test(this.view.datarecord.id)) {
+                session.web.BufferedDataSet.virtual_id_regex.test(this.view.datarecord.id)) {
                 this.$element.find('.oe_mail_thread').hide();
                 return;
             }

From 2d9afec3ced8657ad505956ff46a0d0ccbb8f9de Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Tue, 10 Jul 2012 16:57:20 +0200
Subject: [PATCH 233/239] Removed the dot between kanban vignette labels

bzr revid: mit@openerp.com-20120710145720-ffyadv9ky0l4rwz7
---
 addons/mail/mail_thread.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index ef26f823422..cdcaf4f464d 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -69,7 +69,7 @@ class mail_thread(osv.Model):
             subscriber_ids = self.message_get_subscribers(cr, uid, [id], context=context)
             res[id] = {
                 'message_ids': message_ids,
-                'message_summary': "<span><span class='oe_e'>9</span> %d</span> . <span><span class='oe_e'>+</span> %d</span>" % (len(message_ids), len(subscriber_ids)),
+                'message_summary': "<span><span class='oe_e'>9</span> %d</span> <span><span class='oe_e'>+</span> %d</span>" % (len(message_ids), len(subscriber_ids)),
             }
         return res
 

From ca89b972c313f591a62b4511e13a388941556e22 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Tue, 10 Jul 2012 17:03:13 +0200
Subject: [PATCH 234/239] Restyling of labels in the kanban vignette

bzr revid: mit@openerp.com-20120710150313-m4q9j9o82mzwdwim
---
 addons/web_kanban/static/src/css/kanban.css  | 11 +++++++++--
 addons/web_kanban/static/src/css/kanban.sass | 10 ++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 6d0ae1c3d3b..f16bd58bc5e 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -383,8 +383,9 @@
   display: inline-block;
   background: #e6e6e6;
   border: 1px solid #b9b9b9;
+  color: #666666;
   padding: 0 2px;
-  line-height: 22px;
+  line-height: 16px;
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   border-radius: 3px;
@@ -393,10 +394,15 @@
   line-height: 12px;
   font-size: 22px;
 }
+.openerp .oe_kanban_view .oe_kanban_footer_left .oe_kanban_mail_new {
+  line-height: 18px;
+  position: relative;
+  top: -1px;
+}
 .openerp .oe_kanban_view .oe_kanban_bottom_right {
   float: right;
   position: relative;
-  top: 4px;
+  top: 2px;
 }
 .openerp .oe_kanban_view .oe_kanban_status {
   display: inline-block;
@@ -450,6 +456,7 @@
 }
 .openerp .oe_kanban_view .oe_dropdown_kanban .oe_dropdown_menu {
   left: 0;
+  top: 28px;
   min-width: 160px;
 }
 .openerp .oe_kanban_view .oe_kanban_colorpicker {
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 45f290fdd1e..9ba57befe31 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -325,16 +325,21 @@
             display: inline-block
             background: #E6E6E6
             border: 1px solid #B9B9B9
+            color: #666
             padding: 0 2px
-            line-height: 22px
+            line-height: 16px
             @include radius(3px)
             .oe_e
                 line-height: 12px
                 font-size: 22px
+        .oe_kanban_mail_new
+            line-height: 18px
+            position: relative
+            top: -1px
     .oe_kanban_bottom_right
         float: right
         position: relative
-        top: 4px
+        top: 2px
        
     .oe_kanban_status
         display: inline-block
@@ -369,6 +374,7 @@
             text-decoration: none
         .oe_dropdown_menu
             left: 0
+            top: 28px
             min-width: 160px
     // }}}
     // KanbanColorPicker {{{

From cdd0cba40743a929c51e77a619f74b4856b24ebb Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 10 Jul 2012 17:39:07 +0200
Subject: [PATCH 235/239] improved form partner

bzr revid: fp@tinyerp.com-20120710153907-jly8bpnsc4cbaubt
---
 openerp/addons/base/res/res_partner_view.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index d8760384c2c..f54390b435a 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -136,22 +136,23 @@
                                 <field name="street" placeholder="Street..."/>
                                 <field name="street2"/>
                                 <div>
-                                    <field name="city" placeholder="City" style="width: 45%% !important"/>
-                                    <field name="state_id" class="oe_no_button" placeholder="State" style="width: 20%% !important"/>
-                                    <field name="zip" placeholder="ZIP" style="width: 34%% !important"/>
+                                    <field name="city" placeholder="City" style="width: 40%%"/>
+                                    <field name="state_id" class="oe_no_button" placeholder="State" style="width: 24%%"/>
+                                    <field name="zip" placeholder="ZIP" style="width: 34%%"/>
                                 </div>
                                 <field name="country_id" placeholder="Country" class="oe_no_button"/>
                             </div>
                             <field name="website" widget="url" placeholder="e.g. www.openerp.com"/>
                         </group>
                         <group>
-                            <field name="function" placeholder="Job Position"
+                            <field name="function" placeholder="e.g. Sales Director"
                                 attrs="{'invisible': [('is_company','=', True)]}"/>
                             <field name="phone" placeholder="e.g. +32.81.81.37.00"/>
                             <field name="mobile"/>
                             <field name="fax"/>
                             <field name="email" widget="email"/>
-                            <field name="title" domain="[('domain', '=', 'contact')]" attrs="{'invisible': [('is_company','=', True)]}"/>
+                            <field name="title" domain="[('domain', '=', 'contact')]"
+                                class="oe_no_button" attrs="{'invisible': [('is_company','=', True)]}"/>
                         </group>
                     </group>
 

From 3de5a56fd509dda10bcef6a412110e0bdddf1b7c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 10 Jul 2012 18:29:21 +0200
Subject: [PATCH 236/239] [IMP] new wizard style

bzr revid: fp@tinyerp.com-20120710162921-kxlxfevs926820ah
---
 .../crm/wizard/crm_opportunity_to_phonecall_view.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index 6c921b3f071..ccabcde88fe 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -10,12 +10,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Schedule/Log a Call" version="7.0">
-                    <header>
-                        <button name="action_schedule" type="object" string="Log call" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight"/>
-                        <button name="action_schedule" type="object" string="Schedule Call" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight"  />
-                        or
-                        <button name="action_cancel" string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <group>
                             <field name="action"/>
@@ -34,6 +28,12 @@
                         </group>
                     </group>
                     <field name="note" placeholder="Call Description" />
+                    <footer>
+                        <button name="action_schedule" type="object" string="Log call" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight"/>
+                        <button name="action_schedule" type="object" string="Schedule Call" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight"  />
+                        or
+                        <button name="action_cancel" string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>

From 64a9321d56a6f6a46cf153eafa85fb065327b025 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 10 Jul 2012 18:40:11 +0200
Subject: [PATCH 237/239] [IMP] footer on forms

bzr revid: fp@tinyerp.com-20120710164011-unqi1okf2uu8yhts
---
 .../account_automatic_reconcile_view.xml      | 10 ++---
 .../wizard/account_change_currency_view.xml   | 10 ++---
 addons/account/wizard/account_chart_view.xml  | 10 ++---
 .../wizard/account_fiscalyear_close_view.xml  | 10 ++---
 .../wizard/account_invoice_refund_view.xml    | 10 ++---
 .../wizard/account_invoice_state_view.xml     | 32 +++++++-------
 .../wizard/account_journal_select_view.xml    | 14 +++----
 .../account_move_bank_reconcile_view.xml      | 10 ++---
 ...ccount_move_line_reconcile_select_view.xml | 10 ++---
 .../wizard/account_move_line_select_view.xml  |  6 +--
 ...ount_move_line_unreconcile_select_view.xml | 10 ++---
 .../account_open_closed_fiscalyear_view.xml   | 10 ++---
 .../wizard/account_period_close_view.xml      | 10 ++---
 ...account_reconcile_partner_process_view.xml |  6 +--
 .../account/wizard/account_reconcile_view.xml | 14 +++----
 ...count_report_aged_partner_balance_view.xml | 10 ++---
 .../wizard/account_report_common_view.xml     | 10 ++---
 .../wizard/account_state_open_view.xml        | 10 ++---
 .../account_subscription_generate_view.xml    | 10 ++---
 .../account/wizard/account_tax_chart_view.xml | 10 ++---
 .../wizard/account_unreconcile_view.xml       |  8 ++--
 .../account/wizard/account_use_model_view.xml | 16 +++----
 .../wizard/account_validate_move_view.xml     | 42 +++++++++----------
 addons/account/wizard/account_vat_view.xml    | 10 ++---
 .../account_crossovered_analytic_view.xml     | 10 ++---
 .../analytic_plan_create_model_view.xml       |  6 +--
 .../account_asset_change_duration_view.xml    | 10 ++---
 .../wizard/wizard_asset_compute_view.xml      | 10 ++---
 .../wizard/account_budget_analytic_view.xml   | 10 ++---
 ...account_budget_crossovered_report_view.xml | 10 ++---
 ...budget_crossovered_summary_report_view.xml | 10 ++---
 .../wizard/account_budget_report_view.xml     | 10 ++---
 .../wizard/account_followup_print_view.xml    | 10 ++---
 .../account_payment_create_order_view.xml     | 20 ++++-----
 .../wizard/account_payment_pay_view.xml       |  6 +--
 ...ccount_payment_populate_statement_view.xml | 10 ++---
 .../account_statement_from_invoice_view.xml   | 18 ++++----
 .../account_voucher_unreconcile_view.xml      |  8 ++--
 .../wizard/audittrail_view_log_view.xml       | 10 ++---
 .../base_calendar_invite_attendee_view.xml    | 10 ++---
 .../wizard/generate_relation_graph_view.xml   |  6 +--
 .../wizard/base_module_record_data_view.xml   | 10 ++---
 .../wizard/base_module_record_object_view.xml | 20 ++++-----
 .../wizard/base_module_save_view.xml          | 10 ++---
 .../wizard/base_report_design_view.xml        | 10 ++---
 .../board/wizard/board_menu_create_view.xml   | 10 ++---
 addons/caldav/wizard/caldav_browse_view.xml   |  6 +--
 .../wizard/calendar_event_import_view.xml     | 10 ++---
 .../wizard/calendar_event_subscribe_view.xml  | 10 ++---
 addons/crm/wizard/crm_add_note_view.xml       | 10 ++---
 .../wizard/crm_lead_to_opportunity_view.xml   | 20 ++++-----
 .../crm/wizard/crm_lead_to_partner_view.xml   | 10 ++---
 .../wizard/crm_merge_opportunities_view.xml   | 10 ++---
 .../crm_partner_to_opportunity_view.xml       | 10 ++---
 .../wizard/crm_phonecall_to_meeting_view.xml  |  6 +--
 .../crm_phonecall_to_opportunity_view.xml     | 10 ++---
 .../wizard/crm_phonecall_to_partner_view.xml  | 20 ++++-----
 .../crm_phonecall_to_phonecall_view.xml       | 12 +++---
 .../wizard/crm_forward_to_partner_view.xml    | 10 ++---
 .../wizard/open_questionnaire_view.xml        | 18 ++++----
 .../document_ftp/wizard/ftp_browse_view.xml   | 10 ++---
 .../wizard/email_compose_message_view.xml     | 12 +++---
 addons/event/wizard/event_confirm_view.xml    |  6 +--
 .../wizard/event_project_retro_view.xml       | 10 ++---
 .../wizard/google_login_view.xml              | 10 ++---
 .../wizard/hr_attendance_bymonth_view.xml     | 10 ++---
 .../wizard/hr_attendance_byweek_view.xml      | 10 ++---
 .../wizard/hr_attendance_error_view.xml       | 10 ++---
 .../wizard/hr_attendance_sign_in_out_view.xml | 12 +++---
 .../wizard/hr_evaluation_mail_view.xml        | 10 ++---
 .../hr_holidays_summary_department_view.xml   |  8 ++--
 .../hr_holidays_summary_employees_view.xml    | 10 ++---
 ...hr_recruitment_create_partner_job_view.xml |  6 +--
 .../hr_timesheet_print_employee_view.xml      | 10 ++---
 .../wizard/hr_timesheet_print_users_view.xml  |  8 ++--
 .../wizard/hr_timesheet_sign_in_out_view.xml  | 32 +++++++-------
 .../hr_timesheet_analytic_profit_view.xml     | 22 +++++-----
 ...hr_timesheet_invoice_create_final_view.xml | 10 ++---
 .../hr_timesheet_invoice_create_view.xml      | 10 ++---
 .../wizard/hr_timesheet_current_view.xml      | 10 ++---
 .../wizard/import_google_data_view.xml        | 20 ++++-----
 .../l10n_be_account_vat_declaration_view.xml  | 10 ++---
 .../l10n_be/wizard/l10n_be_vat_intra_view.xml | 12 +++---
 addons/l10n_ch/wizard/bvr_import_view.xml     | 10 ++---
 addons/l10n_ch/wizard/create_dta_view.xml     | 10 ++---
 .../l10n_fr/wizard/fr_report_bilan_view.xml   | 10 ++---
 .../fr_report_compute_resultant_view.xml      | 10 ++---
 addons/l10n_lu/wizard/print_vat_view.xml      | 10 ++---
 .../lunch/wizard/lunch_cashbox_clean_view.xml | 10 ++---
 .../lunch/wizard/lunch_order_cancel_view.xml  | 10 ++---
 .../lunch/wizard/lunch_order_confirm_view.xml | 10 ++---
 .../mail/wizard/mail_compose_message_view.xml | 10 ++---
 .../wizard/membership_invoice_view.xml        | 10 ++---
 .../mrp/wizard/change_production_qty_view.xml | 12 +++---
 addons/mrp/wizard/mrp_price_view.xml          | 10 ++---
 .../mrp/wizard/mrp_product_produce_view.xml   | 10 ++---
 .../mrp/wizard/mrp_workcenter_load_view.xml   | 10 ++---
 .../wizard/mrp_repair_cancel_view.xml         | 10 ++---
 .../wizard/mrp_repair_make_invoice_view.xml   | 12 +++---
 .../wizard/pos_payment_report_user_view.xml   | 10 ++---
 .../point_of_sale/wizard/pos_receipt_view.xml | 10 ++---
 .../point_of_sale/wizard/pos_return_view.xml  |  4 +-
 addons/portal/wizard/portal_wizard_view.xml   | 12 +++---
 .../wizard/make_procurement_view.xml          | 10 ++---
 .../wizard/mrp_procurement_view.xml           | 10 ++---
 .../wizard/orderpoint_procurement_view.xml    | 10 ++---
 .../wizard/schedulers_all_view.xml            | 10 ++---
 addons/product/wizard/product_price_view.xml  | 10 ++---
 .../wizard/product_margin_view.xml            | 10 ++---
 .../wizard/project_task_delegate_view.xml     | 10 ++---
 .../wizard/project_task_reevaluate_view.xml   | 10 ++---
 .../wizard/project_gtd_fill_view.xml          | 10 ++---
 .../wizard/project_compute_phases_view.xml    | 10 ++---
 .../wizard/project_compute_tasks_view.xml     | 10 ++---
 .../wizard/purchase_line_invoice_view.xml     | 10 ++---
 .../wizard/purchase_order_group_view.xml      | 10 ++---
 .../purchase_requisition_partner_view.xml     | 10 ++---
 .../wizard/report_webkit_actions_view.xml     | 10 ++---
 addons/sale_crm/wizard/crm_make_sale_view.xml | 10 ++---
 addons/share/wizard/share_wizard_view.xml     | 28 ++++++-------
 .../wizard/stock_change_product_qty_view.xml  | 10 ++---
 .../stock_change_standard_price_view.xml      | 10 ++---
 .../wizard/stock_fill_inventory_view.xml      | 10 ++---
 .../stock_inventory_line_split_view.xml       | 10 ++---
 .../wizard/stock_inventory_merge_view.xml     |  8 ++--
 .../wizard/stock_invoice_onshipping_view.xml  | 10 ++---
 .../wizard/stock_location_product_view.xml    | 10 ++---
 addons/stock/wizard/stock_move_view.xml       | 26 ++++++------
 .../stock/wizard/stock_partial_move_view.xml  |  8 ++--
 .../wizard/stock_partial_picking_view.xml     | 10 ++---
 .../wizard/stock_return_picking_view.xml      | 10 ++---
 addons/stock/wizard/stock_splitinto_view.xml  | 10 ++---
 .../stock_planning_create_periods_view.xml    | 12 +++---
 .../stock_planning_createlines_view.xml       | 10 ++---
 .../wizard/stock_planning_forecast_view.xml   | 10 ++---
 addons/wiki/wizard/wiki_create_menu_view.xml  | 10 ++---
 addons/wiki/wizard/wiki_make_index_view.xml   |  8 ++--
 addons/wiki/wizard/wiki_show_diff_view.xml    |  6 +--
 .../wiki/wizard/wiki_wiki_page_open_view.xml  |  6 +--
 139 files changed, 772 insertions(+), 772 deletions(-)

diff --git a/addons/account/wizard/account_automatic_reconcile_view.xml b/addons/account/wizard/account_automatic_reconcile_view.xml
index d0ff56924e9..be1776497b3 100644
--- a/addons/account/wizard/account_automatic_reconcile_view.xml
+++ b/addons/account/wizard/account_automatic_reconcile_view.xml
@@ -8,11 +8,6 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                 <form string="Reconciliation" version="7.0">
-                    <header>
-                        <button name="reconcile" string="Reconcile" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <separator string="Reconciliation"/>
                     <label string="For an invoice to be considered as paid, the invoice entries must be reconciled with counterparts, usually payments. With the automatic reconciliation functionality, OpenERP makes its own search for entries to reconcile in a series of accounts. It finds entries for each partner where the amounts correspond."/>
                     <field name="account_ids" domain="[('reconcile','=',1)]"/>
@@ -26,6 +21,11 @@
                         <field name="journal_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
                         <field name="period_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
                     </group>
+                    <footer>
+                        <button name="reconcile" string="Reconcile" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
              </field>
          </record>
diff --git a/addons/account/wizard/account_change_currency_view.xml b/addons/account/wizard/account_change_currency_view.xml
index 322c33aec76..7e33e61eec8 100644
--- a/addons/account/wizard/account_change_currency_view.xml
+++ b/addons/account/wizard/account_change_currency_view.xml
@@ -7,14 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Invoice Currency" version="7.0">
-                    <header>
-                        <button name="change_currency" string="Change Currency" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group string="This wizard will change the currency of the invoice">
                         <field name="currency_id"/>
                     </group>
+                    <footer>
+                        <button name="change_currency" string="Change Currency" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index 83c49fe665a..d7820caa647 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -7,11 +7,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account charts" version="7.0">
-                    <header>
-                        <button string="Open Charts" name="account_chart_open_window" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group colspan="4">
                         <field name="fiscalyear" on_change="onchange_fiscalyear(fiscalyear)"/>
                         <field name="target_move"/>
@@ -20,6 +15,11 @@
                         <field name="period_from"/>
                         <field name="period_to"/>
                     </group>
+                    <footer>
+                        <button string="Open Charts" name="account_chart_open_window" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_fiscalyear_close_view.xml b/addons/account/wizard/account_fiscalyear_close_view.xml
index 8827edba591..8c4df8548f6 100644
--- a/addons/account/wizard/account_fiscalyear_close_view.xml
+++ b/addons/account/wizard/account_fiscalyear_close_view.xml
@@ -7,11 +7,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Generate Fiscal Year Opening Entries" version="7.0">
-                    <header>
-                        <button string="Create" name="data_save" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <separator string="Generate Fiscal Year Opening Entries"/>
                     <label string="This wizard will generate the end of year journal entries of selected fiscal year. Note that you can run this wizard many times for the same fiscal year: it will simply replace the old opening entries with the new ones."/>
                     <newline/>
@@ -22,6 +17,11 @@
                         <field name="period_id" domain ="[('fiscalyear_id','=',fy2_id),('special','=', True)]" />
                         <field name="report_name"/>
                     </group>
+                    <footer>
+                        <button string="Create" name="data_save" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_invoice_refund_view.xml b/addons/account/wizard/account_invoice_refund_view.xml
index 9d38b2034bd..08db574e9ac 100644
--- a/addons/account/wizard/account_invoice_refund_view.xml
+++ b/addons/account/wizard/account_invoice_refund_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Credit Note" version="7.0">
-                    <header>
-                        <button string='Refund' name="invoice_refund" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <separator string="Credit Note Options"/>
                     <group col="4">
                          <field name="description"/>
@@ -24,6 +19,11 @@
                     <label string="Modify Invoice: Cancels the current invoice and creates a new copy of it ready for editing."/>
                     <label string="Credit Note: Creates the credit note, ready for editing."/>
                     <label string="Cancel Invoice: Creates the credit note, validate and reconcile it to cancel the current invoice."/>
+                    <footer>
+                        <button string='Refund' name="invoice_refund" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_invoice_state_view.xml b/addons/account/wizard/account_invoice_state_view.xml
index 5658143f4e1..0ea2eefebc5 100644
--- a/addons/account/wizard/account_invoice_state_view.xml
+++ b/addons/account/wizard/account_invoice_state_view.xml
@@ -6,14 +6,14 @@
             <field name="model">account.invoice.confirm</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	            <form string="Confirm Draft Invoices" version="7.0">
-	                <header>
-	                    <button string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1" class="oe_highlight"/>
-	                    or
-	                    <button string="Cancel" class="oe_link" special="cancel"/>
-	                </header>
-	                <separator string="Confirm Draft Invoices"/>
-	            </form>
+                <form string="Confirm Draft Invoices" version="7.0">
+                    <separator string="Confirm Draft Invoices"/>
+                    <footer>
+                        <button string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
+                </form>
             </field>
         </record>
 
@@ -28,14 +28,14 @@
             <field name="model">account.invoice.cancel</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	            <form string="Cancel Selected Invoices" version="7.0">
-	                <header>
-	                    <button string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1" class="oe_highlight"/>
-	                    or
-	                    <button string="Cancel" class="oe_link" special="cancel"/>
-	                </header>
-	                <separator string="Cancel Selected Invoices"/>
-	            </form>
+                <form string="Cancel Selected Invoices" version="7.0">
+                    <separator string="Cancel Selected Invoices"/>
+                    <footer>
+                        <button string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
+                </form>
             </field>
         </record>
 
diff --git a/addons/account/wizard/account_journal_select_view.xml b/addons/account/wizard/account_journal_select_view.xml
index e2dcc05c266..af0b50168de 100644
--- a/addons/account/wizard/account_journal_select_view.xml
+++ b/addons/account/wizard/account_journal_select_view.xml
@@ -7,14 +7,14 @@
             <field name="model">account.journal.select</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	            <form string="Journal Select" version="7.0">
-	                <header>
-	                    <button string="Open Entries" name="action_open_window" type="object" class="oe_highlight"/>
-	                    or
-	                    <button string="Cancel" class="oe_link" special="cancel"/>
-	                </header>
+                <form string="Journal Select" version="7.0">
                     <label string="Are you sure you want to open Journal Entries?"/>
-	            </form>
+                    <footer>
+                        <button string="Open Entries" name="action_open_window" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
+                </form>
             </field>
         </record>
 
diff --git a/addons/account/wizard/account_move_bank_reconcile_view.xml b/addons/account/wizard/account_move_bank_reconcile_view.xml
index 02509137af5..58707c0d605 100644
--- a/addons/account/wizard/account_move_bank_reconcile_view.xml
+++ b/addons/account/wizard/account_move_bank_reconcile_view.xml
@@ -7,14 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Bank reconciliation" version="7.0">
-                    <header>
-                        <button string="Open for Bank Reconciliation" name="action_open_window" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group>
                         <field name="journal_id"/>
                     </group>
+                    <footer>
+                        <button string="Open for Bank Reconciliation" name="action_open_window" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_move_line_reconcile_select_view.xml b/addons/account/wizard/account_move_line_reconcile_select_view.xml
index 862ffa0956e..1e36cc8bafe 100644
--- a/addons/account/wizard/account_move_line_reconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml
@@ -7,14 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reconciliation" version="7.0">
-                    <header>
-                        <button string="Open for Reconciliation" name="action_open_window" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group>
                          <field name="account_id"/>
                     </group>
+                    <footer>
+                        <button string="Open for Reconciliation" name="action_open_window" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_move_line_select_view.xml b/addons/account/wizard/account_move_line_select_view.xml
index 1d405ae02aa..ade86e29c50 100644
--- a/addons/account/wizard/account_move_line_select_view.xml
+++ b/addons/account/wizard/account_move_line_select_view.xml
@@ -8,12 +8,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Select" version="7.0">
-                    <header>
+                    <label string="Are you sure you want to open Account move line entries?"/>
+                    <footer>
                         <button string="Open Entries" name="open_window" type="object" default_focus="1" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <label string="Are you sure you want to open Account move line entries?"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_move_line_unreconcile_select_view.xml b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
index ff4811f781c..63ba44ba8a7 100644
--- a/addons/account/wizard/account_move_line_unreconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
@@ -7,14 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Unreconciliation" version="7.0">
-                    <header>
-                        <button string="Open for Unreconciliation" name="action_open_window" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group>
                         <field name="account_id"/>
                     </group>
+                    <footer>
+                        <button string="Open for Unreconciliation" name="action_open_window" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_open_closed_fiscalyear_view.xml b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
index bedc1028b4a..7f950e4cf53 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear_view.xml
+++ b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
@@ -7,14 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Choose Fiscal Year " version="7.0">
-                    <header>
-                        <button string="Open" name="remove_entries" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group>
                         <field name="fyear_id" domain="[('state','=','draft')]"/>
                     </group>
+                    <footer>
+                        <button string="Open" name="remove_entries" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_period_close_view.xml b/addons/account/wizard/account_period_close_view.xml
index c285db512cf..c6aa828e3ce 100644
--- a/addons/account/wizard/account_period_close_view.xml
+++ b/addons/account/wizard/account_period_close_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Close Period" version="7.0">
-                    <header>
-                        <button string="Close Period" name="data_save" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group string="Are you sure?">
                         <field name="sure"/>
                     </group>
+                    <footer>
+                        <button string="Close Period" name="data_save" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_reconcile_partner_process_view.xml b/addons/account/wizard/account_reconcile_partner_process_view.xml
index 552907da0c8..ffa298bf22d 100644
--- a/addons/account/wizard/account_reconcile_partner_process_view.xml
+++ b/addons/account/wizard/account_reconcile_partner_process_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Partner Reconciliation" version="7.0">
-                    <header>
-                        <button name="next_partner" icon="terp-gtk-jump-to-ltr" type="object" string="Go to Next Partner" class="oe_highlight"  />
-                    </header>
                     <group col="4">
                         <field name="next_partner_id"/>
                         <field name="progress" widget="progressbar" colspan="4"/>
                         <field name="today_reconciled"/>
                         <field name="to_reconcile"/>
                     </group>
+                    <footer>
+                        <button name="next_partner" icon="terp-gtk-jump-to-ltr" type="object" string="Go to Next Partner" class="oe_highlight"  />
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml
index 4fb418e4fad..d6344f2cbc1 100644
--- a/addons/account/wizard/account_reconcile_view.xml
+++ b/addons/account/wizard/account_reconcile_view.xml
@@ -8,13 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reconciliation" version="7.0">
-                    <header>
-                        <button string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}" class="oe_highlight"/>
-                        <button string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
-                        <button string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group col="4" string="Reconciliation Transactions">
                         <field name="trans_nbr"/>
                         <newline/>
@@ -23,6 +16,13 @@
                     </group><group string="Write-Off">
                         <field name="writeoff"/>
                     </group>
+                    <footer>
+                        <button string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}" class="oe_highlight"/>
+                        <button string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
+                        <button string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_report_aged_partner_balance_view.xml b/addons/account/wizard/account_report_aged_partner_balance_view.xml
index 575af9370db..0e82603ced1 100644
--- a/addons/account/wizard/account_report_aged_partner_balance_view.xml
+++ b/addons/account/wizard/account_report_aged_partner_balance_view.xml
@@ -9,11 +9,6 @@
             <!--<field name="inherit_id" ref="account_common_report_view" />-->
             <field name="arch" type="xml">
                 <form string="Report Options" version="7.0">
-                    <header>
-                        <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <separator string="Aged Partner Balance"/>
                     <label string="Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, OpenERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). OpenERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on. "/>
                     <group col="4">
@@ -26,6 +21,11 @@
                         <field name="direction_selection"/>
                     </group>
                     <field name="journal_ids" required="0" invisible="1"/>
+                    <footer>
+                        <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_report_common_view.xml b/addons/account/wizard/account_report_common_view.xml
index b391764f6c7..2711154a35e 100644
--- a/addons/account/wizard/account_report_common_view.xml
+++ b/addons/account/wizard/account_report_common_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Report Options" version="7.0">
-                <header>
-                    <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
-                    or 
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <label string=""/>  <!-- binding for inherited views -->
                 <group col="4">
                    <field name="chart_account_id" widget='selection' on_change="onchange_chart_id(chart_account_id, context)"/>
@@ -38,6 +33,11 @@
                         <field name="journal_ids"/>
                     </page>
                 </notebook>
+                <footer>
+                    <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
+                    or 
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_state_open_view.xml b/addons/account/wizard/account_state_open_view.xml
index 56b72f120d2..5e53fb66d0f 100644
--- a/addons/account/wizard/account_state_open_view.xml
+++ b/addons/account/wizard/account_state_open_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Open Invoice" version="7.0">
-                    <header>
-                        <button name="change_inv_state" string="Yes" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <label string="Are you sure you want to open this invoice ?"/>
                     <newline/>
                     <label string="(Invoice should be unreconciled if you want to open it)"/>
+                    <footer>
+                        <button name="change_inv_state" string="Yes" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_subscription_generate_view.xml b/addons/account/wizard/account_subscription_generate_view.xml
index 2132851a3fe..64ca3beeb11 100644
--- a/addons/account/wizard/account_subscription_generate_view.xml
+++ b/addons/account/wizard/account_subscription_generate_view.xml
@@ -8,16 +8,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Subscription Compute" version="7.0">
-                    <header>
-                        <button string="Generate Entries" name="action_generate" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <separator string="Generate Entries before:"/>
                     <label string ="Automatically generate entries based on what has been entered in the  system before a specific date."/>
                     <group>
                         <field name="date"/>
                     </group>
+                    <footer>
+                        <button string="Generate Entries" name="action_generate" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_tax_chart_view.xml b/addons/account/wizard/account_tax_chart_view.xml
index 0db91912c5e..ea0c68f739f 100644
--- a/addons/account/wizard/account_tax_chart_view.xml
+++ b/addons/account/wizard/account_tax_chart_view.xml
@@ -8,16 +8,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account tax charts" version="7.0">
-                    <header>
-                        <button string="Open Charts" name="account_tax_chart_open_window" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group>
                         <field name="period_id"/>
                         <label colspan="4" string="(If you do not select period it will take all open periods)"/>
                         <field name="target_move"/>
                     </group>
+                    <footer>
+                        <button string="Open Charts" name="account_tax_chart_open_window" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_unreconcile_view.xml b/addons/account/wizard/account_unreconcile_view.xml
index bec668c29ec..dc3cf7b748a 100644
--- a/addons/account/wizard/account_unreconcile_view.xml
+++ b/addons/account/wizard/account_unreconcile_view.xml
@@ -8,13 +8,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Unreconciliation" version="7.0">
-                <header>
+                <separator string="Unreconciliate Transactions"/>
+                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled"/>
+                <footer>
                     <button string="Unreconcile" name="trans_unrec" type="object" default_focus="1" class="oe_highlight"/>
                     or                    
                     <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
-                <separator string="Unreconciliate Transactions"/>
-                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled"/>
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index 899befeaa0a..777ab38fddf 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -8,16 +8,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 	            <form string="Create Entries From Models" version="7.0">
-	                <header>
-	                    <button string="Create Entries" name="create_entries" type="object" class="oe_highlight"/>
-	                    or
-	                    <button string="Cancel" class="oe_link" special="cancel"/>
-	                </header>
 	                <separator string="This wizard will create recurring accounting entries"/>
 	                <label string="Create manual recurring entries in a chosen journal."/>
 	                <group>
 	                    <field name="model"/>
 	                </group>
+	                <footer>
+	                    <button string="Create Entries" name="create_entries" type="object" class="oe_highlight"/>
+	                    or
+	                    <button string="Cancel" class="oe_link" special="cancel"/>
+	                </footer>
 	            </form>
             </field>
         </record>
@@ -40,12 +40,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Use Model" version="7.0">
-                    <header>
+                    <label string = "Are you sure you want to create entries?"/>
+                    <footer>
                         <button string="Ok" name="create_entries" type="object" default_focus='1' class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <label string = "Are you sure you want to create entries?"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index d5b1cff4533..abadb57c4e7 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -8,19 +8,19 @@
             <field name="model">validate.account.move</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	            <form string="Post Journal Entries" version="7.0">
-	                <header>
-	                    <button string="Approve" name="validate_move" type="object" class="oe_highlight"/>
-	                    or
-	                    <button string="Cancel" class="oe_link" special="cancel"/>
-	                </header>
-	                <separator string="Post Journal Entries of a Journal"/>
-	                <label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accounting fields anymore."/>
-	                <group>
-	                    <field name="journal_id"/>
-	                    <field name="period_id"/>
-	                </group>
-	            </form>
+                <form string="Post Journal Entries" version="7.0">
+                    <separator string="Post Journal Entries of a Journal"/>
+                    <label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accounting fields anymore."/>
+                    <group>
+                        <field name="journal_id"/>
+                        <field name="period_id"/>
+                    </group>
+                    <footer>
+                        <button string="Approve" name="validate_move" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
+                </form>
             </field>
         </record>
 
@@ -47,15 +47,15 @@
             <field name="model">validate.account.move.lines</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	            <form string="Post Journal Entries" version="7.0">
-	                <header>
-	                    <button string="Approve" name="validate_move_lines" type="object" default_focus="1" class="oe_highlight"/>
-	                    or
-	                    <button string="Cancel" class="oe_link" special="cancel"/>
-	                </header>
+                <form string="Post Journal Entries" version="7.0">
                     <separator string="Post Journal Entries"/>
-	                <label string="All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields anymore."/>
-	            </form>
+                    <label string="All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields anymore."/>
+                    <footer>
+                        <button string="Approve" name="validate_move_lines" type="object" default_focus="1" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
+                </form>
             </field>
         </record>
 
diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml
index 91ea78d7bd6..988c4786bb8 100644
--- a/addons/account/wizard/account_vat_view.xml
+++ b/addons/account/wizard/account_vat_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Taxes Report" version="7.0">
-                <header>
-                    <button name="create_vat" string="Print Tax Statement" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
                 <label colspan="4" string="This menu prints a VAT declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."/>
                 <group string="Taxes Report" col="4">
                     <field name="chart_tax_id" widget='selection'/>
@@ -25,6 +20,11 @@
                     <field name="period_from"  domain="[('fiscalyear_id', '=', fiscalyear_id)]"/>
                     <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]"/>
                 </group>
+                <footer>
+                    <button name="create_vat" string="Print Tax Statement" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel"/>
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
index ae95f0f7584..c25705572d1 100644
--- a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
+++ b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Crossovered Analytic" version="7.0">
-                <header>
-                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
                 <group col="4">
                     <field name="date1"/>
                     <field name="date2"/>
@@ -21,6 +16,11 @@
                 </group><group string="Analytic Journal">
                     <field name="journal_ids" colspan="2" nolabel="1"/>
                 </group>
+                <footer>
+                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel"/>
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml b/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
index b67e61bafc6..5b8a11f2587 100644
--- a/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
+++ b/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
@@ -7,12 +7,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Distribution Model Saved" version="7.0">
-                <header>
+                <label string="Save This Distribution as a Model"/>
+                <footer>
                     <button string="Ok" type="object" name="activate" default_focus="1" class="oe_highlight"/>
                     or
                     <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
-                <label string="Save This Distribution as a Model"/>
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/account_asset/wizard/account_asset_change_duration_view.xml b/addons/account_asset/wizard/account_asset_change_duration_view.xml
index 1e8f0f969b7..15b11f4dcff 100644
--- a/addons/account_asset/wizard/account_asset_change_duration_view.xml
+++ b/addons/account_asset/wizard/account_asset_change_duration_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Modify Asset" version="7.0">
-                    <header>
-                        <button name="modify" string="Modify" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group string="Asset Durations to Modify" col="4">
                         <field name="name" colspan="4"/>
                         <group colspan="2" col="2">
@@ -23,6 +18,11 @@
                     </group>
                     <separator string="Notes"/>
                     <field name="note"/>
+                    <footer>
+                        <button name="modify" string="Modify" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account_asset/wizard/wizard_asset_compute_view.xml b/addons/account_asset/wizard/wizard_asset_compute_view.xml
index fee7f77d758..45d3aa22625 100644
--- a/addons/account_asset/wizard/wizard_asset_compute_view.xml
+++ b/addons/account_asset/wizard/wizard_asset_compute_view.xml
@@ -7,16 +7,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Compute Asset" version="7.0">
-                    <header>
-                        <button string="Compute" name="asset_compute" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <separator string="Post Depreciation Lines"/>
                     <label string="This wizard will post the depreciation lines of running assets that belong to the selected period."/>
                     <group>
                         <field name="period_id"/>
                     </group>
+                    <footer>
+                        <button string="Compute" name="asset_compute" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
              </field>
         </record>
diff --git a/addons/account_budget/wizard/account_budget_analytic_view.xml b/addons/account_budget/wizard/account_budget_analytic_view.xml
index 44e0e9aa3a4..c08f15a7410 100644
--- a/addons/account_budget/wizard/account_budget_analytic_view.xml
+++ b/addons/account_budget/wizard/account_budget_analytic_view.xml
@@ -8,15 +8,15 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                  <form string="Select Dates Period" version="7.0">
-                     <header>
-                         <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
-                         or
-                         <button string="Cancel" class="oe_link" special="cancel"/>
-                     </header>
                      <group string="This wizard is used to print budget" col="4">
                          <field name="date_from"/>
                          <field name="date_to"/>
                      </group>
+                     <footer>
+                         <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
+                         or
+                         <button string="Cancel" class="oe_link" special="cancel"/>
+                     </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account_budget/wizard/account_budget_crossovered_report_view.xml b/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
index ee83d272edf..5f2ec7ee46c 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
@@ -8,15 +8,15 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                  <form string="Select Dates Period" version="7.0">
-                     <header>
-                         <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
-                         or
-                         <button string="Cancel" class="oe_link" special="cancel"/>
-                     </header>
                     <group string="This wizard is used to print budget" col="4">
                         <field name="date_from"/>
                         <field name="date_to"/>
                     </group>
+                     <footer>
+                         <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
+                         or
+                         <button string="Cancel" class="oe_link" special="cancel"/>
+                     </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml b/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
index ddfd3d00068..3e02604b746 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
@@ -8,15 +8,15 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                  <form string="Select Dates Period" version="7.0">
-                     <header>
-                         <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
-                         or
-                         <button string="Cancel" class="oe_link" special="cancel"/>
-                     </header>
                     <group string="This wizard is used to print summary of budgets">
                         <field name="date_from"/>
                         <field name="date_to"/>
                     </group>
+                     <footer>
+                         <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
+                         or
+                         <button string="Cancel" class="oe_link" special="cancel"/>
+                     </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account_budget/wizard/account_budget_report_view.xml b/addons/account_budget/wizard/account_budget_report_view.xml
index afdeb62e8ed..984cbeefeef 100644
--- a/addons/account_budget/wizard/account_budget_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_report_view.xml
@@ -8,15 +8,15 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
           <form string="Select Dates Period" version="7.0">
-              <header>
-                  <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
-                  or
-                  <button string="Cancel" class="oe_link" special="cancel"/>
-              </header>
               <group string="Print Budgets" col="4">
                   <field name="date_from"/>
                   <field name="date_to"/>
               </group>
+              <footer>
+                  <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
+                  or
+                  <button string="Cancel" class="oe_link" special="cancel"/>
+              </footer>
           </form>
         </field>
       </record>
diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index 058feedcde3..084de5c2ae6 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -8,17 +8,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Send follow-ups" version="7.0">
-                <header>
-                    <button name="do_continue" string="Continue" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
                 <separator string="Send Follow-ups"/>
                 <label string ="This feature allows you to send reminders to partners with pending invoices. You can send them the default message for unpaid invoices or manually enter a message should you need to remind them of a specific information."/>
                 <group col="4">
                     <field name="followup_id"/>
                     <field name="date"/>
                 </group>
+                <footer>
+                    <button name="do_continue" string="Continue" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel"/>
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/account_payment/wizard/account_payment_create_order_view.xml b/addons/account_payment/wizard/account_payment_create_order_view.xml
index 220c592f6b5..ab90144f0e2 100644
--- a/addons/account_payment/wizard/account_payment_create_order_view.xml
+++ b/addons/account_payment/wizard/account_payment_create_order_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Search Payment lines" version="7.0">
-                <header>
-                    <button name="search_entries" string="Search" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
                 <group>
                     <field name="duedate" />
                 </group>
+                <footer>
+                    <button name="search_entries" string="Search" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel"/>
+                </footer>
             </form>
             </field>
         </record>
@@ -26,14 +26,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Search Payment lines" version="7.0">
-                    <header>
-                        <button name="create_payment" string="_Add to payment order" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group string="Entries">
                         <field name="entries"/>
                     </group>
+                    <footer>
+                        <button name="create_payment" string="_Add to payment order" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account_payment/wizard/account_payment_pay_view.xml b/addons/account_payment/wizard/account_payment_pay_view.xml
index ee86ed75a41..1053d47eebd 100644
--- a/addons/account_payment/wizard/account_payment_pay_view.xml
+++ b/addons/account_payment/wizard/account_payment_pay_view.xml
@@ -8,12 +8,12 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                 <form string="Make Payment" version="7.0">
-                    <header>
+                    <separator string="Are you sure you want to make payment?"/>
+                    <footer>
                         <button name="launch_wizard" string="Yes" type="object" default_focus="1" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <separator string="Are you sure you want to make payment?"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account_payment/wizard/account_payment_populate_statement_view.xml b/addons/account_payment/wizard/account_payment_populate_statement_view.xml
index de1885b1014..c2789f95d38 100644
--- a/addons/account_payment/wizard/account_payment_populate_statement_view.xml
+++ b/addons/account_payment/wizard/account_payment_populate_statement_view.xml
@@ -8,14 +8,14 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                 <form string="Populate Statement:" version="7.0">
-                    <header>
-                        <button name="populate_statement" string="ADD" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group>
                         <field name="lines"/>
                     </group>
+                    <footer>
+                        <button name="populate_statement" string="ADD" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
              </field>
         </record>
diff --git a/addons/account_voucher/wizard/account_statement_from_invoice_view.xml b/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
index 5ecb4cd07bb..33014f394a7 100644
--- a/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
+++ b/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import Invoices in Statement" version="7.0">
-                    <header>
-                        <button string="Go" name="search_invoices" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group>
                         <field name="date"/>
                         <field name="journal_ids"  domain="[('type','in',['sale','purchase','cash'])]"/>
                     </group>
+                    <footer>
+                        <button string="Go" name="search_invoices" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
         </record>
@@ -35,13 +35,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import Entries" version="7.0">
-                    <header>
+                    <separator string="Payable and Receivables"/>
+                    <field height="300" width="700" name="line_ids" domain="[('account_id.type','in',['receivable','payable']),('reconcile_id','=',False), ('reconcile_partial_id','=',False), ('state', '=', 'valid')]"/>
+                    <footer>
                         <button string="Ok" name="populate_statement" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <separator string="Payable and Receivables"/>
-                    <field height="300" width="700" name="line_ids" domain="[('account_id.type','in',['receivable','payable']),('reconcile_id','=',False), ('reconcile_partial_id','=',False), ('state', '=', 'valid')]"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml b/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
index 3bfb0fcb4ec..04131b643eb 100644
--- a/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
+++ b/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
@@ -8,13 +8,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
              <form string="Unreconciliation" version="7.0">
-                <header>
+                <separator string="Unreconciliation Transactions" />
+                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"/>
+                <footer>
                     <button name="trans_unrec" default_focus="1" string="Unreconcile" type="object" class="oe_highlight"/>
                     or
                     <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
-                <separator string="Unreconciliation Transactions" />
-                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"/>
+                </footer>
              </form>
             </field>
         </record>
diff --git a/addons/audittrail/wizard/audittrail_view_log_view.xml b/addons/audittrail/wizard/audittrail_view_log_view.xml
index b66173323e2..fdfffb73c23 100644
--- a/addons/audittrail/wizard/audittrail_view_log_view.xml
+++ b/addons/audittrail/wizard/audittrail_view_log_view.xml
@@ -10,15 +10,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Audit Logs" version="7.0">
-                    <header>
-                        <button string="Open Logs" name="log_open_window" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group col="4">
                          <field name="from"/>
                          <field name="to"/>
                     </group>
+                    <footer>
+                        <button string="Open Logs" name="log_open_window" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
           </record>
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
index a16715e0d52..3bdb9144907 100644
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
@@ -10,11 +10,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Invite People" version="7.0">
-                    <header>
-                        <button name="do_invite" string="Invite" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <separator string="Invite People" colspan="4"/>
                     <field name="type"/>
                     <field name="send_mail"/>
@@ -36,6 +31,11 @@
                             </group>
                         </page>
                     </notebook>
+                    <footer>
+                        <button name="do_invite" string="Invite" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml b/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml
index 1abd6ff3570..4072db42318 100644
--- a/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml
+++ b/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml
@@ -8,12 +8,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Generate Relationship Graph" version="7.0">
-                    <header>
+                    <separator string="Relationship Graphs" colspan="6"/>
+                    <footer>
                         <button name="get_graph" string="Create Graphs" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <separator string="Relationship Graphs" colspan="6"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/base_module_record/wizard/base_module_record_data_view.xml b/addons/base_module_record/wizard/base_module_record_data_view.xml
index 93c38d794f4..281576b0b6a 100644
--- a/addons/base_module_record/wizard/base_module_record_data_view.xml
+++ b/addons/base_module_record/wizard/base_module_record_data_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Data Recording" version="7.0">
-                    <header>
-                        <button name="record_objects" string="Record" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group>
                         <field name="check_date"/>
                         <field name="filter_cond"/>
@@ -20,6 +15,11 @@
                     <separator string="Choose objects to record"/>
                     <field name="objects"/>
                     <group><field name="info_yaml"/></group>
+                    <footer>
+                        <button name="record_objects" string="Record" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/base_module_record/wizard/base_module_record_object_view.xml b/addons/base_module_record/wizard/base_module_record_object_view.xml
index b947c94f871..a621ae69547 100644
--- a/addons/base_module_record/wizard/base_module_record_object_view.xml
+++ b/addons/base_module_record/wizard/base_module_record_object_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Objects Recording" version="7.0">
-                    <header>
-                        <button name="record_objects" string="Record" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group>
                         <field name="check_date"/>
                         <field name="filter_cond"/>
@@ -20,6 +15,11 @@
                     <separator string="Choose objects to record"/>
                     <field name="objects"/>
                     <group><field name="info_yaml"/></group>
+                    <footer>
+                        <button name="record_objects" string="Record" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
@@ -86,11 +86,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Module Recording" version="7.0">
-                    <header>
-                        <button string="Continue" name="inter_call" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group string="Module Information">
                         <field name="name"/>
                         <field name="directory_name"/>
@@ -102,6 +97,11 @@
                     </group>
                     <separator string="Description"/>
                     <field name="description"/>
+                    <footer>
+                        <button string="Continue" name="inter_call" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
          </record>
diff --git a/addons/base_module_record/wizard/base_module_save_view.xml b/addons/base_module_record/wizard/base_module_save_view.xml
index 106ad662b0f..39943697d4f 100644
--- a/addons/base_module_record/wizard/base_module_save_view.xml
+++ b/addons/base_module_record/wizard/base_module_save_view.xml
@@ -8,16 +8,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Module Recording" version="7.0">
-                    <header>
-                        <button name="record_save" string="Continue" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group string="Recording Information">
                         <field name="info_status"/>
                         <field name="info_text"/>
                         <field name="info_yaml"/>
                    </group>
+                    <footer>
+                        <button name="record_save" string="Continue" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/base_report_designer/wizard/base_report_design_view.xml b/addons/base_report_designer/wizard/base_report_design_view.xml
index c060f4a961a..12ac67e3ba0 100644
--- a/addons/base_report_designer/wizard/base_report_design_view.xml
+++ b/addons/base_report_designer/wizard/base_report_design_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Get a report" version="7.0">
-                <header>
+                <group string="Select your report">
+                    <field name="report_id"/>
+                </group>
+                <footer>
                     <button name="get_report" string="Continue" type="object" class="oe_highlight"/>
                     <button name="upload_report" string="Upload the modified report" type="object" class="oe_highlight"/>
                     or
                     <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
-                <group string="Select your report">
-                    <field name="report_id"/>
-                </group>
+                </footer>
             </form>
             </field>
        </record>
diff --git a/addons/board/wizard/board_menu_create_view.xml b/addons/board/wizard/board_menu_create_view.xml
index 3720e87cf43..122dcfe9586 100644
--- a/addons/board/wizard/board_menu_create_view.xml
+++ b/addons/board/wizard/board_menu_create_view.xml
@@ -10,15 +10,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create Menu For Dashboard" version="7.0">
-                    <header>
-                        <button string="Create Menu" name="board_menu_create" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group colspan="4" string="Menu Information">
                         <field name="menu_name"/>
                         <field name="menu_parent_id"/>
                     </group>
+                    <footer>
+                        <button string="Create Menu" name="board_menu_create" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/caldav/wizard/caldav_browse_view.xml b/addons/caldav/wizard/caldav_browse_view.xml
index 29f455d764f..0c16fd0eba4 100644
--- a/addons/caldav/wizard/caldav_browse_view.xml
+++ b/addons/caldav/wizard/caldav_browse_view.xml
@@ -8,9 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Browse Caldav" version="7.0">
-                    <header>
-                        <button special="cancel" string="_Close" icon="gtk-close"/>
-                    </header>
                     <sheet>
                         <group>
                             <separator string="Browse Caldav" colspan="4"/>
@@ -37,6 +34,9 @@
                             
                         </group>
                     </sheet>
+                    <footer>
+                        <button special="cancel" string="_Close" icon="gtk-close"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/caldav/wizard/calendar_event_import_view.xml b/addons/caldav/wizard/calendar_event_import_view.xml
index 3f498504444..014f5500384 100644
--- a/addons/caldav/wizard/calendar_event_import_view.xml
+++ b/addons/caldav/wizard/calendar_event_import_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import ICS" version="7.0">
-                    <header>
-                        <button name="process_imp_ics"  string="_Import" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group colspan="4" >
                          <separator string="Select ICS File"/>
                          <field name="file_path" colspan="4" width="500" nolabel="1"/>
                     </group>
+                    <footer>
+                        <button name="process_imp_ics"  string="_Import" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/caldav/wizard/calendar_event_subscribe_view.xml b/addons/caldav/wizard/calendar_event_subscribe_view.xml
index 590daa34561..0601349690d 100644
--- a/addons/caldav/wizard/calendar_event_subscribe_view.xml
+++ b/addons/caldav/wizard/calendar_event_subscribe_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Subscribe to Remote Calendar" version="7.0">
-                    <header>
-                        <button name="process_imp_ics"  string="_Subscribe" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group colspan="4" >
                          <separator string="Provide Path for Remote Calendar"/>
                           <field name="url_path" colspan="4" width="300" nolabel="1" widget="url"/>
                     </group>
+                    <footer>
+                        <button name="process_imp_ics"  string="_Subscribe" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/crm_add_note_view.xml b/addons/crm/wizard/crm_add_note_view.xml
index 93551eaf943..fc4b57f85dc 100644
--- a/addons/crm/wizard/crm_add_note_view.xml
+++ b/addons/crm/wizard/crm_add_note_view.xml
@@ -10,15 +10,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Add Note" version="7.0">
-                    <header>
-                        <button name="action_add" type="object" string="_Add" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <separator string="Add Note"/>
                         <field name="body"/>
                     </group>
+                    <footer>
+                        <button name="action_add" type="object" string="_Add" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index a240a4de66c..5ad9ef1c9c9 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -6,11 +6,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Convert to Opportunity" version="7.0">
-                    <header>
-                        <button name="action_apply" string="Create Opportunity" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <field name="action"/>
                     <group attrs="{'invisible':[('action','!=','exist')]}">
                         <field name="partner_id" attrs="{'required': [('action', '=', 'exist')]}"/>
@@ -27,6 +22,11 @@
                             <field name="section_id" />
                         </tree>
                     </field>
+                    <footer>
+                        <button name="action_apply" string="Create Opportunity" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record> 
@@ -37,11 +37,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Convert to Opportunity" version="7.0">
-                    <header>
-                        <button name="mass_convert" string="Convert into Opportunities" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <field name="action"/>
                     <field name="name" colspan="4"/>
                     <group string="Assigned Opportunities to">
@@ -53,6 +48,11 @@
                             <field name="name" />
                         </tree>
                     </field>
+                    <footer>
+                        <button name="mass_convert" string="Convert into Opportunities" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/crm_lead_to_partner_view.xml b/addons/crm/wizard/crm_lead_to_partner_view.xml
index ce12d62f9bf..a430c943d5d 100644
--- a/addons/crm/wizard/crm_lead_to_partner_view.xml
+++ b/addons/crm/wizard/crm_lead_to_partner_view.xml
@@ -9,16 +9,16 @@
           <field name="type">form</field>
           <field name="arch" type="xml">
               <form string="Create a Partner" version="7.0">
-                  <header>
-                      <button name="make_partner" string="Continue" type="object" class="oe_highlight"/>
-                      or
-                      <button string="Cancel" class="oe_link" special="cancel" />
-                  </header>
                   <group col="4">
                       <separator string="Create a Partner"/>
                       <field name="action"/>
                       <field name="partner_id" attrs="{'required': [('action', '=', 'exist')], 'invisible':[('action','!=','exist')]}"/>
                   </group>
+                  <footer>
+                      <button name="make_partner" string="Continue" type="object" class="oe_highlight"/>
+                      or
+                      <button string="Cancel" class="oe_link" special="cancel" />
+                  </footer>
               </form>
           </field>
        </record>
diff --git a/addons/crm/wizard/crm_merge_opportunities_view.xml b/addons/crm/wizard/crm_merge_opportunities_view.xml
index 99de31afc15..74973193f24 100644
--- a/addons/crm/wizard/crm_merge_opportunities_view.xml
+++ b/addons/crm/wizard/crm_merge_opportunities_view.xml
@@ -10,11 +10,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Merge Opportunities" version="7.0">
-                    <header>
-                        <button name="action_merge" type="object" string="_Merge" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <separator string="Select Opportunities"/>
                     <field name="opportunity_ids">
                         <tree>
@@ -24,6 +19,11 @@
                             <field name="section_id" />
                         </tree>
                     </field>
+                    <footer>
+                        <button name="action_merge" type="object" string="_Merge" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/crm_partner_to_opportunity_view.xml b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
index 3f37a0b6fa1..8bc97ba141b 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
@@ -9,17 +9,17 @@
           <field name="type">form</field>
           <field name="arch" type="xml">
               <form string="Create Opportunity" version="7.0">
-                  <header>
-                      <button name="make_opportunity" string="Create Opportunity" type="object" class="oe_highlight"/>
-                      or
-                      <button string="Cancel" class="oe_link" special="cancel" />
-                  </header>
                   <group col="4">
                       <field name="name"/>
                       <field name="partner_id"/>
                       <field name="planned_revenue"/>
                       <field name="probability"/>
                   </group>
+                  <footer>
+                      <button name="make_opportunity" string="Create Opportunity" type="object" class="oe_highlight"/>
+                      or
+                      <button string="Cancel" class="oe_link" special="cancel" />
+                  </footer>
               </form>
           </field>
        </record>
diff --git a/addons/crm/wizard/crm_phonecall_to_meeting_view.xml b/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
index 85d0bf4bc47..00f6700e5a5 100644
--- a/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
@@ -11,13 +11,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Convert To Meeting" version="7.0">
-                    <header>
+                    <label string="Are you sure to schedule a Meeting for this Phonecall?"/>
+                    <footer>
                         <button name="action_make_meeting" type="object"
                             string="_Schedule" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <label string="Are you sure to schedule a Meeting for this Phonecall?"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml b/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
index 1dc14786cc3..5304bd8beb5 100644
--- a/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
@@ -10,17 +10,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Convert To Opportunity " version="7.0">
-                    <header>
-                        <button name="make_opportunity" type="object" string="_Convert" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4">
                         <field name="name"/>
                         <field name="partner_id" />
                         <field name="planned_revenue"/>
                         <field name="probability"/>
                     </group>
+                    <footer>
+                        <button name="make_opportunity" type="object" string="_Convert" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/crm_phonecall_to_partner_view.xml b/addons/crm/wizard/crm_phonecall_to_partner_view.xml
index 3281acdeec3..1243d7bc456 100644
--- a/addons/crm/wizard/crm_phonecall_to_partner_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_partner_view.xml
@@ -9,14 +9,14 @@
           <field name="type">form</field>
           <field name="arch" type="xml">
             <form string="Create a Partner" version="7.0">
-                <header>
-                    <button name="open_create_partner" string="Create Partner" type="object" groups="base.group_partner_manager" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <label string="Are you sure you want to create a partner based on this Phonecall ?"/>
                 <newline/>
                 <label string="You may have to verify that this partner does not exist already."/>
+                <footer>
+                    <button name="open_create_partner" string="Create Partner" type="object" groups="base.group_partner_manager" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
         </field>
        </record>
@@ -29,15 +29,15 @@
           <field name="type">form</field>
           <field name="arch" type="xml">
             <form string="Create a Partner" version="7.0">
-                <header>
-                    <button name="make_partner" string="Continue" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <group>
                     <field name="action"/>
                     <field name="partner_id" attrs="{'required':[('action','=','exist')],'invisible':[('action','!=','exist')]}" />
                 </group>
+                <footer>
+                    <button name="make_partner" string="Continue" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
           </field>
        </record>
diff --git a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
index 7319c1b0437..25f7dd0ba81 100644
--- a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
@@ -10,12 +10,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Schedule/Log a Call" version="7.0">
-                    <header>
-                        <button name="action_schedule" type="object" string="Log Call" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight"/>
-                        <button name="action_schedule" type="object" string="Schedule Call" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4">
                         <field name="action"/>
                         <field name="name"/>
@@ -24,6 +18,12 @@
                         <field name="user_id" />
                         <field name="section_id"/>
                     </group>
+                    <footer>
+                        <button name="action_schedule" type="object" string="Log Call" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight"/>
+                        <button name="action_schedule" type="object" string="Schedule Call" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
index 4fda17b5264..e70a053305f 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
@@ -9,11 +9,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Send Mail" version="7.0">
-                    <header>
-                        <button name="action_forward" string="Send" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <separator string="Forward to Partner" colspan="4" />
                     <group col="4" colspan="6">
                         <field name="history" colspan="2" on_change="on_change_history(history, context)"/>
@@ -46,6 +41,11 @@
                             <field name="attachment_ids" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>
+                    <footer>
+                        <button name="action_forward" string="Send" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm_profiling/wizard/open_questionnaire_view.xml b/addons/crm_profiling/wizard/open_questionnaire_view.xml
index 04dca6da22f..4a1291f01aa 100644
--- a/addons/crm_profiling/wizard/open_questionnaire_view.xml
+++ b/addons/crm_profiling/wizard/open_questionnaire_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Questionnaires" version="7.0">
-                    <header>
-                        <button name="build_form" string="Open Questionnaire" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="questionnaire_id"/>
                     </group>
+                    <footer>
+                        <button name="build_form" string="Open Questionnaire" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
@@ -35,13 +35,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form version="7.0">
-                    <header>
+                    <separator colspan="4" string="Questionnaire"/>
+                    <field name="question_ans_ids" colspan="4" nolabel="1" mode="tree,form" width="550" height="200"/>
+                    <footer>
                         <button name="questionnaire_compute" string="Save Data" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <separator colspan="4" string="Questionnaire"/>
-                    <field name="question_ans_ids" colspan="4" nolabel="1" mode="tree,form" width="550" height="200"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/document_ftp/wizard/ftp_browse_view.xml b/addons/document_ftp/wizard/ftp_browse_view.xml
index a0656b5597d..52f012a92ff 100644
--- a/addons/document_ftp/wizard/ftp_browse_view.xml
+++ b/addons/document_ftp/wizard/ftp_browse_view.xml
@@ -7,14 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Browse Document" version="7.0">
-                    <header>
-                        <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="url" widget="url"/>
                     </group>
+                    <footer>
+                        <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/email_template/wizard/email_compose_message_view.xml b/addons/email_template/wizard/email_compose_message_view.xml
index efe0074b313..96ea55da9e5 100644
--- a/addons/email_template/wizard/email_compose_message_view.xml
+++ b/addons/email_template/wizard/email_compose_message_view.xml
@@ -9,12 +9,12 @@
             <field name="inherit_id" ref="mail.email_compose_message_wizard_form"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//form/header/button" position="before">
-						<field name="use_template" invisible="1"/>
-						<button icon="gtk-paste" type="object" name="template_toggle"
-						        string="" help="Use a message template" />
-						<button icon="gtk-save" type="object" name="save_as_template"
-						        string="" help="Save as a new template"/>
+                    <xpath expr="//form/footer/button" position="before">
+                        <field name="use_template" invisible="1"/>
+                        <button icon="gtk-paste" type="object" name="template_toggle"
+                                string="" help="Use a message template" />
+                        <button icon="gtk-save" type="object" name="save_as_template"
+                                string="" help="Save as a new template"/>
                     </xpath>
                     <xpath expr="//form/notebook" position="after">
                         <group attrs="{'invisible':[('use_template','=',False)]}" colspan="4" col="4">
diff --git a/addons/event/wizard/event_confirm_view.xml b/addons/event/wizard/event_confirm_view.xml
index 93b9830ef82..12d8555b0ab 100644
--- a/addons/event/wizard/event_confirm_view.xml
+++ b/addons/event/wizard/event_confirm_view.xml
@@ -8,12 +8,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Event Confirmation" version="7.0">
-                  <header>
+                  <label string="Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?"/>
+                  <footer>
                       <button name="confirm" string="Confirm Anyway" type="object" class="oe_highlight"/>
                       or
                       <button string="Cancel" class="oe_link" special="cancel" />
-                  </header>
-                  <label string="Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?"/>
+                  </footer>
             </form>
             </field>
         </record>
diff --git a/addons/event_project/wizard/event_project_retro_view.xml b/addons/event_project/wizard/event_project_retro_view.xml
index cfac9944d1b..b7ab7a55357 100644
--- a/addons/event_project/wizard/event_project_retro_view.xml
+++ b/addons/event_project/wizard/event_project_retro_view.xml
@@ -8,16 +8,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                <form string="Retro-Planning" version="7.0">
-                   <header>
-                       <button name="create_duplicate" string="Ok" type="object" class="oe_highlight"/>
-                       or
-                       <button string="Cancel" class="oe_link" special="cancel" />
-                   </header>
                    <group col="4">
                        <field name="project_id" colspan="4"/>
                        <field name="date_start"/>
                        <field name="date"/>
                    </group>
+                   <footer>
+                       <button name="create_duplicate" string="Ok" type="object" class="oe_highlight"/>
+                       or
+                       <button string="Cancel" class="oe_link" special="cancel" />
+                   </footer>
               </form>
             </field>
         </record>
diff --git a/addons/google_base_account/wizard/google_login_view.xml b/addons/google_base_account/wizard/google_login_view.xml
index acd9e622b01..ddbd4db7ee2 100644
--- a/addons/google_base_account/wizard/google_login_view.xml
+++ b/addons/google_base_account/wizard/google_login_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Google login"  version="7.0">
-                    <header>
-                        <button name="login" string="_Login" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="user" placeholder="user@gmail.com"/>
                         <field name="password" password="True"/>
                     </group>
+                    <footer>
+                        <button name="login" string="_Login" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
index 3bf762b0f50..c9daaffbe4c 100644
--- a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
@@ -8,15 +8,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Print Attendance Report Monthly" version="7.0">
-                <header>
-                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <group col="4">
                     <field name="month"/>
                     <field name="year"/>
                 </group>
+                <footer>
+                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
index e4f6ec33bcb..554355edbb1 100644
--- a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Print Attendance Report Weekly" version="7.0">
-                <header>
-                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <group>
                     <field name="init_date"/>
                     <field name="end_date"/>
                 </group>    
+                <footer>
+                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/hr_attendance/wizard/hr_attendance_error_view.xml b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
index 0657855c549..4e284cd396c 100644
--- a/addons/hr_attendance/wizard/hr_attendance_error_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
@@ -8,17 +8,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Print Attendance Report Error" version="7.0">
-                <header>
-                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <group string="Analysis Information" col="4">
                     <field name="init_date"/>
                     <field name="end_date"/>
                     <field name="max_delay"/>
                 </group>
                 <label string="Bellow this delay, the error is considered to be voluntary" colspan="2"/>
+                <footer>
+                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
index acc1f5e01b0..96d924f88a7 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
@@ -7,12 +7,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sign in / Sign out" version="7.0">
-                    <header>
-                        <button string="Sign in" name="si_check" type="object" class="oe_highlight"/>
-                        <button string="Sign out" name="so_check" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <separator colspan="4" string="Sign in / Sign out"/>
                         <label colspan="4" nolabel="1" string="If you need your staff to sign in when they arrive at work and sign out again at the end of the day, OpenERP allows you to manage this with this tool. If each employee has been linked to a system user, then they can encode their time with this action button."/>
@@ -22,6 +16,12 @@
                     <field name="name" />
                     <field name="state" />
                     </group>
+                    <footer>
+                        <button string="Sign in" name="si_check" type="object" class="oe_highlight"/>
+                        <button string="Sign out" name="so_check" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
index 5be8871446a..fffdf76f0e9 100644
--- a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
+++ b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
@@ -8,14 +8,14 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Evaluation Reminders" version="7.0">
-                <header>
-                    <button name="send_mail" string="Send Mail" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <group string="Send Evaluation Reminder">
                     <field name="evaluation_id"/>
                 </group>
+                <footer>
+                    <button name="send_mail" string="Send Mail" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
              </form>
         </field>
     </record>
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 c5e408a6748..c0bbf741277 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
@@ -8,15 +8,15 @@
             <field name="type">form</field>
             <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" special="cancel" class="oe_link"/>
-                </header>
                 <group>
                     <field name="date_from" />
                     <field name="holiday_type"/>
                     <field name="depts"/>
                 </group>
+                <footer>
+                    <button name="print_report" string="Print" type="object" class="oe_highlight"/> or
+                    <button string="Cancel" special="cancel" class="oe_link"/>
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
index 4ef2dcc96c4..976d732ee69 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Leaves Summary" version="7.0">
-                    <header>
-                        <button name="print_report" string="Print" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4" colspan="6">
                         <field name="date_from"/>
                         <newline/>
@@ -20,6 +15,11 @@
                         <newline/>
                         <field name="emp" invisible="True"/>
                     </group>
+                    <footer>
+                        <button name="print_report" string="Print" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
index 985f6b25eec..cf8a30c9847 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
+++ b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
@@ -8,12 +8,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Convert To Partner" version="7.0">
-                    <header>
+                    <label string="Are you sure you want to create a contact based on this job request ?"/>
+                    <footer>
                         <button name="make_order" string="Create Contact" type="object" groups="base.group_partner_manager" class="oe_highlight"/>
                         <label string="or" groups="base.group_partner_manager"/>
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <label string="Are you sure you want to create a contact based on this job request ?"/>
+                    </footer>
                 </form>
             </field>
         </record>
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 d14646b0249..afcf64808b7 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -9,16 +9,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <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">
                         <field name="month"/>
                         <field name="year"/>
                         <field name="employee_id" colspan="3"/>
                     </group>
+                    <footer>
+                        <button string="Print" name="print_report" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
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 288a51e34cd..8ead6ea63d6 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -9,10 +9,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Monthly Employees Timesheet" version="7.0">
-                    <header>
-                        <button string="Print" name="print_report" type="object" class="oe_highlight"/> or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <sheet>
                         <group>
                              <label for="month" string="Period"/>
@@ -25,6 +21,10 @@
                             <field name="employee_ids" nolabel="1"/>
                         </group>
                     </sheet>
+                    <footer>
+                        <button string="Print" name="print_report" type="object" class="oe_highlight"/> or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
index c7b7f320c37..dc2a6c47b8d 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sign In/Out by Project" version="7.0">
-                    <header>
-                        <button string="Sign in / Sign out" name="check_state" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <separator colspan="4" string="Sign In/Out by Project"/>
                         <label colspan="4" nolabel="1" string="Employees can encode their time spent on the different projects they are assigned on. A  project is an analytic account and the time spent on a project generates costs on the analytic account. This feature allows to record at the same time the attendance and the timesheet."/>
                     </group>
+                    <footer>
+                        <button string="Sign in / Sign out" name="check_state" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                </form>
             </field>
         </record>
@@ -26,11 +26,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sign In/Out by Project" version="7.0">
-                    <header>
-                        <button string="Start Working" name="sign_in_result" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group colspan="4" >
                         <separator string="Sign in" colspan="4"/>
                         <field name="name" readonly="True" />
@@ -40,6 +35,11 @@
                         <field name="date"/>
                         <label string="(Keep empty for current time)" colspan="2"/>
                     </group>
+                    <footer>
+                        <button string="Start Working" name="sign_in_result" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                </form>
             </field>
         </record>
@@ -60,12 +60,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sign In/Out by Project" version="7.0">
-                    <header>
-                        <button string="Change Work" name="sign_out_result" type="object" class="oe_highlight"/>
-                        <button string="Stop Working" name="sign_out_result_end" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group colspan="4" >
                         <separator string="General Information" colspan="4" />
                         <field name="name" readonly="True" />
@@ -80,6 +74,12 @@
                         <field name="analytic_amount"/>
                     </group>
 
+                    <footer>
+                        <button string="Change Work" name="sign_out_result" type="object" class="oe_highlight"/>
+                        <button string="Stop Working" name="sign_out_result_end" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                </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 4e4eb7b36d2..f0679de8d95 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
@@ -7,27 +7,27 @@
             <field name="model">hr.timesheet.analytic.profit</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-				<form string="Timesheet Profit" version="7.0">
-                   <header>
-                        <button name="print_report" string="Print" colspan="1" type="object" class="oe_highlight"/> or
-                        <button special="cancel" string="Cancel" class="oe_link"/>
-                   </header>
+                <form string="Timesheet Profit" version="7.0">
                    <sheet>
                        <group> 
-                           <label for="date_from" string="Duration" />					
+                           <label for="date_from" string="Duration" />
                            <div>
- 						       <field name="date_from" nolabel="1" class="oe_inline" />
+                               <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"/>
+                           <field name="journal_ids" colspan="4" nolabel="1"/>
                            <separator string="Users" colspan="4"/>
-						   <field name="employee_ids" colspan="4" nolabel="1"/>
-					   </group>
+                           <field name="employee_ids" colspan="4" nolabel="1"/>
+                       </group>
                    </sheet>
-			   </form>
+                   <footer>
+                        <button name="print_report" string="Print" colspan="1" type="object" class="oe_highlight"/> or
+                        <button special="cancel" string="Cancel" class="oe_link"/>
+                   </footer>
+               </form>
             </field>
         </record>
 
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
index 28e8662f010..85d9538cc5b 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
@@ -27,11 +27,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Invoice contract" version="7.0">
-                <header>
-                    <button name="do_create" string="Create Invoice" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                     <separator string="Do you want to display work details on the invoice?" colspan="4"/>
                     <field name="date"/>
                     <field name="time"/>
@@ -39,6 +34,11 @@
                     <field name="price"/>
                     <separator string="Force to use a special product" colspan="4"/>
                     <field name="product"/>
+                <footer>
+                    <button name="do_create" string="Create Invoice" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
index aec0b52d5e6..1c163a1ac0e 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Create Invoice" version="7.0">
-                <header>
-                    <button name="do_create" string="Create Invoices" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <notebook>
                     <page string="Billing Data">
                        <group>
@@ -28,6 +23,11 @@
                        </group>
                     </page>
                 </notebook>
+                <footer>
+                    <button name="do_create" string="Create Invoices" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
index 2c04f116b48..b2dfabb310e 100644
--- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
+++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
@@ -7,14 +7,14 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="My Current Timesheet" version="7.0">
-               <header>
-                    <button name="open_timesheet" string="Open" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-               </header>
                <group>
                     <separator string="It will open your current timesheet"/>
                </group>
+               <footer>
+                    <button name="open_timesheet" string="Open" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+               </footer>
            </form>
         </field>
     </record>
diff --git a/addons/import_google/wizard/import_google_data_view.xml b/addons/import_google/wizard/import_google_data_view.xml
index 2968b009a51..b8adc71f2a5 100644
--- a/addons/import_google/wizard/import_google_data_view.xml
+++ b/addons/import_google/wizard/import_google_data_view.xml
@@ -7,11 +7,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import contacts from a google account" version="7.0">
-                    <header>
-                        <button name="import_google" string="_Import Contacts" type="object" class="oe_highlight"  />
-                        or 
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group colspan="4" col="4" width="430">
                        <field name="group_name" colspan="4"/>
                        <newline/>
@@ -21,6 +16,11 @@
                             <field name="supplier"  colspan="4"/>
                        </group>
                     </group>
+                    <footer>
+                        <button name="import_google" string="_Import Contacts" type="object" class="oe_highlight"  />
+                        or 
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
@@ -33,14 +33,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import Google Calendar Events" version="7.0">
-                    <header>
-                        <button name="import_google" string="_Import Events" type="object" class="oe_highlight"  />
-                        or 
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group colspan="4" col="4" width="320">
                        <field name="calendar_name" />
                     </group>
+                    <footer>
+                        <button name="import_google" string="_Import Events" type="object" class="oe_highlight"  />
+                        or 
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
index 357dc78c9d7..30ff9a9ed8f 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Periodical VAT Declaration" version="7.0">
-                    <header>
-                        <button name="create_xml" string="Create XML" type="object" default_focus="1" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <group string="Declare Periodical VAT">
                             <field name="period_id" widget="selection"/>
@@ -26,6 +21,11 @@
                     </group>
                     <separator string="Comments"/>
                     <field name="comments"/>
+                    <footer>
+                        <button name="create_xml" string="Create XML" type="object" default_focus="1" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
index d4bcd756922..f0bdb2a2a3f 100644
--- a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
@@ -8,12 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Partner VAT intra" version="7.0">
-                    <header>
-                        <button name="create_xml" string="Create _XML" type="object" class="oe_highlight"/>
-                        <button name="preview" string="_Preview" type="object" class="oe_highlight" />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <separator string="Intracom VAT Declaration"/>
                     </group>   
@@ -33,6 +27,12 @@
                             <field name="country_ids" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>
+                    <footer>
+                        <button name="create_xml" string="Create _XML" type="object" class="oe_highlight"/>
+                        <button name="preview" string="_Preview" type="object" class="oe_highlight" />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/l10n_ch/wizard/bvr_import_view.xml b/addons/l10n_ch/wizard/bvr_import_view.xml
index ed704810e45..222aad3b6b9 100644
--- a/addons/l10n_ch/wizard/bvr_import_view.xml
+++ b/addons/l10n_ch/wizard/bvr_import_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="BVR Import" version="7.0">
-                    <header>
-                        <button name="import_bvr" string="Import" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="file"/>
                     </group>
+                    <footer>
+                        <button name="import_bvr" string="Import" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/l10n_ch/wizard/create_dta_view.xml b/addons/l10n_ch/wizard/create_dta_view.xml
index 1340d869941..7e9d5894dfc 100644
--- a/addons/l10n_ch/wizard/create_dta_view.xml
+++ b/addons/l10n_ch/wizard/create_dta_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="DTA file creation - Results" version="7.0">
-                    <header>
-                        <button name="create_dta" string="Create DTA" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="dta_file"/>
                     </group>
+                    <footer>
+                        <button name="create_dta" string="Create DTA" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/l10n_fr/wizard/fr_report_bilan_view.xml b/addons/l10n_fr/wizard/fr_report_bilan_view.xml
index 440c182e336..f5358d9dd42 100644
--- a/addons/l10n_fr/wizard/fr_report_bilan_view.xml
+++ b/addons/l10n_fr/wizard/fr_report_bilan_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Bilan Report" version="7.0">
-                   <header>
-                        <button name="print_bilan_report" string="Print" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                   </header>
                    <group>
                         <field name="fiscalyear_id"/>
                    </group>
+                   <footer>
+                        <button name="print_bilan_report" string="Print" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                   </footer>
                  </form>
             </field>
         </record>
diff --git a/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml b/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
index d9f71c2ef3e..9d9b3b91c71 100644
--- a/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
+++ b/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string='Compte de resultat' version="7.0">
-                    <header>
-                        <button name="print_cdr_report" string="Print" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="fiscalyear_id"/>
                     </group>
+                    <footer>
+                        <button name="print_cdr_report" string="Print" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                  </form>
             </field>
         </record>
diff --git a/addons/l10n_lu/wizard/print_vat_view.xml b/addons/l10n_lu/wizard/print_vat_view.xml
index e5c13e7e4c4..1f60096e815 100644
--- a/addons/l10n_lu/wizard/print_vat_view.xml
+++ b/addons/l10n_lu/wizard/print_vat_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Print Tax Statements" version="7.0">
-                   <header>
-                        <button name="print_vat_declaration_report" string="Print Tax Statements" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                   </header>
                    <group col="4">
                        <field name="tax_code_id" widget="selection"/>
                        <field name="period_id" widget="selection"/>
                    </group>
+                   <footer>
+                        <button name="print_vat_declaration_report" string="Print Tax Statements" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                   </footer>
                  </form>
             </field>
         </record>
diff --git a/addons/lunch/wizard/lunch_cashbox_clean_view.xml b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
index 287d283e212..eb05c0dc304 100644
--- a/addons/lunch/wizard/lunch_cashbox_clean_view.xml
+++ b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
@@ -10,14 +10,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reset cashbox" version="7.0">
-                    <header>
-                        <button name="set_to_zero" string="Set to Zero" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <label string="Are you sure you want to reset this cashbox ?"/>
                     </group>
+                    <footer>
+                        <button name="set_to_zero" string="Set to Zero" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                </form>
             </field>
           </record>
diff --git a/addons/lunch/wizard/lunch_order_cancel_view.xml b/addons/lunch/wizard/lunch_order_cancel_view.xml
index cd96b9765c9..cb10eb57fd0 100644
--- a/addons/lunch/wizard/lunch_order_cancel_view.xml
+++ b/addons/lunch/wizard/lunch_order_cancel_view.xml
@@ -10,14 +10,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Cancel Order" version="7.0">
-                    <header>
-                        <button  name="cancel" string="Yes" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4" >
                         <label string="Are you sure you want to cancel this order ?"/>
                    </group>
+                    <footer>
+                        <button  name="cancel" string="Yes" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/lunch/wizard/lunch_order_confirm_view.xml b/addons/lunch/wizard/lunch_order_confirm_view.xml
index ade5b227cc2..282b79539f8 100644
--- a/addons/lunch/wizard/lunch_order_confirm_view.xml
+++ b/addons/lunch/wizard/lunch_order_confirm_view.xml
@@ -10,15 +10,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Confirm" version="7.0">
-                    <header>
-                        <button name="confirm" string="Confirm Order" type="object" class="oe_highlight"  />
-                        or 
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4">
                          <separator string="Orders Confirmation" colspan="4"/>
                          <field name="confirm_cashbox"/>
                    </group>
+                    <footer>
+                        <button name="confirm" string="Confirm Order" type="object" class="oe_highlight"  />
+                        or 
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 3da63fb1adc..bcc11c4111d 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -7,11 +7,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Compose Email" version="7.0">
-                    <header>
-                        <button name="send_mail" string="Send" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="model" invisible="1"/>
                         <field name="res_id" invisible="1"/>
@@ -33,6 +28,11 @@
                             <field name="attachment_ids" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>
+                    <footer>
+                        <button name="send_mail" string="Send" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/membership/wizard/membership_invoice_view.xml b/addons/membership/wizard/membership_invoice_view.xml
index 7c26f5486ce..e97ad7445df 100644
--- a/addons/membership/wizard/membership_invoice_view.xml
+++ b/addons/membership/wizard/membership_invoice_view.xml
@@ -8,15 +8,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Membership Invoice" version="7.0">
-                    <header>
-                        <button string="Join" name="membership_invoice" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="product_id" domain="[('membership','=',True)]" widget="selection" on_change="onchange_product(product_id)"/>
                         <field name="member_price"/>
                     </group>
+                    <footer>
+                        <button string="Join" name="membership_invoice" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/wizard/change_production_qty_view.xml b/addons/mrp/wizard/change_production_qty_view.xml
index ee7f5eeb258..87b180f0aad 100644
--- a/addons/mrp/wizard/change_production_qty_view.xml
+++ b/addons/mrp/wizard/change_production_qty_view.xml
@@ -10,17 +10,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Change Product Qty" version="7.0">
-                    <header>
-                        <button name="change_prod_qty" string="Approve"
-                            colspan="1" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />    
-                    </header>
                     <group>
                         <separator string="Change Quantity" colspan="4"/>
                         <newline/>
                         <field name="product_qty"/>
                     </group>
+                    <footer>
+                        <button name="change_prod_qty" string="Approve"
+                            colspan="1" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />    
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/wizard/mrp_price_view.xml b/addons/mrp/wizard/mrp_price_view.xml
index 6ba09ecbdb0..f8aaa7e3c5d 100644
--- a/addons/mrp/wizard/mrp_price_view.xml
+++ b/addons/mrp/wizard/mrp_price_view.xml
@@ -10,14 +10,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Product Cost Structure" version="7.0">
-                    <header>
-                        <button name="print_report" type="object" string="Print" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group string="Print Cost Structure of Product.">
                         <field name="number"/>
                     </group>
+                    <footer>
+                        <button name="print_report" type="object" string="Print" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/wizard/mrp_product_produce_view.xml b/addons/mrp/wizard/mrp_product_produce_view.xml
index 23a51642630..72d0ccfcaa2 100644
--- a/addons/mrp/wizard/mrp_product_produce_view.xml
+++ b/addons/mrp/wizard/mrp_product_produce_view.xml
@@ -11,15 +11,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Produce" version="7.0">
-                    <header>
-                        <button name="do_produce" type="object" string="Confirm" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group string="Produce">
                         <field name="mode"/>
                         <field name="product_qty" colspan="2"/>
                     </group>    
+                    <footer>
+                        <button name="do_produce" type="object" string="Confirm" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/wizard/mrp_workcenter_load_view.xml b/addons/mrp/wizard/mrp_workcenter_load_view.xml
index b40be0df0ac..439e180ca3c 100644
--- a/addons/mrp/wizard/mrp_workcenter_load_view.xml
+++ b/addons/mrp/wizard/mrp_workcenter_load_view.xml
@@ -10,17 +10,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Select time unit" version="7.0">
-                    <header>
-                        <button name="print_report" type="object" string="Print" class="oe_highlight"/>
-                        or 
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <sheet>
                         <group>
                             <field name="time_unit"/>
                             <field name="measure_unit"/>
                         </group>
                     </sheet>
+                    <footer>
+                        <button name="print_report" type="object" string="Print" class="oe_highlight"/>
+                        or 
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
index ee0e47e1da3..b90d822121a 100644
--- a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
@@ -10,14 +10,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Cancel Repair Order" version="7.0">
-                    <header>
-                        <button name="cancel_repair" string="Yes" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <label string="This operation will cancel the Repair process, but will not cancel it's Invoice. Do you want to continue?"/>
                     </group>
+                    <footer>
+                        <button name="cancel_repair" string="Yes" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>         
diff --git a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
index f18eac5ce89..ca4690df210 100644
--- a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
@@ -10,15 +10,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Create invoices" version="7.0">
-                <header>
-                    <button name="make_invoices" string="Create Invoice" type="object"  class="oe_highlight"  />
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <group string="Do you really want to create the invoice(s)?">
                     <field name="group"/>
                 </group>
-                </form>
+                <footer>
+                    <button name="make_invoices" string="Create Invoice" type="object"  class="oe_highlight"  />
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
+            </form>
             </field>
         </record>
 
diff --git a/addons/point_of_sale/wizard/pos_payment_report_user_view.xml b/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
index a8a69b2ff69..850ae6729a6 100644
--- a/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
+++ b/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
@@ -7,14 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sale by User" version="7.0">
-                    <header>
-                        <button name="print_report" string="Print Report" type="object" icon="gtk-print" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" special="cancel" class="oe_link"/>
-                    </header>
                     <group>
                         <field name="user_id"/>
                     </group>
+                    <footer>
+                        <button name="print_report" string="Print Report" type="object" icon="gtk-print" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" special="cancel" class="oe_link"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_receipt_view.xml b/addons/point_of_sale/wizard/pos_receipt_view.xml
index cd556fbb6de..fef823fe403 100644
--- a/addons/point_of_sale/wizard/pos_receipt_view.xml
+++ b/addons/point_of_sale/wizard/pos_receipt_view.xml
@@ -10,14 +10,14 @@
               <field name="type">form</field>
               <field name="arch" type="xml">
                 <form string="Receipt :" version="7.0">
-                    <header>
-                      <button name="print_report" string="Print Receipt" type="object" class="oe_highlight"  />
-                      or
-                      <button string="Cancel" class="oe_link" special="cancel" />  
-                    </header>
                     <group>
                         <label string="Print the Receipt of the Sale"/>
                     </group>    
+                    <footer>
+                      <button name="print_report" string="Print Receipt" type="object" class="oe_highlight"  />
+                      or
+                      <button string="Cancel" class="oe_link" special="cancel" />  
+                    </footer>
                 </form>
               </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_return_view.xml b/addons/point_of_sale/wizard/pos_return_view.xml
index f197daeebff..09005712b78 100644
--- a/addons/point_of_sale/wizard/pos_return_view.xml
+++ b/addons/point_of_sale/wizard/pos_return_view.xml
@@ -7,11 +7,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Return lines" version="7.0">
-                    <header>
+                    <footer>
                         <button name= "create_returns" string="Return Products" type="object" class="oe_highlight"  />
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
+                    </footer>
                  </form>
             </field>
         </record>
diff --git a/addons/portal/wizard/portal_wizard_view.xml b/addons/portal/wizard/portal_wizard_view.xml
index 1809c33d20a..55a8404f54b 100644
--- a/addons/portal/wizard/portal_wizard_view.xml
+++ b/addons/portal/wizard/portal_wizard_view.xml
@@ -17,18 +17,18 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Add Portal Access" version="7.0">
-                    <header>
-                        <button string="Send Invitations"
-                            name="action_create" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />    
-                    </header>
                     <group col="4">
                         <field name="portal_id" widget="selection"/>
                     </group>
                     <field name="user_ids"/>
                     <label string="The following text will be included in the welcome email sent to users."/>
                     <field name="message"/>
+                    <footer>
+                        <button string="Send Invitations"
+                            name="action_create" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />    
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/procurement/wizard/make_procurement_view.xml b/addons/procurement/wizard/make_procurement_view.xml
index de371db211f..5e18892f464 100644
--- a/addons/procurement/wizard/make_procurement_view.xml
+++ b/addons/procurement/wizard/make_procurement_view.xml
@@ -10,11 +10,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Procurement Request" version="7.0">
-                    <header>
-                        <button name="make_procurement" string="Ask New Products" type="object"  class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4" string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders."/>
                      <group>
                         <field name="product_id" on_change="onchange_product_id(product_id)"/>
@@ -23,6 +18,11 @@
                         <field name="date_planned"/>
                         <field name="warehouse_id"/>
                     </group>
+                    <footer>
+                        <button name="make_procurement" string="Ask New Products" type="object"  class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/procurement/wizard/mrp_procurement_view.xml b/addons/procurement/wizard/mrp_procurement_view.xml
index 6e6b038d9fa..ab98e598a3d 100644
--- a/addons/procurement/wizard/mrp_procurement_view.xml
+++ b/addons/procurement/wizard/mrp_procurement_view.xml
@@ -10,15 +10,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Parameters" version="7.0">
-                    <header>
+                    <group>
+                        <label string="This wizard will schedule procurements."/>
+                    </group>
+                    <footer>
                         <button name="procure_calculation" string="Compute Procurements"
                             type="object" class="oe_highlight"  />
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />    
-                    </header>
-                    <group>
-                        <label string="This wizard will schedule procurements."/>
-                    </group>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/procurement/wizard/orderpoint_procurement_view.xml b/addons/procurement/wizard/orderpoint_procurement_view.xml
index 340624fc822..5a29959949e 100644
--- a/addons/procurement/wizard/orderpoint_procurement_view.xml
+++ b/addons/procurement/wizard/orderpoint_procurement_view.xml
@@ -10,17 +10,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Parameters" version="7.0">
-                    <header>
-                        <button name="procure_calculation" string="Compute Stock" type="object"  class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <label string="Wizard checks all the stock minimum rules and generate procurement order."/>
                     </group>
                     <group col="2">
                         <field name="automatic"/>
                     </group>
+                    <footer>
+                        <button name="procure_calculation" string="Compute Stock" type="object"  class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/procurement/wizard/schedulers_all_view.xml b/addons/procurement/wizard/schedulers_all_view.xml
index dc25dc4c7ef..01712a0cedd 100644
--- a/addons/procurement/wizard/schedulers_all_view.xml
+++ b/addons/procurement/wizard/schedulers_all_view.xml
@@ -10,14 +10,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Scheduler Parameters" version="7.0">
-                    <header>
-                        <button name="procure_calculation" string="Compute Schedulers" type="object"  class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group string="This wizard allows you to run all procurement, production and/or purchase orders that should be processed based on their configuration. By default, the scheduler is launched automatically every night by OpenERP. You can use this menu to force it to be launched now. Note that it runs in the background, you may have to wait for a few minutes until it has finished computing.">
                         <field name="automatic"/>
                     </group>
+                    <footer>
+                        <button name="procure_calculation" string="Compute Schedulers" type="object"  class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/product/wizard/product_price_view.xml b/addons/product/wizard/product_price_view.xml
index d1a1b4b3a11..dbc57c4f6e7 100644
--- a/addons/product/wizard/product_price_view.xml
+++ b/addons/product/wizard/product_price_view.xml
@@ -10,11 +10,6 @@
               <field name="type">form</field>
               <field name="arch" type="xml">
                 <form string="Price List" version="7.0">
-                    <header>
-                        <button name="print_report" string="Print"  type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group string="Calculate Product Price per Unit Based on Pricelist Version.">
                         <field name="price_list" widget="selection"/>
                         <field name="qty1"/>
@@ -23,6 +18,11 @@
                         <field name="qty4"/>
                         <field name="qty5"/>
                     </group>
+                    <footer>
+                        <button name="print_report" string="Print"  type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
               </field>
         </record>
diff --git a/addons/product_margin/wizard/product_margin_view.xml b/addons/product_margin/wizard/product_margin_view.xml
index 26e40b77189..f174c6af445 100644
--- a/addons/product_margin/wizard/product_margin_view.xml
+++ b/addons/product_margin/wizard/product_margin_view.xml
@@ -7,16 +7,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Properties categories" version="7.0">
-                    <header>
-                        <button name="action_open_window" string="Open Margins" type="object"  class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4" string="General Information">
                         <field name="from_date" />
                         <field name="to_date" />
                         <field name="invoice_state" />
                     </group>
+                    <footer>
+                        <button name="action_open_window" string="Open Margins" type="object"  class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml
index 7dd1cdb9465..4bd7e4b5b1d 100644
--- a/addons/project/wizard/project_task_delegate_view.xml
+++ b/addons/project/wizard/project_task_delegate_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Project Task Delegate" version="7.0">
-                    <header>
-                        <button name="delegate" string="_Delegate" type="object" class="oe_highlight"/>
-                         or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <group>
                             <field name="project_id" on_change="onchange_project_id(project_id)"/>
@@ -30,6 +25,11 @@
                             <field name="state"/>
                         </group>
                     </group>
+                    <footer>
+                        <button name="delegate" string="_Delegate" type="object" class="oe_highlight"/>
+                         or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml
index 066f15582b4..84436c045a6 100644
--- a/addons/project/wizard/project_task_reevaluate_view.xml
+++ b/addons/project/wizard/project_task_reevaluate_view.xml
@@ -8,15 +8,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reevaluate Task" version="7.0">
-                    <header>
-                        <button name="compute_hours" string="_Evaluate" type="object" default_focus="1" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <separator string="Reevaluation Task"/>
                     <group>
                         <field name="remaining_hours" widget="float_time"/>
                     </group>
+                    <footer>
+                        <button name="compute_hours" string="_Evaluate" type="object" default_focus="1" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/project_gtd/wizard/project_gtd_fill_view.xml b/addons/project_gtd/wizard/project_gtd_fill_view.xml
index aa81b9d6c43..ca6a4d5f7a4 100644
--- a/addons/project_gtd/wizard/project_gtd_fill_view.xml
+++ b/addons/project_gtd/wizard/project_gtd_fill_view.xml
@@ -8,16 +8,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Plannify Timebox" version="7.0">
-                    <header>
-                        <button name="process" string="Add to Timebox" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                       <group col="4">
                           <field name="timebox_id" widget="selection"/>
                           <field name="timebox_to_id" widget="selection"/>
                       </group>
                       <field name="task_ids" domain="[('timebox_id','=',timebox_id),('state','=','open')]" />
+                    <footer>
+                        <button name="process" string="Add to Timebox" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml
index 8439244d717..0d5c81984ba 100644
--- a/addons/project_long_term/wizard/project_compute_phases_view.xml
+++ b/addons/project_long_term/wizard/project_compute_phases_view.xml
@@ -8,15 +8,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                   <form string="Schedule Phases" version="7.0">
-                      <header>
-                          <button name="check_selection" string="C_ompute" type="object" class="oe_highlight"/>
-                          or
-                         <button string="Cancel" class="oe_link" special="cancel" />
-                      </header>
                       <group>
                           <field name="target_project"/>
                           <field name="project_id" attrs="{'invisible':[('target_project','=','all')], 'required':[('target_project','!=','all')]}"/>
                       </group>
+                      <footer>
+                          <button name="check_selection" string="C_ompute" type="object" class="oe_highlight"/>
+                          or
+                         <button string="Cancel" class="oe_link" special="cancel" />
+                      </footer>
                   </form>
             </field>
         </record>
diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml
index 17779ffa268..8eb9db762dd 100644
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                  <form string="Schedule Tasks" version="7.0">
-                     <header>
-                         <button name="compute_date" string="C_ompute" type="object" class="oe_highlight"/>
-                         or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                     </header>
                      <group>
                          <field name="project_id"/>
                      </group>
+                     <footer>
+                         <button name="compute_date" string="C_ompute" type="object" class="oe_highlight"/>
+                         or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                     </footer>
                   </form>
             </field>
         </record>
diff --git a/addons/purchase/wizard/purchase_line_invoice_view.xml b/addons/purchase/wizard/purchase_line_invoice_view.xml
index 9ece8f0eb04..c15c8e4fe09 100644
--- a/addons/purchase/wizard/purchase_line_invoice_view.xml
+++ b/addons/purchase/wizard/purchase_line_invoice_view.xml
@@ -10,14 +10,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Select an Open Sale Order" version="7.0">
-                    <header>
-                        <button name="makeInvoices" string="Confirm" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <label string="Do you want to generate the supplier invoices?"/>
                     </group>
+                    <footer>
+                        <button name="makeInvoices" string="Confirm" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase/wizard/purchase_order_group_view.xml b/addons/purchase/wizard/purchase_order_group_view.xml
index d82d6f7fb2f..17b1f7eea5f 100644
--- a/addons/purchase/wizard/purchase_order_group_view.xml
+++ b/addons/purchase/wizard/purchase_order_group_view.xml
@@ -7,11 +7,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                <form string="Merge orders" version="7.0">
-                    <header>
-                        <button name="merge_orders" string="Merge orders" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <separator string="Are you sure you want to merge these orders?"/>
                         <label string="
@@ -25,6 +20,11 @@ Lines will only be merged if: &#10;
 " colspan="4"/>
                     </group>
                     
+                    <footer>
+                        <button name="merge_orders" string="Merge orders" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
index ed6de182f99..aab257827c2 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
@@ -7,14 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Purchase Requisition" version="7.0">
-                    <header>
-                        <button name="create_order" string="Create Quotation" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="partner_id"/>
                     </group>
+                    <footer>
+                        <button name="create_order" string="Create Quotation" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/report_webkit/wizard/report_webkit_actions_view.xml b/addons/report_webkit/wizard/report_webkit_actions_view.xml
index ce410da232e..3d4b5bce6bb 100644
--- a/addons/report_webkit/wizard/report_webkit_actions_view.xml
+++ b/addons/report_webkit/wizard/report_webkit_actions_view.xml
@@ -8,15 +8,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Add Print Buttons" col="4" version="7.0">
-                    <header>
-                        <button name="do_action" type="object" string="_Ok" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="print_button"/>
                         <field name="open_action"/>
                     </group>
+                    <footer>
+                        <button name="do_action" type="object" string="_Ok" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/sale_crm/wizard/crm_make_sale_view.xml b/addons/sale_crm/wizard/crm_make_sale_view.xml
index 835e5aa80cc..ef7546107c2 100644
--- a/addons/sale_crm/wizard/crm_make_sale_view.xml
+++ b/addons/sale_crm/wizard/crm_make_sale_view.xml
@@ -9,16 +9,16 @@
           <field name="type">form</field>
           <field name="arch" type="xml">
             <form string="Convert to Quotation"  version="7.0">
-                <header>
-                    <button name="makeOrder" string="_Create" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <group col="4">
                     <field name="partner_id" required="1"/>
                     <field name="shop_id" required="1" widget="selection"/>
                     <field name="close"/>
                 </group>
+                <footer>
+                    <button name="makeOrder" string="_Create" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
           </field>
        </record>
diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index 58734caa25b..ad4df1a5193 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sharing: preparation" version="7.0">
-                    <header>
-                        <button name="go_step_1" string="Next" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <separator
                         string="Please select the action that opens the screen containing the data you want to share."/>
                     <group>
@@ -21,6 +16,11 @@
                             string="Optionally, you may specify an additional domain restriction that will be applied to the shared data."/>
                         <field name="domain"/>
                     </group>
+                    <footer>
+                        <button name="go_step_1" string="Next" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
@@ -31,11 +31,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form version="7.0">
-                    <header>
-                        <button name="go_step_2" string="Share" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="user_type" invisible="1"/>
                         <field name="invite" invisible="1"/>
@@ -60,6 +55,11 @@
                             <field name="access_mode"/>
                         </group>
                     </group>
+                    <footer>
+                        <button name="go_step_2" string="Share" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
@@ -70,10 +70,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Access granted!" version="7.0">
-                    <header>
-                        <field name="user_type" invisible="1"/>
-                        <field name="access_mode" invisible="1"/>
-                    </header>
                     <group attrs="{'invisible':[('user_type','=','embedded')]}"
                         string="An email notification with instructions has been sent to the following people:">
                         <field name="result_line_ids" nolabel="1" mode="tree">
@@ -100,6 +96,10 @@
                                 attrs="{'invisible':[('access_mode','=','readonly')]}"/>
                         </group>
                     </group>
+                    <footer>
+                        <field name="user_type" invisible="1"/>
+                        <field name="access_mode" invisible="1"/>
+                    </footer>
 
                 </form>
             </field>
diff --git a/addons/stock/wizard/stock_change_product_qty_view.xml b/addons/stock/wizard/stock_change_product_qty_view.xml
index dc00fdbe736..e360f5aa025 100644
--- a/addons/stock/wizard/stock_change_product_qty_view.xml
+++ b/addons/stock/wizard/stock_change_product_qty_view.xml
@@ -7,17 +7,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Change Product Quantity" version="7.0">
-                    <header>
-                        <button name="change_product_qty" string="_Apply" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group string="Select Quantity">
                         <field name="new_quantity" />
                         <field name="product_id" invisible="1"/>
                         <field name="location_id" />
                         <field name="prodlot_id" />
                     </group>
+                    <footer>
+                        <button name="change_product_qty" string="_Apply" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_change_standard_price_view.xml b/addons/stock/wizard/stock_change_standard_price_view.xml
index 968a268a5ef..6062c946d07 100644
--- a/addons/stock/wizard/stock_change_standard_price_view.xml
+++ b/addons/stock/wizard/stock_change_standard_price_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Change Standard Price" version="7.0">
-                  <header>
-                      <button name="change_price" string="_Apply" type="object" class="oe_highlight"/>
-                      or
-                      <button string="Cancel" class="oe_link" special="cancel" />
-                  </header>
                   <separator string="Change Price"/>
                   <group>
                       <field name="new_price" string="Cost Price"/>
                   </group>
+                  <footer>
+                      <button name="change_price" string="_Apply" type="object" class="oe_highlight"/>
+                      or
+                      <button string="Cancel" class="oe_link" special="cancel" />
+                  </footer>
               </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_fill_inventory_view.xml b/addons/stock/wizard/stock_fill_inventory_view.xml
index ea07955eff2..75a7b13233b 100644
--- a/addons/stock/wizard/stock_fill_inventory_view.xml
+++ b/addons/stock/wizard/stock_fill_inventory_view.xml
@@ -7,17 +7,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Import Inventory" version="7.0">
-                  <header>
-                      <button name="fill_inventory" string="Fill Inventory" type="object" class="oe_highlight"/>
-                      or
-                      <button string="Cancel" class="oe_link" special="cancel" />
-                  </header>
                   <separator string="Import current product inventory from the following location"/>
                   <group>
                       <field name="location_id"/>
                       <field name="recursive"/>
                       <field name="set_stock_zero"/>
                   </group>
+                  <footer>
+                      <button name="fill_inventory" string="Fill Inventory" type="object" class="oe_highlight"/>
+                      or
+                      <button string="Cancel" class="oe_link" special="cancel" />
+                  </footer>
               </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_inventory_line_split_view.xml b/addons/stock/wizard/stock_inventory_line_split_view.xml
index d8a808ed5db..5072007f210 100644
--- a/addons/stock/wizard/stock_inventory_line_split_view.xml
+++ b/addons/stock/wizard/stock_inventory_line_split_view.xml
@@ -7,11 +7,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Split in Lots" version="7.0">
-                    <header>
-                        <button name="split_lot" string="Ok" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="product_id" colspan="4" readonly="1"/>
                         <label for="qty"/>
@@ -45,6 +40,11 @@
                             </group>
                         </form>
                     </field>
+                    <footer>
+                        <button name="split_lot" string="Ok" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record> 
diff --git a/addons/stock/wizard/stock_inventory_merge_view.xml b/addons/stock/wizard/stock_inventory_merge_view.xml
index 0dcca2de211..0386e429ee6 100644
--- a/addons/stock/wizard/stock_inventory_merge_view.xml
+++ b/addons/stock/wizard/stock_inventory_merge_view.xml
@@ -8,13 +8,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Merge Inventories" version="7.0">
-                    <header>
+                    <separator string="Merge Inventories" />
+                    <label string="Do you want to merge theses inventories?"/>
+                    <footer>
                         <button name="do_merge" string="Yes" type="object" icon="gtk-apply" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <separator string="Merge Inventories" />
-                    <label string="Do you want to merge theses inventories?"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_invoice_onshipping_view.xml b/addons/stock/wizard/stock_invoice_onshipping_view.xml
index 088498292ae..20f05f394fd 100644
--- a/addons/stock/wizard/stock_invoice_onshipping_view.xml
+++ b/addons/stock/wizard/stock_invoice_onshipping_view.xml
@@ -7,16 +7,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Create invoice" version="7.0">
-                  <header>
-                      <button name="open_invoice" string="Create" type="object" class="oe_highlight"/>
-                      or
-                      <button string="Cancel" class="oe_link" special="cancel"/>
-                  </header>
                   <group string="Create Invoice">
                       <field name="journal_id"/>
                       <field name="group"/>
                       <field name="invoice_date" />
                   </group>
+                  <footer>
+                      <button name="open_invoice" string="Create" type="object" class="oe_highlight"/>
+                      or
+                      <button string="Cancel" class="oe_link" special="cancel"/>
+                  </footer>
              </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_location_product_view.xml b/addons/stock/wizard/stock_location_product_view.xml
index b1f77576392..f0a52933c8a 100644
--- a/addons/stock/wizard/stock_location_product_view.xml
+++ b/addons/stock/wizard/stock_location_product_view.xml
@@ -7,17 +7,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                <form string="View Stock of Products" version="7.0">
-                    <header>
-                        <button name="action_open_window" string="Open Product" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <separator string="Stock Location Analysis"/>
                     <group>
                         <field name="from_date"/>
                         <field name="to_date"/>
                     </group>
                     <label string="(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)"/>
+                    <footer>
+                        <button name="action_open_window" string="Open Product" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index 9655edf49b8..5ecfc9a85a1 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -9,11 +9,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Consume Move" version="7.0">
-                    <header>
-                        <button name="do_move_consume" string="Ok" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group string="Consume Products">
                         <field name="product_id" readonly="1"/>
                         <label for="product_qty"/>
@@ -23,6 +18,11 @@
                         </div>
                         <field name="location_id"/>
                     </group>
+                    <footer>
+                        <button name="do_move_consume" string="Ok" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
@@ -42,11 +42,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Scrap Move" version="7.0">
-                    <header>
-                        <button name="move_scrap" string="Ok" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <separator string="Scrap Products"/>
                     <group>
                         <field name="product_id"  readonly="1"/>
@@ -57,6 +52,11 @@
                         </div>
                         <field name="location_id" string="Scrap Location" domain="[('usage','&lt;&gt;','view'),('scrap_location','=',True)]" widget="selection"/>
                     </group>
+                    <footer>
+                        <button name="move_scrap" string="Ok" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
@@ -76,9 +76,6 @@
                 <field name="type">form</field>
                 <field name="arch" type="xml">
                 <form string="Split in Lots" version="7.0">
-                    <header>
-                        <button name="split_lot" string="Ok" type="object" icon="gtk-ok" class="oe_highlight"  />
-                    </header>
                     <group>
                         <field name="product_id" readonly="1"/>
                         <label for="qty"/>
@@ -113,6 +110,9 @@
                             </group>
                         </form>
                     </field>
+                    <footer>
+                        <button name="split_lot" string="Ok" type="object" icon="gtk-ok" class="oe_highlight"  />
+                    </footer>
                 </form>
                 </field>
             </record>
diff --git a/addons/stock/wizard/stock_partial_move_view.xml b/addons/stock/wizard/stock_partial_move_view.xml
index 497467025b5..3e0699ec3d8 100644
--- a/addons/stock/wizard/stock_partial_move_view.xml
+++ b/addons/stock/wizard/stock_partial_move_view.xml
@@ -21,13 +21,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form version="7.0">
-                    <header>
+                    <separator string="Products"/>
+                    <field name="move_ids"/>
+                    <footer>
                         <button name="do_partial" string="_Validate" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <separator string="Products"/>
-                    <field name="move_ids"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml
index c8da4459efa..fdbcabb9ed7 100644
--- a/addons/stock/wizard/stock_partial_picking_view.xml
+++ b/addons/stock/wizard/stock_partial_picking_view.xml
@@ -16,11 +16,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form version="7.0">
-                    <header>
-                        <button name="do_partial" string="_Transfer" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <field name="hide_tracking" invisible="1"/>
                     <separator string="Transfer Products" name="product_separator"/>
                     <field name="move_ids" context="{'hide_tracking': hide_tracking}">
@@ -36,6 +31,11 @@
                             <field name="currency"  invisible="1"/>
                         </tree>
                     </field>
+                    <footer>
+                        <button name="do_partial" string="_Transfer" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_return_picking_view.xml b/addons/stock/wizard/stock_return_picking_view.xml
index 06e318c295e..5cdad44f681 100644
--- a/addons/stock/wizard/stock_return_picking_view.xml
+++ b/addons/stock/wizard/stock_return_picking_view.xml
@@ -59,16 +59,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Return lines" version="7.0">
-                    <header>
-                        <button name="create_returns" string="Return" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <label string="Provide the quantities of the returned products."/>
                     <group>
                         <field name="product_return_moves"/>
                         <field name="invoice_state" />
                     </group>
+                    <footer>
+                        <button name="create_returns" string="Return" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_splitinto_view.xml b/addons/stock/wizard/stock_splitinto_view.xml
index 573014b7cac..52b182a3f27 100644
--- a/addons/stock/wizard/stock_splitinto_view.xml
+++ b/addons/stock/wizard/stock_splitinto_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Split Move" version="7.0">
-                <header>
-                    <button name="split" string="Ok" type="object" class="oe_highlight" />
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <separator string="Quantity to Leave in the Current Pack"/>
                 <group>
                     <field name="quantity"/>
                 </group>
+                <footer>
+                    <button name="split" string="Ok" type="object" class="oe_highlight" />
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
index db78799f000..e65f378a638 100644
--- a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
@@ -9,7 +9,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Stock Periods" version="7.0">
-                    <header>
+                    <group col="4">
+                        <field name="date_start"/>
+                        <field name="date_stop"/>
+                    </group>
+                    <footer>
                         <button name="create_stock_periods" string="Create Daily Periods" type="object" class="oe_highlight"/>
                         or
                         <button name="create_stock_periods" string="Create Weekly Periods" type="object" context="{'interval': 6, 'name': 'Weekly'}" class="oe_highlight"/>
@@ -17,11 +21,7 @@
                         <button name="create_stock_periods" string="Create Monthly Periods" type="object" context="{'interval': 1, 'name': 'Monthly'}" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <group col="4">
-                        <field name="date_start"/>
-                        <field name="date_stop"/>
-                    </group>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/stock_planning/wizard/stock_planning_createlines_view.xml b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
index e51ab4a3ba0..458994621c1 100644
--- a/addons/stock_planning/wizard/stock_planning_createlines_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create Stock Planning Lines" version="7.0">
-                    <header>
-                        <button name="create_planning" string="Create" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4">
                         <field name="period_id" widget="selection"/>
                         <field name="company_id" widget= "selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
@@ -20,6 +15,11 @@
                         <field name="forecasted_products"/>
                         <field name="product_categ_id" attrs="{'required':[('forecasted_products','=',0)]}" widget="selection"/>
                     </group>
+                    <footer>
+                        <button name="create_planning" string="Create" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/stock_planning/wizard/stock_planning_forecast_view.xml b/addons/stock_planning/wizard/stock_planning_forecast_view.xml
index 3c31404a070..0f3018350c0 100644
--- a/addons/stock_planning/wizard/stock_planning_forecast_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_forecast_view.xml
@@ -9,11 +9,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create Forecasts Lines" version="7.0">
-                    <header>
-                        <button name="create_forecast" string="Create" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4">
                         <field name="period_id"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
@@ -21,6 +16,11 @@
                         <field name="copy_forecast"/>
                         <field name="product_categ_id" widget="selection"/>
                     </group>
+                    <footer>
+                        <button name="create_forecast" string="Create" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/wiki/wizard/wiki_create_menu_view.xml b/addons/wiki/wizard/wiki_create_menu_view.xml
index 45c4ba6a487..213ca9dd2e2 100644
--- a/addons/wiki/wizard/wiki_create_menu_view.xml
+++ b/addons/wiki/wizard/wiki_create_menu_view.xml
@@ -10,15 +10,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create Menu" version="7.0">
-                    <header>
-                        <button name="wiki_menu_create" string="Create Menu" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group string="Menu Information">
                         <field name="menu_name" />
                         <field name="menu_parent_id" />
                     </group>
+                    <footer>
+                        <button name="wiki_menu_create" string="Create Menu" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/wiki/wizard/wiki_make_index_view.xml b/addons/wiki/wizard/wiki_make_index_view.xml
index c818721c09c..90139c3afac 100644
--- a/addons/wiki/wizard/wiki_make_index_view.xml
+++ b/addons/wiki/wizard/wiki_make_index_view.xml
@@ -10,13 +10,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create Menu" version="7.0">
-                    <header>
+                    <separator string="Menu Information"/>
+                    <label string="Want to create a Index on Selected Pages ? "/>
+                    <footer>
                         <button name="wiki_do_index" string="Create Index" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <separator string="Menu Information"/>
-                    <label string="Want to create a Index on Selected Pages ? "/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/wiki/wizard/wiki_show_diff_view.xml b/addons/wiki/wizard/wiki_show_diff_view.xml
index c5b3583b1e5..4729586c858 100644
--- a/addons/wiki/wizard/wiki_show_diff_view.xml
+++ b/addons/wiki/wizard/wiki_show_diff_view.xml
@@ -10,11 +10,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Difference" version="7.0">
-                    <header>
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <separator string="Notes"/>
                     <field name="file_path" width="300"/>
+                    <footer>
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/wiki/wizard/wiki_wiki_page_open_view.xml b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
index 9be2d4d22aa..49f333e453f 100644
--- a/addons/wiki/wizard/wiki_wiki_page_open_view.xml
+++ b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
@@ -10,12 +10,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Open Page" version="7.0">
-                    <header>
+                    <label string="Want to open a wiki page? "/>
+                    <footer>
                         <button name="open_wiki_page" string="Open Wiki Page" type="object"  class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <label string="Want to open a wiki page? "/>
+                    </footer>
              </form>
             </field>
         </record>

From baa0accf764046085238a9e63a5718626eb8b566 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 11 Jul 2012 05:14:46 +0000
Subject: [PATCH 238/239] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120711051446-bcpkjpszuy1qdug2
---
 openerp/addons/base/i18n/tlh.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/openerp/addons/base/i18n/tlh.po b/openerp/addons/base/i18n/tlh.po
index 047047b7e5b..78f0877d2a2 100644
--- a/openerp/addons/base/i18n/tlh.po
+++ b/openerp/addons/base/i18n/tlh.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:44+0000\n"
-"PO-Revision-Date: 2009-11-30 07:48+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-07-10 17:36+0000\n"
+"Last-Translator: Felix Malmenbeck <felixm@kth.se>\n"
 "Language-Team: \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:46+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-11 05:14+0000\n"
+"X-Generator: Launchpad (build 15593)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -24,7 +24,7 @@ msgstr ""
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Other Configuration"
-msgstr ""
+msgstr "latlh Qur"
 
 #. module: base
 #: selection:ir.property,type:0

From 6cbb04758af8d1e7056df3eadbf1b490b958b0b5 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 11 Jul 2012 05:15:15 +0000
Subject: [PATCH 239/239] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120711051515-k67xt5ps6oe853qg
---
 addons/account/i18n/zh_CN.po        |  14 +--
 addons/account_asset/i18n/mn.po     |   4 +-
 addons/project/i18n/ja.po           |   4 +-
 addons/project_timesheet/i18n/mn.po | 148 +++++++++++++++-------------
 4 files changed, 90 insertions(+), 80 deletions(-)

diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 09b4a8b9ac4..37fe86db46b 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.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 00:35+0000\n"
-"PO-Revision-Date: 2012-06-20 16:17+0000\n"
-"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
+"PO-Revision-Date: 2012-07-11 03:05+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
 "Language-Team: \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:44+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-07-11 05:15+0000\n"
+"X-Generator: Launchpad (build 15593)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -4963,7 +4963,7 @@ msgstr "资产负债表"
 #: view:account.general.journal:0
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
-msgstr "一般账簿"
+msgstr "总账账簿"
 
 #. module: account
 #: field:account.journal,allow_date:0
@@ -5702,7 +5702,7 @@ msgstr "发票税科目"
 #: model:ir.actions.act_window,name:account.action_account_general_journal
 #: model:ir.model,name:account.model_account_general_journal
 msgid "Account General Journal"
-msgstr "一般账簿"
+msgstr "科目总账账簿"
 
 #. module: account
 #: field:account.payment.term.line,days:0
@@ -10184,7 +10184,7 @@ msgstr "周期次数"
 #: report:account.general.journal:0
 #: model:ir.actions.report.xml,name:account.account_general_journal
 msgid "General Journal"
-msgstr "一般账簿"
+msgstr "总账账簿"
 
 #. module: account
 #: view:account.invoice:0
diff --git a/addons/account_asset/i18n/mn.po b/addons/account_asset/i18n/mn.po
index 8275f14ed6e..060fd9f598d 100644
--- a/addons/account_asset/i18n/mn.po
+++ b/addons/account_asset/i18n/mn.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-10 05:34+0000\n"
-"X-Generator: Launchpad (build 15558)\n"
+"X-Launchpad-Export-Date: 2012-07-11 05:15+0000\n"
+"X-Generator: Launchpad (build 15593)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/project/i18n/ja.po b/addons/project/i18n/ja.po
index 68f60160a76..8e9ece1452f 100644
--- a/addons/project/i18n/ja.po
+++ b/addons/project/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-10 05:33+0000\n"
-"X-Generator: Launchpad (build 15558)\n"
+"X-Launchpad-Export-Date: 2012-07-11 05:14+0000\n"
+"X-Generator: Launchpad (build 15593)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project_timesheet/i18n/mn.po b/addons/project_timesheet/i18n/mn.po
index e3056d29d96..0dbf42990af 100644
--- a/addons/project_timesheet/i18n/mn.po
+++ b/addons/project_timesheet/i18n/mn.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-06-24 16:46+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-07-11 03:11+0000\n"
+"Last-Translator: gobi <Unknown>\n"
 "Language-Team: Mongolian <mn@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-25 05:15+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-11 05:15+0000\n"
+"X-Generator: Launchpad (build 15593)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
@@ -45,12 +45,12 @@ msgid ""
 "Fill in the timesheet tab of the employee form."
 msgstr ""
 "Холбогдох ажилтанд журнал тодорхойлогдоогүй байна.\n"
-"Ажилтны формын цагийн хуваарь хавтасыг бөглө."
+"Ажилтны формын цагийн хуудас хавтасыг бөглө."
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_timesheettask0
 msgid "Timesheet task"
-msgstr "Цагийн хуваарийн даалгавар"
+msgstr "Цагийн хуудсын даалгавар"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -90,31 +90,33 @@ msgid ""
 "You cannot delete a partner which is assigned to project, we suggest you to "
 "uncheck the active box!"
 msgstr ""
+"Та төсөлд оноогдсон харилцагчийг устгах боломжгүй, тиймээс идэвхтэй "
+"тэмдэглэгээг арилгахыг зөвлөе!"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Group By..."
-msgstr ""
+msgstr "Бүлэглэх..."
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_triggerinvoice0
 msgid "Trigger invoices from sale order lines"
-msgstr ""
+msgstr "Борлуулалтын захиалгын мөрөөс нэхэмжлэх үүсгэх"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
-msgstr ""
+msgstr "10-р сар"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Timesheet/Task hours Report Per Month"
-msgstr ""
+msgstr "Цагийн хуудас/Даалгавар цагийн тайлан сарын хэмжээнд"
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Billable"
-msgstr ""
+msgstr "Нэхэмжлэх боломжтой"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_account_analytic_overdue
@@ -122,225 +124,227 @@ msgid ""
 "You will find here the contracts related to your customer projects in order "
 "to track the invoicing progress."
 msgstr ""
+"Энд захиалагчийн төсөлтэй холбогдсон гэрээнүүдийг харах болно. Энэ нь "
+"нэхэмжлэх явцыг зөвх хянахад туслана."
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Analytic account/project"
-msgstr ""
+msgstr "Шинжилгээний данс/төсөл"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,task_hrs:0
 msgid "Task Hours"
-msgstr ""
+msgstr "Даалгаврын цагууд"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,year:0
 msgid "Year"
-msgstr ""
+msgstr "Он"
 
 #. module: project_timesheet
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
+msgstr "Алдаа! төслийн эхлэх огноо дуусах огноогоос бага байх ёстой."
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_account_analytic_overdue
 msgid "Customer Projects"
-msgstr ""
+msgstr "Захиалагчийн төслууд"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Шинжилгээний мөр"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "August"
-msgstr ""
+msgstr "8-р сар"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_taskinvoice0
 msgid "Task invoice"
-msgstr ""
+msgstr "Даалгаврын нэхэмжлэл"
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_taskwork0
 msgid "Task Work"
-msgstr ""
+msgstr "Даалгаврын ажил"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "May"
-msgstr ""
+msgstr "5-р сар"
 
 #. module: project_timesheet
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Алдаа ! Та рекурсив цэс үүсгэж болохгүй!"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_project_working_hours
 msgid "Timesheet Lines"
-msgstr ""
+msgstr "Цагийн хуудсын мөрүүд"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:231
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "Алдаатай үйлдэл !"
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Billable Project"
-msgstr ""
+msgstr "Нэхэмжлэх боломжтой Төсөл"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_invoicing_contracts
 msgid "Contracts to Renew"
-msgstr ""
+msgstr "Шинэчлэх Гэрээнүүд"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in
 msgid "Sign in / Sign out by project"
-msgstr ""
+msgstr "Орох/Гарах үйлдлийг төслөөр харах"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Group by month of date"
-msgstr ""
+msgstr "Огнооны сараар бүлэглэх"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task
 msgid "Task"
-msgstr ""
+msgstr "Даалгавар"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
 msgid "Invoice Tasks Work"
-msgstr ""
+msgstr "Даалгаврын Ажлыг Нэхэмжлэх"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Хэрэглэгч"
 
 #. module: project_timesheet
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Алдаа! Ижил төсөлд томруулалтыг олгох боломжгүй."
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,name:0
 msgid "Date"
-msgstr ""
+msgstr "Огноо"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "July"
-msgstr ""
+msgstr "7-р сар"
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_timesheettask0
 msgid "Complete Your Timesheet."
-msgstr ""
+msgstr "Цагийн Хуудсаа Гүйцээ"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Task Hours in current year"
-msgstr ""
+msgstr "Энэ жилийн даалгаврын цаг"
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Customer"
-msgstr ""
+msgstr "Захиалагч"
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_taskwork0
 msgid "Work on task"
-msgstr ""
+msgstr "Даалгавар дахь ажил"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "February"
-msgstr ""
+msgstr "2-р сар"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
 msgid "Bill Tasks Works"
-msgstr ""
+msgstr "Даалгаврын ажлуудын тооцоо"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,timesheet_hrs:0
 msgid "Timesheet Hours"
-msgstr ""
+msgstr "Цагийн хуудас дахь цагууд"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_taskencoding0
 msgid "Task encoding"
-msgstr ""
+msgstr "Даалгаврыг шивнэ үү"
 
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_filltimesheet0
 msgid "Task summary is comes into the timesheet line"
-msgstr ""
+msgstr "Даалгаврын товчоо нь цагийн хуудсын мөр рүү очдог."
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "January"
-msgstr ""
+msgstr "1-р сар"
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_triggerinvoice0
 msgid "Trigger Invoice"
-msgstr ""
+msgstr "Нэхэмжлэлийг Үүсгэх"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "November"
-msgstr ""
+msgstr "11-р сар"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Task hours of last month"
-msgstr ""
+msgstr "Өнгөрсөн сарын ажлын цагууд"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "March"
-msgstr ""
+msgstr "3-р сар"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
-msgstr ""
+msgstr "Төсөл"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "April"
-msgstr ""
+msgstr "4-р сар"
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Invoicing Data"
-msgstr ""
+msgstr "Нэхэмжлэх өгөгдөл"
 
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_taskencoding0
 msgid "Encode how much time u spent on your task"
-msgstr ""
+msgstr "Өөрийн даалгавар дээр хичнээн цаг зарцуулснаа оруулна уу"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Харилцагч"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:247
 #, python-format
 msgid "Invalid Analytic Account !"
-msgstr ""
+msgstr "Буруу Шинжилгээний Данс  !"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:59
@@ -349,6 +353,8 @@ msgid ""
 "No product defined on the related employee.\n"
 "Fill in the timesheet tab of the employee form."
 msgstr ""
+"Холбогдох ажилтан дээр бараа тодорхойлогдоогүй байна.\n"
+"Ажилтны формын цагийн хуудас хавтас дээр бөглөнө үү."
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:54
@@ -357,17 +363,17 @@ msgstr ""
 #: code:addons/project_timesheet/project_timesheet.py:69
 #, python-format
 msgid "Bad Configuration !"
-msgstr ""
+msgstr "Буруу Тохиргоо !"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_project_billing
 msgid "Invoicing"
-msgstr ""
+msgstr "Нэхэмжлэл"
 
 #. module: project_timesheet
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Алдаа ! Рекурсив холбогдсон гишүүдийг үүсгэх боломжгүй."
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:247
@@ -375,57 +381,58 @@ msgstr ""
 msgid ""
 "You cannot select a Analytic Account which is in Close or Cancelled state"
 msgstr ""
+"Хаагдсан эсвэл Цуцлагдсан төлөвтэй Шинжилгээний Дансыг сонгох боломжгүй"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid " Month-1 "
-msgstr ""
+msgstr " Сар-1 "
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "September"
-msgstr ""
+msgstr "9-р сар"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "December"
-msgstr ""
+msgstr "12-р сар"
 
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_taskinvoice0
 msgid "After task is completed, Create its invoice."
-msgstr ""
+msgstr "Даалгавар дуусмагц харгалзах нэхэмжлэл үүсгэнэ."
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "June"
-msgstr ""
+msgstr "6-р сар"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_report_timesheet_task_user
 msgid "report.timesheet.task.user"
-msgstr ""
+msgstr "report.timesheet.task.user"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,month:0
 msgid "Month"
-msgstr ""
+msgstr "Сар"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_act_project_management_timesheet_sheet_form
 msgid "My Timesheet"
-msgstr ""
+msgstr "Өөрийн цагийн хуудас"
 
 #. module: project_timesheet
 #: constraint:account.analytic.line:0
 msgid "You can not create analytic line on view account."
-msgstr ""
+msgstr "Харагдац төрлийн данс дээр шинжилгээний мөрийг үүсгэх боломжгүй."
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Invoice Task Work"
-msgstr ""
+msgstr "Даалгаврын Ажлыг Нэхэмжлэх"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:70
@@ -435,15 +442,18 @@ msgid ""
 "employee.\n"
 "Fill in the timesheet tab of the employee form."
 msgstr ""
+"Холбогдох ажилтан дээр бараа болон барааны ангилалын үзүүлэлтийн данс "
+"тодорхойлогдоогүй байна.\n"
+"Ажилтны формын цагийн хуудас хавтсыг бөглөнө үү."
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
 #: view:report.timesheet.task.user:0
 msgid "Task Hours Per Month"
-msgstr ""
+msgstr "Даалгаврын цагууд сарын хэмжээнд"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_filltimesheet0
 msgid "Fill Timesheet"
-msgstr ""
+msgstr "Цагийн хуудсыг бөглөх"