From b3c1d7ebaa2c85a15445a0415ea9ad8bb903b602 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Fri, 22 Jun 2012 11:52:09 +0530
Subject: [PATCH 001/171] [IMP]warehouse :Receive/Deliver by Orders/Incoming
 Shipments : "-" is remove if second field is empty , all labels are display

bzr revid: hsa@tinyerp.com-20120622062209-7dxefdewqyiwwmnq
---
 addons/stock/stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index d0db8194331..e6e5970ee64 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -730,7 +730,7 @@
                     <label for="name" class="oe_edit_only"/>
                     <h1>
                         <field name="name" class="oe_inline"/>
-                        <span attr="{'invisible': [('origin','=',False)]}"> - </span>
+                        <span attr="{'invisible': [('origin','=',False)]}"></span>
                         <field name="origin" placeholder="PO0032" class="oe_inline"/>
                     </h1>
                     <label for="partner_id" class="oe_edit_only"/>

From de90ef25dc393dc19d4b32e97f2e64b1cfeb8db4 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Fri, 22 Jun 2012 17:33:53 +0530
Subject: [PATCH 002/171] [IMP]Manufacturing orders view change

bzr revid: kjo@tinyerp.com-20120622120353-poglhhjdz17vbegi
---
 addons/mrp/mrp.py                             |  8 ++--
 addons/mrp/mrp_view.xml                       | 40 +++++++++++--------
 addons/mrp_operations/mrp_operations_view.xml |  4 +-
 addons/sale_mrp/sale_mrp.py                   |  4 +-
 addons/sale_mrp/sale_mrp_view.xml             |  6 ++-
 5 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 3214cad5a5c..e22bc286e0a 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -472,9 +472,9 @@ class mrp_production(osv.osv):
 
         'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id','=',False)], readonly=True, states={'draft':[('readonly',False)]}),
         'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', readonly=True, states={'draft':[('readonly',False)]}, help="The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production plannification."),
-        'picking_id': fields.many2one('stock.picking', 'Picking list', readonly=True, ondelete="restrict",
+        'picking_id': fields.many2one('stock.picking', 'Picking List', readonly=True, ondelete="restrict",
             help="This is the Internal Picking List that brings the finished product to the production plan"),
-        'move_prod_id': fields.many2one('stock.move', 'Move product', readonly=True),
+        'move_prod_id': fields.many2one('stock.move', 'Product Move', readonly=True),
         'move_lines': fields.many2many('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Products to Consume', domain=[('state','not in', ('done', 'cancel'))], states={'done':[('readonly',True)]}),
         'move_lines2': fields.many2many('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Consumed Products', domain=[('state','in', ('done', 'cancel'))]),
         'move_created_ids': fields.one2many('stock.move', 'production_id', 'Products to Produce', domain=[('state','not in', ('done', 'cancel'))], states={'done':[('readonly',True)]}),
@@ -1112,9 +1112,9 @@ class mrp_production_product_line(osv.osv):
     _columns = {
         'name': fields.char('Name', size=64, required=True),
         'product_id': fields.many2one('product.product', 'Product', required=True),
-        'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product Unit of Measure'), required=True),
+        'product_qty': fields.float('Product Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True),
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True),
-        'product_uos_qty': fields.float('Product UOS Qty'),
+        'product_uos_qty': fields.float('Product UOS Quantity'),
         'product_uos': fields.many2one('product.uom', 'Product UOS'),
         'production_id': fields.many2one('mrp.production', 'Production Order', select=True),
     }
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 8559a679beb..456cd5cbed8 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -642,17 +642,19 @@
                     <notebook>
                         <page string="Consumed Products">
                             <group col="4">
+                                <group>
+                                    <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)"/>
+                                </group>
                                 <group>
                                     <field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
                                     <field name="location_dest_id" domain="[('usage','=','internal')]"/>
                                 </group>
-                                <group>
-                                    <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)"/>
-                                </group>
+                             </group>
+                                <separator string="Products to Consume"/>
                                 <field name="move_lines" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
                                     <tree colors="blue:state == 'draft';black:state in ('picking_except','confirmed','ready','in_production');gray:state in ('cancel','done') " string="Products to Consume">
                                         <field name="product_id" />
-                                        <field name="product_qty"  string="Qty"/>
+                                        <field name="product_qty"  string="Quantity"/>
                                         <field name="product_uom"  string="Unit of Measure"/>
                                         <field name="location_id"  string="Source Loc."/>
                                         <field name="state" invisible="1"/>
@@ -671,10 +673,11 @@
                                             states="draft,waiting,confirmed,assigned"/>
                                     </tree>
                                 </field>
+                                <separator string="Consumed Product"/>
                                 <field name="move_lines2" domain="[('state','in', ('done', 'cancel'))]">
                                    <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state == 'cancel' " string="Consumed Products" editable="bottom">
                                        <field name="product_id" readonly="1"/>
-                                       <field name="product_qty" readonly="1" string="Qty"/>
+                                       <field name="product_qty" readonly="1" string="Quantity"/>
                                        <field name="product_uom" readonly="1" string="Unit of Measure"/>
                                        <field name="prodlot_id" context="{'product_id': product_id}"/>
                                        <field name="state" invisible="1"/>
@@ -686,14 +689,13 @@
                                            states="done,cancel"/>
                                    </tree>
                                 </field>
-                            </group>
                         </page>
                         <page string="Finished Products">
-                            <group>
-                            <field name="move_created_ids" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
+                            <separator string="Products to Produce"/>
+                            <field name="move_created_ids" domain="[('state','&lt;&gt;', ('done', 'cancel'))]" nolabel="1">
                                 <tree string="Products to Finish">
                                     <field name="product_id" />
-                                    <field name="product_qty"  string="Qty"/>
+                                    <field name="product_qty"  string="Quantity"/>
                                     <field name="product_uom"  string="Unit of Measure"/>
                                     <field name="state" invisible="1"/>
                                     <button name="%(stock.action_partial_move_server)d"
@@ -706,10 +708,11 @@
                                         states="draft,waiting,confirmed,assigned" />
                                 </tree>
                             </field>
-                            <field name="move_created_ids2" domain="[('state','in', ('done', 'cancel'))]">
+                            <separator string="Produced Products"/>
+                            <field name="move_created_ids2" domain="[('state','in', ('done', 'cancel'))]" nolabel="1">
                                 <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Finished Products">
                                     <field name="product_id" readonly="1"/>
-                                    <field name="product_qty" readonly="1" string="Qty"/>
+                                    <field name="product_qty" readonly="1" string="Quantity"/>
                                     <field name="product_uom" readonly="1" string="Unit of Measure"/>
                                     <field name="location_dest_id"  readonly="1" string="Destination Loc." widget="selection"/>
                                     <field name="prodlot_id" context="{'product_id': product_id}"/>
@@ -722,7 +725,6 @@
                                         states="done,cancel" />
                                 </tree>
                             </field>
-                            </group>
                         </page>
                         <page string="Work Orders">
                             <button name="action_compute" states="draft"
@@ -732,7 +734,7 @@
                                 <form string="Production Work Centers" version="7.0">
                                     <group col="4">
                                         <field colspan="4" name="name"/>
-                                        <field name="workcenter_id" widget="selection"/>
+                                        <field name="workcenter_id"/>
                                         <field name="sequence"/>
                                         <field name="cycle"/>
                                         <field name="hour"/>
@@ -741,7 +743,7 @@
                                 <tree string="Production Work Centers">
                                     <field name="sequence"/>
                                     <field name="name"/>
-                                    <field name="workcenter_id" widget="selection"/>
+                                    <field name="workcenter_id"/>
                                     <field name="cycle"/>
                                     <field name="hour"/>
                                 </tree>
@@ -755,12 +757,16 @@
                         </page>
                         <page string="Extra Information">
                             <group col="4">
-                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                <group>
                                 <field name="priority"/>
                                 <field name="date_start"/>
                                 <field name="date_finished"/>
-                                <field name="picking_id"/>
-                                <field name="move_prod_id"/>
+                                </group>
+                                <group>
+                                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                    <field name="picking_id"/>
+                                    <field name="move_prod_id"/>
+                                </group>
                             </group>
                         </page>
                     </notebook>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index b25041bef98..22f71421ec9 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -80,7 +80,7 @@
             <sheet string="Work Orders">
                 <group col="4">
                     <field colspan="4" name="name"/>
-                    <field name="workcenter_id" widget="selection"/>
+                    <field name="workcenter_id"/>
                     <field name="production_id"/>
                     <field name="production_state"/>
                     <field name="sequence"/>
@@ -350,7 +350,7 @@
         <field name="model">mrp.production</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <field name="priority" position="after">
+            <field name="date_finished" position="after">
                 <field name="allow_reorder"/>
             </field>
         </field>
diff --git a/addons/sale_mrp/sale_mrp.py b/addons/sale_mrp/sale_mrp.py
index 840c33770a7..7397edbec2b 100644
--- a/addons/sale_mrp/sale_mrp.py
+++ b/addons/sale_mrp/sale_mrp.py
@@ -70,8 +70,8 @@ class mrp_production(osv.osv):
         return res
 
     _columns = {
-        'sale_name': fields.function(_ref_calc, multi='sale_name', type='char', string='Sales Name', help='Indicate the name of sales order.'),
-        'sale_ref': fields.function(_ref_calc, multi='sale_name', type='char', string='Sales Reference', help='Indicate the Customer Reference from sales order.'),
+        'sale_name': fields.function(_ref_calc, multi='sale_name', type='char', string='Sale Name', help='Indicate the name of sales order.'),
+        'sale_ref': fields.function(_ref_calc, multi='sale_name', type='char', string='Sale Reference', help='Indicate the Customer Reference from sales order.'),
     }
 
 mrp_production()
diff --git a/addons/sale_mrp/sale_mrp_view.xml b/addons/sale_mrp/sale_mrp_view.xml
index fbf2e7a9327..882663680c5 100644
--- a/addons/sale_mrp/sale_mrp_view.xml
+++ b/addons/sale_mrp/sale_mrp_view.xml
@@ -8,10 +8,12 @@
             <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='move_prod_id']" position="after">
-                    <field name="sale_name"/>
+                <xpath expr="//field[@name='company_id']" position="after">
                     <field name="sale_ref"/>
                 </xpath>
+                <xpath expr="//field[@name='sale_ref']" position="after">
+                    <field name="sale_name"/>
+                </xpath>
             </field>
         </record>
 

From 1a944c6c29dc0cc269de254b8a079dc0aae53bb8 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Fri, 22 Jun 2012 18:08:22 +0530
Subject: [PATCH 003/171] [IMP] workcenter and rounting view change

bzr revid: kjo@tinyerp.com-20120622123822-3o2d1npxrfy40xr1
---
 addons/mrp/mrp_view.xml | 44 +++++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 456cd5cbed8..9ac5e5f6e99 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -113,12 +113,14 @@
             action="mrp_property_action"
             id="menu_mrp_property_action"
             groups="product.group_mrp_properties"
-            parent="menu_mrp_property"/>
+            parent="menu_mrp_configuration"
+            sequence="30" />
         <menuitem
             action="mrp_property_group_action"
-            parent="menu_mrp_property"
-            groups="product.group_mrp_properties"
-            id="menu_mrp_property_group_action"/>
+            parent="menu_mrp_configuration"
+            groups="base.group_no_one"
+            id="menu_mrp_property_group_action"
+            sequence="35" />
 
         <!--
         Work Centers
@@ -144,12 +146,16 @@
             <field name="arch" type="xml">
                 <form string="Work Center" version="7.0">
                     <group col="4">
-                        <field name="name"/>
-                        <field name="code"/>
-                        <field name="active"/>
-                        <field name="resource_type"/>
-                        <field name="calendar_id" widget="selection"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        <group>
+                            <field name="name"/>
+                            <field name="resource_type"/>
+                            <field name="calendar_id" widget="selection"/>
+                        </group>
+                        <group>
+                            <field name="code"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <field name="active"/>
+                        </group>
                     </group>
                     <notebook>
                         <page string="General Information">
@@ -251,11 +257,15 @@
             <field name="arch" type="xml">
                 <form string="Routing" version="7.0">
                     <group col="4">
-                        <field name="name"/>
-                        <field name="code"/>
-                        <field name="active"/>
-                        <field name="location_id"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        <group>
+                            <field name="name"/>
+                            <field name="code"/>
+                        </group>
+                        <group>
+                            <field name="location_id"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                            <field name="active"/>
+                       </group>
                     </group>
                     <notebook>
                         <page string="Work Center Operations">
@@ -483,7 +493,7 @@
         <menuitem
             action="mrp_bom_form_action2"
             id="menu_mrp_bom_form_action2"
-            parent="menu_mrp_bom"
+            parent="menu_mrp_configuration"
             sequence="20"/>
 
         <record id="action2" model="ir.actions.act_window">
@@ -976,7 +986,7 @@
         </record>
 
         <menuitem id="menu_pm_resources_config" name="Resources" parent="menu_mrp_configuration"/>
-        <menuitem action="mrp_workcenter_action" id="menu_view_resource_search_mrp" groups="mrp.group_mrp_routings" parent="mrp.menu_mrp_bom" sequence="25"/>
+        <menuitem action="mrp_workcenter_action" id="menu_view_resource_search_mrp" groups="mrp.group_mrp_routings" parent="mrp.menu_mrp_configuration" sequence="25"/>
         <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar_search_mrp" parent="menu_pm_resources_config" sequence="1" groups="base.group_no_one"/>
         <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search_mrp" parent="menu_pm_resources_config" sequence="1" groups="base.group_no_one"/>
 

From 1bd6e72fce6838e72eb9650486a5e1caf6ebbaa2 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Fri, 22 Jun 2012 18:50:31 +0530
Subject: [PATCH 004/171] [IMP]warehouse : changes in someview form

bzr revid: hsa@tinyerp.com-20120622132031-uv9ig344h14isbk4
---
 .../wizard/schedulers_all_view.xml            |  2 +-
 addons/product_expiry/product_expiry_view.xml |  1 -
 addons/stock/stock_view.xml                   | 28 +++++++---------
 addons/stock_planning/stock_planning_view.xml | 33 ++++++++++++++-----
 .../stock_planning_createlines_view.xml       |  1 -
 5 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/addons/procurement/wizard/schedulers_all_view.xml b/addons/procurement/wizard/schedulers_all_view.xml
index a2f987e3aa1..539ee7b1865 100644
--- a/addons/procurement/wizard/schedulers_all_view.xml
+++ b/addons/procurement/wizard/schedulers_all_view.xml
@@ -13,7 +13,7 @@
                     <header>
                         <button name="procure_calculation" string="Compute Schedulers" type="object" icon="gtk-ok" />
                     </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.">
+                    <group>
                         <field name="automatic"/>
                     </group>
                 </form>
diff --git a/addons/product_expiry/product_expiry_view.xml b/addons/product_expiry/product_expiry_view.xml
index e0a249d09eb..3e2d6573443 100644
--- a/addons/product_expiry/product_expiry_view.xml
+++ b/addons/product_expiry/product_expiry_view.xml
@@ -8,7 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="date" position="after">
-                    <separator string="Dates" colspan="4" />
                     <field name="life_date" />
                     <field name="use_date" />
                     <field name="removal_date" />
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index e6e5970ee64..fd6ec506893 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -119,20 +119,13 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet>
-                    <div class="oe_title">
-                        <div class="oe_edit_only">
-                            <label for="name"  /> 
-                        </div>
-                        <h1>
-                            <field name="name" placeholder="Annual inventory"/>
-                        </h1>
-                    </div>
-                <group>
-                    <group>
-                        <field name="date"/>
+                    <h1>
+                        <field name="name" placeholder="Annual inventory" class="oe_inline"/>
+                        <field name="date" class="oe_inline"/>
+                    </h1>
+                    <div>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    </group>
-                </group>
+                    </div>
                     <notebook>
                     <page string="General Informations">
                         <field name="inventory_line_id">
@@ -160,7 +153,8 @@
                                 </group>
                             </form>
                         </field>
-                    </page><page string="Posted Inventory">
+                    </page>
+                    <page string="Posted Inventory">
                          <field name="move_ids" context="{'inventory_id':active_id}" >
                             <tree string="Stock Moves">
                                 <field name="product_id"/>
@@ -334,7 +328,9 @@
                             <field name="prefix"/>
                             <field name="name"/>
                             <field name="ref"/>
-                            <field name="date"/>
+                            <group string="Dates">
+                                <field name="date"/>
+                            </group>
                         </group>
                         <group string="Traceability">
                             <field name="stock_available"/>
@@ -730,7 +726,7 @@
                     <label for="name" class="oe_edit_only"/>
                     <h1>
                         <field name="name" class="oe_inline"/>
-                        <span attr="{'invisible': [('origin','=',False)]}"></span>
+                        <label string="-" attrs="{'invisible':[('origin','=',False)]}"/> 
                         <field name="origin" placeholder="PO0032" class="oe_inline"/>
                     </h1>
                     <label for="partner_id" class="oe_edit_only"/>
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 05b3c5a213f..e9cd86ea1c8 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -255,16 +255,29 @@
                                          domain = "[('category_id','in',[product_uom_categ,product_uos_categ])]"
                                          on_change = "onchange_uom(product_uom, product_id, active_uom, planned_outgoing, to_procure)"/>
                             <field name="active_uom" invisible = "True" />
+                        </group>
+                        <group colspan ="2" col="2">
+                            <separator colspan ="2" string = "Minimum Stock Rule Indicators"/>
+                            <field name="minimum_op"/>
+                            <field name="maximum_op"/>
+                        </group>
+                    </group>
+                    <group colspan="4" col="3">
+                        <group>
+                            <separator colspan ="2" string = "Current Period Situation"/>
+                            <field name="stock_start"/>
+                            <field name="already_out"/>
+                            <field name="already_in"/>
+                        </group>
+                        <group>
                             <separator colspan ="2" string = "Forecasts"/>
                             <field name="warehouse_forecast"/>
                             <field name="company_forecast"/>
                             <field name="confirmed_forecasts_only"/>
                         </group>
-                        <group colspan ="2" col="2">
-                            <separator colspan ="2" string = "Current Period Situation"/>
-                            <field name="stock_start"/>
-                            <field name="already_out"/>
-                            <field name="already_in"/>
+                    </group>
+                    <group colspan="4" col="8">
+                        <group>
                             <separator colspan ="2" string = "Planning and Situation for Calculated Period"/>
                             <field name="planned_outgoing"/>
                             <field name="outgoing"/>
@@ -275,21 +288,23 @@
                             <button name="calculate_planning" string="Calculate Planning" type="object" icon="gtk-execute" colspan="2"/>
                             <field name="stock_only"/>
                         </group>
-                        <group colspan ="2" col="2">
-                            <separator colspan ="2" string = "Minimum Stock Rule Indicators"/>
-                            <field name="minimum_op"/>
-                            <field name="maximum_op"/>
+                        <group>
                             <separator colspan ="2" string = "Calculated Period Simulation"/>
                             <field name="outgoing_before"/>
                             <field name="incoming_before"/>
                             <field name="stock_simulation"/>
                             <button name="procure_incomming_left" icon="gtk-convert" string="Procure Incoming Left" type="object" colspan="2"/>
                             <field name="procure_to_stock"/>
+                        </group>
+                    </group>
+                    <group>
+                        <group>
                             <separator colspan ="2" string = "Internal Supply"/>
                             <button name="internal_supply" string="Supply from Another Warehouse" icon="gtk-convert"  type="object" colspan="2"/>
                             <field name="supply_warehouse_id" domain = "[('company_id','=',company_id)] "/>
                             <field name="stock_supply_location"/>
                         </group>
+                        <group></group>
                     </group>
                     <separator colspan ="4" string = "Procurement History"/>
                     <field name = "history" colspan = "2" nolabel = "1"/>
diff --git a/addons/stock_planning/wizard/stock_planning_createlines_view.xml b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
index 2ebddb89212..3772ceddf31 100644
--- a/addons/stock_planning/wizard/stock_planning_createlines_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
@@ -9,7 +9,6 @@
             <field name="arch" type="xml">
                 <form string="Create Stock Planning Lines" version="7.0">
                     <header>
-                        <button icon="gtk-cancel" special="cancel" string="Close"/>
                         <button icon="gtk-ok" name="create_planning" string="Create" type="object"/>
                     </header>
                     <group col="4">

From 1d6041aea1673352281e17d2a7f6171d7b40830b Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 22 Jun 2012 19:06:21 +0530
Subject: [PATCH 005/171] [IMP] delivery,Procurement : Improve View for
 procurement and delivery method

bzr revid: dbr@tinyerp.com-20120622133621-ouhbiunlv3r85iyt
---
 addons/delivery/delivery_view.xml       | 146 +++++++++++++-----------
 addons/procurement/procurement_view.xml |  47 +++++---
 2 files changed, 110 insertions(+), 83 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 5e54f74f7f1..903d169085a 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -21,51 +21,61 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Carrier" version="7.0">
-                    <group col="4" name="general">
-                        <field name="name"/>
-                        <field name="partner_id"/>
-                        <field name="product_id"/>
-                        <field name="active"/>
-                        <separator string="Pricing Information" colspan="4"/>
-                        <group colspan="4" col="4">
-                            <field name="normal_price" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
-                            <newline/>
-                            <field name="free_if_more_than" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
-                            <field name="amount" attrs="{'required':[('free_if_more_than','&lt;&gt;',False)], 'invisible':[('free_if_more_than','=',False)]}"/>
+                    <sheet>
+                        <group col="4">
+                            <group>
+                                <label for="free_if_more_than"/>
+                                <div>
+                                    <field name="free_if_more_than" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}" class="oe_inline"/>
+                                    <field name="amount" attrs="{'required':[('free_if_more_than','&lt;&gt;',False)], 'invisible':[('free_if_more_than','=',False)]}" class="oe_inline"/>
+                                </div>
+                                <field name="use_detailed_pricelist"/>
+                            </group>
+                            <group>
+                                <field name="name"/>
+                                <field name="partner_id"/>
+                                <field name="product_id"/>
+                                <field name="active" invisible="1"/>
+                                <field name="normal_price" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}" invisible="1"/>
+                            </group>
                         </group>
-                        <newline/>
-                        <field name="use_detailed_pricelist"/>
-                    </group>
-                    <field name="pricelist_ids" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree,form">
-                         <tree string="Delivery grids">
-                              <field name="sequence"/>
-                              <field name="name"/>
-                         </tree>
-                        <form string="Delivery grids" version="7.0">
-                             <group col="4">
-                                 <field name="name"/>
-                                 <field name="active"/>
-                                 <field name="sequence"/>
-                             </group>
-                             <notebook>
-                               <page string="Grid definition">
-                                  <field name="line_ids"/>
-                               </page>
-                               <page string="Destination">
-                                   <group string="Countries">
-                                       <field colspan="2" name="country_ids" nolabel="1"/>
-                                   </group>
-                                   <group string="States">
-                                       <field colspan="2" name="state_ids" nolabel="1"/>
-                                   </group>
-                                   <group col="4">
-                                       <field name="zip_from"/>
-                                       <field name="zip_to"/>
-                                   </group>
-                               </page>
-                             </notebook>
-                       </form>
-                   </field>
+                        <group>
+                            <field name="pricelist_ids" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree,form" nolabel="1">
+                                 <tree string="Delivery grids">
+                                      <field name="sequence"/>
+                                      <field name="name"/>
+                                 </tree>
+                                 <form string="Delivery grids" version="7.0">
+                                     <group col="4">
+                                         <field name="name"/>
+                                         <field name="active"/>
+                                         <field name="sequence"/>
+                                     </group>
+                                     <notebook>
+                                        <page string="Grid definition">
+                                           <field name="line_ids"/>
+                                        </page>
+                                        <page string="Destination">
+                                            <group>
+                                                <field name="country_ids" widget="many2many_tags"/>
+                                                <field name="state_ids" widget="many2many_tags"/>
+                                            </group>
+                                            <group>
+                                                <div>
+                                                    <label for="zip_from" class="oe_inline"/>
+                                                    <field name="zip_from" class="oe_inline"/>
+                                                    <label string="-" class="oe_inline"/>
+                                                    <field name="zip_to" class="oe_inline"/>
+                                                </div>
+                                            </group>
+                                        </page>
+                                    </notebook>
+                                </form>
+                            </field>
+
+                        </group>
+
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -111,13 +121,13 @@
                             <field name="line_ids"/>
                         </page>
                         <page string="Destination">
-                            <group string="Countries">
-                                <field name="country_ids"/>
-                            </group>
-                            <group string="States">
-                                <field colspan="2" name="state_ids" nolabel="1"/>
-                                <field name="zip_from"/>
-                                <field name="zip_to"/>
+                            <field name="country_ids" widget="many2many_tags"/>
+                            <field name="state_ids" widget="many2many_tags"/>
+                            <group>
+                                <label string="Zip" class="oe_inline"/>
+                                <field name="zip_from" class="oe_inline" nolabel="1"/>
+                                <label string="-" class="oe_inline"/>
+                                <field name="zip_to" class="oe_inline" nolabel="1"/>
                             </group>
                         </page>
                     </notebook>
@@ -140,19 +150,27 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Grid Lines" version="7.0">
-                    <field colspan="4" name="name"/>
-                    <div>
-                        <label string="condition" for="type"/>
-                        <field name="type" class="oe_inline"/>
-                        <field name="operator" class="oe_inline"/>
-                        <field name="max_value" class="oe_inline"/>
-                    </div>
-                    <group col="4">
-                        <field name="list_price"/>
-                        <field name="standard_price"/>
-                        <field name="price_type"/>
-                        <field name="variable_factor" attrs="{'invisible':[('price_type','=','fixed')]}"/>
-                    </group>
+                    <sheet>
+                        <div class="oe_title" colspan="4">
+                            <field name="name" />
+                        </div>
+                        <group col="4">
+                            <group>
+                                <label string="Condition" for="type"/>
+                                <div>
+                                    <field name="type"/>
+                                    <field name="operator"/>
+                                    <field name="max_value"/>
+                                </div>
+                            </group>
+                            <group>
+                                <field name="list_price"/>
+                                <field name="standard_price"/>
+                                <field name="price_type"/>
+                                <field name="variable_factor" attrs="{'invisible':[('price_type','=','fixed')]}"/>
+                            </group>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index c9a6d55c9d4..2be98ec4630 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -55,31 +55,40 @@
                         <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed" />
                     </header>
                     <sheet>
+                    <h1>
+                        <field name="name" class="oe_inline"/>
+                        <label string="-" attrs="{'invisible':[('origin','=',False)]}"/>
+                        <field name="origin"  class="oe_inline"/>
+                    </h1>
+                    <h2>
+                        <field name="message"/>
+                    </h2>
                     <group>
-                        <group string="References">
-                            <field name="name"/>
-                            <field name="origin"/>
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                        </group>
-                        <group string="Planification">
-                            <field name="date_planned"/>
-                            <field name="procure_method"/>
-                            <field name="priority"/>
-                        </group>
+                        <field name="date_planned"/>
+                        <field name="procure_method"/>
+                        <field name="priority"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection" invisible="1"/>
                     </group>
                     <notebook>
                     <page string="Procurement Details">
                         <group string="Product &amp; Location" col="4">
-                            <field name="product_id" on_change="onchange_product_id(product_id)"/>
-                            <field name="location_id" domain="[('usage','=','internal')]"/>
-                            <field name="product_qty"/>
-                            <field name="product_uom"/>
-
-                            <field name="product_uos_qty" groups="product.group_uos"/>
-                            <field name="product_uos"  groups="product.group_uos"/>
+                            <group>
+                                <field name="product_id" on_change="onchange_product_id(product_id)"/>
+                                <label for="product_qty" />
+                                <div>
+                                    <field name="product_qty" class="oe_inline"/>
+                                    <field name="product_uom" class="oe_inline"/>
+                                </div>
+                                <label for="product_uos_qty" />
+                                <div>
+                                    <field name="product_uos_qty" groups="product.group_uos" class="oe_inline"/>
+                                    <field name="product_uos"  groups="product.group_uos" class="oe_inline"/>
+                                </div>
+                            </group>
+                            <group>
+                               <field name="location_id" domain="[('usage','=','internal')]"/>
+                            </group>
                         </group>
-                        <separator string="Status"/>
-                        <field name="message"/>
                     </page>
                     <page string="Extra Information">
                         <group string="Details" col="4">

From 36e94e982d9cac8abc4291425c8bfd1c0a6f720b Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Fri, 22 Jun 2012 19:15:17 +0530
Subject: [PATCH 006/171] [IMP] bom view change

bzr revid: kjo@tinyerp.com-20120622134517-ewlgnn3w7veps9wi
---
 addons/mrp/mrp_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 9ac5e5f6e99..7530c104e52 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -350,8 +350,8 @@
 	                        <group>
 	                            <field name="type"/>
 	                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-	                            <field name="product_uos_qty" groups="product.group_uos" />
-	                            <field name="product_uos"  groups="product.group_uos"/>
+                                <field name="product_uos_qty" groups="product.group_uos" nolabel="1"/>
+                                <field name="product_uos"  groups="product.group_uos" nolabel="1"/>
 	                        </group>
 	                    </group>
 	                    <notebook>

From e1c58b182c9a258b374c7f03dd47cd3b6d1be0cb Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 25 Jun 2012 11:03:49 +0530
Subject: [PATCH 007/171] [IMP]delivery: IMprove a group view for Zipcode

bzr revid: dbr@tinyerp.com-20120625053349-8o8sgxt4t0csq6c0
---
 addons/delivery/delivery_view.xml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 903d169085a..0d538b55e86 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -60,13 +60,10 @@
                                                 <field name="country_ids" widget="many2many_tags"/>
                                                 <field name="state_ids" widget="many2many_tags"/>
                                             </group>
-                                            <group>
-                                                <div>
-                                                    <label for="zip_from" class="oe_inline"/>
-                                                    <field name="zip_from" class="oe_inline"/>
-                                                    <label string="-" class="oe_inline"/>
-                                                    <field name="zip_to" class="oe_inline"/>
-                                                </div>
+                                            <group class="oe_inline" col="4">
+                                                <field name="zip_from" string="Zip"/>
+                                                <label  string="-"/>
+                                                <field name="zip_to" nolabel="1"/>
                                             </group>
                                         </page>
                                     </notebook>

From 5731d3473127ad392773e7b2eab84085063baaf0 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Mon, 25 Jun 2012 11:22:59 +0530
Subject: [PATCH 008/171] [IMP]stock planning : set widget="o2m_list"

bzr revid: hsa@tinyerp.com-20120625055259-y0p8m1owm5zbycm2
---
 .../stock_planning/wizard/stock_planning_createlines_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock_planning/wizard/stock_planning_createlines_view.xml b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
index 3772ceddf31..48f35201cda 100644
--- a/addons/stock_planning/wizard/stock_planning_createlines_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
@@ -12,11 +12,11 @@
                         <button icon="gtk-ok" name="create_planning" string="Create" type="object"/>
                     </header>
                     <group col="4">
-                        <field name="period_id" widget="selection"/>
+                        <field name="period_id" widget="one2many_list"/>
                         <field name="company_id" widget= "selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
                         <field name="warehouse_id" domain = "[('company_id','=',company_id)] "/>
                         <field name="forecasted_products"/>
-                        <field name="product_categ_id" attrs="{'required':[('forecasted_products','=',0)]}" widget="selection"/>
+                        <field name="product_categ_id" attrs="{'required':[('forecasted_products','=',0)]}" widget="one2many_list"/>
                     </group>
                 </form>
             </field>

From 74b1e9d77033597356955d60d3125bed28a717b6 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 25 Jun 2012 11:24:11 +0530
Subject: [PATCH 009/171] [IMP] set button on top

bzr revid: kjo@tinyerp.com-20120625055411-zod3eaopqihynuf1
---
 addons/mrp/mrp_view.xml                       | 18 ++++++++++++++----
 addons/mrp_operations/mrp_operations_view.xml | 11 +++++------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 7530c104e52..2b2e073dd4f 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -350,8 +350,13 @@
 	                        <group>
 	                            <field name="type"/>
 	                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                <field name="product_uos_qty" groups="product.group_uos" nolabel="1"/>
-                                <field name="product_uos"  groups="product.group_uos" nolabel="1"/>
+	                            <label name="product_uso_qty" />
+                                <div>
+                                <field name="product_uos_qty" 
+                                    groups="product.group_uos" 
+                                    class="oe_inline"/>
+                                <field name="product_uos" groups="product.group_uos" colspan="4" class="oe_inline"/>
+                                </div>
 	                        </group>
 	                    </group>
 	                    <notebook>
@@ -645,8 +650,13 @@
                         </group>
                         <group>
                             <field name="user_id"/>
-                            <field name="product_uos_qty" groups="product.group_uos"/>
-                            <field name="product_uos" groups="product.group_uos"/>
+                            <label name="product_uso_qty" />
+                            <div>
+                                <field name="product_uos_qty" 
+                                    groups="product.group_uos" 
+                                    class="oe_inline"/>
+                                <field name="product_uos" groups="product.group_uos" colspan="4" class="oe_inline"/>
+                            </div>
                         </group>
                     </group>
                     <notebook>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 22f71421ec9..d4d1802eb6c 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -8,17 +8,16 @@
         <field name="type">form</field>
         <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
         <field name="arch" type="xml">
-           <xpath expr="//field[@name='workcenter_lines']/form//field[@name='hour']" position="after">
-               <group colspan="8" col="8">
-                   <separator colspan="8"/>
-                   <field name="state"/>
+           <xpath expr="//field[@name='workcenter_lines']/form//field[@name='name']" position="before">
+            <header colspan="8">
+                   <button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr" help="Start Working"/>
                    <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop" help="Cancel Order"/>
                    <button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert" help="Set to Draft"/>
-                   <button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr" help="Start Working"/>
                    <button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause" help="Resume Work Order"/>
                    <button name="button_pause" string="Pending" states="startworking" icon="gtk-media-pause" help="Pause Work Order"/>
                    <button name="button_done" string="Finished" states="startworking" icon="terp-check" help="Finish Order"/>
-               </group>
+                   <field name="state" widget="statusbar"/>
+            </header>
            </xpath>
         </field>
     </record>

From 41547d5942d1a945a7cb8af9b8434c8161f9e28a Mon Sep 17 00:00:00 2001
From: "Jalpesh Patel (OpenERP)" <pja@tinyerp.com>
Date: Mon, 25 Jun 2012 11:43:43 +0530
Subject: [PATCH 010/171] [IMP]customers-sales-receipt

bzr revid: pja@tinyerp.com-20120625061343-oxbyvom0a37qtcez
---
 addons/account_voucher/voucher_sales_purchase_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 5de7636c0c1..1365a24051f 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -96,15 +96,15 @@
                     <group>
                         <group>
                             <field name="partner_id" domain="[('customer','=',True)]" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
+                            <field name="pay_now" on_change="onchange_payment(pay_now, journal_id, partner_id)" required="1"/>
                             <field name="date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
                             <field name="date_due" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
-                            <field name="name" colspan="2"/>
                             <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         </group>
                         <group>
                             <field name="currency_id"/>
                             <field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
-                            <field name="pay_now" on_change="onchange_payment(pay_now, journal_id, partner_id)" required="1"/>
+                            <field name="name" colspan="2"/>
                             <field name="account_id"
                                  attrs="{'invisible':[('pay_now','!=','pay_now')]}"
                                   domain="[('type','=','liquidity')]"/>

From edfd2c18f067868261f346dae0b0088617b65696 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 25 Jun 2012 11:49:50 +0530
Subject: [PATCH 011/171] [IMP] remove string

bzr revid: kjo@tinyerp.com-20120625061950-nw23wvb4zcu86dzh
---
 addons/mrp/mrp_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 2b2e073dd4f..6a53efa4f0b 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -697,7 +697,7 @@
                                 <field name="move_lines2" domain="[('state','in', ('done', 'cancel'))]">
                                    <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state == 'cancel' " string="Consumed Products" editable="bottom">
                                        <field name="product_id" readonly="1"/>
-                                       <field name="product_qty" readonly="1" string="Quantity"/>
+                                       <field name="product_qty" readonly="1"/>
                                        <field name="product_uom" readonly="1" string="Unit of Measure"/>
                                        <field name="prodlot_id" context="{'product_id': product_id}"/>
                                        <field name="state" invisible="1"/>
@@ -715,7 +715,7 @@
                             <field name="move_created_ids" domain="[('state','&lt;&gt;', ('done', 'cancel'))]" nolabel="1">
                                 <tree string="Products to Finish">
                                     <field name="product_id" />
-                                    <field name="product_qty"  string="Quantity"/>
+                                    <field name="product_qty"/>
                                     <field name="product_uom"  string="Unit of Measure"/>
                                     <field name="state" invisible="1"/>
                                     <button name="%(stock.action_partial_move_server)d"
@@ -732,7 +732,7 @@
                             <field name="move_created_ids2" domain="[('state','in', ('done', 'cancel'))]" nolabel="1">
                                 <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Finished Products">
                                     <field name="product_id" readonly="1"/>
-                                    <field name="product_qty" readonly="1" string="Quantity"/>
+                                    <field name="product_qty" readonly="1"/>
                                     <field name="product_uom" readonly="1" string="Unit of Measure"/>
                                     <field name="location_dest_id"  readonly="1" string="Destination Loc." widget="selection"/>
                                     <field name="prodlot_id" context="{'product_id': product_id}"/>

From f1957e856384abfaba18bf82750e7daee19e5f02 Mon Sep 17 00:00:00 2001
From: "Jalpesh Patel (OpenERP)" <pja@tinyerp.com>
Date: Mon, 25 Jun 2012 11:59:19 +0530
Subject: [PATCH 012/171] [IMP]customers-sales-receipt

bzr revid: pja@tinyerp.com-20120625062919-lawo5zyr8i4zn8jc
---
 addons/account_voucher/account_voucher.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 9ca30aed099..1e882b7c585 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -260,7 +260,7 @@ class account_voucher(osv.osv):
             ('receipt','Receipt'),
         ],'Default Type', readonly=True, states={'draft':[('readonly',False)]}),
         'name':fields.char('Memo', size=256, readonly=True, states={'draft':[('readonly',False)]}),
-        'date':fields.date('Date', readonly=True, select=True, states={'draft':[('readonly',False)]}, help="Effective date for accounting entries"),
+        'date':fields.date('Bill Date', readonly=True, select=True, states={'draft':[('readonly',False)]}, help="Effective date for accounting entries"),
         'journal_id':fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'account_id':fields.many2one('account.account', 'Account', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'line_ids':fields.one2many('account.voucher.line','voucher_id','Voucher Lines', readonly=True, states={'draft':[('readonly',False)]}),

From 44f45e3922bd94ae2557006f8a1944699dafe5b1 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 25 Jun 2012 12:26:27 +0530
Subject: [PATCH 013/171] [IMP] change menu name

bzr revid: kjo@tinyerp.com-20120625065627-09700e1rk8hapwah
---
 addons/mrp/mrp_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 6a53efa4f0b..15255d6637b 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -32,7 +32,7 @@
             </field>
         </record>
         <record id="mrp_property_group_action" model="ir.actions.act_window">
-            <field name="name">Property Groups</field>
+            <field name="name">Property Group</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.property.group</field>
             <field name="view_type">form</field>
@@ -986,7 +986,7 @@
         <!-- Menu for Resource for MRP-->
 
         <record id="mrp_workcenter_action" model="ir.actions.act_window">
-            <field name="name">Work Centers</field>
+            <field name="name">Work Center</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.workcenter</field>
             <field name="view_type">form</field>

From 6d8b91f69e6d5d143f4be53485e41132733e06d9 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 25 Jun 2012 12:49:20 +0530
Subject: [PATCH 014/171] [IMP]stock_plannig: Remove cancel btn and set
 Duration

bzr revid: dbr@tinyerp.com-20120625071920-gnn2vy3zji3mcne8
---
 .../wizard/stock_planning_create_periods_view.xml          | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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 bdfe240b106..26bb4886131 100644
--- a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
@@ -10,14 +10,17 @@
             <field name="arch" type="xml">
                 <form string="Stock Periods" version="7.0">
                     <header>
-                        <button string="Cancel" special="cancel" icon="gtk-cancel"/>
                         <button name="create_stock_periods" icon="gtk-dnd" string="Create Daily Periods" type="object"/>
                         <button name="create_stock_periods" icon="gtk-dnd"  string="Create Weekly Periods" type="object" context="{'interval': 6, 'name': 'Weekly'}"/>
                         <button name="create_stock_periods" icon="gtk-dnd" string="Create Monthly Periods" type="object" context="{'interval': 1, 'name': 'Monthly'}"/>
                     </header>
-                    <group col="4">
+                    <group>
+                        <label for="date_start" string="Duration"/>
+                    <div>
                         <field name="date_start"/>
+                        <label string="-"/>
                         <field name="date_stop"/>
+                    </div>
                     </group>
                 </form>
             </field>

From bb4240fc56964c5e4c775e53feb245efdb681843 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Mon, 25 Jun 2012 14:55:40 +0530
Subject: [PATCH 015/171] [IMP] improve the customer and supplier invoice and
 refunds form

bzr revid: nco@tinyerp.com-20120625092540-m7243o1kkdcg1l62
---
 addons/account/account_invoice_view.xml       | 83 ++++++++++---------
 .../account_asset_invoice_view.xml            |  2 +-
 .../account_invoice_layout_view.xml           |  2 +-
 3 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 68a723aa4a0..7ac6e6154ab 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -53,6 +53,7 @@
                 <form string="Invoice Line" version="7.0">
                     <group col="4">
                         <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
+                        <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
                         <field name="name"/>
                         <label string="Quantity" for="quantity" align="1.0"/>
                         <div>
@@ -60,12 +61,11 @@
                             <field name="uos_id" class="oe_inline"
                               on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
                         </div>
-                        <field name="price_unit"/>
-                        <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
-                        <field name="discount"/>
-                        <field name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]" widget="many2many_tags"/>
-                        <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                         <field name="company_id" groups="base.group_multi_company" readonly="1"/>
+                        <field name="price_unit"/>
+                        <field name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]" widget="many2many_tags"/>
+                        <field name="discount"/>
+                        <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                     </group>
                     <separator string="Notes"/>
                     <field name="note"/>
@@ -156,33 +156,42 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                 </header>
                 <sheet string="Supplier Invoice">
-                    <group>
-                        <group>
-                            <field string="Supplier" name="partner_id"
+                	<h1>
+                		<label string="Draft Invoice " attrs="{'invisible': [('state','not in',('draft',))]}"/>
+                		<label string="Pro Forma Invoice " attrs="{'invisible': [('state','not in',('proforma','proforma2'))]}"/>
+                		<label string="Invoice " attrs="{'invisible': [('state','in',('draft','proforma','proforma2'))]}"/>
+                		<field name="number" readonly="1" class="oe_inline"/>
+            		</h1>
+                    <label string="Concerns" for="origin" class="oe_edit_only"/>
+                    <h2>
+                        <field name="origin" placeholder="PO 002"/>
+                        <field string="Supplier" name="partner_id"
                               on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
                               context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"
                               domain="[('supplier', '=', True)]"/>
-                            <field name="fiscal_position" widget="selection"/>
-                        </group>
-                        <group>
-                            <field name="number"/>
-                            <field name="date_invoice"/>
-                            <field name="period_id" domain="[('state', '=', 'draft')]"
-                                groups="account.group_account_user" widget="selection"/>
-                            <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"
-                                groups="account.group_account_user"/>
-                            <field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]"
-                                name="account_id" groups="account.group_account_user"/>
-                            <field name="currency_id"/>
-                            <field name="type" invisible="1"/>
-                        </group>
-                        <group>
-                            <label for="reference"/>
+                    </h2>
+                    <group>
+                    	<group>
+	                    	<field name="date_invoice"/>
+	                    	<field name="date_due"/>
+	                    	<field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
+	                        <label for="reference"/>
                             <div>
                                 <field name="reference_type"/>
                                 <field name="reference" placeholder="Payment Reference"/>
                             </div>
-                            <field name="date_due"/>
+                        </group>
+                        <group>
+                        	<field name="fiscal_position" widget="selection"/>
+                        	<field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"
+	                                groups="account.group_account_user"/>
+	                        <field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]"
+	                                name="account_id" groups="account.group_account_user"/>
+                            <field name="currency_id"/>
+                           
+                        </group>
+                        <group>
+                            <field name="type" invisible="1"/>
                         </group>
                     </group>
                     <notebook>
@@ -232,15 +241,13 @@
                         </page>
                         <page string="Other Info">
                             <group col="4">
-                                <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
+                            	<field name="payment_term" widget="selection"/>
+                            	<field name="user_id"/>
+                            	<field name="move_id" groups="account.group_account_user"/>
+                            	<field name="name"/>
+                                <field name="period_id" domain="[('state', '=', 'draft')]"
+                                groups="account.group_account_user" widget="selection"/>
                                 <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
-                                <newline/>
-                                <field name="payment_term" widget="selection"/>
-                                <field name="name"/>
-                                <newline/>
-                                <field name="origin" placeholder="PO0025"/>
-                                <field name="user_id"/>
-                                <field name="move_id" groups="account.group_account_user"/>
                             </group>
                         </page>
                         <page string="Payments">
@@ -364,16 +371,14 @@
                         </page>
                         <page string="Other Info">
                             <group col="4">
+                            	<field name="user_id"/>
+                            	<field name="origin" placeholder="SO0032"/>
                                 <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
-                                <newline/>
                                 <field name="date_due"/>
-                                <field name="user_id"/>
-                                <newline/>
-                                <field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id"/>
-                                <field name="origin" placeholder="SO0032"/>
                                 <field name="move_id" groups="account.group_account_user"/>
+                                <field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id"/>
                             </group>
-                            <field name="comment" placeholder="Add an additional information in the invoice..."/>
+                            <field name="comment" placeholder="Terms and Conditions..."/>
                         </page>
                         <page string="Payments">
                             <field name="payment_ids">
diff --git a/addons/account_asset/account_asset_invoice_view.xml b/addons/account_asset/account_asset_invoice_view.xml
index fe1435d4745..4af0c6568fe 100644
--- a/addons/account_asset/account_asset_invoice_view.xml
+++ b/addons/account_asset/account_asset_invoice_view.xml
@@ -12,7 +12,7 @@
         <field name="inherit_id" ref="account.view_invoice_line_form"/>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <field name="account_id" position="after">
+            <field name="name" position="after">
                 <field name="asset_category_id"/>
             </field>
         </field>
diff --git a/addons/account_invoice_layout/account_invoice_layout_view.xml b/addons/account_invoice_layout/account_invoice_layout_view.xml
index e9789b8199e..7cf4c0a821a 100644
--- a/addons/account_invoice_layout/account_invoice_layout_view.xml
+++ b/addons/account_invoice_layout/account_invoice_layout_view.xml
@@ -9,7 +9,7 @@
             <field name="inherit_id" ref="account.view_invoice_line_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <field name="name" position="before">
+                <field name="product_id" position="before">
                     <field name="state" on_change="onchange_invoice_line_view(state)" />
                     <field name="sequence"/>
                 </field>

From df0a9899c962cd982fdb4a39935ef563b6f3ff8f Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 25 Jun 2012 16:16:43 +0530
Subject: [PATCH 016/171] [IMP]stock : Minore view improvemnetas

bzr revid: dbr@tinyerp.com-20120625104643-jm9axgyr1n54nyp6
---
 addons/stock/stock_view.xml                   |  1 +
 .../stock_planning_createlines_view.xml       | 22 +++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 8e058d3cb89..b5235a67678 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -123,6 +123,7 @@
                 <sheet>
                     <h1>
                         <field name="name" placeholder="Annual inventory" class="oe_inline"/>
+                        <span> - </span>
                         <field name="date" class="oe_inline"/>
                     </h1>
                     <div>
diff --git a/addons/stock_planning/wizard/stock_planning_createlines_view.xml b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
index 48f35201cda..35f8e1c520c 100644
--- a/addons/stock_planning/wizard/stock_planning_createlines_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
@@ -11,13 +11,21 @@
                     <header>
                         <button icon="gtk-ok" name="create_planning" string="Create" type="object"/>
                     </header>
-                    <group col="4">
-                        <field name="period_id" widget="one2many_list"/>
-                        <field name="company_id" widget= "selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
-                        <field name="warehouse_id" domain = "[('company_id','=',company_id)] "/>
-                        <field name="forecasted_products"/>
-                        <field name="product_categ_id" attrs="{'required':[('forecasted_products','=',0)]}" widget="one2many_list"/>
-                    </group>
+                    <sheet>
+                        <group>
+                            <field name="company_id" widget= "selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
+                            <field name="warehouse_id" domain = "[('company_id','=',company_id)] "/>
+                            <field name="forecasted_products"/>
+                        </group>
+                        <newline/>
+                        <group string="Period">
+                            <field name="period_id" widget="one2many_list" nolabel="1"/>
+                        </group>
+                        <newline/>
+                        <group string="Product category">
+                            <field name="product_categ_id" attrs="{'required':[('forecasted_products','=',0)]}" widget="one2many_list" nolabel="1"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>

From 15424766b9ba0441b342804b6b227f7bf70bdcf0 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 25 Jun 2012 16:26:32 +0530
Subject: [PATCH 017/171] [IMP]stock : Remove Forcefully added widget= o2m_list

bzr revid: dbr@tinyerp.com-20120625105632-s91qpv0v3qs4if5b
---
 .../wizard/stock_planning_createlines_view.xml         | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/addons/stock_planning/wizard/stock_planning_createlines_view.xml b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
index 35f8e1c520c..ed210f510d2 100644
--- a/addons/stock_planning/wizard/stock_planning_createlines_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
@@ -16,14 +16,8 @@
                             <field name="company_id" widget= "selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
                             <field name="warehouse_id" domain = "[('company_id','=',company_id)] "/>
                             <field name="forecasted_products"/>
-                        </group>
-                        <newline/>
-                        <group string="Period">
-                            <field name="period_id" widget="one2many_list" nolabel="1"/>
-                        </group>
-                        <newline/>
-                        <group string="Product category">
-                            <field name="product_categ_id" attrs="{'required':[('forecasted_products','=',0)]}" widget="one2many_list" nolabel="1"/>
+                            <field name="period_id"/>
+                            <field name="product_categ_id" attrs="{'required':[('forecasted_products','=',0)]}"/>
                         </group>
                     </sheet>
                 </form>

From e645dc56beebd2a7812c492c4e84198f07093e86 Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Mon, 25 Jun 2012 18:09:13 +0530
Subject: [PATCH 018/171] [IMP] improve customer payment

bzr revid: shp@tinyerp.com-20120625123913-cojrmo49t7bkmtx6
---
 addons/account_voucher/account_voucher.py      | 11 +++++++++++
 .../account_voucher/account_voucher_view.xml   |  6 ++++--
 .../voucher_payment_receipt_view.xml           | 18 ++++++++++++++----
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 9ca30aed099..3bf03b244c8 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -53,6 +53,15 @@ class account_voucher(osv.osv):
             res[voucher.id] = paid
         return res
 
+    def _amount_all(self, cr, uid, ids, name, args, context=None):
+        res = {}
+        amount = 0.0
+        for voucher in self.browse(cr, uid, ids, context=context):
+            for line in voucher.line_cr_ids:
+                amount += line.amount
+            res[voucher.id] = amount
+        return res
+
     def _get_type(self, cr, uid, context=None):
         if context is None:
             context = {}
@@ -312,6 +321,7 @@ class account_voucher(osv.osv):
             help='The specific rate that will be used, in this voucher, between the selected currency (in \'Payment Rate Currency\' field)  and the voucher currency.'),
         'paid_amount_in_company_currency': fields.function(_paid_amount_in_company_currency, string='Paid Amount in Company Currency', type='float', readonly=True),
         'is_multi_currency': fields.boolean('Multi Currency Voucher', help='Fields with internal purpose only that depicts if the voucher is a multi currency one or not'),
+        'amount_total': fields.function(_amount_all, digits_compute=dp.get_precision('Account'), string='Invoice Total'),
     }
     _defaults = {
         'period_id': _get_period,
@@ -1337,6 +1347,7 @@ class account_voucher_line(osv.osv):
         'amount_unreconciled': fields.function(_compute_balance, multi='dc', type='float', string='Open Balance', store=True, digits_compute=dp.get_precision('Account')),
         'company_id': fields.related('voucher_id','company_id', relation='res.company', type='many2one', string='Company', store=True, readonly=True),
         'currency_id': fields.function(_currency_id, string='Currency', type='many2one', relation='res.currency', readonly=True),
+       
     }
     _defaults = {
         'name': '',
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 6177da71eed..cfb61e09cf9 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -53,11 +53,13 @@
                     <group col="6" colspan="4">
                         <field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
                         <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/>
+                        <field name="name"/>
                         <field name="journal_id" widget="selection" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
                         <field name="type" required="1"/>
-                        <field name="name" colspan="2"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="reference"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                       
+                       
                         <field name="account_id" widget="selection" invisible="True"/>
                     </group>
                     <notebook colspan="4">
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index cfed906e431..93f083fda17 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -304,6 +304,7 @@
                 <sheet>
                     <div class="oe_title">
                         <div class="oe_edit_only">
+                        customer
                             <label for="parter_id" /> 
                         </div>
                         <h1>
@@ -312,12 +313,13 @@
                     </div>
                     <div>
                         Pay
+                      <h2>
                         <field name="amount"
                             invisible="context.get('line_type', False)"
                             string="Paid Amount"
                             class="oe_inline"
                             on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
-                        by
+                         by
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
                             invisible="context.get('line_type', False)"
@@ -325,14 +327,15 @@
                             class="oe_inline"
                             on_change="onchange_journal(journal_id, line_cr_ids, False, partner_id, date, amount, type, company_id, context)"
                             string="Payment Method"/>
+                         </h2>
 
                     </div>
 
                     <group col="6">
                         <field name="currency_id" invisible="1"/>
                         <field name="date" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
+                          <field name="name" colspan="2" invisible="context.get('line_type', False)" placeholder="Invoice SAJ/0042"/>
                         <field name="reference" invisible="context.get('line_type', False)" string="Payment Ref" placeholder="003/10"/>
-                        <field name="name" colspan="2" invisible="context.get('line_type', False)" placeholder="Invoice SAJ/0042"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="account_id"
                             widget="selection"
@@ -376,7 +379,7 @@
                             </field>
                             <group col="3">
                                 <group col="2" string="Internal Notes">
-                                    <field name="narration" colspan="2" nolabel="1"/>
+                                    <field name="narration" colspan="2" nolabel="1" placeholder="Add an internal note"/>
                                 </group>
                                 <group col="4" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
                                     <separator string="Currency Options" colspan="4"/>
@@ -385,6 +388,7 @@
                                     <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
                                     <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
                                 </group>
+                                <group>
                                 <group col="2">
                                     <separator string="Payment Options" colspan="2"/>
                                     <field name="writeoff_amount"/>
@@ -396,8 +400,13 @@
                                            attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
                                     <field name="analytic_id"
                                            groups="analytic.group_analytic_accounting"/>
-                                </group>
+                                </group>  
+                                <group class="oe_subtotal_footer">
+                                    <field name="amount_total" class="oe_subtotal_footer_separator"/>
+                            	</group>
+                            	</group>
                             </group>
+                            
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
                             <group col="4">
@@ -425,6 +434,7 @@
                         </page>
                     </notebook>
                     </sheet>
+                    
                 </form>
             </field>
         </record>

From 6b7047c9c4880802d56065f5bf4ff426dc43b331 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Mon, 25 Jun 2012 18:18:04 +0530
Subject: [PATCH 019/171] [IMP] improved views of account_asset module and also
 added function for Entries feature

bzr revid: bde@tinyerp.com-20120625124804-37hru51o1uyaop3n
---
 addons/account_asset/account_asset.py       | 22 +++++--
 addons/account_asset/account_asset_view.xml | 63 +++++++++++++++------
 2 files changed, 61 insertions(+), 24 deletions(-)

diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index 0799a59a423..27a58d3079b 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -213,13 +213,13 @@ class account_asset_asset(osv.osv):
 
     _columns = {
         'account_move_line_ids': fields.one2many('account.move.line', 'asset_id', 'Entries', readonly=True, states={'draft':[('readonly',False)]}),
-        'name': fields.char('Asset', size=64, required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'name': fields.char('Asset Name', size=64, required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'code': fields.char('Reference', size=32, readonly=True, states={'draft':[('readonly',False)]}),
-        'purchase_value': fields.float('Gross value ', required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'purchase_value': fields.float('Gross Value ', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'currency_id': fields.many2one('res.currency','Currency',required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'company_id': fields.many2one('res.company', 'Company', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'note': fields.text('Note'),
-        'category_id': fields.many2one('account.asset.category', 'Asset category', required=True, change_default=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'category_id': fields.many2one('account.asset.category', 'Asset Category', required=True, change_default=True, readonly=True, states={'draft':[('readonly',False)]}),
         'parent_id': fields.many2one('account.asset.asset', 'Parent Asset', readonly=True, states={'draft':[('readonly',False)]}),
         'child_ids': fields.one2many('account.asset.asset', 'parent_id', 'Children Assets'),
         'purchase_date': fields.date('Purchase Date', required=True, readonly=True, states={'draft':[('readonly',False)]}),
@@ -316,6 +316,16 @@ class account_asset_asset(osv.osv):
         asset_id = super(account_asset_asset, self).create(cr, uid, vals, context=context)
         self.compute_depreciation_board(cr, uid, [asset_id], context=context)
         return asset_id
+    
+    def open_entries(self, cr, uid, ids, context=None):
+        return {
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'account.move.line',
+            'view_id': False,
+            'type': 'ir.actions.act_window',
+            'context':{'search_default_asset_id': ids, 'default_asset_id': ids},
+        }
 
 account_asset_asset()
 
@@ -331,12 +341,12 @@ class account_asset_depreciation_line(osv.osv):
 
     _columns = {
         'name': fields.char('Depreciation Name', size=64, required=True, select=1),
-        'sequence': fields.integer('Sequence of the depreciation', required=True),
+        'sequence': fields.integer('Sequence', required=True),
         'asset_id': fields.many2one('account.asset.asset', 'Asset', required=True),
         'parent_state': fields.related('asset_id', 'state', type='char', string='State of Asset'),
         'amount': fields.float('Depreciation Amount', required=True),
-        'remaining_value': fields.float('Amount to Depreciate', required=True),
-        'depreciated_value': fields.float('Amount Already Depreciated', required=True),
+        'remaining_value': fields.float('Amount to depreciate', required=True),
+        'depreciated_value': fields.float('Amount already depreciated', required=True),
         'depreciation_date': fields.char('Depreciation Date', size=64, select=1),
         'move_id': fields.many2one('account.move', 'Depreciation Entry'),
         'move_check': fields.function(_get_move_check, method=True, type='boolean', string='Posted', store=True)
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 8efe929e471..a126f6d1173 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -70,7 +70,7 @@
             </search>
         </field>
     </record>
-
+    
     <!--
         Asset
      -->
@@ -88,28 +88,40 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
                 </header>
                 <sheet>
-                    <label for="name"/>
-                    <h1><field name="name"/></h1>
+                    <div>
+                        <label for="name"/>
+                        <h1>
+                            <field name="name" class="oe_inline"/> -
+                            <field name="code" class="oe_inline" placeholder="Reference"/>
+                            <button name="open_entries" string="Entries" type="object"/>
+                        </h1>
+                    </div>
                     <label for="category_id"/>
                     <h2><field name="category_id" on_change="onchange_category_id(category_id)"/></h2>
+                    <group>
+                        <group col="2">
+                            <field name="parent_id"/>
+                            <field name="partner_id"/>
+                        </group>
+                        <group col="2">
+                            <field name="company_id" widget="selection" groups="base.group_multi_company" on_change="onchange_company_id(company_id)"/>
+                            <field name="purchase_date"/>
+                            <field name="currency_id"/>
+                            
+                        </group>
+                    </group>
                     <notebook colspan="4">
                         <page string="General">
                         <group>
-                            <group>
-                                <field name="code"/>
-                                <field name="company_id" widget="selection"
-                                   groups="base.group_multi_company" on_change="onchange_company_id(company_id)"/>
-                            </group>
                             <group>
                                 <field name="purchase_value"/>
                                 <field name="salvage_value"/>
                                 <field name="value_residual"/>
-                                <field name="currency_id"/>
                             </group>
                             <group>
-                                <field name="partner_id"/>
-                                <field name="purchase_date"/>
-                                <field name="parent_id"/>
+                                <field name="method"/>
+                                <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
+                                <field name="prorata" attrs="{'invisible': [('method_time','=','end')]}"/>
                             </group>
                             <group>
                                 <field name="method_time" on_change="onchange_method_time(method_time)"/>
@@ -118,11 +130,6 @@
                                 <field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','number')]}"/>
                                 <button name="%(action_asset_modify)d" states="open" string="Change Duration" type="action" icon="terp-stock_effects-object-colorize" colspan="2"/>
                             </group>
-                            <group>
-                                <field name="method"/>
-                                <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
-                                <field name="prorata" attrs="{'invisible': [('method_time','=','end')]}"/>
-                            </group>
                         </group>
                         </page>
                         <page string="Depreciation Board">
@@ -137,11 +144,31 @@
                                   <field name="parent_state" invisible="1"/>
                                   <button name="create_move" attrs="{'invisible':['|',('move_check','!=',False),('parent_state','!=','open')]}" icon="gtk-execute" string="Create Move" type="object"/>
                                </tree>
+                               <form string="Depriciation Lines"> 
+                                   <group>
+                                       <group col="2">
+                                           <field name="asset_id" invisible="1"/>
+                                           <field name="parent_state" invisible="1"/>
+                                           <field name="name"/>
+                                           <field name="amount"/>
+                                           <field name="move_id"/>
+                                           <field name="move_check"/>
+                                           <field name="parent_state" invisible="1"/>
+                                       </group>
+                                       <group col="2">
+                                           <field name="sequence"/>
+                                           <field name="depreciation_date"/>
+                                           <field name="depreciated_value" readonly="1"/>
+                                           <field name="remaining_value" readonly="1"/>
+                                       </group>
+                                   </group>
+                               </form>
                                <graph type="bar">
                                   <field name="name"/>
                                   <field name="amount"/>
                                   <field name="depreciated_value"/>
                                </graph>
+                             
                             </field>
                             <button type="object" name="compute_depreciation_board" string="Compute" icon="terp-stock_format-scientific" colspan="2" attrs="{'invisible':[('state','=','close')]}"/>
                         </page>
@@ -157,7 +184,7 @@
            </form>
        </field>
     </record>
-
+    
     <record model="ir.ui.view" id="view_account_asset_asset_tree">
         <field name="name">account.asset.asset.tree</field>
         <field name="model">account.asset.asset</field>

From fb838181dab5069d838a34d2517a2d4bb6dd7744 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Mon, 25 Jun 2012 19:03:53 +0530
Subject: [PATCH 020/171] [IMP] improved the views of Periodical
 Processing/Recurring Entries/ Define Recurring Entries and Genereate entries
 menus

bzr revid: bde@tinyerp.com-20120625133353-6ncjph9hijgpsxop
---
 addons/account/account.py                             |  2 +-
 addons/account/account_view.xml                       | 11 ++++-------
 .../account/wizard/account_subscription_generate.py   |  2 +-
 .../wizard/account_subscription_generate_view.xml     |  3 ---
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 6e96ce73962..1804c7835ad 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2347,7 +2347,7 @@ class account_subscription(osv.osv):
         'ref': fields.char('Reference', size=16),
         'model_id': fields.many2one('account.model', 'Model', required=True),
         'date_start': fields.date('Start Date', required=True),
-        'period_total': fields.integer('Number of Periods', required=True),
+        'period_total': fields.integer('Number of Period(s)', required=True),
         'period_nbr': fields.integer('Period', required=True),
         'period_type': fields.selection([('day','days'),('month','month'),('year','year')], 'Period Type', required=True),
         'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'Status', required=True, readonly=True),
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index ab46f7519f8..18b5e88899b 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1830,22 +1830,19 @@
                     </header>
                     <sheet>
                         <group>
-                            <group>
+                            <group col="2">
                                 <field name="name"/>
                                 <field name="model_id"/>
                                 <field name="ref"/>
                             </group>
-                            <newline/>
     
-                            <group string="Starts on">
+                            <group col="2">
                                 <field name="date_start"/>
+                                <field name="period_type"/>
+                                <field name="period_nbr"/>
                                 <field name="period_total"/>
                             </group>
     
-                            <group string="Valid Up to">
-                                <field name="period_nbr"/>
-                                <field name="period_type"/>
-                            </group>
                         </group>
                         <separator string="Subscription Lines"/>
                         <field name="lines_id" widget="one2many_list"/>
diff --git a/addons/account/wizard/account_subscription_generate.py b/addons/account/wizard/account_subscription_generate.py
index 8efcd25b789..dc5209ebea0 100644
--- a/addons/account/wizard/account_subscription_generate.py
+++ b/addons/account/wizard/account_subscription_generate.py
@@ -28,7 +28,7 @@ class account_subscription_generate(osv.osv_memory):
     _name = "account.subscription.generate"
     _description = "Subscription Compute"
     _columns = {
-       'date': fields.date('Date', required=True),
+       'date': fields.date('Generate Entries Before', required=True),
     }
     _defaults = {
         'date': lambda *a: time.strftime('%Y-%m-%d'),
diff --git a/addons/account/wizard/account_subscription_generate_view.xml b/addons/account/wizard/account_subscription_generate_view.xml
index bf848bb3776..bd5ba404cdd 100644
--- a/addons/account/wizard/account_subscription_generate_view.xml
+++ b/addons/account/wizard/account_subscription_generate_view.xml
@@ -9,12 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Subscription Compute" version="7.0">
                     <header>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
                         <button icon="gtk-execute" string="Generate Entries"
                             name="action_generate" type="object" />
                     </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>

From 37dc334f0c32cbccf44a5d555982b3300ca01776 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Mon, 25 Jun 2012 19:07:05 +0530
Subject: [PATCH 021/171] [IMP] improve the supplier payment and write check
 view.

bzr revid: nco@tinyerp.com-20120625133705-z4v609vb7wkr46ta
---
 .../account_voucher_view.xml                  | 146 +++++++++++++++++-
 addons/account_voucher/account_voucher.py     |  14 +-
 .../voucher_payment_receipt_view.xml          |  11 +-
 3 files changed, 161 insertions(+), 10 deletions(-)

diff --git a/addons/account_check_writing/account_voucher_view.xml b/addons/account_check_writing/account_voucher_view.xml
index b53bdc35468..7573218229f 100644
--- a/addons/account_check_writing/account_voucher_view.xml
+++ b/addons/account_check_writing/account_voucher_view.xml
@@ -2,14 +2,12 @@
 <openerp>
     <data>
 
-        <!-- Supplier voucher view -->
-        
-        <record model="ir.ui.view" id="view_vendor_payment_check_form">
-            <field name="name">account.voucher.payment.check.form</field>
-            <field name="model">account.voucher</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="account_voucher.view_vendor_payment_form" />
+
+   <!--   <field name="inherit_id" ref="account_voucher.view_vendor_payment_form" />
             <field name="arch" type="xml">
+            	<h1 position="replace">
+                		<field name="partner_id" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id, 'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"  string="Supplier"/>
+            	</h1>
                 <field name="journal_id" position="after">
                     <newline/>
                     <field name="allow_check" invisible="1"/>
@@ -22,7 +20,141 @@
                 <button name="proforma_voucher" position="after">
                     <button name="print_check" icon="gtk-print" string="Print Check" type="object" attrs="{'invisible':['|',('allow_check','!=',1),('state','!=','posted') ]}"/>
                 </button>
+            </field> -->
+
+
+        <!-- Supplier voucher view -->
+        
+        <record model="ir.ui.view" id="view_vendor_payment_check_form">
+            <field name="name">account.voucher.payment.check.form</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            	<form version="7.0">
+                <header>
+                    <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)"/>
+                    <button name="print_check" icon="gtk-print" string="Print Check" type="object" attrs="{'invisible':['|',('allow_check','!=',1),('state','!=','posted') ]}"/>
+                    <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
+                    <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
+                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
+                </header>
+                <sheet string="Bill Payment">
+                    <group col="4">
+                    	<field name="partner_id" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id, 'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"  string="Supplier"/>
+                    	<field name="journal_id"
+                            domain="[('type','in',['bank', 'cash'])]"
+                            invisible="context.get('line_type', False)"
+                            widget="selection"
+                            on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, company_id, context)"
+                            string="Payment Method"/>
+	                    <field name="amount" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/> 
+	                    <field name="amount_in_word" attrs="{'invisible':[('allow_check','!=',1)]}" nolabel="1" colspan="6"/>
+                        <field name="date" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
+                        <field name="reference" invisible="context.get('line_type', False)" string="Payment Ref" placeholder="003/10"/>
+                        <field name="name" colspan="2" invisible="context.get('line_type', False)" placeholder="Invoice SAJ/0042"/>    
+                        <field name="allow_check" invisible="1"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        <field name="account_id"
+                            widget="selection"
+                            invisible="True"/>
+                        <field name="pre_line" invisible="1"/>
+                        <field name="type" invisible="True"/>
+                        <field name="currency_id" invisible="1" colspan="4"/>
+                    </group>
+                    <notebook>
+                        <page string="Payment Information">
+                            <field name="line_dr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
+                                <tree string="Supplier Invoices and Outstanding transactions" editable="bottom" colors="gray:amount==0">
+                                    <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
+                                        on_change="onchange_move_line_id(move_line_id)"
+                                        domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
+                                        required="1"
+                                        />
+                                    <field name="account_id" groups="base.group_no_one" domain="[('type','=','payable')]"/>
+                                    <field name="date_original" readonly="1"/>
+                                    <field name="date_due" readonly="1"/>
+                                    <field name="amount_original" readonly="1"/>
+                                    <field name="amount_unreconciled" readonly="1"/>
+                                    <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)"/>
+                                    <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
+                                </tree>
+                            </field>
+                            <field name="line_cr_ids" attrs="{'invisible': [('pre_line','=',False)]}" context="{'journal_id':journal_id, 'partner_id':partner_id}">
+                                <tree string="Credits" editable="bottom" colors="gray:amount==0">
+                                    <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
+                                        on_change="onchange_move_line_id(move_line_id)"
+                                        domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
+                                        required="1"
+                                        />
+                                    <field name="account_id" groups="base.group_no_one" domain="[('type','=','payable')]"/>
+                                    <field name="date_original" readonly="1"/>
+                                    <field name="date_due" readonly="1"/>
+                                    <field name="amount_original" readonly="1"/>
+                                    <field name="amount_unreconciled" readonly="1"/>
+                                    <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)"/>
+                                    <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
+                                </tree>
+                            </field>
+                            <group class="oe_subtotal_footer">
+	                        		<field name="amount_total" class="oe_subtotal_footer_separator"/>
+	                        	</group>
+                            <group>
+                                <group string="Internal Notes">
+                                    <field name="narration" colspan="2" nolabel="1"/>
+                                </group>
+                                <group>
+                                    <group col="4" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
+                                        <separator string="Currency Options" colspan="4"/>
+                                        <field name="is_multi_currency" invisible="1"/>
+                                        <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
+                                        <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
+                                        <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
+                                    </group>
+                                    <group col="2">
+                                        <separator string="Payment Options" colspan="2"/>
+                                        <field name="writeoff_amount"/>
+                                        <field name="payment_option" required="1"/>
+                                        <field name="writeoff_acc_id"
+                                               attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
+                                               domain="[('type','=','other')]"/>
+                                        <field name="comment"
+                                               attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
+                                        <field name="analytic_id"
+                                               groups="analytic.group_analytic_accounting"/>
+                                    </group>
+                                </group>
+                            </group>
+                        </page>
+                        <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
+                            <group col="4">
+                                <field name="period_id"/>
+                                <field name="audit"/>
+                                <field name="number" attrs="{'readonly':[('allow_check','!=',1)]}" />
+                            </group>
+                            <field name="move_ids" readonly="1">
+                               <tree string="Journal Items">
+                                   <field name="move_id"/>
+                                   <field name="ref"/>
+                                   <field name="date"/>
+                                   <field name="statement_id"/>
+                                   <field name="partner_id"/>
+                                   <field name="account_id"/>
+                                   <field name="name"/>
+                                   <field name="debit"/>
+                                   <field name="credit"/>
+                                   <field name="state"/>
+                                   <field name="reconcile_id"/>
+                                   <field name="amount_currency"/>
+                                   <field name="currency_id"/>
+                               </tree>
+                            </field>
+                        </page>
+                    </notebook>
+                    </sheet>
+                </form>
             </field>
+       
         </record>
 
         <record id="action_write_check" model="ir.actions.act_window">
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 9ca30aed099..f7f18f89d3e 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -247,7 +247,18 @@ class account_voucher(osv.osv):
                     rate = voucher_rate * company_currency_rate
             res[voucher.id] =  voucher.amount / rate
         return res
-
+    def _amount_all(self, cr, uid, ids, name, args, context=None):
+        print ids, "\n name ",name, "\n args ::> ", args, "\n context ::> ",context
+        res = {}
+        amount = 0.0
+        for voucher in self.browse(cr, uid, ids, context=context):
+            print "voucher :> ",voucher 
+            for line in voucher.line_dr_ids:
+                print "line :> ",line
+                amount += line.amount
+                print "amount ::>>  ",amount
+            res[voucher.id] = amount
+        return res
     _name = 'account.voucher'
     _description = 'Accounting Voucher'
     _order = "date desc, id desc"
@@ -312,6 +323,7 @@ class account_voucher(osv.osv):
             help='The specific rate that will be used, in this voucher, between the selected currency (in \'Payment Rate Currency\' field)  and the voucher currency.'),
         'paid_amount_in_company_currency': fields.function(_paid_amount_in_company_currency, string='Paid Amount in Company Currency', type='float', readonly=True),
         'is_multi_currency': fields.boolean('Multi Currency Voucher', help='Fields with internal purpose only that depicts if the voucher is a multi currency one or not'),
+        'amount_total': fields.function(_amount_all, digits_compute=dp.get_precision('Account'), string='Invoice Total'),
     }
     _defaults = {
         'period_id': _get_period,
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index cfed906e431..ac3bbe93fbb 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -150,8 +150,10 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
                 <sheet string="Bill Payment">
-                    <group col="6">
-                        <field name="partner_id" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id, 'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"  string="Supplier"/>
+                	<h1>
+                		<field name="partner_id" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id, 'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"  string="Supplier"/>
+            		</h1>
+                    <group col="4">
                         <field name="amount" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
@@ -204,6 +206,9 @@
                                     <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
                                 </tree>
                             </field>
+                            <group class="oe_subtotal_footer">
+	                        	<field name="amount_total" class="oe_subtotal_footer_separator"/>
+	                        </group>
                             <group>
                                 <group string="Internal Notes">
                                     <field name="narration" colspan="2" nolabel="1"/>
@@ -228,7 +233,9 @@
                                         <field name="analytic_id"
                                                groups="analytic.group_analytic_accounting"/>
                                     </group>
+	                                
                                 </group>
+                                
                             </group>
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">

From 20a04f01de32be4bb203275b2504c5cf11c71a34 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Tue, 26 Jun 2012 11:11:14 +0530
Subject: [PATCH 022/171] [IMP] improve view for supplier payment and write
 checks.

bzr revid: nco@tinyerp.com-20120626054114-nh23jv8dyu98areu
---
 addons/account_check_writing/account_voucher_view.xml   | 7 +++----
 addons/account_voucher/account_voucher.py               | 8 ++------
 addons/account_voucher/voucher_payment_receipt_view.xml | 4 ++--
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/addons/account_check_writing/account_voucher_view.xml b/addons/account_check_writing/account_voucher_view.xml
index 7573218229f..d52a595796e 100644
--- a/addons/account_check_writing/account_voucher_view.xml
+++ b/addons/account_check_writing/account_voucher_view.xml
@@ -96,9 +96,9 @@
                                     <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
                                 </tree>
                             </field>
-                            <group class="oe_subtotal_footer">
-	                        		<field name="amount_total" class="oe_subtotal_footer_separator"/>
-	                        	</group>
+                            <group class="oe_subtotal_footer oe_right">
+	                        		<field name="amount_line_total" class="oe_subtotal_footer_separator"/>
+	                        </group>
                             <group>
                                 <group string="Internal Notes">
                                     <field name="narration" colspan="2" nolabel="1"/>
@@ -154,7 +154,6 @@
                     </sheet>
                 </form>
             </field>
-       
         </record>
 
         <record id="action_write_check" model="ir.actions.act_window">
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index f7f18f89d3e..21b0a785da6 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -247,16 +247,12 @@ class account_voucher(osv.osv):
                     rate = voucher_rate * company_currency_rate
             res[voucher.id] =  voucher.amount / rate
         return res
-    def _amount_all(self, cr, uid, ids, name, args, context=None):
-        print ids, "\n name ",name, "\n args ::> ", args, "\n context ::> ",context
+    def _amount_total(self, cr, uid, ids, name, args, context=None):
         res = {}
         amount = 0.0
         for voucher in self.browse(cr, uid, ids, context=context):
-            print "voucher :> ",voucher 
             for line in voucher.line_dr_ids:
-                print "line :> ",line
                 amount += line.amount
-                print "amount ::>>  ",amount
             res[voucher.id] = amount
         return res
     _name = 'account.voucher'
@@ -323,7 +319,7 @@ class account_voucher(osv.osv):
             help='The specific rate that will be used, in this voucher, between the selected currency (in \'Payment Rate Currency\' field)  and the voucher currency.'),
         'paid_amount_in_company_currency': fields.function(_paid_amount_in_company_currency, string='Paid Amount in Company Currency', type='float', readonly=True),
         'is_multi_currency': fields.boolean('Multi Currency Voucher', help='Fields with internal purpose only that depicts if the voucher is a multi currency one or not'),
-        'amount_total': fields.function(_amount_all, digits_compute=dp.get_precision('Account'), string='Invoice Total'),
+        'amount_line_total': fields.function(_amount_total, digits_compute=dp.get_precision('Account'), string='Invoice Total'),
     }
     _defaults = {
         'period_id': _get_period,
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index ac3bbe93fbb..49e989aac00 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -206,8 +206,8 @@
                                     <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
                                 </tree>
                             </field>
-                            <group class="oe_subtotal_footer">
-	                        	<field name="amount_total" class="oe_subtotal_footer_separator"/>
+                            <group class="oe_subtotal_footer oe_right">
+	                        	<field name="amount_line_total" class="oe_subtotal_footer_separator"/>
 	                        </group>
                             <group>
                                 <group string="Internal Notes">

From 08d73d0fe19e22d5ff3830e358eaaf59adab2e8f Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 26 Jun 2012 12:05:57 +0530
Subject: [PATCH 023/171] [IMP] stock : Remove Extra group and lines

bzr revid: dbr@tinyerp.com-20120626063557-qye4e37mlp00i80u
---
 addons/stock/stock_view.xml                   |  2 +-
 addons/stock_planning/stock_planning_view.xml | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index b5235a67678..78be02ad324 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -144,7 +144,7 @@
                                 <field name="state" invisible="True"/>
                             </tree>
                             <form string="Products" version="7.0">
-                                <group col="4">
+                                <group>
                                     <field domain="[('usage','=','internal')]" name="location_id"/>
                                     <field context="{'location':location_id, 'uom':product_uom, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)"  domain="[('type','&lt;&gt;','service')]"/>
                                     <field name="product_qty"/>
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index a0c8481d6e5..0c610c090ff 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -244,7 +244,7 @@
             <field name="arch" type="xml">
                 <form string="Stock Planning" version="7.0">
                     <sheet>
-                        <group col="4">
+                        <group>
                             <group string = "General Info">
                                 <field name="company_id" select = "1" widget= "selection"
                                              on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
@@ -263,8 +263,7 @@
                                 <field name="maximum_op"/>
                             </group>
                         </group>
-                        <newline/>
-                        <group col="4">
+                        <group>
                             <group string = "Current Period Situation">
                                 <field name="stock_start"/>
                                 <field name="already_out"/>
@@ -276,8 +275,7 @@
                                 <field name="confirmed_forecasts_only"/>
                             </group>
                         </group>
-                        <newline/>
-                        <group col="4">
+                        <group>
                             <group string = "Planning and Situation for Calculated Period">
                                 <field name="planned_outgoing"/>
                                 <field name="outgoing"/>
@@ -296,8 +294,6 @@
                                 <field name="procure_to_stock"/>
                             </group>
                         </group>
-                        <newline/>
-                        <newline/>
                         <group string = "Internal Supply">
                             <button name="internal_supply" string="Supply from Another Warehouse" icon="gtk-convert"  type="object" colspan="2"/>
                             <field name="supply_warehouse_id" domain = "[('company_id','=',company_id)] "/>

From c6c9b565c197c6b7a3c5ea298e1daae58cf04718 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Tue, 26 Jun 2012 12:44:45 +0530
Subject: [PATCH 024/171] [IMP] improved the view of account_budget module

bzr revid: bde@tinyerp.com-20120626071445-au3q28spbnm3hzhp
---
 addons/account_budget/account_budget_view.xml | 92 +++++++++++--------
 1 file changed, 55 insertions(+), 37 deletions(-)

diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 2e939ae7b58..21627b3c70d 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -108,48 +108,66 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form version="7.0">
-                <header>
-                    <button string="Confirm" name="confirm" states="draft" type="workflow" />
-                    <button string="Approve" name="validate" states="confirm" type="workflow"/>
-                    <button string="Done" name="done" states="validate" type="workflow"   />
-                    <button name="draft" states="cancel" string="Reset to Draft" type="workflow"/>
-                    <button string="Cancel" name="cancel" states="confirm,validate" type="workflow"/>
-                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
-                </header>
-                <sheet string="Budget">
-                    <group col="4">
-                            <field name="name" colspan="1" attrs="{'readonly':[('state','!=','draft')]}"/>
-                            <field name="code" colspan="1" attrs="{'readonly':[('state','!=','draft')]}"/>
-                            <field name="creating_user_id" attrs="{'readonly':[('state','!=','draft')]}"/>
-                            <field name="validating_user_id" readonly="True" attrs="{'readonly':[('state','!=','draft')]}"/>
-                            <field name="date_from" attrs="{'readonly':[('state','!=','draft')]}"/>
-                            <field name="date_to" attrs="{'readonly':[('state','!=','draft')]}"/>
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            <field name="crossovered_budget_line" colspan="4" nolabel="1" attrs="{'readonly':[('state','!=','draft')]}">
-                                <tree string="Budget Lines">
-                                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
-                                    <field name="general_budget_id"/>
-                                    <field name="date_from"/>
-                                    <field name="date_to"/>
-                                    <field name="paid_date"/>
-                                    <field name="planned_amount" sum="Planned Amount"/>
-                                    <field name="practical_amount" sum="Practical Amount"/>
-                                    <field name="theoritical_amount" sum="Theoretical Amount"/>
-                                    <field name="percentage"/>
-                                </tree>
-                                <form string="Budget Lines" version="7.0">
-                                    <group col="4">
+                    <header>
+                        <button string="Confirm" name="confirm" states="draft" type="workflow" />
+                        <button string="Approve" name="validate" states="confirm" type="workflow"/>
+                        <button string="Done" name="done" states="validate" type="workflow"   />
+                        <button name="draft" states="cancel" string="Reset to Draft" type="workflow"/>
+                        <button string="Cancel" name="cancel" states="confirm,validate" type="workflow"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
+                    </header>
+                    <sheet string="Budget">
+                        <group col="4">
+                            <group>
+                                <field name="name" colspan="1" attrs="{'readonly':[('state','!=','draft')]}"/>
+                                <field name="creating_user_id" attrs="{'readonly':[('state','!=','draft')]}"/>
+                                <field name="validating_user_id" readonly="True" attrs="{'readonly':[('state','!=','draft')]}"/>
+                            </group>
+                            <group>
+                                <field name="code" colspan="1" attrs="{'readonly':[('state','!=','draft')]}"/>
+                                <label for="date_from" string="Duration"/>
+                                <div>
+                                    <field name="date_from" attrs="{'readonly':[('state','!=','draft')]}"/> - 
+                                    <field name="date_to" attrs="{'readonly':[('state','!=','draft')]}" nolabel="1"/>
+                                </div>
+                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            </group>
+                        </group>
+                        <notebook>
+                            <page string="Budget Lines">
+                                <field name="crossovered_budget_line" colspan="4" nolabel="1" attrs="{'readonly':[('state','!=','draft')]}">
+                                    <tree string="Budget Lines">
                                         <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                                         <field name="general_budget_id"/>
                                         <field name="date_from"/>
                                         <field name="date_to"/>
                                         <field name="paid_date"/>
-                                        <field name="planned_amount"/>
-                                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                                    </group>
-                                </form>
-                            </field>
-                        </group>
+                                        <field name="planned_amount" sum="Planned Amount"/>
+                                        <field name="practical_amount" sum="Practical Amount"/>
+                                        <field name="theoritical_amount" sum="Theoretical Amount"/>
+                                        <field name="percentage"/>
+                                    </tree>
+                                    <form string="Budget Lines" version="7.0">
+                                        <group col="4">
+                                            <group>
+                                                <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
+                                                <field name="general_budget_id"/>
+                                                <field name="planned_amount"/>
+                                                <label for="date_from" string="Duration"/>
+                                                <div>
+                                                    <field name="date_from"/>-
+                                                    <field name="date_to"/>
+                                                </div>
+                                            </group>
+                                            <group>
+                                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                                                <field name="paid_date"/>
+                                            </group>
+                                        </group>
+                                    </form>
+                                </field>
+                            </page>
+                        </notebook>
                     </sheet>
                 </form>
             </field>

From 5f4975106914ba8894eba3443284050f8ad907f3 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Tue, 26 Jun 2012 14:43:10 +0530
Subject: [PATCH 025/171] [IMP] improve customer invoice view.

bzr revid: nco@tinyerp.com-20120626091310-5srg6va55n52rvxg
---
 addons/account/account_invoice_view.xml       | 33 +++++++++++--------
 .../account_asset_invoice_view.xml            |  2 +-
 .../account_invoice_layout.py                 |  2 +-
 .../account_invoice_layout_view.xml           |  2 ++
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 7ac6e6154ab..5eab7e62651 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -52,20 +52,25 @@
             <field name="arch" type="xml">
                 <form string="Invoice Line" version="7.0">
                     <group col="4">
-                        <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
-                        <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
-                        <field name="name"/>
-                        <label string="Quantity" for="quantity" align="1.0"/>
-                        <div>
-                            <field name="quantity" class="oe_inline"/>
-                            <field name="uos_id" class="oe_inline"
-                              on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
-                        </div>
-                        <field name="company_id" groups="base.group_multi_company" readonly="1"/>
-                        <field name="price_unit"/>
-                        <field name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]" widget="many2many_tags"/>
-                        <field name="discount"/>
-                        <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
+                    	<group>
+	                        <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
+	                        <field name="name"/>
+	                        <label string="Quantity" for="quantity" align="1.0"/>
+	                        <div>
+	                            <field name="quantity" class="oe_inline"/>
+	                            <field name="uos_id" class="oe_inline"
+	                              on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
+	                        </div>
+	                        <field name="price_unit"/>
+	                        <field name="discount"/>
+                        </group>
+                        
+                        <group>
+                        	<field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
+                        	<field name="company_id" groups="base.group_multi_company" readonly="1"/>
+                        	<field name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]" widget="many2many_tags"/>
+                        	<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
+                        </group>
                     </group>
                     <separator string="Notes"/>
                     <field name="note"/>
diff --git a/addons/account_asset/account_asset_invoice_view.xml b/addons/account_asset/account_asset_invoice_view.xml
index 4af0c6568fe..fe1435d4745 100644
--- a/addons/account_asset/account_asset_invoice_view.xml
+++ b/addons/account_asset/account_asset_invoice_view.xml
@@ -12,7 +12,7 @@
         <field name="inherit_id" ref="account.view_invoice_line_form"/>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <field name="name" position="after">
+            <field name="account_id" position="after">
                 <field name="asset_category_id"/>
             </field>
         </field>
diff --git a/addons/account_invoice_layout/account_invoice_layout.py b/addons/account_invoice_layout/account_invoice_layout.py
index 68ae537f20e..1336914fb35 100644
--- a/addons/account_invoice_layout/account_invoice_layout.py
+++ b/addons/account_invoice_layout/account_invoice_layout.py
@@ -160,7 +160,7 @@ class account_invoice_line(osv.osv):
                 ('line','Separator Line'),
                 ('break','Page Break'),]
             ,'Type', select=True, required=True),
-        'sequence': fields.integer('Sequence Number', select=True, help="Gives the sequence order when displaying a list of invoice lines."),
+        'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of invoice lines."),
         'functional_field': fields.function(_fnct, arg=None, fnct_inv=None, fnct_inv_arg=None, type='char', fnct_search=None, obj=None, store=False, string="Source Account"),
     }
 
diff --git a/addons/account_invoice_layout/account_invoice_layout_view.xml b/addons/account_invoice_layout/account_invoice_layout_view.xml
index 7cf4c0a821a..faaed1dfd79 100644
--- a/addons/account_invoice_layout/account_invoice_layout_view.xml
+++ b/addons/account_invoice_layout/account_invoice_layout_view.xml
@@ -11,6 +11,8 @@
             <field name="arch" type="xml">
                 <field name="product_id" position="before">
                     <field name="state" on_change="onchange_invoice_line_view(state)" />
+                </field>
+                <field name="account_id" position="before">
                     <field name="sequence"/>
                 </field>
             </field>

From 022d717f1016c3c040f33f69f6e27c31d0068cab Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Tue, 26 Jun 2012 14:46:51 +0530
Subject: [PATCH 026/171] [IMP] improved views of menus under Periodical
 Processing from useability point of view

bzr revid: bde@tinyerp.com-20120626091651-4cugzyz1dj2n4mb1
---
 addons/account/account_view.xml               | 21 ++++++++++++-------
 .../wizard/account_fiscalyear_close_state.py  |  2 +-
 .../wizard/account_fiscalyear_close_state.xml |  4 +---
 .../wizard/account_fiscalyear_close_view.xml  |  2 --
 .../account_open_closed_fiscalyear_view.xml   |  1 -
 .../account/wizard/account_use_model_view.xml |  4 +---
 .../wizard/account_validate_move_view.xml     |  4 +---
 .../wizard/wizard_asset_compute_view.xml      |  3 ---
 .../wizard/account_followup_print.py          |  6 +++---
 .../wizard/account_followup_print_view.xml    | 15 +++++--------
 10 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 18b5e88899b..9a77a9286e3 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -105,13 +105,20 @@
                 </header>
                 <sheet>
                     <group col="4">
-                        <field name="name"/>
-                        <field name="code"/>
-                        <field name="date_start"/>
-                        <field name="date_stop"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                        <field name="fiscalyear_id" widget="selection"/>
-                        <field name="special"/>
+                        <group>
+                            <field name="name"/>
+                            <field name="fiscalyear_id" widget="selection"/>
+                            <label for="date_start" string="Duration"/>
+                            <div>
+                                <field name="date_start"/>- 
+                                <field name="date_stop" nolabel="1"/>
+                            </div>
+                        </group>
+                        <group>
+                            <field name="code"/>
+                            <field name="special"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        </group>
                     </group>
                 </sheet>
                 </form>
diff --git a/addons/account/wizard/account_fiscalyear_close_state.py b/addons/account/wizard/account_fiscalyear_close_state.py
index 68c758eb495..1d73c852a8d 100644
--- a/addons/account/wizard/account_fiscalyear_close_state.py
+++ b/addons/account/wizard/account_fiscalyear_close_state.py
@@ -29,7 +29,7 @@ class account_fiscalyear_close_state(osv.osv_memory):
     _description = "Fiscalyear Close state"
     _columns = {
        'fy_id': fields.many2one('account.fiscalyear', \
-                                 'Fiscal Year to close', required=True, help="Select a fiscal year to close"),
+                                 'Fiscal Year to Close', required=True, help="Select a fiscal year to close"),
     }
 
     def data_save(self, cr, uid, ids, context=None):
diff --git a/addons/account/wizard/account_fiscalyear_close_state.xml b/addons/account/wizard/account_fiscalyear_close_state.xml
index e141b4fc911..5c9e1dea50d 100644
--- a/addons/account/wizard/account_fiscalyear_close_state.xml
+++ b/addons/account/wizard/account_fiscalyear_close_state.xml
@@ -8,10 +8,8 @@
             <field name="arch" type="xml">
                 <form string="Close states of Fiscal year and periods" version="7.0">
                 <header>
-                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    <button icon="terp-locked" string="Close Fiscalyear" name="data_save" type="object"/>
+                    <button icon="terp-locked" string="Close Fiscal Year" name="data_save" type="object"/>
                 </header>
-                <separator string="Close states of Fiscal year and periods"/>
                 <label string ="If no additional entries should be recorded on a fiscal year, you can close it from here. It will close all opened periods in this year that will make impossible any new entry record. Close a fiscal year when you need to finalize your end of year results definitive "/>
                 <group>
                     <field name="fy_id"  domain="[('state','=','draft')]"/>
diff --git a/addons/account/wizard/account_fiscalyear_close_view.xml b/addons/account/wizard/account_fiscalyear_close_view.xml
index aa34fefd128..b27a0279fb3 100644
--- a/addons/account/wizard/account_fiscalyear_close_view.xml
+++ b/addons/account/wizard/account_fiscalyear_close_view.xml
@@ -9,9 +9,7 @@
                 <form string="Generate Fiscal Year Opening Entries" version="7.0">
                     <header>
                         <button icon="gtk-execute" string="Create" name="data_save" type="object"/>
-                        <button icon="gtk-cancel" special="cancel" string="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/>
                     <group col="4">
diff --git a/addons/account/wizard/account_open_closed_fiscalyear_view.xml b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
index a4e338f3b9e..6df9e848411 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear_view.xml
+++ b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
@@ -8,7 +8,6 @@
             <field name="arch" type="xml">
                 <form string="Choose Fiscal Year " version="7.0">
                     <header>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                         <button icon="terp-gtk-go-back-rtl" string="Open" name="remove_entries" type="object"/>
                     </header>
                     <group>
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index 682236a0610..bf069b3f16b 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -10,12 +10,10 @@
             <form string="Create Entries From Models" version="7.0">
                 <header>
                     <button icon="gtk-execute" string="Create Entries" name="create_entries" type="object"/>
-                    <button icon="gtk-cancel" special="cancel" string="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"/>
+                    <field name="model" nolabel="1"/>
                 </group>
             </form>
             </field>
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index 2ee826fe1f7..8f991257f9a 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -11,9 +11,7 @@
             <form string="Post Journal Entries" version="7.0">
                 <header>
                     <button icon="terp-camera_test" string="Approve" name="validate_move" type="object"/>
-                    <button icon="gtk-cancel" special="cancel" string="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"/>
@@ -24,7 +22,7 @@
         </record>
 
         <record id="action_validate_account_move" model="ir.actions.act_window">
-            <field name="name">Open Journal</field>
+            <field name="name">Post Journal Entries</field>
             <field name="res_model">validate.account.move</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
diff --git a/addons/account_asset/wizard/wizard_asset_compute_view.xml b/addons/account_asset/wizard/wizard_asset_compute_view.xml
index 5d2bc39a751..6c517d5ed14 100644
--- a/addons/account_asset/wizard/wizard_asset_compute_view.xml
+++ b/addons/account_asset/wizard/wizard_asset_compute_view.xml
@@ -9,10 +9,7 @@
                 <form string="Compute Asset" version="7.0">
                     <header>
                         <button icon="gtk-execute" string="Compute" name="asset_compute" type="object"/>
-                        <button icon="gtk-cancel" special="cancel" string="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>
diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py
index 088ff868ca0..555ba1a34cf 100644
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@@ -31,7 +31,7 @@ class account_followup_print(osv.osv_memory):
     _description = 'Print Followup & Send Mail to Customers'
     _columns = {
         'date': fields.date('Follow-up Sending Date', required=True, help="This field allow you to select a forecast date to plan your follow-ups"),
-        'followup_id': fields.many2one('account_followup.followup', 'Follow-up', required=True),
+        'followup_id': fields.many2one('account_followup.followup', 'Follow-Up', required=True),
     }
 
     def _get_followup(self, cr, uid, context=None):
@@ -121,10 +121,10 @@ class account_followup_print_all(osv.osv_memory):
     _description = 'Print Followup & Send Mail to Customers'
     _columns = {
         'partner_ids': fields.many2many('account_followup.stat.by.partner', 'partner_stat_rel', 'osv_memory_id', 'partner_id', 'Partners', required=True),
-        'email_conf': fields.boolean('Send email confirmation'),
+        'email_conf': fields.boolean('Send Email Confirmation'),
         'email_subject': fields.char('Email Subject', size=64),
         'partner_lang': fields.boolean('Send Email in Partner Language', help='Do not change message text, if you want to send email in partner language, or configure from company'),
-        'email_body': fields.text('Email body'),
+        'email_body': fields.text('Email Body'),
         'summary': fields.text('Summary', required=True, readonly=True),
         'test_print': fields.boolean('Test Print', help='Check if you want to print followups without changing followups level.')
     }
diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index 32b6383a8cc..9f0474ca8b7 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -7,13 +7,10 @@
             <field name="model">account.followup.print</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Send followups" version="7.0">
+            <form string="Send Follow-Ups" version="7.0">
                 <header>
                     <button name="do_continue" string="Continue" colspan="1" type="object" icon="gtk-ok"/>
-                    <button special="cancel"  string="Cancel" icon='gtk-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"/>
@@ -23,7 +20,7 @@
         </record>
 
         <record id="action_account_followup_print" model="ir.actions.act_window">
-            <field name="name">Send followups</field>
+            <field name="name">Send Follow-Ups</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.followup.print</field>
             <field name="view_type">form</field>
@@ -75,11 +72,10 @@
             <field name="model">account.followup.print.all</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Send followups" version="7.0">
+            <form string="Send Follow-Ups" version="7.0">
                 <header>
                     <button name="do_mail" string="Send Mails" colspan="1" type="object" icon="gtk-execute"/>
-                    <button name="do_print" string="Print Follow Ups" colspan="1" type="object" icon="gtk-print"/>
-                    <button special="cancel" string="Cancel" icon='gtk-cancel'/>
+                    <button name="do_print" string="Print Follow-Ups" colspan="1" type="object" icon="gtk-print"/>
                 </header>
                 <notebook>
                     <page string="Partner Selection">
@@ -91,7 +87,6 @@
                             <field name="partner_lang" colspan="4"/>
                             <field name="test_print" colspan="4"/>
                             <field name="email_subject" colspan="4"/>
-                            <separator string="Email Body" colspan="4" />
                             <field name="email_body" colspan="4" nolabel="1"/>
                         </group>
                         <group string="Legend">
@@ -126,7 +121,7 @@
         </record>
 
         <record id="action_account_followup_print_all" model="ir.actions.act_window">
-            <field name="name">Send followups</field>
+            <field name="name">Send Follow-Ups</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.followup.print.all</field>
             <field name="view_type">form</field>

From 6ecc7cc97e31d4a38a6cc12195acb1966b3dc423 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Tue, 26 Jun 2012 15:35:39 +0530
Subject: [PATCH 027/171] [IMP] improve the supplier payment and write check
 view.

bzr revid: nco@tinyerp.com-20120626100539-nu49v8dttvjs5r3t
---
 .../account_voucher_view.xml                  | 34 ++++++-------------
 .../voucher_payment_receipt_view.xml          | 22 +++++++-----
 2 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/addons/account_check_writing/account_voucher_view.xml b/addons/account_check_writing/account_voucher_view.xml
index d52a595796e..8805bc4603b 100644
--- a/addons/account_check_writing/account_voucher_view.xml
+++ b/addons/account_check_writing/account_voucher_view.xml
@@ -2,28 +2,7 @@
 <openerp>
     <data>
 
-
-   <!--   <field name="inherit_id" ref="account_voucher.view_vendor_payment_form" />
-            <field name="arch" type="xml">
-            	<h1 position="replace">
-                		<field name="partner_id" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id, 'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"  string="Supplier"/>
-            	</h1>
-                <field name="journal_id" position="after">
-                    <newline/>
-                    <field name="allow_check" invisible="1"/>
-                    <field name="amount_in_word" attrs="{'invisible':[('allow_check','!=',1)]}" nolabel="1" colspan="6"/>
-                    <newline/>
-                </field>
-                <field name="number" position="replace">
-                    <field name="number" attrs="{'readonly':[('allow_check','!=',1)]}" />
-                </field>
-                <button name="proforma_voucher" position="after">
-                    <button name="print_check" icon="gtk-print" string="Print Check" type="object" attrs="{'invisible':['|',('allow_check','!=',1),('state','!=','posted') ]}"/>
-                </button>
-            </field> -->
-
-
-        <!-- Supplier voucher view -->
+        <!-- Supplier write check view -->
         
         <record model="ir.ui.view" id="view_vendor_payment_check_form">
             <field name="name">account.voucher.payment.check.form</field>
@@ -48,8 +27,15 @@
                             widget="selection"
                             on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, company_id, context)"
                             string="Payment Method"/>
-	                    <field name="amount" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/> 
-	                    <field name="amount_in_word" attrs="{'invisible':[('allow_check','!=',1)]}" nolabel="1" colspan="6"/>
+                    </group>
+                    <group>
+                    	<label for="amount" string="Total" class="oe_inline"/>
+	                    <div>
+	                        <field name="amount" class="oe_inline" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/> -
+	                        <field name="amount_in_word" class="oe_inline" attrs="{'invisible':[('allow_check','!=',1)]}" nolabel="1" colspan="1"/> 
+	                    </div>
+                    </group>
+	                <group col="4">
                         <field name="date" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
                         <field name="reference" invisible="context.get('line_type', False)" string="Payment Ref" placeholder="003/10"/>
                         <field name="name" colspan="2" invisible="context.get('line_type', False)" placeholder="Invoice SAJ/0042"/>    
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 49e989aac00..03cee6d6a14 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -150,17 +150,23 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
                 <sheet string="Bill Payment">
+                	<label for="partner_id" class="oe_edit_only" string="Supplier"/>
                 	<h1>
                 		<field name="partner_id" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id, 'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"  string="Supplier"/>
             		</h1>
-                    <group col="4">
-                        <field name="amount" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
-                        <field name="journal_id"
-                            domain="[('type','in',['bank', 'cash'])]"
-                            invisible="context.get('line_type', False)"
-                            widget="selection"
-                            on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, company_id, context)"
-                            string="Payment Method"/>
+                    <h2>
+                    	Pay
+	                    <field name="amount" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)" nolabel="1"/>
+    	                by
+    	                <field name="journal_id"
+                        domain="[('type','in',['bank', 'cash'])]"
+                        invisible="context.get('line_type', False)"
+                        widget="selection" class="oe_inline"
+                        on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, company_id, context)"
+                        nolabel="1" colspan="4"/>
+            		</h2>
+                    
+                   <group col="4">
                         <field name="date" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
                         <field name="reference" invisible="context.get('line_type', False)" string="Payment Ref" placeholder="003/10"/>
                         <field name="name" colspan="2" invisible="context.get('line_type', False)" placeholder="Invoice SAJ/0042"/>

From e67936f82e2240451af68312522fa8c295fef5ad Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Tue, 26 Jun 2012 15:37:49 +0530
Subject: [PATCH 028/171] [IMP] improved the view of Payment Orders

bzr revid: bde@tinyerp.com-20120626100749-bhgyjcbn8qfp1ckx
---
 addons/account_payment/account_payment.py     | 10 ++++-----
 .../account_payment/account_payment_view.xml  | 22 +++++++++++--------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index 80d7a5419e7..02d12a534db 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -87,9 +87,9 @@ class payment_order(osv.osv):
         return res
 
     _columns = {
-        'date_scheduled': fields.date('Scheduled date if fixed', states={'done':[('readonly', True)]}, help='Select a date if you have chosen Preferred Date to be fixed.'),
+        'date_scheduled': fields.date('Scheduled Date', states={'done':[('readonly', True)]}, help='Select a date if you have chosen Preferred Date to be fixed.'),
         'reference': fields.char('Reference', size=128, required=1, states={'done': [('readonly', True)]}),
-        'mode': fields.many2one('payment.mode', 'Payment mode', select=True, required=1, states={'done': [('readonly', True)]}, help='Select the Payment Mode to be applied.'),
+        'mode': fields.many2one('payment.mode', 'Payment Mode', select=True, required=1, states={'done': [('readonly', True)]}, help='Select the Payment Mode to be applied.'),
         'state': fields.selection([
             ('draft', 'Draft'),
             ('cancel', 'Cancelled'),
@@ -103,9 +103,9 @@ class payment_order(osv.osv):
             ('now', 'Directly'),
             ('due', 'Due date'),
             ('fixed', 'Fixed date')
-            ], "Preferred date", change_default=True, required=True, states={'done': [('readonly', True)]}, help="Choose an option for the Payment Order:'Fixed' stands for a date specified by you.'Directly' stands for the direct execution.'Due date' stands for the scheduled date of execution."),
-        'date_created': fields.date('Creation date', readonly=True),
-        'date_done': fields.date('Execution date', readonly=True),
+            ], "Preferred Date", change_default=True, required=True, states={'done': [('readonly', True)]}, help="Choose an option for the Payment Order:'Fixed' stands for a date specified by you.'Directly' stands for the direct execution.'Due date' stands for the scheduled date of execution."),
+        'date_created': fields.date('Creation Date', readonly=True),
+        'date_done': fields.date('Execution Date', readonly=True),
         'company_id': fields.related('mode', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
     }
 
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index aa4cd18308f..0979ebe049e 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -113,16 +113,20 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
                 </header>
                 <sheet string="Payment order" layout="auto">
-                    <group col="4">
-                      <field name="reference"/>
-                      <field name="mode" widget='selection'/>
-                      <field name="user_id"/>
-                      <field name="date_prefered"/>
-                      <field name="date_scheduled" attrs="{'readonly':[('date_prefered','!=','fixed')]}" />
-                      <field name="company_id" widget='selection' groups="base.group_multi_company"/>
-                      <button name="%(action_create_payment_order)d" string="Select Invoices to Pay"
-                          type="action" attrs="{'invisible':[('state','=','done')]}" icon="gtk-find"/>
+                    <group>
+                        <group>
+                            <field name="reference"/>
+                            <field name="user_id"/>
+                            <field name="mode"/>
+                        </group>                        
+                        <group>
+                            <field name="date_prefered"/>
+                            <field name="date_scheduled" attrs="{'readonly':[('date_prefered','!=','fixed')]}"/>
+                            <field name="company_id" widget='selection' groups="base.group_multi_company"/>
+                        </group>
                     </group>
+                    <button name="%(action_create_payment_order)d" string="Select Invoices to Pay"
+                        type="action" attrs="{'invisible':[('state','=','done')]}" icon="gtk-find"/>
                     <field name="line_ids" context="{'order_id': active_id or False}" >
                         <form string="Payment Line" version="7.0">
                             <notebook>

From 8ca636edb68321ff86cc861805beaf18cf91c0ee Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Tue, 26 Jun 2012 16:38:23 +0530
Subject: [PATCH 029/171] [IMP] change position in preference form of
 res_user_view.xml of mail module

bzr revid: fka@tinyerp.com-20120626110823-gs0mz00muttboarf
---
 addons/mail/res_users_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index 428f53d092e..d382fb258a2 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -9,7 +9,7 @@
             <field name="inherit_id" ref="base.view_users_form_simple_modif"/>
             <field name="arch" type="xml">
             <data>
-                <field name="context_tz" position="after">
+                <field name="context_tz" position="before">
                     <field name="notification_email_pref" readonly="0"/>
                 </field>
             </data>

From defc239d9537cef4099dcf0a6af0474a3d5358e8 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Tue, 26 Jun 2012 16:58:01 +0530
Subject: [PATCH 030/171] [IMP] remove the title "Change my Preferences" And
 rearrenge fields in preferences

bzr revid: fka@tinyerp.com-20120626112801-zw3n8auufwky5a3x
---
 openerp/addons/base/res/res_users_view.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index 82093dadd4b..44e7e77c476 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -202,15 +202,15 @@
                         <h1>
                             <field name="name" readonly="1" class="oe_edit_only"/>
                             (<field name="login" readonly="1" class="oe_edit_only"/>)
-                        </h1>
+                        </h1> 
+                    </div>
+                    <group col="4" string="Preferences">
+                        <field name="context_lang" readonly="0"/>
                         <label for="company_id" class="oe_edit_only"/>
                         <h2>
                             <field name="company_id" widget="selection" readonly="0"
                                 groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>
                         </h2>
-                    </div>
-                    <group col="4" string="Preferences">
-                        <field name="context_lang" readonly="0"/>
                         <field name="context_tz" readonly="0"/>
                     </group>
                     <group string="Email Preferences">
@@ -222,7 +222,6 @@
             </field>
         </record>
         <record id="action_res_users_my" model="ir.actions.act_window">
-            <field name="name">Change My Preferences</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.users</field>
             <field name="view_type">form</field>

From 6ccc52f380ea671bdbd44db12a8c2340b7e02444 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Tue, 26 Jun 2012 18:52:58 +0530
Subject: [PATCH 031/171] [IMP] improve view of Cash Registers.

bzr revid: nco@tinyerp.com-20120626132258-u7ye84qw0yf4dajp
---
 addons/account/account_view.xml | 106 +++++++++++++++++---------------
 1 file changed, 58 insertions(+), 48 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index ab46f7519f8..5a6db76eb8c 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2550,15 +2550,24 @@ action = pool.get('res.config').next(cr, uid, [], context)
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet string="Statement">
-                    <group col="4">
-                        <field name="name"/>
-                        <field name='company_id' widget="selection" groups="base.group_multi_company" />
-                        <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/>
-                        <field name="user_id" readonly="1"/>
-                        <field name="period_id"/>
-                        <field name="currency" invisible="1"/>
-                    </group>
-
+                    <label for="name" class="oe_edit_only"/>
+                    <h1><field name="name" class="oe_inline"/>-<field name="period_id" class="oe_inline"/></h1>
+                    <label for="journal_id" class="oe_edit_only"/>
+                    <h2>
+                    	<field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/>	
+                    </h2>
+                	<group col="4">
+	                    <group>
+	                    	<field name="user_id" readonly="1"/>
+	                    	<field name="total_entry_encoding"/>
+	                   		<field name='company_id' widget="selection" groups="base.group_multi_company" />     
+	                    </group>
+						<group>
+                            <field name="date" attrs="{'readonly':[('state','!=','draft')]}"  on_change="onchange_date(date, company_id)"/>
+                            <field name="closing_date" readonly="1"/>
+                            <field name="currency" invisible="1"/>
+	                   </group>
+                   </group>
                     <notebook>
                         <page string="Cash Transactions" attrs="{'invisible': [('state','=','draft')]}">
                             <field name="line_ids" context="{'date':date}">
@@ -2591,51 +2600,52 @@ action = pool.get('res.config').next(cr, uid, [], context)
                             </field>
                         </page>
                         <page string="CashBox">
-                            <group>
-                                <field name="starting_details_ids" attrs="{'readonly':[('state','!=','draft')]}" nolabel="1">
-                                    <tree string = "Opening Balance" editable="bottom">
-                                        <field name="pieces"/>
-                                        <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
-                                        <field name="subtotal" sum="Total"/>
-                                    </tree>
-                                    <form string = "Opening Balance" version="7.0">
-                                        <field name="pieces"/>
-                                        <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
-                                        <field name="subtotal"/>
-                                    </form>
-                                </field>
-                                <field name="ending_details_ids" attrs="{'readonly':[('state','!=','open')]}" nolabel="1">
-                                    <tree string = "Closing Balance" editable="bottom">
-                                        <field name="pieces"/>
-                                        <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
-                                        <field name="subtotal" sum="Total"/>
-                                    </tree>
-                                    <form string = "Closing Balance" version="7.0">
-                                        <field name="pieces"/>
-                                        <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
-                                        <field name="subtotal"/>
-                                    </form>
-                                </field>
+                            <group col="4">
+                            	<group>
+                            		<label for="starting_details_ids" string="Opening Operations"/><newline/>
+	                                <field name="starting_details_ids" attrs="{'readonly':[('state','!=','draft')]}" nolabel="1">
+	                                    <tree string = "Opening Balance" editable="bottom">
+	                                        <field name="pieces"/>
+	                                        <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
+	                                        <field name="subtotal" sum="Total"/>
+	                                    </tree>
+	                                    <form string = "Opening Balance" version="7.0">
+	                                        <field name="pieces"/>
+	                                        <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
+	                                        <field name="subtotal"/>
+	                                    </form>
+	                                </field>
+	                                <newline/>
+	                                <group class="oe_subtotal_footer oe_right">
+                                		<field name="balance_start" readonly="1" string="Total"/>
+                                	</group>
+                                </group>
+                                <group>
+                                	<label for="ending_details_ids" string="Closing Operations"/><newline/>
+	                                <field name="ending_details_ids" attrs="{'readonly':[('state','!=','open')]}" nolabel="1">
+	                                    <tree string = "Closing Balance" editable="bottom">
+	                                        <field name="pieces"/>
+	                                        <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
+	                                        <field name="subtotal" sum="Total"/>
+	                                    </tree>
+	                                    <form string = "Closing Balance" version="7.0">
+	                                        <field name="pieces"/>
+	                                        <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
+	                                        <field name="subtotal"/>
+	                                    </form>
+	                                </field>
+	                                <newline/>
+	                                <group class="oe_subtotal_footer oe_right">
+	                                	<field name="balance_end_cash" invisible="1" string="Total"/>
+                                		<field name="balance_end" string="Total"/>
+			                        </group>
+	                            </group> 
                             </group>
                         </page>
                         <page string="Journal Entries" attrs="{'invisible': [('state','!=','confirm')]}">
                             <field name="move_line_ids" string="Journal Entries"/>
                         </page>
                     </notebook>
-                    <group col="3">
-                        <group string="Dates">
-                            <field name="date" attrs="{'readonly':[('state','!=','draft')]}"  on_change="onchange_date(date, company_id)"/>
-                            <field name="closing_date" readonly="1"/>
-                        </group>
-                        <group string="Opening Balance">
-                            <field name="balance_start" readonly="1" string="Opening Balance"/>
-                            <field name="total_entry_encoding"/>
-                        </group>
-                        <group string="Closing Balance">
-                            <field name="balance_end"/>
-                            <field name="balance_end_cash"/>
-                        </group>
-                    </group>
                 </sheet>
                 </form>
             </field>

From df5b6a25aa1e1264335d0ef8929ac6546d711d94 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 27 Jun 2012 10:00:22 +0530
Subject: [PATCH 032/171] [REM]: Remove tab

bzr revid: atp@tinyerp.com-20120627043022-3lf3ljnu92syesyq
---
 addons/account/account_invoice_view.xml | 28 ++++++++++++-------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 16dd6d51866..75b31d94c0d 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -53,22 +53,22 @@
                 <form string="Invoice Line" version="7.0">
                     <group>
                     	<group>
-	                        <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
-	                        <field name="name"/>
-	                        <label string="Quantity" for="quantity" align="1.0"/>
-	                        <div>
-	                            <field name="quantity" class="oe_inline"/>
-	                            <field name="uos_id" class="oe_inline"
-	                              on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
-	                        </div>
-	                        <field name="price_unit"/>
-	                        <field name="discount"/>
+                          <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
+                          <field name="name"/>
+                          <label string="Quantity" for="quantity" align="1.0"/>
+                          <div>
+                             <field name="quantity" class="oe_inline"/>
+                             <field name="uos_id" class="oe_inline"
+                               on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
+                          </div>
+                          <field name="price_unit"/>
+                          <field name="discount"/>
                         </group>
                         <group>
-                        	<field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
-                        	<field name="company_id" groups="base.group_multi_company" readonly="1"/>
-                        	<field name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]" widget="many2many_tags"/>
-                        	<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
+                           <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
+                           <field name="company_id" groups="base.group_multi_company" readonly="1"/>
+                           <field name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]" widget="many2many_tags"/>
+                           <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                         </group>
                     </group>
                     <separator string="Notes"/>

From 5fabd6fe48ef3d76892d8c09b197cebf4d520045 Mon Sep 17 00:00:00 2001
From: "Jalpesh Patel (OpenERP)" <pja@tinyerp.com>
Date: Wed, 27 Jun 2012 10:32:16 +0530
Subject: [PATCH 033/171] [IMP] improve sales-receipt

bzr revid: pja@tinyerp.com-20120627050216-lf9nko3d1q3vqdj9
---
 addons/account_voucher/account_voucher.py        | 16 +++++++++++++---
 .../voucher_sales_purchase_view.xml              |  4 +++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 1e882b7c585..1eba8c5be9a 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -52,7 +52,16 @@ class account_voucher(osv.osv):
                     paid = True
             res[voucher.id] = paid
         return res
-
+    def untaxed_amount(self, cr, uid, ids, name, args, context=None):
+        res = {}
+        amount = 0.0
+        for voucher in self.browse(cr, uid, ids, context=context):
+            for line in voucher.line_cr_ids:
+                amount += line.amount
+            res[voucher.id] = amount
+        return res
+ 
+    
     def _get_type(self, cr, uid, context=None):
         if context is None:
             context = {}
@@ -312,6 +321,7 @@ class account_voucher(osv.osv):
             help='The specific rate that will be used, in this voucher, between the selected currency (in \'Payment Rate Currency\' field)  and the voucher currency.'),
         'paid_amount_in_company_currency': fields.function(_paid_amount_in_company_currency, string='Paid Amount in Company Currency', type='float', readonly=True),
         'is_multi_currency': fields.boolean('Multi Currency Voucher', help='Fields with internal purpose only that depicts if the voucher is a multi currency one or not'),
+        'amount_untaxed': fields.function(untaxed_amount, digits_compute=dp.get_precision('Account'), string='Untaxed'),
     }
     _defaults = {
         'period_id': _get_period,
@@ -381,6 +391,7 @@ class account_voucher(osv.osv):
         return True
 
     def onchange_price(self, cr, uid, ids, line_ids, tax_id, partner_id=False, context=None):
+        
         context = context or {}
         tax_pool = self.pool.get('account.tax')
         partner_pool = self.pool.get('res.partner')
@@ -398,7 +409,6 @@ class account_voucher(osv.osv):
             line_amount = 0.0
             line_amount = line.get('amount',0.0)
             voucher_total += line_amount
-
         total = voucher_total
         total_tax = 0.0
         if tax_id:
@@ -415,7 +425,7 @@ class account_voucher(osv.osv):
 
         res.update({
             'amount':total or voucher_total,
-            'tax_amount':total_tax
+            'tax_amount':total_tax    
         })
         return {
             'value':res
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 1365a24051f..0cb24c6d7e5 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -131,11 +131,12 @@
                                 </group>
                                 <group>
                                     <group class="oe_subtotal_footer" string="Total">
+                                       <field name="amount_untaxed"/>
                                         <field name="tax_id" 
                                             on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
                                             widget="selection"
                                             domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
-                                        <field name="tax_amount" nolabel="1"/>
+                                        <field name="tax_amount"/>
                                         <field name="amount" class="oe_subtotal_footer_separator" />
                                         <button type="object"
                                             icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax"
@@ -279,6 +280,7 @@
                                             attrs="{'invisible': [('state','!=','draft')]}"/>
                                     </div>
                                     -->
+                                    
                                     <field name="tax_id" 
                                         on_change="onchange_price(line_dr_ids, tax_id, partner_id)"
                                         widget="selection"

From d05fd95f2bd4bc84072a3d024cb9e840ab6f1f66 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Wed, 27 Jun 2012 10:44:03 +0530
Subject: [PATCH 034/171] [IMP] remove the cancel button.

bzr revid: nco@tinyerp.com-20120627051403-73ioj2a70gflou79
---
 addons/account_coda/account_coda_wizard.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/account_coda/account_coda_wizard.xml b/addons/account_coda/account_coda_wizard.xml
index 91ba355ba65..91d493bcda9 100644
--- a/addons/account_coda/account_coda_wizard.xml
+++ b/addons/account_coda/account_coda_wizard.xml
@@ -11,7 +11,6 @@
         <form string="Import CODA File" version="7.0">
             <header>
                 <button name="coda_parsing" string="_Import" type="object" icon="gtk-ok"/>
-                <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
             </header>
             <group col="2" string="Select Your File :">
                 <field name="coda_data" filename="coda_fname"/>

From afebbef66cfe515615e0c60cf47f55a084306db4 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Wed, 27 Jun 2012 11:28:20 +0530
Subject: [PATCH 035/171] [IMP] improved view of Chart of Accounts wizard

bzr revid: bde@tinyerp.com-20120627055820-396fiiqjw7s4obkg
---
 addons/account/wizard/account_chart_view.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index 1ae294c3c0a..23688980389 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -9,12 +9,13 @@
                 <form string="Account charts" version="7.0">
                     <header>
                         <button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_chart_open_window" type="object"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                     </header>
-                    <group colspan="4">
+                    <group col="4">
                         <field name="fiscalyear" on_change="onchange_fiscalyear(fiscalyear)"/>
+                        <label align="0.7" string="(If you do not select Fiscal year it will take all open fiscal years)"/>
+                    </group>
+                    <group>
                         <field name="target_move"/>
-                        <label align="0.7" colspan="4" string="(If you do not select Fiscal year it will take all open fiscal years)"/>
                         <separator string="Periods" colspan="4"/>
                         <field name="period_from"/>
                         <field name="period_to"/>
@@ -24,7 +25,7 @@
         </record>
 
         <record id="action_account_chart" model="ir.actions.act_window">
-            <field name="name">Chart of Accounts</field>
+            <field name="name">Select an Accounting Setup</field>
             <field name="res_model">account.chart</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -35,6 +36,7 @@
 
         <menuitem icon="STOCK_INDENT" action="action_account_chart"
             id="menu_action_account_tree2"
+            name="Chart of Accounts"
             parent="account.menu_finance_charts" />
     </data>
 </openerp>

From 4c71e322175bdaf97e290fe690fd1ad8fd9e69ac Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Wed, 27 Jun 2012 12:00:13 +0530
Subject: [PATCH 036/171] [IMP] improved view of chart of taxes wizard

bzr revid: bde@tinyerp.com-20120627063013-3w5rlcpb1th4kgi5
---
 addons/account/wizard/account_tax_chart_view.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/account/wizard/account_tax_chart_view.xml b/addons/account/wizard/account_tax_chart_view.xml
index 309af53ca17..8fa4cc8c3fe 100644
--- a/addons/account/wizard/account_tax_chart_view.xml
+++ b/addons/account/wizard/account_tax_chart_view.xml
@@ -10,11 +10,12 @@
                 <form string="Account tax charts" version="7.0">
                     <header>
                         <button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_tax_chart_open_window" type="object" />
-                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
                     </header>
-                    <group>
+                    <group col="4">
                         <field name="period_id"/>
-                        <label colspan="4" string="(If you do not select period it will take all open periods)"/>
+                        <label string="(If you do not select period it will take all open periods)"/>
+                    </group>
+                    <group>
                         <field name="target_move"/>
                     </group>
                 </form>

From 67ebfdecae4a3fb754ead7a9347a6fead54fbf32 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Wed, 27 Jun 2012 12:04:57 +0530
Subject: [PATCH 037/171] [IMP] improve the journal entries view.

bzr revid: nco@tinyerp.com-20120627063457-1a5e2xflmbj2rmwl
---
 addons/account/account_view.xml | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index ab46f7519f8..a278253e370 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1274,15 +1274,19 @@
                 </header>
                 <sheet string="Journal Entries" layout="auto">
                     <group col="4">
-                        <field name="name" readonly="True"/>
-                        <field name="ref"/>
-                        <field name="journal_id"/>
-                        <field name="period_id"/>
-                        <field name="to_check"/>
-                        <field name="date"/>
-                        <field name="company_id" required="1" groups="base.group_multi_company"/>
-                        <field name="partner_id" invisible="1"/>
-                        <field name="amount" invisible="1"/>
+                    	<group>
+                    		<field name="name" readonly="True"/>
+                    		<field name="journal_id"/>
+                        	<field name="period_id"/>
+                        	<field name="company_id" required="1" groups="base.group_multi_company"/>
+                        	<field name="partner_id" invisible="1"/>
+                    	</group>
+                    	<group>
+                    		<field name="ref"/>
+	                        <field name="date"/>
+	                        <field name="to_check"/>
+	                        <field name="amount" invisible="1"/>
+                    	</group>	
                     </group>
                     <notebook colspan="4">
                         <page string="Journal Items">
@@ -1374,8 +1378,8 @@
                                     <field name="reconcile_partial_id"/>
                                 </tree>
                             </field>
-                            <separator string="Internal Note"/>
-                            <field name="narration" colspan="4" nolabel="1" height="50"/>
+                            <separator/>
+                            <field name="narration" colspan="4" placeholder="Add an internal note" nolabel="1" height="50"/>
                         </page>
                     </notebook>
                     </sheet>

From 127ae36646ad4ee3ee644ad473aa54c37060525c Mon Sep 17 00:00:00 2001
From: "Jalpesh Patel (OpenERP)" <pja@tinyerp.com>
Date: Wed, 27 Jun 2012 12:58:22 +0530
Subject: [PATCH 038/171] [IMP] improve sales-receipt

bzr revid: pja@tinyerp.com-20120627072822-z7a6i6li0c95gl9r
---
 addons/account_voucher/account_voucher.py             | 11 +----------
 .../account_voucher/voucher_sales_purchase_view.xml   | 10 ++++------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 1eba8c5be9a..972e56d0bc9 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -52,15 +52,6 @@ class account_voucher(osv.osv):
                     paid = True
             res[voucher.id] = paid
         return res
-    def untaxed_amount(self, cr, uid, ids, name, args, context=None):
-        res = {}
-        amount = 0.0
-        for voucher in self.browse(cr, uid, ids, context=context):
-            for line in voucher.line_cr_ids:
-                amount += line.amount
-            res[voucher.id] = amount
-        return res
- 
     
     def _get_type(self, cr, uid, context=None):
         if context is None:
@@ -321,7 +312,7 @@ class account_voucher(osv.osv):
             help='The specific rate that will be used, in this voucher, between the selected currency (in \'Payment Rate Currency\' field)  and the voucher currency.'),
         'paid_amount_in_company_currency': fields.function(_paid_amount_in_company_currency, string='Paid Amount in Company Currency', type='float', readonly=True),
         'is_multi_currency': fields.boolean('Multi Currency Voucher', help='Fields with internal purpose only that depicts if the voucher is a multi currency one or not'),
-        'amount_untaxed': fields.function(untaxed_amount, digits_compute=dp.get_precision('Account'), string='Untaxed'),
+        
     }
     _defaults = {
         'period_id': _get_period,
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 0cb24c6d7e5..6657cd54e19 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -130,20 +130,19 @@
                                     <field name="narration" placeholder="Internal Notes" nolabel="1" />
                                 </group>
                                 <group>
-                                    <group class="oe_subtotal_footer" string="Total">
-                                       <field name="amount_untaxed"/>
+                                    <group class="oe_subtotal_footer">
                                         <field name="tax_id" 
                                             on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
                                             widget="selection"
                                             domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
                                         <field name="tax_amount"/>
                                         <field name="amount" class="oe_subtotal_footer_separator" />
-                                        <button type="object"
-                                            icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax"
-                                            attrs="{'invisible': [('state','!=','draft')]}"/>
                                     </group>                                    
                                 </group>
                             </group>
+                            <button type="object"
+                                            icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax"
+                                            attrs="{'invisible': [('state','!=','draft')]}"/>
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
                             <group col="4">
@@ -280,7 +279,6 @@
                                             attrs="{'invisible': [('state','!=','draft')]}"/>
                                     </div>
                                     -->
-                                    
                                     <field name="tax_id" 
                                         on_change="onchange_price(line_dr_ids, tax_id, partner_id)"
                                         widget="selection"

From 040556242483caf372d3057eb35766b33962b72c Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 27 Jun 2012 15:24:21 +0530
Subject: [PATCH 039/171] [IMP]delivery: some minore view updation

bzr revid: dbr@tinyerp.com-20120627095421-hyv4jghcl4z24wv6
---
 addons/delivery/delivery_view.xml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 0d538b55e86..b78bfd0f8b7 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -46,10 +46,14 @@
                                       <field name="name"/>
                                  </tree>
                                  <form string="Delivery grids" version="7.0">
-                                     <group col="4">
-                                         <field name="name"/>
-                                         <field name="active"/>
-                                         <field name="sequence"/>
+                                     <group>
+                                         <group>
+                                             <field name="name"/>
+                                         </group>
+                                         <group>
+                                             <field name="active"/>
+                                             <field name="sequence"/>
+                                         </group>
                                      </group>
                                      <notebook>
                                         <page string="Grid definition">
@@ -148,9 +152,10 @@
             <field name="arch" type="xml">
                 <form string="Grid Lines" version="7.0">
                     <sheet>
-                        <div class="oe_title" colspan="4">
-                            <field name="name" />
-                        </div>
+                        <label for="name" class="oe_edit_only"/>
+
+                            <field name="name" col="4"/>
+
                         <group col="4">
                             <group>
                                 <label string="Condition" for="type"/>

From 6bbb339b9f2a484990ee1db235a58b70e60c1bf7 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 27 Jun 2012 16:42:52 +0530
Subject: [PATCH 040/171] [IMP]:improved view in new style

bzr revid: apa@tinyerp.com-20120627111252-j0dliz74sqlwg2v4
---
 addons/mrp/mrp_view.xml | 316 +++++++++++++++++++++-------------------
 1 file changed, 166 insertions(+), 150 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index dab2a2da37a..3463f2c0d52 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -146,42 +146,44 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Work Center" version="7.0">
-                    <group col="4">
-                        <group>
-                            <field name="name"/>
-                            <field name="resource_type"/>
-                            <field name="calendar_id" widget="selection"/>
-                        </group>
-                        <group>
-                            <field name="code"/>
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            <field name="active"/>
-                        </group>
-                    </group>
-                    <notebook>
-                        <page string="General Information">
+                    <sheet>
+                        <group col="4">
                             <group>
-                                <group string="Capacity Information">
-                                    <field name="time_efficiency"/>
-                                    <field name="capacity_per_cycle"/>
-                                    <field name="time_cycle" widget="float_time"/>
-                                    <field name="time_start" widget="float_time"/>
-                                    <field name="time_stop" widget="float_time"/>
-                                </group>
-                                <group string="Costing Information">
-                                    <field name="product_id" on_change="on_change_product_cost(product_id)"/>
-                                    <field name="costs_hour"/>
-                                    <field name="costs_hour_account_id" groups="analytic.group_analytic_accounting"/>
-                                    <field name="costs_cycle"/>
-                                    <field name="costs_cycle_account_id" groups="analytic.group_analytic_accounting"/>
-                                    <field name="costs_journal_id" attrs="{'required':['|',('costs_hour_account_id', '=', True),('costs_cycle_account_id', '=', True)]}" groups="analytic.group_analytic_accounting"/>
-                                    <field name="costs_general_account_id" attrs="{ 'required':['|',('costs_cycle_account_id', '=', True),('costs_hour_account_id', '=', True)]}" groups="analytic.group_analytic_accounting"/>
-                                </group>
+                                <field name="name"/>
+                                <field name="resource_type"/>
+                                <field name="calendar_id" widget="selection"/>
                             </group>
-                            <label for="note"/>
-                            <field name="note"/>
-                        </page>
-                    </notebook>
+                            <group>
+                                <field name="code"/>
+                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                <field name="active"/>
+                            </group>
+                        </group>
+                        <notebook>
+                            <page string="General Information">
+                                <group>
+                                    <group string="Capacity Information">
+                                        <field name="time_efficiency"/>
+                                        <field name="capacity_per_cycle"/>
+                                        <field name="time_cycle" widget="float_time"/>
+                                        <field name="time_start" widget="float_time"/>
+                                        <field name="time_stop" widget="float_time"/>
+                                    </group>
+                                    <group string="Costing Information">
+                                        <field name="product_id" on_change="on_change_product_cost(product_id)"/>
+                                        <field name="costs_hour"/>
+                                        <field name="costs_hour_account_id" groups="analytic.group_analytic_accounting"/>
+                                        <field name="costs_cycle"/>
+                                        <field name="costs_cycle_account_id" groups="analytic.group_analytic_accounting"/>
+                                        <field name="costs_journal_id" attrs="{'required':['|',('costs_hour_account_id', '=', True),('costs_cycle_account_id', '=', True)]}" groups="analytic.group_analytic_accounting"/>
+                                        <field name="costs_general_account_id" attrs="{ 'required':['|',('costs_cycle_account_id', '=', True),('costs_hour_account_id', '=', True)]}" groups="analytic.group_analytic_accounting"/>
+                                    </group>
+                                </group>
+                                <label for="note"/>
+                                <field name="note"/>
+                            </page>
+                        </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -237,16 +239,18 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Routing Work Centers" version="7.0">
-                    <group col="4" string="General Information">
-                        <field colspan="4" name="name"/>
-                        <field name="sequence"/>
-                        <field name="workcenter_id"/>
-                        <field name="cycle_nbr"/>
-                        <field name="hour_nbr" widget="float_time"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    </group>
-                    <label for="note"/>
-                    <field name="note"/>
+                    <sheet>
+                        <group col="4" string="General Information">
+                            <field colspan="4" name="name"/>
+                            <field name="sequence"/>
+                            <field name="workcenter_id"/>
+                            <field name="cycle_nbr"/>
+                            <field name="hour_nbr" widget="float_time"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        </group>
+                        <label for="note"/>
+                        <field name="note"/>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -257,25 +261,26 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Routing" version="7.0">
-                    <group col="4">
-                        <group>
-                            <field name="name"/>
-                            <field name="code"/>
+                    <sheet>
+                        <group col="4">
+                            <group>
+                                <field name="name"/>
+                                <field name="code"/>
+                            </group>
+                            <group>
+                                <field name="location_id"/>
+                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                                <field name="active"/>
+                           </group>
                         </group>
-                        <group>
-                            <field name="location_id"/>
-                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                            <field name="active"/>
-                       </group>
-                    </group>
-                    <notebook>
-                        <page string="Work Center Operations">
-                           <field name="workcenter_lines"/>
-                        </page>
-                        <page string="Notes">
-                           <field name="note"/>
-                        </page>
-                    </notebook>
+                        <notebook>
+                            <page string="Work Center Operations">
+                                <field name="workcenter_lines"/>
+                                <label string="Notes"/>
+                                <field name="note"/>
+                            </page>
+                        </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -350,12 +355,12 @@
 	                        <group>
 	                            <field name="type"/>
 	                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-	                            <label name="product_uso_qty" />
-                                <div>
-                                <field name="product_uos_qty" 
-                                    groups="product.group_uos" 
-                                    class="oe_inline"/>
-                                <field name="product_uos" groups="product.group_uos" colspan="4" class="oe_inline"/>
+	                            <label for="product_uos_qty" groups="product.group_uos" string="Product UoS Quantity"/>
+                                <div groups="product.group_uos" >
+                                    <field name="product_uos_qty" 
+                                        class="oe_inline"/>
+                                    <label string="-" attrs="{'invisible':[('product_uos','=',False)]}" class="oe_inline"/> 
+                                    <field name="product_uos" class="oe_inline"/>
                                 </div>
 	                        </group>
 	                    </group>
@@ -364,7 +369,7 @@
 	                            <field name="bom_lines" widget="one2many_list">
 	                                <tree string="Components" editable="bottom">
 	                                    <field name="product_id" on_change="onchange_product_id(product_id, name)"/>
-	                                    <field name="product_qty"/>
+	                                    <field name="product_qty" string="Product Quantity"/>
 	                                    <field name="product_uom"/>
 	                                    <field name="name" invisible="1"/>
 	                                    <field name="date_start"/>
@@ -459,7 +464,7 @@
                     <field name="code"/>
                     <field name="product_id" string="Component Product"/>
                     <field name="bom_id"/>
-                    <field name="product_qty"/>
+                    <field name="product_qty" string="Product Quantity"/>
                     <field name="product_uom"/>
                     <field name="type"/>
                     <field name="method"/>
@@ -650,12 +655,11 @@
                         </group>
                         <group>
                             <field name="user_id"/>
-                            <label name="product_uso_qty" />
-                            <div>
-                                <field name="product_uos_qty" 
-                                    groups="product.group_uos" 
-                                    class="oe_inline"/>
-                                <field name="product_uos" groups="product.group_uos" colspan="4" class="oe_inline"/>
+                            <label for="product_uos_qty" groups="product.group_uos" string="Product UoS Quantity"/>
+                            <div groups="product.group_uos">
+                                <field name="product_uos_qty" class="oe_inline"/>
+                                <label string="-" attrs="{'invisible':[('product_uos','=',False)]}" class="oe_inline"/>
+                                <field name="product_uos" class="oe_inline"/>
                             </div>
                         </group>
                     </group>
@@ -669,82 +673,94 @@
                                     <field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
                                     <field name="location_dest_id" domain="[('usage','=','internal')]"/>
                                 </group>
-                             </group>
-                                <separator string="Products to Consume"/>
-                                <field name="move_lines" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
-                                    <tree colors="blue:state == 'draft';black:state in ('picking_except','confirmed','ready','in_production');gray:state in ('cancel','done') " string="Products to Consume">
-                                        <field name="product_id" />
-                                        <field name="product_qty"  string="Quantity"/>
-                                        <field name="product_uom"  string="Unit of Measure"/>
-                                        <field name="location_id"  string="Source Loc."/>
-                                        <field name="state" invisible="1"/>
-                                        <button name="%(stock.move_consume)d"
-                                            string="Consume Products" type="action"
-                                            icon="gtk-go-forward" context="{'consume': True}"
-                                            states="draft,waiting,confirmed,assigned" />
-                                        <button
-                                               name="%(stock.track_line)d"
-                                               string="Split in Serial Numbers"
-                                               type="action" icon="gtk-justify-fill"
-                                               states="draft,waiting,confirmed,assigned" />
-                                        <button name="%(stock.move_scrap)d"
-                                            string="Scrap Products" type="action"
-                                            icon="gtk-convert" context="{'scrap': True}"
-                                            states="draft,waiting,confirmed,assigned"/>
-                                    </tree>
-                                </field>
-                                <separator string="Consumed Product"/>
-                                <field name="move_lines2" domain="[('state','in', ('done', 'cancel'))]">
-                                   <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state == 'cancel' " string="Consumed Products" editable="bottom">
-                                       <field name="product_id" readonly="1"/>
-                                       <field name="product_qty" readonly="1"/>
-                                       <field name="product_uom" readonly="1" string="Unit of Measure"/>
-                                       <field name="prodlot_id" context="{'product_id': product_id}"/>
-                                       <field name="state" invisible="1"/>
-                                       <field name="scrapped" invisible="1"/>
-                                       <button
-                                           name="%(stock.move_scrap)d"
-                                           string="Scrap Products" type="action"
-                                           icon="gtk-convert"
-                                           states="done,cancel"/>
-                                   </tree>
-                                </field>
+                            </group>
+                            <group col="4">
+                                <group col="1" colspan="2">
+                                    <separator string="Products to Consume"/>
+                                    <field name="move_lines" domain="[('state','&lt;&gt;', ('done', 'cancel'))]" nolabel="1">
+                                        <tree colors="blue:state == 'draft';black:state in ('picking_except','confirmed','ready','in_production');gray:state in ('cancel','done') " string="Products to Consume">
+                                            <field name="product_id" />
+                                            <field name="product_qty"  string="Quantity"/>
+                                            <field name="product_uom"  string="Unit of Measure"/>
+                                            <field name="location_id"  string="Source Loc."/>
+                                            <field name="state" invisible="1"/>
+                                            <button name="%(stock.move_consume)d"
+                                                string="Consume Products" type="action"
+                                                icon="gtk-go-forward" context="{'consume': True}"
+                                                states="draft,waiting,confirmed,assigned" />
+                                            <button
+                                                   name="%(stock.track_line)d"
+                                                   string="Split in Serial Numbers"
+                                                   type="action" icon="gtk-justify-fill"
+                                                   states="draft,waiting,confirmed,assigned" />
+                                            <button name="%(stock.move_scrap)d"
+                                                string="Scrap Products" type="action"
+                                                icon="gtk-convert" context="{'scrap': True}"
+                                                states="draft,waiting,confirmed,assigned"/>
+                                        </tree>
+                                    </field>
+                                </group>
+                                <group col="1" colspan="2">
+                                    <separator string="Consumed Product"/>
+                                    <field name="move_lines2" domain="[('state','in', ('done', 'cancel'))]" nolabel="1">
+                                       <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state == 'cancel' " string="Consumed Products" editable="bottom">
+                                           <field name="product_id" readonly="1"/>
+                                           <field name="product_qty" readonly="1"/>
+                                           <field name="product_uom" readonly="1" string="Unit of Measure"/>
+                                           <field name="prodlot_id" context="{'product_id': product_id}"/>
+                                           <field name="state" invisible="1"/>
+                                           <field name="scrapped" invisible="1"/>
+                                           <button
+                                               name="%(stock.move_scrap)d"
+                                               string="Scrap Products" type="action"
+                                               icon="gtk-convert"
+                                               states="done,cancel"/>
+                                       </tree>
+                                    </field>
+                                </group>
+                            </group>
                         </page>
                         <page string="Finished Products">
-                            <separator string="Products to Produce"/>
-                            <field name="move_created_ids" domain="[('state','&lt;&gt;', ('done', 'cancel'))]" nolabel="1">
-                                <tree string="Products to Finish">
-                                    <field name="product_id" />
-                                    <field name="product_qty"/>
-                                    <field name="product_uom"  string="Unit of Measure"/>
-                                    <field name="state" invisible="1"/>
-                                    <button name="%(stock.action_partial_move_server)d"
-                                        string="Partial"
-                                        type="action" states="confirmed,assigned"
-                                        icon="gtk-justify-fill"/>
-                                    <button name="%(stock.move_scrap)d"
-                                        string="Scrap Products" type="action"
-                                        icon="gtk-convert" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned" />
-                                </tree>
-                            </field>
-                            <separator string="Produced Products"/>
-                            <field name="move_created_ids2" domain="[('state','in', ('done', 'cancel'))]" nolabel="1">
-                                <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Finished Products">
-                                    <field name="product_id" readonly="1"/>
-                                    <field name="product_qty" readonly="1"/>
-                                    <field name="product_uom" readonly="1" string="Unit of Measure"/>
-                                    <field name="location_dest_id"  readonly="1" string="Destination Loc." widget="selection"/>
-                                    <field name="prodlot_id" context="{'product_id': product_id}"/>
-                                    <field name="scrapped" invisible="1"/>
-                                    <field name="state" invisible="1"/>
-                                    <button name="%(stock.track_line)d"
-                                         string="Split in Serial Numbers" type="action" icon="gtk-justify-fill" states="done,cancel"/>
-                                    <button name="%(stock.move_scrap)d"
-                                        string="Scrap Products" type="action" icon="gtk-convert"
-                                        states="done,cancel" />
-                                </tree>
-                            </field>
+                            <group col="4">
+                                <group col="1" colspan="2">
+                                    <separator string="Products to Produce"/>
+                                    <field name="move_created_ids" domain="[('state','&lt;&gt;', ('done', 'cancel'))]" nolabel="1">
+                                        <tree string="Products to Finish">
+                                            <field name="product_id" />
+                                            <field name="product_qty"/>
+                                            <field name="product_uom"  string="Unit of Measure"/>
+                                            <field name="state" invisible="1"/>
+                                            <button name="%(stock.action_partial_move_server)d"
+                                                string="Partial"
+                                                type="action" states="confirmed,assigned"
+                                                icon="gtk-justify-fill"/>
+                                            <button name="%(stock.move_scrap)d"
+                                                string="Scrap Products" type="action"
+                                                icon="gtk-convert" context="{'scrap': True}"
+                                                states="draft,waiting,confirmed,assigned" />
+                                        </tree>
+                                    </field>
+                                </group>
+                                <group col="1" colspan="2">
+                                    <separator string="Produced Products"/>
+                                    <field name="move_created_ids2" domain="[('state','in', ('done', 'cancel'))]" nolabel="1">
+                                        <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Finished Products">
+                                            <field name="product_id" readonly="1"/>
+                                            <field name="product_qty" readonly="1"/>
+                                            <field name="product_uom" readonly="1" string="Unit of Measure"/>
+                                            <field name="location_dest_id"  readonly="1" string="Destination Loc." widget="selection"/>
+                                            <field name="prodlot_id" context="{'product_id': product_id}"/>
+                                            <field name="scrapped" invisible="1"/>
+                                            <field name="state" invisible="1"/>
+                                            <button name="%(stock.track_line)d"
+                                                 string="Split in Serial Numbers" type="action" icon="gtk-justify-fill" states="done,cancel"/>
+                                            <button name="%(stock.move_scrap)d"
+                                                string="Scrap Products" type="action" icon="gtk-convert"
+                                                states="done,cancel" />
+                                        </tree>
+                                    </field>
+                                </group>
+                            </group>
                         </page>
                         <page string="Work Orders">
                             <button name="action_compute" states="draft"

From 0fd39ebd7e231b77312d5861f94302339ecf69f7 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Wed, 27 Jun 2012 17:14:28 +0530
Subject: [PATCH 041/171] [IMP] improved bank statement view

bzr revid: bde@tinyerp.com-20120627114428-t1wtl2fkbfhedvj0
---
 addons/account/account_view.xml               | 19 +++++++++++++++----
 .../account_payment/account_payment_view.xml  |  6 +++---
 ...ccount_payment_populate_statement_view.xml |  1 -
 .../account_voucher/account_voucher_view.xml  |  6 +++---
 .../account_statement_from_invoice_view.xml   |  1 -
 addons/l10n_ch/wizard/bvr_import_view.xml     |  7 +++----
 6 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index ab46f7519f8..6c7c750a6cf 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -598,14 +598,25 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet>
+                        
+                    <div class="oe_right oe_button_box_new" name="import_buttons">
+                    </div>
+                    
+                    <label for="name" class="oe_edit_only"/>
+                    <h1>
+                        <field name="name" class="oe_inline"/>-
+                        <field name="period_id" class="oe_inline"/>
+                    </h1>
+                    <label for="journal_id" class="oe_edit_only"/>
+                    <h2>
+                        <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" widget="selection"/>                        
+                    </h2>
                     <group>
                         <group>
-                            <field name="name"/>
                             <field name="date" on_change="onchange_date(date, company_id)"/>
-                            <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" widget="selection"/>
-                            <field name="period_id"/>
                             <field name='company_id' widget="selection" groups="base.group_multi_company" />
-                        </group><group>
+                        </group>
+                        <group>
                             <field name="balance_start"/>
                             <field name="balance_end_real"/>
                             <field name="currency" invisible="1"/>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index aa4cd18308f..f214930e230 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -330,9 +330,9 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
-                <field name="journal_id" position="after">
-                    <button name="%(action_account_populate_statement_confirm)d" attrs="{'invisible':[('state','=','confirm')]}" string="Import payment lines" type="action" icon="gtk-execute"/>
-                </field>
+                <xpath expr="//div[@name='import_buttons']" position="inside">
+                    <button name="%(action_account_populate_statement_confirm)d" attrs="{'invisible':[('state','=','confirm')]}" string="Import Payment Lines" type="action" icon="gtk-execute"/>
+                </xpath>      
             </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 afcaf82be3a..1e0ba141ff5 100644
--- a/addons/account_payment/wizard/account_payment_populate_statement_view.xml
+++ b/addons/account_payment/wizard/account_payment_populate_statement_view.xml
@@ -10,7 +10,6 @@
                 <form string="Populate Statement:" version="7.0">
                     <header>
                         <button name="populate_statement" string="ADD" type="object" icon="gtk-ok"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
                     </header>
                     <field name="lines"/>
                 </form>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 6177da71eed..d2105c2d8a2 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -206,11 +206,11 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
-              <field name="currency" invisible="1" position="after">
-                <button name="%(action_view_account_statement_from_invoice_lines)d"
+                <xpath expr="//div[@name='import_buttons']" position="inside">
+                    <button name="%(action_view_account_statement_from_invoice_lines)d"
                             string="Import Invoices" type="action" icon="gtk-execute"
                             attrs="{'invisible':[('state','=','confirm')]}"/>
-              </field>
+                </xpath>      
             </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 1c0c00bd662..9617e895920 100644
--- a/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
+++ b/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
@@ -42,7 +42,6 @@
                     </group>
                     <group colspan="4" col="6">
                         <label string ="" colspan="2"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                         <button icon="gtk-execute" string="Ok" name="populate_statement" type="object"/>
                    </group>
                </form>
diff --git a/addons/l10n_ch/wizard/bvr_import_view.xml b/addons/l10n_ch/wizard/bvr_import_view.xml
index 6625aaef9cd..f7a1ace6614 100644
--- a/addons/l10n_ch/wizard/bvr_import_view.xml
+++ b/addons/l10n_ch/wizard/bvr_import_view.xml
@@ -10,7 +10,6 @@
                 <form string="BVR Import" version="7.0">
                     <header>
                         <button name="import_bvr" string="Import" type="object" icon="gtk-ok" colspan="2"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"  colspan="2"/>
                     </header>
                     <group>
                         <field name="file"/>
@@ -35,9 +34,9 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
-                <field name="balance_end_real" position="after">
-                    <button name="%(wizard_bvr_import)d" icon="gtk-execute" string="Import BVR" type="action" colspan="2"/>
-                </field>
+                <xpath expr="//div[@name='import_buttons']" position="inside">
+                    <button name="%(wizard_bvr_import)d" icon="gtk-execute" string="Import BVR" type="action"/>
+                </xpath>
             </field>
         </record>
     </data>

From a4995d990278432308668325cf6d250257bc1167 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Wed, 27 Jun 2012 17:23:20 +0530
Subject: [PATCH 042/171] [IMP] Add name in window

bzr revid: kjo@tinyerp.com-20120627115320-ip48sm1g564g6vir
---
 openerp/addons/base/res/res_users_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index 44e7e77c476..edc680a1f22 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -222,6 +222,7 @@
             </field>
         </record>
         <record id="action_res_users_my" model="ir.actions.act_window">
+            <field name="name">Change My Preferences</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.users</field>
             <field name="view_type">form</field>

From a7df6d69e06bd9af556529b4d506197ecf14a860 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Wed, 27 Jun 2012 17:45:39 +0530
Subject: [PATCH 043/171] [IMP] remove the header tag in company field

bzr revid: kjo@tinyerp.com-20120627121539-h46t0kev48tg4fql
---
 openerp/addons/base/res/res_users_view.xml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index edc680a1f22..fcb7a5b1a56 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -206,11 +206,8 @@
                     </div>
                     <group col="4" string="Preferences">
                         <field name="context_lang" readonly="0"/>
-                        <label for="company_id" class="oe_edit_only"/>
-                        <h2>
-                            <field name="company_id" widget="selection" readonly="0"
-                                groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>
-                        </h2>
+                        <field name="company_id" readonly="0"
+                            groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>
                         <field name="context_tz" readonly="0"/>
                     </group>
                     <group string="Email Preferences">

From 29ae3ad12cf84d6087920a793e381dcd88ca053b Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Wed, 27 Jun 2012 18:42:13 +0530
Subject: [PATCH 044/171] [IMP] kept periods on single line

bzr revid: bde@tinyerp.com-20120627131213-h8lorzub169401gi
---
 addons/account/wizard/account_chart_view.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index 23688980389..109fdc5b148 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -16,9 +16,11 @@
                     </group>
                     <group>
                         <field name="target_move"/>
-                        <separator string="Periods" colspan="4"/>
-                        <field name="period_from"/>
-                        <field name="period_to"/>
+                        <label for="period_from" string="Periods"/>
+                        <div>
+                            <field name="period_from" class="oe_inline"/>-
+                            <field name="period_to" class="oe_inline"/>
+                        </div>
                     </group>
                 </form>
             </field>

From 482b1ce9c6915a860e98d245a00f595c8bf3d340 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Wed, 27 Jun 2012 18:46:27 +0530
Subject: [PATCH 045/171] [IMP] set class oe_inline to name

bzr revid: kjo@tinyerp.com-20120627131627-1qki2cpf7unxu2ht
---
 openerp/addons/base/res/res_users_view.xml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index fcb7a5b1a56..38d7526d6aa 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -198,12 +198,10 @@
                     <div class="oe_right oe_avatar">
                         <field name="avatar" widget='image' on_change="onchange_avatar(avatar)"/>
                     </div>
-                    <div class="oe_title">
-                        <h1>
-                            <field name="name" readonly="1" class="oe_edit_only"/>
-                            (<field name="login" readonly="1" class="oe_edit_only"/>)
-                        </h1> 
-                    </div>
+                    <h1>
+                            <field name="name" readonly="1" class="oe_inline oe_edit_only"/>
+                            (<field name="login" readonly="1" class="oe_inline oe_edit_only"/>)
+                    </h1>
                     <group col="4" string="Preferences">
                         <field name="context_lang" readonly="0"/>
                         <field name="company_id" readonly="0"

From 30e94efedf649e6e5d259b8803cb0435d58f8bf2 Mon Sep 17 00:00:00 2001
From: "Jalpesh Patel (OpenERP)" <pja@tinyerp.com>
Date: Thu, 28 Jun 2012 10:37:51 +0530
Subject: [PATCH 046/171] [IMP]purchase receipt view

bzr revid: pja@tinyerp.com-20120628050751-cde0pa09a28n0ux9
---
 .../account_voucher/voucher_sales_purchase_view.xml  | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 5de7636c0c1..a0e53bb1cc0 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -236,21 +236,19 @@
                             <field name="partner_id" domain="[('supplier','=',True)]" required="1" string="Supplier" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" />
                             <field name="date" string="Bill Date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
                             <field name="date_due"/>
-                            <field name="name" colspan="2"/>
-
+                            <field name="reference"/>
                         </group>
                         <group>
                             <field name="paid" invisible="1"/>
                             <field name="currency_id"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                             <field name="journal_id"
                                 domain="[('type','in',['purchase','purchase_refund'])]"
                                 widget="selection"
                                 on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
-                            <field name="reference"/>
-                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                        </group>
-
-                    </group>
+                            <field name="name" colspan="2"/>
+                    	</group>
+					</group>
                     <group col="6">
                         <field name="account_id" domain="[('type','=','other')]"  invisible="True"/>
                         <field name="type" invisible="True"/>

From 0c797699436157d9496b393ce74322c2aa4c9041 Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Thu, 28 Jun 2012 12:23:14 +0530
Subject: [PATCH 047/171] [IMP] improve journal voucher

bzr revid: shp@tinyerp.com-20120628065314-jdpxl38ol8xsl9z4
---
 .../account_voucher/account_voucher_view.xml  | 62 ++++++++++++-------
 1 file changed, 38 insertions(+), 24 deletions(-)

diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 6177da71eed..96adaadae4c 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -50,16 +50,27 @@
                       <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                   </header>
                   <sheet string="Accounting Voucher">
-                    <group col="6" colspan="4">
-                        <field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
-                        <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/>
-                        <field name="journal_id" widget="selection" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
-                        <field name="type" required="1"/>
-                        <field name="name" colspan="2"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                        <field name="reference"/>
-                        <field name="account_id" widget="selection" invisible="True"/>
-                    </group>
+                  	<h1>
+                  		<label for="number"/>
+                        <field name="number"   class="oe_inline"/>
+                        <span attr="{'invisible': [('type','=',False)]}" class="oe_inline"> ( </span>
+                		<field name="type" required="1"  class="oe_inline"/>
+                		<span attr="{'invisible': [('type','=',False)]}" class="oe_inline"> ) </span>
+                	</h1>		
+                  <group>
+                  	<group>
+                  		<field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
+                  		<field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/>
+                  		<field name="journal_id" widget="selection" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
+                  	</group>
+                  	<group>
+                  		 <field name="currency_id"/>
+                  		 <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                  		 <field name="reference"/>
+                  		 <field name="name"/>
+                  	</group>
+                  </group>
+                   <field name="account_id" widget="selection" invisible="True"/>
                     <notebook colspan="4">
                         <page string="Voucher Entry">
                             <field name="line_ids" on_change="onchange_price(line_ids, tax_id, partner_id)" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
@@ -71,22 +82,25 @@
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                 </tree>
                             </field>
-                            <group col="3">
+                           <group col="3">
+                            <div>
                                 <group string="Internal Notes">
-                                    <field name="narration" colspan="2" nolabel="1"/>
+                                    <field name="narration" colspan="2" nolabel="1"  placeholder="Add an internal notes "/>
                                 </group>
-                                <group string="Other Information">
-                                    <field name="number"/>
-                                    <field name="currency_id"/>
-                                </group>
-                                <group col="4" attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}">
-                                    <separator string="Total" colspan="4"/>
-                                    <field name="tax_id" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/>
-                                    <field name="tax_amount" nolabel="1"/>
-                                    <button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
-                                    <label colspan="1" string=""/><field name="amount" string="Total"/>
-                                </group>
-                            </group>
+                                <button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
+                             </div>
+                             <group>  
+                             	<group attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}" class="oe_subtotal_footer  oe_right">
+                             		<group>
+                                    	<field name="tax_id" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/>
+                                 	</group>
+                                 	<group>   
+                                    	<field name="tax_amount"/>
+                                    	<field name="amount" class="oe_subtotal_footer_separator"/>
+                                 	</group>  
+                             	</group>
+                           	</group>
+                         </group>  	
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
                             <group col="4">

From fc1610bedc90335f94b49c7ff08e2b49efc1b153 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Thu, 28 Jun 2012 13:08:49 +0530
Subject: [PATCH 048/171] [IMP] add cancel button.

bzr revid: nco@tinyerp.com-20120628073849-th08eklny1rwwnkz
---
 addons/account_coda/account_coda_wizard.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account_coda/account_coda_wizard.xml b/addons/account_coda/account_coda_wizard.xml
index 91d493bcda9..91ba355ba65 100644
--- a/addons/account_coda/account_coda_wizard.xml
+++ b/addons/account_coda/account_coda_wizard.xml
@@ -11,6 +11,7 @@
         <form string="Import CODA File" version="7.0">
             <header>
                 <button name="coda_parsing" string="_Import" type="object" icon="gtk-ok"/>
+                <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
             </header>
             <group col="2" string="Select Your File :">
                 <field name="coda_data" filename="coda_fname"/>

From d1188ef84d6ad569a9447461cead96ede0756844 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Thu, 28 Jun 2012 15:10:10 +0530
Subject: [PATCH 049/171] [IMP] add cancel button in wizards.

bzr revid: nco@tinyerp.com-20120628094010-z4dlxcnt5tlt1cwq
---
 addons/account/wizard/account_chart_view.xml                   | 1 +
 addons/account/wizard/account_fiscalyear_close_state.xml       | 1 +
 addons/account/wizard/account_fiscalyear_close_view.xml        | 1 +
 addons/account/wizard/account_open_closed_fiscalyear_view.xml  | 1 +
 addons/account/wizard/account_subscription_generate_view.xml   | 1 +
 addons/account/wizard/account_tax_chart_view.xml               | 1 +
 addons/account/wizard/account_use_model_view.xml               | 1 +
 addons/account/wizard/account_validate_move_view.xml           | 1 +
 addons/account_asset/wizard/wizard_asset_compute_view.xml      | 1 +
 addons/account_followup/wizard/account_followup_print_view.xml | 2 ++
 10 files changed, 11 insertions(+)

diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index 109fdc5b148..7bcbe5e3494 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -9,6 +9,7 @@
                 <form string="Account charts" version="7.0">
                     <header>
                         <button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_chart_open_window" type="object"/>
+                        <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
                     </header>
                     <group col="4">
                         <field name="fiscalyear" on_change="onchange_fiscalyear(fiscalyear)"/>
diff --git a/addons/account/wizard/account_fiscalyear_close_state.xml b/addons/account/wizard/account_fiscalyear_close_state.xml
index 5c9e1dea50d..0f116e07dbd 100644
--- a/addons/account/wizard/account_fiscalyear_close_state.xml
+++ b/addons/account/wizard/account_fiscalyear_close_state.xml
@@ -9,6 +9,7 @@
                 <form string="Close states of Fiscal year and periods" version="7.0">
                 <header>
                     <button icon="terp-locked" string="Close Fiscal Year" name="data_save" type="object"/>
+                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                 </header>
                 <label string ="If no additional entries should be recorded on a fiscal year, you can close it from here. It will close all opened periods in this year that will make impossible any new entry record. Close a fiscal year when you need to finalize your end of year results definitive "/>
                 <group>
diff --git a/addons/account/wizard/account_fiscalyear_close_view.xml b/addons/account/wizard/account_fiscalyear_close_view.xml
index b27a0279fb3..5ef53c42575 100644
--- a/addons/account/wizard/account_fiscalyear_close_view.xml
+++ b/addons/account/wizard/account_fiscalyear_close_view.xml
@@ -9,6 +9,7 @@
                 <form string="Generate Fiscal Year Opening Entries" version="7.0">
                     <header>
                         <button icon="gtk-execute" string="Create" name="data_save" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                     </header>
                     <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/>
diff --git a/addons/account/wizard/account_open_closed_fiscalyear_view.xml b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
index 6df9e848411..f6723717e8a 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear_view.xml
+++ b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
@@ -9,6 +9,7 @@
                 <form string="Choose Fiscal Year " version="7.0">
                     <header>
                         <button icon="terp-gtk-go-back-rtl" string="Open" name="remove_entries" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                     </header>
                     <group>
                         <field name="fyear_id" domain="[('state','=','draft')]"/>
diff --git a/addons/account/wizard/account_subscription_generate_view.xml b/addons/account/wizard/account_subscription_generate_view.xml
index bd5ba404cdd..961cfa01d61 100644
--- a/addons/account/wizard/account_subscription_generate_view.xml
+++ b/addons/account/wizard/account_subscription_generate_view.xml
@@ -11,6 +11,7 @@
                     <header>
                         <button icon="gtk-execute" string="Generate Entries"
                             name="action_generate" type="object" />
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                     </header>
                     <group>
                         <field name="date"/>
diff --git a/addons/account/wizard/account_tax_chart_view.xml b/addons/account/wizard/account_tax_chart_view.xml
index 8fa4cc8c3fe..e0e2698a198 100644
--- a/addons/account/wizard/account_tax_chart_view.xml
+++ b/addons/account/wizard/account_tax_chart_view.xml
@@ -10,6 +10,7 @@
                 <form string="Account tax charts" version="7.0">
                     <header>
                         <button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_tax_chart_open_window" type="object" />
+                        <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
                     </header>
                     <group col="4">
                         <field name="period_id"/>
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index bf069b3f16b..00eb4676058 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -10,6 +10,7 @@
             <form string="Create Entries From Models" version="7.0">
                 <header>
                     <button icon="gtk-execute" string="Create Entries" name="create_entries" type="object"/>
+                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                 </header>
                 <label string="Create manual recurring entries in a chosen journal."/>
                 <group>
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index 8f991257f9a..1f11d40ac49 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -11,6 +11,7 @@
             <form string="Post Journal Entries" version="7.0">
                 <header>
                     <button icon="terp-camera_test" string="Approve" name="validate_move" type="object"/>
+                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                 </header>
                 <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>
diff --git a/addons/account_asset/wizard/wizard_asset_compute_view.xml b/addons/account_asset/wizard/wizard_asset_compute_view.xml
index 6c517d5ed14..5e028a41473 100644
--- a/addons/account_asset/wizard/wizard_asset_compute_view.xml
+++ b/addons/account_asset/wizard/wizard_asset_compute_view.xml
@@ -9,6 +9,7 @@
                 <form string="Compute Asset" version="7.0">
                     <header>
                         <button icon="gtk-execute" string="Compute" name="asset_compute" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                     </header>
                     <group>
                         <field name="period_id"/>
diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index 9f0474ca8b7..741fdd94cd9 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -10,6 +10,7 @@
             <form string="Send Follow-Ups" version="7.0">
                 <header>
                     <button name="do_continue" string="Continue" colspan="1" type="object" icon="gtk-ok"/>
+                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                 </header>
                 <group col="4">
                     <field name="followup_id"/>
@@ -76,6 +77,7 @@
                 <header>
                     <button name="do_mail" string="Send Mails" colspan="1" type="object" icon="gtk-execute"/>
                     <button name="do_print" string="Print Follow-Ups" colspan="1" type="object" icon="gtk-print"/>
+                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                 </header>
                 <notebook>
                     <page string="Partner Selection">

From 87a8a5660f9712ffbbea78bcdaeba408c9804c89 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Thu, 28 Jun 2012 17:31:50 +0530
Subject: [PATCH 050/171] [IMP] arranged the buttons in Bank Statements

bzr revid: bde@tinyerp.com-20120628120150-9hr4a4iq85tcpsgq
---
 addons/account/account_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 6c7c750a6cf..4f45ec79091 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -599,7 +599,7 @@
                 </header>
                 <sheet>
                         
-                    <div class="oe_right oe_button_box_new" name="import_buttons">
+                    <div class="oe_right oe_button_box" name="import_buttons">
                     </div>
                     
                     <label for="name" class="oe_edit_only"/>

From f99f476acbc1f78078f97ad56de07d27809a7520 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 28 Jun 2012 21:37:59 +0530
Subject: [PATCH 051/171] [FIX]: Fix customer payment view

bzr revid: atp@tinyerp.com-20120628160759-hjqc2gep7p6on7a9
---
 addons/account_voucher/voucher_payment_receipt_view.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 5555f9f27f1..0a0eb9bf4de 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -394,17 +394,14 @@
                                 </tree>
                             </field>
                             <group>
-                                <group col="2">
-                                    <field name="narration" colspan="2" nolabel="1"  placeholder="Add an internal note"/>
-                                </group>
-                                <group col="4" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
+                                <group  attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
                                     <separator string="Currency Options" colspan="4"/>
                                     <field name="is_multi_currency" invisible="1"/>
                                     <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
                                     <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
                                     <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
                                 </group>
-                                <group col="2">
+                                <group>
                                     <separator string="Payment Options" colspan="2"/>
                                     <field name="writeoff_amount"/>
                                     <field name="payment_option" required="1"/>
@@ -417,6 +414,7 @@
                                            groups="analytic.group_analytic_accounting"/>
                                 </group>
                             </group>
+                            <field name="narration"  nolabel="1"  placeholder="Add an internal note"/>
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
                             <group col="4">

From 5fe3d220292498c0a79a541d39cd630f88836f07 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 28 Jun 2012 23:14:41 +0530
Subject: [PATCH 052/171] [FIX]:Fix in minor view

bzr revid: atp@tinyerp.com-20120628174441-w9228qfg8w5qw9z3
---
 addons/account_voucher/voucher_payment_receipt_view.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 0a0eb9bf4de..7c9ba177e70 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -394,15 +394,13 @@
                                 </tree>
                             </field>
                             <group>
-                                <group  attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
-                                    <separator string="Currency Options" colspan="4"/>
+                                <group string="Currency Options" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
                                     <field name="is_multi_currency" invisible="1"/>
                                     <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
                                     <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
                                     <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
                                 </group>
-                                <group>
-                                    <separator string="Payment Options" colspan="2"/>
+                                <group string="Payment Options">
                                     <field name="writeoff_amount"/>
                                     <field name="payment_option" required="1"/>
                                     <field name="writeoff_acc_id"

From 42509288758294b4850df2adc68f231dbaa0bbf0 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Fri, 29 Jun 2012 11:44:54 +0530
Subject: [PATCH 053/171] [ADD]: Add untaxed amount in sales receipt and
 purchase receipt

bzr revid: atp@tinyerp.com-20120629061454-6cmayn8jx5cykhkv
---
 addons/account_voucher/account_voucher.py     | 61 ++++++++++++-------
 .../account_voucher/account_voucher_view.xml  |  1 +
 .../voucher_sales_purchase_view.xml           | 24 ++++----
 3 files changed, 54 insertions(+), 32 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index c7749b317ac..6545990ba3a 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -129,7 +129,6 @@ class account_voucher(osv.osv):
         journal_id = context.get('journal_id', False)
         if journal_id:
             journal = journal_pool.browse(cr, uid, journal_id, context=context)
-            print "jpurnallll",journal
             if journal.currency:
                 return journal.currency.id
         return False
@@ -249,6 +248,22 @@ class account_voucher(osv.osv):
             res[voucher.id] =  voucher.amount / rate
         return res
 
+    def _amount_untaxed(self, cr, uid, ids, name, args, context=None):
+        res = {}
+        for voucher in self.browse(cr, uid, ids, context=context):
+            res[voucher.id] = {
+                'amount_untaxed': 0.0,
+            }
+            for line in voucher.line_ids:
+                res[voucher.id]['amount_untaxed'] += line.untax_amount or line.amount
+        return res
+
+    def _get_voucher_line(self, cr, uid, ids, context=None):
+        result = {}
+        for line in self.pool.get('account.voucher.line').browse(cr, uid, ids, context=context):
+            result[line.voucher_id.id] = True
+        return result.keys()
+   
     _name = 'account.voucher'
     _description = 'Accounting Voucher'
     _inherit = ['mail.thread']
@@ -286,7 +301,7 @@ class account_voucher(osv.osv):
                         \n* The \'Posted\' state is used when user create voucher,a voucher number is generated and voucher entries are created in account \
                         \n* The \'Cancelled\' state is used when user cancel voucher.'),
         'amount': fields.float('Total', digits_compute=dp.get_precision('Account'), required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'tax_amount':fields.float('Tax Amount', digits_compute=dp.get_precision('Account'), readonly=True, states={'draft':[('readonly',False)]}),
+        'tax_amount':fields.float('Tax', digits_compute=dp.get_precision('Account'), readonly=True, states={'draft':[('readonly',False)]}),
         'reference': fields.char('Ref #', size=64, readonly=True, states={'draft':[('readonly',False)]}, help="Transaction reference number."),
         'number': fields.char('Number', size=32, readonly=True,),
         'move_id':fields.many2one('account.move', 'Account Entry'),
@@ -314,6 +329,12 @@ class account_voucher(osv.osv):
             help='The specific rate that will be used, in this voucher, between the selected currency (in \'Payment Rate Currency\' field)  and the voucher currency.'),
         'paid_amount_in_company_currency': fields.function(_paid_amount_in_company_currency, string='Paid Amount in Company Currency', type='float', readonly=True),
         'is_multi_currency': fields.boolean('Multi Currency Voucher', help='Fields with internal purpose only that depicts if the voucher is a multi currency one or not'),
+        'amount_untaxed': fields.function(_amount_untaxed, digits_compute=dp.get_precision('Account'), string='Untaxed',
+            store={
+                'account.voucher': (lambda self, cr, uid, ids, c={}: ids, ['line_ids'], 20),
+                'account.voucher.line': (_get_voucher_line, ['amount', 'untax_amount '], 20),
+            },
+            multi='all'),
     }
     _defaults = {
         'period_id': _get_period,
@@ -350,28 +371,24 @@ class account_voucher(osv.osv):
         if context is None: context = {}
 
         for voucher in voucher_pool.browse(cr, uid, ids, context=context):
-            voucher_amount = 0.0
+            voucher_untax_amount = 0.0
             for line in voucher.line_ids:
-                voucher_amount += line.untax_amount or line.amount
+                voucher_untax_amount += line.untax_amount or line.amount
                 line.amount = line.untax_amount or line.amount
                 voucher_line_pool.write(cr, uid, [line.id], {'amount':line.amount, 'untax_amount':line.untax_amount})
-
             if not voucher.tax_id:
-                self.write(cr, uid, [voucher.id], {'amount':voucher_amount, 'tax_amount':0.0})
+                self.write(cr, uid, [voucher.id], {'amount': voucher_untax_amount,  'amount_untaxed': voucher_untax_amount, 'tax_amount':0.0})
                 continue
 
             tax = [tax_pool.browse(cr, uid, voucher.tax_id.id, context=context)]
             partner = partner_pool.browse(cr, uid, voucher.partner_id.id, context=context) or False
             taxes = position_pool.map_tax(cr, uid, partner and partner.property_account_position or False, tax)
             tax = tax_pool.browse(cr, uid, taxes, context=context)
-
-            total = voucher_amount
             total_tax = 0.0
-
+            total = 0.0
             if not tax[0].price_include:
-                for tax_line in tax_pool.compute_all(cr, uid, tax, voucher_amount, 1).get('taxes', []):
+                for tax_line in tax_pool.compute_all(cr, uid, tax, voucher_untax_amount, 1).get('taxes', []):
                     total_tax += tax_line.get('amount', 0.0)
-                total += total_tax
             else:
                 for line in voucher.line_ids:
                     line_total = 0.0
@@ -383,8 +400,8 @@ class account_voucher(osv.osv):
                     total_tax += line_tax
                     untax_amount = line.untax_amount or line.amount
                     voucher_line_pool.write(cr, uid, [line.id], {'amount':line_total, 'untax_amount':untax_amount})
-
-            self.write(cr, uid, [voucher.id], {'amount':total, 'tax_amount':total_tax})
+            total = total_tax+voucher_untax_amount
+            self.write(cr, uid, [voucher.id], {'amount': total, 'amount_untaxed': voucher_untax_amount, 'tax_amount':total_tax})
         return True
 
     def onchange_price(self, cr, uid, ids, line_ids, tax_id, partner_id=False, context=None):
@@ -396,17 +413,19 @@ class account_voucher(osv.osv):
         res = {
             'tax_amount': False,
             'amount': False,
+            'amount_untaxed': False,
         }
         voucher_total = 0.0
-
+        amount_untaxed = 0.0 
         line_ids = resolve_o2m_operations(cr, uid, line_pool, line_ids, ["amount"], context)
-
         for line in line_ids:
             line_amount = 0.0
             line_amount = line.get('amount',0.0)
             voucher_total += line_amount
-        total = voucher_total
+       
+        amount_untaxed = voucher_total
         total_tax = 0.0
+        total = 0.0
         if tax_id:
             tax = [tax_pool.browse(cr, uid, tax_id, context=context)]
             if partner_id:
@@ -415,13 +434,13 @@ class account_voucher(osv.osv):
                 tax = tax_pool.browse(cr, uid, taxes, context=context)
 
             if not tax[0].price_include:
-                for tax_line in tax_pool.compute_all(cr, uid, tax, voucher_total, 1).get('taxes', []):
+                for tax_line in tax_pool.compute_all(cr, uid, tax,  amount_untaxed, 1).get('taxes', []):
                     total_tax += tax_line.get('amount')
-                total += total_tax
-
+        total = total_tax + amount_untaxed
         res.update({
-            'amount':total or voucher_total,
-            'tax_amount':total_tax    
+            'amount_untaxed': amount_untaxed,
+            'amount': total,
+            'tax_amount':total_tax 
         })
         return {
             'value':res
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 907f6d47283..a924028ade5 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -94,6 +94,7 @@
                                      <field name="tax_id" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/>
                                    </group>
                                    <group>
+                                   <field name="amount_untaxed"/>
                                      <field name="tax_amount"/>
                                      <field name="amount" class="oe_subtotal_footer_separator"/>
                                    </group>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 7e0721d6b3d..956fea346d9 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -129,17 +129,19 @@
                             <button type="object"
                                    icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax"
                                     attrs="{'invisible': [('state','!=','draft')]}"/>
+                               <field name="tax_id"
+                                on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
+                                widget="selection"
+                               domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
+                                    
                             <group>
                                 <group>
-                                      <field name="narration" placeholder="Internal Notes" nolabel="1" />
+                                      <field name="narration" placeholder="Add a internal note." nolabel="1" />
                                 </group>
                                 <group class="oe_subtotal_footer">
-                                    <field name="tax_id" string="Tax"
-                                        on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
-                                        widget="selection"
-                                       domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
-                                    <field name="tax_amount"/>
-                                    <field name="amount" class="oe_subtotal_footer_separator" />
+                                   <field name="amount_untaxed"/>
+                                    <field name="tax_amount" readonly="1"/>
+                                    <field name="amount" class="oe_subtotal_footer_separator" readonly="1"/>
                                 </group>
                             </group>
                         </page>
@@ -279,10 +281,10 @@
                                         widget="selection"
                                         domain="[('type_tax_use','in',('purchase','all')), ('parent_id', '=', False)]"
                                         />
-                                    <field name="tax_amount" />
-                                    <field name="amount" string="Total" class="oe_subtotal_footer_separator"/>
-                                </group>                                    
-
+                                    <field name="amount_untaxed" readonly="1"/>
+                                    <field name="tax_amount" readonly="1"/>
+                                    <field name="amount" string="Total" class="oe_subtotal_footer_separator" readonly="1"/>
+                                </group>
                             </group>
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">

From 4a40e6779ac32b9709b87a1046269be636ec6105 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Fri, 29 Jun 2012 12:54:02 +0530
Subject: [PATCH 054/171] [IMP]: Improve view

bzr revid: atp@tinyerp.com-20120629072402-fnzj2y4le7leeqe7
---
 addons/account_voucher/account_voucher.py     |  2 +-
 .../account_voucher/account_voucher_view.xml  |  8 ++--
 .../voucher_payment_receipt_view.xml          |  6 ++-
 .../voucher_sales_purchase_view.xml           | 41 +++++++++++--------
 4 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 6545990ba3a..10da37dd88a 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -332,7 +332,7 @@ class account_voucher(osv.osv):
         'amount_untaxed': fields.function(_amount_untaxed, digits_compute=dp.get_precision('Account'), string='Untaxed',
             store={
                 'account.voucher': (lambda self, cr, uid, ids, c={}: ids, ['line_ids'], 20),
-                'account.voucher.line': (_get_voucher_line, ['amount', 'untax_amount '], 20),
+                'account.voucher.line': (_get_voucher_line, ['account_id', 'voucher_id', 'amount', 'untax_amount '], 20),
             },
             multi='all'),
     }
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index a924028ade5..9d61084ebfd 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -89,14 +89,14 @@
                              <group>
                                 <field name="narration" colspan="2" nolabel="1"  placeholder="Add an internal note"/>
                              </group>
-                               <group attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}" class="oe_subtotal_footer  oe_right">
+                               <group attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}" class="oe_subtotal_footer">
                                    <group>
                                      <field name="tax_id" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/>
                                    </group>
                                    <group>
-                                   <field name="amount_untaxed"/>
-                                     <field name="tax_amount"/>
-                                     <field name="amount" class="oe_subtotal_footer_separator"/>
+                                   <field name="amount_untaxed" readonly="1"/>
+                                     <field name="tax_amount" readonly="1"/>
+                                     <field name="amount" class="oe_subtotal_footer_separator" readonly="1"/>
                                    </group>
                               </group>
                               <group>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 7c9ba177e70..74dbf939732 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -393,7 +393,10 @@
                                     <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)" string="Allocation"/>
                                 </tree>
                             </field>
-                            <group>
+                            <group col="3">
+                               <group>
+                                   <field name="narration"  nolabel="1"  placeholder="Add an internal note"/>
+                               </group>
                                 <group string="Currency Options" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
                                     <field name="is_multi_currency" invisible="1"/>
                                     <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
@@ -412,7 +415,6 @@
                                            groups="analytic.group_analytic_accounting"/>
                                 </group>
                             </group>
-                            <field name="narration"  nolabel="1"  placeholder="Add an internal note"/>
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
                             <group col="4">
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 956fea346d9..2dbc59d63cc 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -126,23 +126,28 @@
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                 </tree>
                             </field>
-                            <button type="object"
-                                   icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax"
-                                    attrs="{'invisible': [('state','!=','draft')]}"/>
-                               <field name="tax_id"
-                                on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
-                                widget="selection"
-                               domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
-                                    
                             <group>
                                 <group>
                                       <field name="narration" placeholder="Add a internal note." nolabel="1" />
                                 </group>
                                 <group class="oe_subtotal_footer">
-                                   <field name="amount_untaxed"/>
-                                    <field name="tax_amount" readonly="1"/>
-                                    <field name="amount" class="oe_subtotal_footer_separator" readonly="1"/>
+                                  <group>
+                                     <field name="tax_id"
+                                      on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
+                                      widget="selection"
+                                      domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
+                                  </group>
+                                  <group>
+                                       <field name="amount_untaxed"/>
+                                       <field name="tax_amount" readonly="1"/>
+                                       <field name="amount" class="oe_subtotal_footer_separator" readonly="1"/>
+                                    </group>
                                 </group>
+                               <group>
+                                 <button type="object"
+                                   icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax"
+                                    attrs="{'invisible': [('state','!=','draft')]}"/>
+                               </group>
                             </group>
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
@@ -273,17 +278,21 @@
                             </field>
                             <group>
                                 <group>
-                                    <field name="narration" placeholder="Internal Notes" nolabel="1" />
+                                    <field name="narration" placeholder="Internal Notes" colspan="2" nolabel="1" />
                                 </group>
                                 <group class="oe_subtotal_footer">
-                                    <field name="tax_id" 
+                                   <group>
+                                     <field name="tax_id" 
                                         on_change="onchange_price(line_dr_ids, tax_id, partner_id)"
                                         widget="selection"
                                         domain="[('type_tax_use','in',('purchase','all')), ('parent_id', '=', False)]"
                                         />
-                                    <field name="amount_untaxed" readonly="1"/>
-                                    <field name="tax_amount" readonly="1"/>
-                                    <field name="amount" string="Total" class="oe_subtotal_footer_separator" readonly="1"/>
+                                   </group>
+                                    <group>
+                                       <field name="amount_untaxed" readonly="1"/>
+                                       <field name="tax_amount" readonly="1"/>
+                                       <field name="amount" string="Total" class="oe_subtotal_footer_separator" readonly="1"/>
+                                    </group>
                                 </group>
                             </group>
                         </page>

From 1ca5472d75c0aa005ea1a869df36e70e817a734f Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 29 Jun 2012 16:00:00 +0530
Subject: [PATCH 055/171] [IMP]:purchase:Incoming Shipment: add a field
 warehouse below the company (the field warehouse is filled with the one in
 rlated PO)

bzr revid: apa@tinyerp.com-20120629103000-kr5ugo7ej2wx75su
---
 addons/purchase/stock.py       | 2 ++
 addons/purchase/stock_view.xml | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index 06b391513e0..95c1c6e2423 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -39,6 +39,7 @@ class stock_picking(osv.osv):
     _columns = {
         'purchase_id': fields.many2one('purchase.order', 'Purchase Order',
             ondelete='set null', select=True),
+        
     }
     _defaults = {
         'purchase_id': False,
@@ -134,5 +135,6 @@ class stock_picking_in(osv.osv):
     _columns = {
         'purchase_id': fields.many2one('purchase.order', 'Purchase Order',
             ondelete='set null', select=True),
+        'warehouse_id': fields.related('purchase_id', 'warehouse_id', type='many2one', relation='stock.warehouse', string='Warehouse'),
     }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index df6ba9531f3..18b9e3579f1 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -51,9 +51,12 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
-                 <xpath expr="/form/sheet/group/group/field[@name='date']" position="before">
+                <xpath expr="//field[@name='date']" position="before">
                     <field name="purchase_id"/>
                 </xpath>
+                <xpath expr="//field[@name='company_id']" position="after">
+                    <field name="warehouse_id"/>
+                </xpath>
             </field>
         </record>
         

From c09112510f243851200f7e4f5b8dd5e09d6a19ba Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Fri, 29 Jun 2012 17:09:33 +0530
Subject: [PATCH 056/171] [IMP] res-partner-view

bzr revid: pna@tinyerp.com-20120629113933-ei3t7z6u0fx3e5h4
---
 addons/crm_claim/crm_claim_view.xml            |  5 ++++-
 addons/event/res_partner_view.xml              | 12 ++++++++++--
 addons/marketing_campaign/res_partner_view.xml |  7 +++++--
 addons/project/res_partner_view.xml            |  7 +++++--
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index a080dd71c52..35c5e300bc5 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -257,6 +257,9 @@
                 <xpath expr="//page[@string='History']" position="attributes">
                     <attribute name="invisible">False</attribute>
                 </xpath>
+                <xpath expr="//group[@string='Claim']" position="attributes">
+                   <attribute name="invisible">False</attribute>
+                </xpath>
             </field>
         </record>
         <record id="view_claim_partner_info_form1" model="ir.ui.view">
@@ -267,7 +270,7 @@
             <field name="priority">20</field>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//page[@string='History']" position="inside">
+                    <xpath expr="//group[@string='Claim']" position="inside">
                         <field name="claims_ids" colspan="4" nolabel="1">
                             <tree string="Partners Claim" editable="bottom">
                                 <field name="name"/>
diff --git a/addons/event/res_partner_view.xml b/addons/event/res_partner_view.xml
index 410030408c7..6a3db28d486 100644
--- a/addons/event/res_partner_view.xml
+++ b/addons/event/res_partner_view.xml
@@ -13,6 +13,12 @@
                 <field name="supplier" position="after">
                     <field name="speaker"/>
                 </field>
+                <xpath expr="//group[@string='Event']" position="attributes">
+                   <attribute name="invisible">False</attribute>
+                </xpath>
+                <xpath expr="//group[@string='Registration']" position="attributes">
+                   <attribute name="invisible">False</attribute>
+                </xpath>
             </field>
        </record>
        <record id="view_event_partner_info_form" model="ir.ui.view">
@@ -21,13 +27,15 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <page string="History" position="inside">
+                <group string="Event" position="inside">
                     <field name="event_ids" colspan="4" nolabel="1">
                         <tree string="Events">
                             <field name="name" string="Event"/>
                             <field name="main_speaker_id"/>
                         </tree>
                     </field>
+                   </group>
+                   <group string="Registration" position="inside">
                     <field name="event_registration_ids" colspan="4" nolabel="1">
                         <tree string="Events Registration">
                             <field name="event_begin_date" string="Date"/>
@@ -39,7 +47,7 @@
                             <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
                         </tree>
                     </field>
-                </page>
+               </group>
             </field>
        </record>
 
diff --git a/addons/marketing_campaign/res_partner_view.xml b/addons/marketing_campaign/res_partner_view.xml
index b5fb2a31f1a..a424ad03a5f 100644
--- a/addons/marketing_campaign/res_partner_view.xml
+++ b/addons/marketing_campaign/res_partner_view.xml
@@ -12,6 +12,9 @@
                 <xpath expr="//page[@string='History']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
+                <xpath expr="//group[@string='Campaign']" position="attributes">
+                   <attribute name="invisible">False</attribute>
+                </xpath>
            </field>
           </record>	
         <record id="view_workitem_partner_info_form" model="ir.ui.view">
@@ -20,9 +23,9 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                    <page string="History" position="inside">
+                    <group string="Campaign" position="inside">
                             <field name="workitem_ids" colspan="4" nolabel="1"/>
-                        </page>
+                    </group>
             </field>
        </record>
    </data>
diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml
index 2a648791056..2fd15bbf8d1 100644
--- a/addons/project/res_partner_view.xml
+++ b/addons/project/res_partner_view.xml
@@ -12,6 +12,9 @@
                 <xpath expr="//page[@string='History']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
+                <xpath expr="//group[@string='Tasks']" position="attributes">
+                   <attribute name="invisible">False</attribute>
+                </xpath>
              </field>
           </record>	
         <record id="view_task_partner_info_form" model="ir.ui.view">
@@ -20,7 +23,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <page string="History" position="inside">
+                   <group string="Tasks" position="inside">
                     <field name="task_ids" colspan="4" nolabel="1">
                         <tree string="Tasks" editable="bottom">
                             <field name="name"/>
@@ -31,7 +34,7 @@
 			    <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
                         </tree>
                     </field>
-                </page>
+                  </group>
             </field>
        </record>
        

From f5b9ce48941e7e573a6c40509933130fc083a668 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 29 Jun 2012 17:11:39 +0530
Subject: [PATCH 057/171] [IMP]:improved view

bzr revid: apa@tinyerp.com-20120629114139-ajfyd8j1q2ljxo1x
---
 addons/delivery/delivery_view.xml             |  99 +++++-----
 addons/procurement/procurement_view.xml       |  15 +-
 addons/stock/stock_view.xml                   | 177 ++++++++++--------
 addons/stock_planning/stock_planning_view.xml |   4 +-
 4 files changed, 161 insertions(+), 134 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index b78bfd0f8b7..9c469addb71 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -15,6 +15,7 @@
                 </tree>
             </field>
         </record>
+        
         <record id="view_delivery_carrier_form" model="ir.ui.view">
             <field name="name">delivery.carrier.form</field>
             <field name="model">delivery.carrier</field>
@@ -22,64 +23,68 @@
             <field name="arch" type="xml">
                 <form string="Carrier" version="7.0">
                     <sheet>
-                        <group col="4">
-                            <group>
-                                <label for="free_if_more_than"/>
-                                <div>
-                                    <field name="free_if_more_than" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}" class="oe_inline"/>
-                                    <field name="amount" attrs="{'required':[('free_if_more_than','&lt;&gt;',False)], 'invisible':[('free_if_more_than','=',False)]}" class="oe_inline"/>
-                                </div>
-                                <field name="use_detailed_pricelist"/>
-                            </group>
-                            <group>
-                                <field name="name"/>
-                                <field name="partner_id"/>
-                                <field name="product_id"/>
-                                <field name="active" invisible="1"/>
-                                <field name="normal_price" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}" invisible="1"/>
+                        <group col="4" name="general">
+                            <field name="name"/>
+                            <field name="partner_id"/>
+                            <field name="product_id"/>
+                            <field name="active"/>
+                            <separator string="Pricing Information" colspan="4"/>
+                            <group colspan="4" col="4">
+                                <group col="2" colspan="2">
+                                    <field name="normal_price" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
+                                    <label for="free_if_more_than"/>
+                                    <div>
+                                        <field name="free_if_more_than" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
+                                        <field name="amount" attrs="{'required':[('free_if_more_than','&lt;&gt;',False)], 'invisible':[('free_if_more_than','=',False)]}"/>
+                                    </div>
+                                </group>
                             </group>
+                            <newline/>
+                            <field name="use_detailed_pricelist"/>
                         </group>
-                        <group>
-                            <field name="pricelist_ids" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree,form" nolabel="1">
-                                 <tree string="Delivery grids">
-                                      <field name="sequence"/>
-                                      <field name="name"/>
-                                 </tree>
-                                 <form string="Delivery grids" version="7.0">
-                                     <group>
-                                         <group>
-                                             <field name="name"/>
-                                         </group>
-                                         <group>
-                                             <field name="active"/>
-                                             <field name="sequence"/>
-                                         </group>
-                                     </group>
-                                     <notebook>
-                                        <page string="Grid definition">
-                                           <field name="line_ids"/>
-                                        </page>
-                                        <page string="Destination">
+                        <field name="pricelist_ids" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree,form">
+                            <tree string="Delivery grids">
+                                  <field name="sequence"/>
+                                  <field name="name"/>
+                            </tree>
+                            <form string="Delivery grids" version="7.0">
+                                 <group>
+                                    <group>
+                                        <field name="name"/>
+                                    </group>
+                                    <group>
+                                        <field name="active"/>
+                                        <field name="sequence"/>
+                                    </group>
+                                 </group>
+                                 <notebook>
+                                    <page string="Grid definition">
+                                       <field name="line_ids"/>
+                                    </page>
+                                    <page string="Destination">
+                                        <group>
                                             <group>
                                                 <field name="country_ids" widget="many2many_tags"/>
                                                 <field name="state_ids" widget="many2many_tags"/>
                                             </group>
-                                            <group class="oe_inline" col="4">
-                                                <field name="zip_from" string="Zip"/>
-                                                <label  string="-"/>
-                                                <field name="zip_to" nolabel="1"/>
+                                            <group>
+                                                <label for="zip_from" string="Zip"/>
+                                                <div>
+                                                    <field name="zip_from" class="oe_inline"/>
+                                                    -
+                                                    <field name="zip_to" class="oe_inline"/>
+                                                </div>
                                             </group>
-                                        </page>
-                                    </notebook>
-                                </form>
-                            </field>
-
-                        </group>
-
+                                        </group>
+                                    </page>
+                                </notebook>
+                            </form>
+                       </field>
                     </sheet>
                 </form>
             </field>
         </record>
+        
         <record id="action_delivery_carrier_form" model="ir.actions.act_window">
             <field name="name">Delivery Method</field>
             <field name="type">ir.actions.act_window</field>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index c89b8d1daa3..a32e7091b29 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -55,19 +55,24 @@
                         <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed" />
                     </header>
                     <sheet>
+                    <label for="name" class="oe_edit_only"/>
                     <h1>
                         <field name="name" class="oe_inline"/>
                         <label string="-" attrs="{'invisible':[('origin','=',False)]}"/>
                         <field name="origin"  class="oe_inline"/>
                     </h1>
+                    <label for="message" class="oe_edit_only"/>
                     <h2>
                         <field name="message"/>
                     </h2>
-                    <group>
-                        <field name="date_planned"/>
-                        <field name="procure_method"/>
-                        <field name="priority"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection" invisible="1"/>
+                    <group col="4" colspan="4">
+                        <group col="2" colspan="2">
+                            <field name="date_planned"/>
+                            <field name="procure_method"/>
+                            <field name="priority"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection" invisible="1"/>
+                        </group>
+                        <group col="2" colspan="2"/>
                     </group>
                     <notebook>
                     <page string="Procurement Details">
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 78be02ad324..aed29ad2609 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -121,14 +121,16 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet>
+                    <label for="name" class="oe_edit_only"/>
                     <h1>
                         <field name="name" placeholder="Annual inventory" class="oe_inline"/>
                         <span> - </span>
                         <field name="date" class="oe_inline"/>
                     </h1>
-                    <div>
+                    <label for="company_id" class="oe_edit_only"/>
+                    <h2>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    </div>
+                    </h2>
                     <notebook>
                     <page string="General Informations">
                         <field name="inventory_line_id">
@@ -144,16 +146,27 @@
                                 <field name="state" invisible="True"/>
                             </tree>
                             <form string="Products" version="7.0">
-                                <group>
-                                    <field domain="[('usage','=','internal')]" name="location_id"/>
-                                    <field context="{'location':location_id, 'uom':product_uom, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)"  domain="[('type','&lt;&gt;','service')]"/>
-                                    <field name="product_qty"/>
-                                    <field name="product_uom" groups="product.group_uom"/>
-                                    <field name="prod_lot_id" groups="stock.group_production_lot"/>
-                                    <button name="%(stock.action_view_stock_inventory_line_split)d"
-                                        string="Split inventory lines" groups="stock.group_inventory_valuation"
-                                        type="action" icon="terp-stock_effects-object-colorize"/>
-                                </group>
+                                <sheet>
+                                    <div class="oe_right oe_button_box">
+                                        <button name="%(stock.action_view_stock_inventory_line_split)d"
+                                            string="Split inventory lines" groups="stock.group_inventory_valuation"
+                                            type="action" icon="terp-stock_effects-object-colorize"/>
+                                    </div>
+                                    <group>
+                                        <group>
+                                            <field domain="[('usage','=','internal')]" name="location_id"/>
+                                            <field context="{'location':location_id, 'uom':product_uom, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)"  domain="[('type','&lt;&gt;','service')]"/>
+                                        </group>
+                                        <group>
+                                            <label for="product_qty"/>
+                                            <div>
+                                                <field name="product_qty" class="oe_inline"/>
+                                                <field name="product_uom" class="oe_inline" groups="product.group_uom"/>
+                                            </div>
+                                            <field name="prod_lot_id" groups="stock.group_production_lot"/>
+                                        </group>
+                                    </group>
+                                </sheet>
                             </form>
                         </field>
                     </page>
@@ -326,44 +339,46 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Serial Number" version="7.0">
-                    <group>
-                        <group string="Serial Number Identification">
-                            <field name="product_id"/>
-                            <field name="prefix"/>
-                            <field name="name"/>
-                            <field name="ref"/>
-                            <group string="Dates">
-                                <field name="date"/>
+                    <sheet>
+                        <group>
+                            <group string="Serial Number Identification">
+                                <field name="product_id"/>
+                                <field name="prefix"/>
+                                <field name="name"/>
+                                <field name="ref"/>
+                                <group string="Dates">
+                                    <field name="date"/>
+                                </group>
+                            </group>
+                            <group string="Traceability">
+                                <field name="stock_available"/>
+                                <button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': '', 'field': 'prodlot_id'}" icon="gtk-go-up" colspan="2"/>
+                                <button name="action_traceability" string="Downstream Traceability" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}" icon="gtk-go-down" colspan="2"/>
                             </group>
                         </group>
-                        <group string="Traceability">
-                            <field name="stock_available"/>
-                            <button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': '', 'field': 'prodlot_id'}" icon="gtk-go-up" colspan="2"/>
-                            <button name="action_traceability" string="Downstream Traceability" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}" icon="gtk-go-down" colspan="2"/>
-                        </group>
-                    </group>
-                    <notebook>
-                        <page string="Revisions">
-                            <field name="revisions"/>
-                        </page>
-                        <page string="Stock Moves">
-                            <field name="move_ids">
-                                <tree  string="Stock Moves">
-                                    <field name="picking_id" string="Reference"/>
-                                    <field name="origin"/>
-                                    <field name="product_id"/>
-                                    <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                                    <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
-                                    <field name="tracking_id" groups="stock.group_tracking_lot"/>
-                                    <field name="date"/>
-                                    <field name="prodlot_id"/>
-                                    <field name="location_id" groups="stock.group_locations"/>
-                                    <field name="location_dest_id" groups="stock.group_locations"/>
-                                    <field name="state"/>
-                                </tree>
-                             </field>
-                        </page>
-                    </notebook>
+                        <notebook>
+                            <page string="Revisions">
+                                <field name="revisions"/>
+                            </page>
+                            <page string="Stock Moves">
+                                <field name="move_ids">
+                                    <tree  string="Stock Moves">
+                                        <field name="picking_id" string="Reference"/>
+                                        <field name="origin"/>
+                                        <field name="product_id"/>
+                                        <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                        <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
+                                        <field name="tracking_id" groups="stock.group_tracking_lot"/>
+                                        <field name="date"/>
+                                        <field name="prodlot_id"/>
+                                        <field name="location_id" groups="stock.group_locations"/>
+                                        <field name="location_dest_id" groups="stock.group_locations"/>
+                                        <field name="state"/>
+                                    </tree>
+                                 </field>
+                            </page>
+                        </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -509,39 +524,41 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Stock Location" version="7.0">
-                    <label for="name" class="oe_edit_only"/>
-                    <h1><field name="name"/></h1>
-                    <label for="location_id" class="oe_edit_only"/>
-                    <h2><field name="location_id"/></h2>
-                    <group>
-                        <group string="Additional Information">
-                            <field name="usage"/>
-                            <field name="partner_id"/>
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            <field name="icon"/>
-                            <field name="scrap_location"/>
-                            <field name="active"/>
+                    <sheet>
+                        <label for="name" class="oe_edit_only"/>
+                        <h1><field name="name"/></h1>
+                        <label for="location_id" class="oe_edit_only"/>
+                        <h2><field name="location_id"/></h2>
+                        <group>
+                            <group string="Additional Information">
+                                <field name="usage"/>
+                                <field name="partner_id"/>
+                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                <field name="icon"/>
+                                <field name="scrap_location"/>
+                                <field name="active"/>
+                            </group>
+                            <group string="Chained Locations">
+                                <field name="chained_location_type"/>
+                                <field name="chained_location_id"  attrs="{'required':[('chained_location_type','=','fixed')]}"/>
+                                <field name="chained_auto_packing"/>
+                                <field name="chained_delay"/>
+                                <field name="chained_journal_id"/>
+                                <field name="chained_picking_type"/>
+                                <field name="chained_company_id" widget="selection"/>
+                            </group>
+                            <group string="Localization">
+                                <field name="posx"/>
+                                <field name="posy"/>
+                                <field name="posz"/>
+                            </group><group string="Accounting Information">
+                                <field name="valuation_in_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/>
+                                <field name="valuation_out_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/>
+                            </group>
                         </group>
-                        <group string="Chained Locations">
-                            <field name="chained_location_type"/>
-                            <field name="chained_location_id"  attrs="{'required':[('chained_location_type','=','fixed')]}"/>
-                            <field name="chained_auto_packing"/>
-                            <field name="chained_delay"/>
-                            <field name="chained_journal_id"/>
-                            <field name="chained_picking_type"/>
-                            <field name="chained_company_id" widget="selection"/>
-                        </group>
-                        <group string="Localization">
-                            <field name="posx"/>
-                            <field name="posy"/>
-                            <field name="posz"/>
-                        </group><group string="Accounting Information">
-                            <field name="valuation_in_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/>
-                            <field name="valuation_out_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/>
-                        </group>
-                    </group>
-                    <separator string="Additional Information"/>
-                    <field name="comment"/>
+                        <separator string="Additional Information"/>
+                        <field name="comment"/>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 0c610c090ff..86755d8c8d0 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -299,8 +299,8 @@
                             <field name="supply_warehouse_id" domain = "[('company_id','=',company_id)] "/>
                             <field name="stock_supply_location"/>
                         </group>
-                        <group string = "Procurement Histor">
-                            <field name = "history" nolabel = "1"/>
+                        <group string="Procurement History">
+                            <field name="history" nolabel = "1"/>
                         </group>
                     </sheet>
                 </form>

From 7828a1002af4acf1371ee6f56c4b94dadf1b4c41 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Fri, 29 Jun 2012 17:20:04 +0530
Subject: [PATCH 058/171] [IMP]: ADD oe_right in oe_subtotal_footer group.

bzr revid: atp@tinyerp.com-20120629115004-26a3q4t3bwsrc3em
---
 addons/account_voucher/account_voucher_view.xml        | 2 +-
 addons/account_voucher/voucher_sales_purchase_view.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 9d61084ebfd..5245b3525cd 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -89,7 +89,7 @@
                              <group>
                                 <field name="narration" colspan="2" nolabel="1"  placeholder="Add an internal note"/>
                              </group>
-                               <group attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}" class="oe_subtotal_footer">
+                               <group attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}" class="oe_subtotal_footer oe_right">
                                    <group>
                                      <field name="tax_id" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/>
                                    </group>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 2dbc59d63cc..ea811b1d02a 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -130,7 +130,7 @@
                                 <group>
                                       <field name="narration" placeholder="Add a internal note." nolabel="1" />
                                 </group>
-                                <group class="oe_subtotal_footer">
+                                <group class="oe_subtotal_footer oe_right">
                                   <group>
                                      <field name="tax_id"
                                       on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
@@ -280,7 +280,7 @@
                                 <group>
                                     <field name="narration" placeholder="Internal Notes" colspan="2" nolabel="1" />
                                 </group>
-                                <group class="oe_subtotal_footer">
+                                <group class="oe_subtotal_footer oe_right">
                                    <group>
                                      <field name="tax_id" 
                                         on_change="onchange_price(line_dr_ids, tax_id, partner_id)"

From 297699f4d2d8e1f2d80a5b55c404414537d0c481 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Fri, 29 Jun 2012 17:22:26 +0530
Subject: [PATCH 059/171] [REM]: Remove account_invoice_layout module

bzr revid: atp@tinyerp.com-20120629115226-xhiwxn7m8507evdi
---
 .../account_invoice_layout.py.THIS            | 210 ------------------
 .../account_invoice_layout_view.xml.THIS      | 123 ----------
 2 files changed, 333 deletions(-)
 delete mode 100644 addons/account_invoice_layout/account_invoice_layout.py.THIS
 delete mode 100644 addons/account_invoice_layout/account_invoice_layout_view.xml.THIS

diff --git a/addons/account_invoice_layout/account_invoice_layout.py.THIS b/addons/account_invoice_layout/account_invoice_layout.py.THIS
deleted file mode 100644
index 1336914fb35..00000000000
--- a/addons/account_invoice_layout/account_invoice_layout.py.THIS
+++ /dev/null
@@ -1,210 +0,0 @@
-# -*- 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/>.
-#
-##############################################################################
-
-from osv import fields, osv
-
-class notify_message(osv.osv):
-    _name = 'notify.message'
-    _description = 'Notify By Messages'
-    _columns = {
-        'name':  fields.char('Title', size=64, required=True),
-        'msg': fields.text('Special Message', size=128, required=True, help='This notification will appear at the bottom of the Invoices when printed.', translate=True)
-    }
-
-notify_message()
-
-class account_invoice_line(osv.osv):
-
-    def move_line_get_item(self, cr, uid, line, context=None):
-        if line.state != 'article':
-            return None
-        return super(account_invoice_line, self).move_line_get_item(cr, uid, line, context)
-
-    def fields_get(self, cr, uid, fields=None, context=None):
-        article = {
-            'article': [('readonly', False), ('invisible', False)],
-            'text': [('readonly', True), ('invisible', True), ('required', False)],
-            'subtotal': [('readonly', True), ('invisible', True), ('required', False)],
-            'title': [('readonly', True), ('invisible', True), ('required', False)],
-            'break': [('readonly', True), ('invisible', True), ('required', False)],
-            'line': [('readonly', True), ('invisible', True), ('required', False)],
-        }
-        states = {
-            'name': {
-                'break': [('readonly', True),('required', False),('invisible', True)],
-                'line': [('readonly', True),('required', False),('invisible', True)],
-                },
-            'product_id': article,
-            'account_id': article,
-            'quantity': article,
-            'uos_id': article,
-            'price_unit': article,
-            'discount': article,
-            'invoice_line_tax_id': article,
-            'account_analytic_id': article,
-        }
-        res = super(account_invoice_line, self).fields_get(cr, uid, fields, context)
-        for field in res:
-            if states.has_key(field):
-                for key,value in states[field].items():
-                    res[field].setdefault('states',{})
-                    res[field]['states'][key] = value
-        return res
-
-    def onchange_invoice_line_view(self, cr, uid, id, type, context=None, *args):
-
-        if (not type):
-            return {}
-        if type != 'article':
-            temp = {'value': {
-                    'product_id': False,
-                    'uos_id': False,
-                    'account_id': False,
-                    'price_unit': False,
-                    'price_subtotal': False,
-                    'quantity': 0,
-                    'discount': False,
-                    'invoice_line_tax_id': False,
-                    'account_analytic_id': False,
-                    },
-                }
-            if type == 'line':
-                temp['value']['name'] = ' '
-            if type == 'break':
-                temp['value']['name'] = ' '
-            if type == 'subtotal':
-                temp['value']['name'] = 'Sub Total'
-            return temp
-        return {}
-
-    def create(self, cr, user, vals, context=None):
-        if vals.has_key('state'):
-            if vals['state'] == 'line':
-                vals['name'] = ' '
-            if vals['state'] == 'break':
-                vals['name'] = ' '
-            if vals['state'] != 'article':
-                vals['quantity']= 0
-                vals['account_id']= self._default_account(cr, user, None)
-        return super(account_invoice_line, self).create(cr, user, vals, context)
-
-    def write(self, cr, user, ids, vals, context=None):
-        if vals.has_key('state'):
-            if vals['state'] != 'article':
-                vals['product_id']= False
-                vals['uos_id']= False
-                vals['account_id']= self._default_account(cr, user, None)
-                vals['price_unit']= False
-                vals['price_subtotal']= False
-                vals['quantity']= 0
-                vals['discount']= False
-                vals['invoice_line_tax_id']= False
-                vals['account_analytic_id']= False
-            if vals['state'] == 'line':
-                vals['name'] = ' '
-            if vals['state'] == 'break':
-                vals['name'] = ' '
-        return super(account_invoice_line, self).write(cr, user, ids, vals, context)
-
-    def copy_data(self, cr, uid, id, default=None, context=None):
-        if default is None:
-            default = {}
-        default['state'] = self.browse(cr, uid, id, context=context).state
-        return super(account_invoice_line, self).copy_data(cr, uid, id, default, context)
-
-    def _fnct(self, cr, uid, ids, name, args, context=None):
-        res = {}
-        lines = self.browse(cr, uid, ids, context=context)
-        account_ids = [line.account_id.id for line in lines]
-        account_names = dict(self.pool.get('account.account').name_get(cr, uid, account_ids, context=context))
-        for line in lines:
-            if line.state != 'article':
-                if line.state == 'line':
-                    res[line.id] = '-----------------------------------------'
-                elif line.state == 'break':
-                    res[line.id] = 'PAGE BREAK'
-                else:
-                    res[line.id] = ' '
-            else:
-                res[line.id] = account_names.get(line.account_id.id, '')
-        return res
-
-    _name = "account.invoice.line"
-    _order = "invoice_id, sequence asc"
-    _description = "Invoice Line"
-    _inherit = "account.invoice.line"
-    _columns = {
-        'state': fields.selection([
-                ('article','Product'),
-                ('title','Title'),
-                ('text','Note'),
-                ('subtotal','Sub Total'),
-                ('line','Separator Line'),
-                ('break','Page Break'),]
-            ,'Type', select=True, required=True),
-        'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of invoice lines."),
-        'functional_field': fields.function(_fnct, arg=None, fnct_inv=None, fnct_inv_arg=None, type='char', fnct_search=None, obj=None, store=False, string="Source Account"),
-    }
-
-    def _default_account(self, cr, uid, context=None):
-        cr.execute("select id from account_account where parent_id IS NULL LIMIT 1")
-        res = cr.fetchone()
-        return res[0]
-
-    _defaults = {
-        'state': 'article',
-        'sequence': 0,
-    }
-
-account_invoice_line()
-
-class one2many_mod2(fields.one2many):
-
-    def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
-        if context is None:
-            context = {}
-        if not values:
-            values = {}
-        res = {}
-        for id in ids:
-            res[id] = []
-        ids2 = obj.pool.get(self._obj).search(cr, user, [(self._fields_id,'in',ids),('state','=','article')], limit=self._limit)
-        for r in obj.pool.get(self._obj)._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_write'):
-            res[r[self._fields_id]].append( r['id'] )
-        return res
-
-class account_invoice(osv.osv):
-
-    def copy(self, cr, uid, id, default=None, context=None):
-        if default is None:
-            default = {}
-        default['invoice_line'] = False
-        return super(account_invoice, self).copy(cr, uid, id, default, context)
-
-    _inherit = "account.invoice"
-    _columns = {
-        'abstract_line_ids': fields.one2many('account.invoice.line', 'invoice_id', 'Invoice Lines',readonly=True, states={'draft':[('readonly',False)]}),
-        'invoice_line': one2many_mod2('account.invoice.line', 'invoice_id', 'Invoice Lines',readonly=True, states={'draft':[('readonly',False)]}),
-    }
-
-account_invoice()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_invoice_layout/account_invoice_layout_view.xml.THIS b/addons/account_invoice_layout/account_invoice_layout_view.xml.THIS
deleted file mode 100644
index faaed1dfd79..00000000000
--- a/addons/account_invoice_layout/account_invoice_layout_view.xml.THIS
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0"?>
-
-<openerp>
-    <data>
-
-        <record model="ir.ui.view" id="view_invoice_line_form_inherit_1">
-            <field name="name">account.invoice.line.form.inherit_1</field>
-            <field name="model">account.invoice.line</field>
-            <field name="inherit_id" ref="account.view_invoice_line_form"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <field name="product_id" position="before">
-                    <field name="state" on_change="onchange_invoice_line_view(state)" />
-                </field>
-                <field name="account_id" position="before">
-                    <field name="sequence"/>
-                </field>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_invoice_line_tree_inherit_1">
-            <field name="name">account.invoice.line.tree.inherit_1</field>
-            <field name="model">account.invoice.line</field>
-            <field name="inherit_id" ref="account.view_invoice_line_tree"/>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <xpath expr="/tree/field[@name='name']" position="before">
-                    <field name="state" invisible="1"/>
-                    <field name="sequence" string="Seq."/>
-                </xpath>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_invoice_line_tree_inherit_2">
-            <field name="name">account.invoice.line.tree.inherit_2</field>
-            <field name="model">account.invoice.line</field>
-            <field name="inherit_id" ref="view_invoice_line_tree_inherit_1"/>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <xpath expr="/tree/field[@name='account_id']" position="replace">
-                    <field name="functional_field"/>
-                </xpath>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="account_invoice_form_inherit_1">
-            <field name="name">account.invoice.form.inherit_1</field>
-            <field name="model">account.invoice</field>
-            <field name="inherit_id" ref="account.invoice_form"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='invoice_line']" position="replace">
-                    <!-- keep the original fields, because other views position on that, too -->
-                    <field name="invoice_line" invisible="True"/>
-                    <field name="abstract_line_ids" colspan="4" nolabel="1"/>
-                </xpath>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="account_invoice_supplier_form_layout">
-          <field name="name">account.invoice.supplier.form.layout</field>
-          <field name="model">account.invoice</field>
-          <field name="inherit_id" ref="account.invoice_supplier_form"/>
-          <field name="type">form</field>
-          <field name="arch" type="xml">
-            <xpath expr="//field[@name='invoice_line']/tree/*[1]" position="before">
-              <field name="state" invisible="1"/>
-            </xpath>
-          </field>
-        </record>
-
-<!-- notification message views -->
-    <record model="ir.ui.view" id="view_notify_message_search">
-        <field name="name">notify.message.search</field>
-        <field name="model">notify.message</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-            <search string="Messages">
-                <field name="name" string="Message"/>
-                <separator orientation="vertical"/>
-                <field name="msg"/>
-            </search>
-        </field>
-    </record>
-    <record model="ir.ui.view" id="view_notify_message_tree">
-        <field name="name">notify.message.tree</field>
-        <field name="model">notify.message</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Messages">
-                <field name="name"/>
-                <field name="msg"/>
-            </tree>
-        </field>
-    </record>
-    <record model="ir.ui.view" id="view_notify_message_form">
-        <field name="name">notify.message.form</field>
-        <field name="model">notify.message</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Messages" version="7.0">
-                <group string="Write a notification or a wishful message.">
-                    <field name="name"/>
-                </group>
-                <group string="Special Message">
-                    <field name="msg"/>
-                </group>
-            </form>
-        </field>
-    </record>
-    <record model="ir.actions.act_window" id="notify_mesage_tree_form">
-        <field name="name">Write Messages</field>
-        <field name="res_model">notify.message</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="search_view_id" ref="view_notify_message_search"/>
-    </record>
-
-    <menuitem name="Notification Message" id="menu_finan_config_notify_message" parent="account.menu_finance_configuration" sequence="45"/>
-    <menuitem name="All Notification Messages" id="menu_notify_mesage_tree_form" action="notify_mesage_tree_form" parent="menu_finan_config_notify_message"/>
-
-    </data>
-</openerp>

From 7597d87357d678a475a3ff5b9557a8423d1b2c1e Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 29 Jun 2012 17:44:57 +0530
Subject: [PATCH 060/171] [IMP]set cancel button

bzr revid: dbr@tinyerp.com-20120629121457-5zhdnj0ae95xie88
---
 .../stock_planning/wizard/stock_planning_create_periods_view.xml | 1 +
 1 file changed, 1 insertion(+)

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 26bb4886131..4bf9c03178b 100644
--- a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
@@ -10,6 +10,7 @@
             <field name="arch" type="xml">
                 <form string="Stock Periods" version="7.0">
                     <header>
+                        <button string="Cancel" special="cancel" icon="gtk-cancel"/>
                         <button name="create_stock_periods" icon="gtk-dnd" string="Create Daily Periods" type="object"/>
                         <button name="create_stock_periods" icon="gtk-dnd"  string="Create Weekly Periods" type="object" context="{'interval': 6, 'name': 'Weekly'}"/>
                         <button name="create_stock_periods" icon="gtk-dnd" string="Create Monthly Periods" type="object" context="{'interval': 1, 'name': 'Monthly'}"/>

From c965934484ba6824b81cb5d4cd5aa0fcca88b9b7 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Fri, 29 Jun 2012 17:51:53 +0530
Subject: [PATCH 061/171] [IMP] imporve the view of outlook and thunderbird
 plugins.

bzr revid: nco@tinyerp.com-20120629122153-hzkibz5gx02f8nff
---
 addons/plugin_outlook/plugin_outlook.xml         | 14 +++-----------
 addons/plugin_thunderbird/plugin_thunderbird.xml | 13 +++----------
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index 13c1e6f32c4..c1fe66b3354 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -11,14 +11,8 @@
                     <form position="attributes">
                         <attribute name="string">Install Outlook Plug-In</attribute>
                     </form>
-                    <separator string="title" position="before">
-                        <label string="This plug-in allows you to create and link outlook emails with openerp objects."/>
-                    </separator>
-                    <xpath expr="//button[@string='Install Modules']" position="replace">
-                        <button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
-                    </xpath>
-                    <xpath expr="//button[@string='Cancel']" position="replace">
-                    </xpath>
+                    <xpath expr="//button[@string='Install Modules']" position="replace"/>
+                    <xpath expr="//button[@string='Cancel']" position="replace"/>
                     <xpath expr="//separator[@string='title']" position="after" version="7.0">
                         <group>
                             <field name="plugin32" widget="url"/>
@@ -32,9 +26,7 @@
                             <li>2. MS .Net Framework 3.5 or above.</li>
                         </ul>
                     </xpath>
-                    <separator string="title" position="attributes">
-                        <attribute name="string">Install Outlook Plug-In</attribute>
-                    </separator>
+                    <separator position="replace"/>
                 </data>
             </field>
         </record>
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index 7ff4f529fd0..4c8f90d3d1d 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -11,13 +11,8 @@
                     <form position="attributes">
                         <attribute name="string">Install Thunderbird Plug-In</attribute>
                     </form>
-                     <separator string="title" position="before">
-                        <label string="This plug-in allows you to link your email to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."/>
-                    </separator>
-                    <xpath expr="//button[@string='Install Modules']" position="replace">
-                        <button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
-                    </xpath>
-                    <xpath expr="//button[@string='Cancel']" position="replace"></xpath>
+                  	<xpath expr="//button[@string='Install Modules']" position="replace"/> 
+                    <xpath expr="//button[@string='Cancel']" position="replace"/>
                     <xpath expr="//separator[@string='title']" position="after">
                         <group>
                             <field name="thunderbird" invisible="1"/>
@@ -37,9 +32,7 @@
                             <li>7. Configure your openerp server.</li>
                         </ul>
                     </xpath>
-                    <separator string="title" position="attributes">
-                         <attribute name="string">Install Thunderbird Plug-In</attribute>
-                    </separator>
+                    <separator position="replace"/>
                 </data>
             </field>
         </record>

From 4ef750426e011f5daf3dc4c268260acccc348605 Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Fri, 29 Jun 2012 18:19:37 +0530
Subject: [PATCH 062/171] [IMP] res-partner-view

bzr revid: pna@tinyerp.com-20120629124937-csslsnhmqlm4woa5
---
 addons/event/res_partner_view.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/event/res_partner_view.xml b/addons/event/res_partner_view.xml
index 6a3db28d486..478ffd0fb2e 100644
--- a/addons/event/res_partner_view.xml
+++ b/addons/event/res_partner_view.xml
@@ -13,6 +13,9 @@
                 <field name="supplier" position="after">
                     <field name="speaker"/>
                 </field>
+                <xpath expr="//page[@string='History']" position="attributes">
+                   <attribute name="invisible">False</attribute>
+                </xpath>
                 <xpath expr="//group[@string='Event']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>

From 66c7c07a83df000cf0d314a035855fb1ddb76aa0 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 2 Jul 2012 10:21:47 +0530
Subject: [PATCH 063/171] [IMP]: Improve view.change separator string.

bzr revid: atp@tinyerp.com-20120702045147-zes3zfsjllegrykz
---
 addons/plugin_outlook/plugin_outlook.xml         | 4 +++-
 addons/plugin_thunderbird/plugin_thunderbird.xml | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index c1fe66b3354..b8a9129cad2 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -26,7 +26,9 @@
                             <li>2. MS .Net Framework 3.5 or above.</li>
                         </ul>
                     </xpath>
-                    <separator position="replace"/>
+                    <separator string="title" position="attributes">
+                        <attribute name="string"></attribute>
+                      </separator>
                 </data>
             </field>
         </record>
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index 4c8f90d3d1d..8cfff8a18d4 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -32,7 +32,10 @@
                             <li>7. Configure your openerp server.</li>
                         </ul>
                     </xpath>
-                    <separator position="replace"/>
+                    <separator string="title" position="attributes">
+                        <attribute name="string"></attribute>
+                      </separator>
+
                 </data>
             </field>
         </record>

From 548f2475316c16852bd01afcd398e00e9fb14e69 Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Mon, 2 Jul 2012 11:14:33 +0530
Subject: [PATCH 064/171] [IMP] res-partner-view

bzr revid: pna@tinyerp.com-20120702054433-6kx399wosnidbm0p
---
 addons/marketing_campaign/res_partner_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/marketing_campaign/res_partner_view.xml b/addons/marketing_campaign/res_partner_view.xml
index a424ad03a5f..1ee2e349472 100644
--- a/addons/marketing_campaign/res_partner_view.xml
+++ b/addons/marketing_campaign/res_partner_view.xml
@@ -3,8 +3,8 @@
     <data>
 
          <!--  Partners inherited form -->
-        <record id="base.view_crm_partner_info_History" model="ir.ui.view">
-           <field name="name">res.partner.crm.history.inherit1</field>
+        <record id="base.view_crm_partner_info_History2" model="ir.ui.view">
+           <field name="name">res.partner.crm.history.inherit2</field>
            <field name="model">res.partner</field>
            <field name="type">form</field>
            <field name="inherit_id" ref="base.view_partner_form"/>

From 6f8990949664280f5b44cda5cb6b15a857d352c6 Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Mon, 2 Jul 2012 18:55:40 +0530
Subject: [PATCH 065/171] [IMP] improve payment order

bzr revid: shp@tinyerp.com-20120702132540-p29np5fsy0hzdtvp
---
 addons/account/account_view.xml                   | 15 ++++++++++-----
 addons/account_asset/account_asset.py             |  2 +-
 .../wizard/account_followup_print_view.xml        |  1 -
 addons/account_payment/account_payment.py         |  2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 8b294690a79..d2568fe1717 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -108,11 +108,6 @@
                         <group>
                             <field name="name"/>
                             <field name="fiscalyear_id" widget="selection"/>
-                            <label for="date_start" string="Duration"/>
-                            <div>
-                                <field name="date_start"/> - 
-                                <field name="date_stop" nolabel="1"/>
-                            </div>
                         </group>
                         <group>
                             <field name="code"/>
@@ -120,6 +115,16 @@
                             <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         </group>
                     </group>
+					<group>
+                          <group>
+                            <label for="date_start" string="Duration" />
+                            <div>
+                               <field name="date_start" class="oe_inline" nolabel="1"/> 
+                                <span attr="{'invisible': [('date_stop','=',False)]}"> - </span> 
+                                <field name="date_stop" nolabel="1" class="oe_inline"/>
+                             </div>
+                            </group>
+					</group>
                 </sheet>
                 </form>
             </field>
diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index 32019ed31fe..e491b858286 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -345,7 +345,7 @@ class account_asset_depreciation_line(osv.osv):
         'asset_id': fields.many2one('account.asset.asset', 'Asset', required=True),
         'parent_state': fields.related('asset_id', 'state', type='char', string='State of Asset'),
         'amount': fields.float('Depreciation Amount', required=True),
-        'remaining_value': fields.float('Amount To Depreciate', required=True),
+        'remaining_value': fields.float('Amount to Depreciate', required=True),
         'depreciated_value': fields.float('Amount Already Depreciated', required=True),
         'depreciation_date': fields.char('Depreciation Date', size=64, select=1),
         'move_id': fields.many2one('account.move', 'Depreciation Entry'),
diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index 01bfcf62e79..f3701c34200 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -13,7 +13,6 @@
                     <button name="do_continue" string="Continue" colspan="1" type="object" icon="gtk-ok"/>
                     <button icon="gtk-cancel" special="cancel" string="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"/>
diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index 02d12a534db..22b7fc5f6f2 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -98,7 +98,7 @@ class payment_order(osv.osv):
             help='When an order is placed the state is \'Draft\'.\n Once the bank is confirmed the state is set to \'Confirmed\'.\n Then the order is paid the state is \'Done\'.'),
         'line_ids': fields.one2many('payment.line', 'order_id', 'Payment lines', states={'done': [('readonly', True)]}),
         'total': fields.function(_total, string="Total", type='float'),
-        'user_id': fields.many2one('res.users', 'User', required=True, states={'done': [('readonly', True)]}),
+        'user_id': fields.many2one('res.users', 'Responsible', required=True, states={'done': [('readonly', True)]}),
         'date_prefered': fields.selection([
             ('now', 'Directly'),
             ('due', 'Due date'),

From 7f6a3c4336023e09618bcde5d48c4f8f7d025ae5 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 2 Jul 2012 21:25:41 +0530
Subject: [PATCH 066/171] [IMP]: Improve view.

bzr revid: atp@tinyerp.com-20120702155541-r4wgdwz972waimr3
---
 addons/account/account_invoice_view.xml            |  3 +--
 addons/account_budget/account_budget_view.xml      | 14 ++++++++------
 addons/account_coda/account_coda_wizard.xml        |  2 +-
 .../voucher_sales_purchase_view.xml                |  6 +++---
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 8368bee4dff..46d3412f3b2 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -379,9 +379,8 @@
                               <field name="move_id" groups="account.group_account_user"/>
                              </group>
                              <group>
-                            	<field name="origin" placeholder="SO0032"/>
+                                <field name="origin" placeholder="SO0032"/>
                                 <field name="date_due"/>
-                                <field name="user_id" groups="base.group_user"/>
                                 <newline/>
                                 <field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id"/>
                              </group>
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 23f6777d7df..86e7cf3219d 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -117,7 +117,7 @@
                        <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                     </header>
                     <sheet string="Budget">
-                        <group>
+                        <group col="4">
                             <group>
                                 <field name="name" colspan="1" attrs="{'readonly':[('state','!=','draft')]}"/>
                                 <field name="creating_user_id" attrs="{'readonly':[('state','!=','draft')]}"/>
@@ -127,11 +127,12 @@
                                 <field name="code" colspan="1" attrs="{'readonly':[('state','!=','draft')]}"/>
                                 <label for="date_from" string="Duration"/>
                                 <div>
-                                    <field name="date_from" attrs="{'readonly':[('state','!=','draft')]}"/> - 
-                                    <field name="date_to" attrs="{'readonly':[('state','!=','draft')]}" nolabel="1"/>
+                                    <field name="date_from" class="oe_inline" attrs="{'readonly':[('state','!=','draft')]}"/>
+                                    <span  attrs="{'invisible':[('date_to','=',False)]}" class="oe_inline"> - </span> 
+                                    <field name="date_to" class="oe_inline" attrs="{'readonly':[('state','!=','draft')]}" nolabel="1"/>
                                 </div>
                                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            </group>
+                          </group>
                         </group>
                         <notebook>
                             <page string="Budget Lines">
@@ -148,14 +149,15 @@
                                         <field name="percentage"/>
                                     </tree>
                                     <form string="Budget Lines" version="7.0">
-                                        <group>
+                                        <group col="4">
                                             <group>
                                                 <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                                                 <field name="general_budget_id"/>
                                                 <field name="planned_amount"/>
                                                 <label for="date_from" string="Duration"/>
                                                 <div>
-                                                    <field name="date_from"/>-
+                                                    <field name="date_from"/>
+                                                     <span  attrs="{'invisible':[('date_to','=',False)]}" class="oe_inline"> - </span>
                                                     <field name="date_to"/>
                                                 </div>
                                             </group>
diff --git a/addons/account_coda/account_coda_wizard.xml b/addons/account_coda/account_coda_wizard.xml
index 7bb5d9eb66b..655f1afb95e 100644
--- a/addons/account_coda/account_coda_wizard.xml
+++ b/addons/account_coda/account_coda_wizard.xml
@@ -14,7 +14,7 @@
                 or
                 <button string="Cancel" class="oe_link" special="cancel"/>
             </header>
-            <group col="2" string="Select Your File :">
+            <group col="2">
                 <field name="coda_data" filename="coda_fname"/>
                 <field name="coda_fname"/>
             </group>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index c133051c656..1c2fb977ea6 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -144,9 +144,9 @@
                                     </group>
                                 </group>
                                <group>
-                                 <button type="object"
-                                   icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax"
-                                    attrs="{'invisible': [('state','!=','draft')]}"/>
+                                  <button type="object"
+                                        icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax"
+                                         attrs="{'invisible': [('state','!=','draft')]}"/>
                                </group>
                             </group>
                         </page>

From bd440a9e053ed311b95c51e56dc2e855c9d2a734 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 2 Jul 2012 22:40:14 +0530
Subject: [PATCH 067/171] [FIX]: Change user name in cash register~

bzr revid: atp@tinyerp.com-20120702171014-pj2irjfmr7q74gys
---
 addons/account/account_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index fb12f27b405..1893efb3c27 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2574,7 +2574,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
                     </h2>
                     <group col="4">
                       <group>
-                         <field name="user_id" readonly="1"/>
+                         <field name="user_id" readonly="1" string="Responsible"/>
                          <field name="total_entry_encoding"/>
                         <field name='company_id' widget="selection" groups="base.group_multi_company" />     
                        </group>

From fa3100073a178c7ef8cab7e1c478b7c52dbf20ee Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 2 Jul 2012 22:50:54 +0530
Subject: [PATCH 068/171] [IMP]: Improve account bank statement view

bzr revid: atp@tinyerp.com-20120702172054-jxhisxzazi57c1nw
---
 addons/account/account_view.xml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 1893efb3c27..b24ffa9bc0f 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -609,17 +609,15 @@
                    <div class="oe_right oe_button_box" name="import_buttons">
                        <!-- Put here related buttons -->
                     </div>
-                    <div class="oe_title">
-                       <label for="name" class="oe_edit_only"/>
-                       <h1>
-                         <field name="name" class="oe_inline"/>-
-                         <field name="period_id" class="oe_inline"/>
-                       </h1>
-                       <label for="journal_id" class="oe_edit_only"/>
-                       <h2>
-                         <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" widget="selection"/>                        
-                       </h2>
-                    </div>
+                     <label for="name" class="oe_edit_only"/>
+                     <h1>
+                       <field name="name" class="oe_inline"/>-
+                       <field name="period_id" class="oe_inline"/>
+                     </h1>
+                     <label for="journal_id" class="oe_edit_only"/>
+                     <h2>
+                       <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" widget="selection"/>                        
+                     </h2>
                     <group>
                         <group>
                             <field name="date" on_change="onchange_date(date, company_id)"/>

From 1c7607980555fe78015714719757576a3d800e7f Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Tue, 3 Jul 2012 17:35:58 +0530
Subject: [PATCH 069/171] [IMP]improve view as per reviewed

bzr revid: sgo@tinyerp.com-20120703120558-e5suakmct2xsxs2k
---
 addons/delivery/delivery_view.xml       | 16 +++++++++-------
 addons/stock/stock_view.xml             | 14 +++++++-------
 addons/stock/wizard/stock_move_view.xml |  1 -
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 9c469addb71..fb874cde0f6 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -127,13 +127,15 @@
                             <field name="line_ids"/>
                         </page>
                         <page string="Destination">
-                            <field name="country_ids" widget="many2many_tags"/>
-                            <field name="state_ids" widget="many2many_tags"/>
                             <group>
-                                <label string="Zip" class="oe_inline"/>
-                                <field name="zip_from" class="oe_inline" nolabel="1"/>
-                                <label string="-" class="oe_inline"/>
-                                <field name="zip_to" class="oe_inline" nolabel="1"/>
+                                <group>
+                                    <field name="country_ids" widget="many2many_tags"/>
+                                    <field name="state_ids" widget="many2many_tags"/>
+                                </group>
+                                <group>
+                                    <field name="zip_from" class="oe_inline"/>
+                                    <field name="zip_to" class="oe_inline"/>
+                                </group>
                             </group>
                         </page>
                     </notebook>
@@ -203,7 +205,7 @@
             <field name="model">stock.picking.out</field>
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
-                <field name="partner_id" position="after">
+                <field name="min_date" position="after">
                     <field name="carrier_id"/>
                     <field name="carrier_tracking_ref"/>
                     <field name="number_of_packages"/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index fdea0457e0c..f1b051bfae1 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -807,7 +807,7 @@
                                         <field name="state" widget="statusbar" status_visible="draft,assigned,done" />
                                     </header>
                                     <group>
-                                        <group string="Move Information">
+                                        <group>
                                             <field name="name" invisible="1"/>
                                             <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
                                             <label for="product_qty"/>
@@ -817,17 +817,17 @@
                                                 <button name="%(stock.move_scrap)d"
                                                         string="Scrap" type="action"
                                                         icon="gtk-convert" context="{'scrap': True}"
-                                                        states="draft,waiting,confirmed,assigned" colspan="1"/>
+                                                        states="draft,waiting,confirmed,assigned"/>
                                             </div>
                                             <label for="product_uos_qty" groups="product.group_uos"/>
-                                            <div>
-                                                <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_inline"/>
-                                                <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
+                                            <div groups="product.group_uos">
+                                                <field name="product_uos_qty" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_inline"/>
+                                                <field name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
                                             </div>
                                             <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
-                                        </group>
+                                         </group>
 
-                                        <group string="Dates">
+                                        <group>
                                             <field name="create_date" invisible="1"/>
                                             <field name="date"/>
                                             <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index 9655edf49b8..67725508acb 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -47,7 +47,6 @@
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
-                    <separator string="Scrap Products"/>
                     <group>
                         <field name="product_id"  readonly="1"/>
                         <label for="product_qty"/>

From ef37a6856a9b8fb286805f3b2851268db182e7aa Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Tue, 3 Jul 2012 18:03:48 +0530
Subject: [PATCH 070/171] [IMP]schedule_Date and destidation address moved in
 other group

bzr revid: sgo@tinyerp.com-20120703123348-jfjdoa9ftnx230xy
---
 addons/stock/stock_view.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index f1b051bfae1..1e597b64c30 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1265,11 +1265,12 @@
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             <field name="location_id" groups="stock.group_locations"/>
                             <field name="location_dest_id" groups="stock.group_locations"/>
-                            <field name="partner_id" context="{'contact_display':'partner'}"/>
                             <field name="create_date" groups="base.group_no_one" />
                             <field name="date" groups="base.group_no_one" />
+                        </group>
+                        <group>
+                            <field name="partner_id" context="{'contact_display':'partner'}"/>
                             <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
-
                         </group>
                         <group>
                             <label for="tracking_id"/>
@@ -1452,9 +1453,11 @@
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                         <field name="location_id" groups="stock.group_locations"/>
                         <field name="location_dest_id" groups="stock.group_locations"/>
-                        <field name="partner_id" groups="stock.group_locations"/>
                         <field name="create_date" groups="base.group_no_one" />
                         <field name="date" groups="base.group_no_one" />
+                    </group>
+                    <group>
+                        <field name="partner_id" groups="stock.group_locations"/>
                         <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
                     </group>
 

From 2649dd52c9a10a05ee1fd4f84367f61a1ce7a9e1 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 4 Jul 2012 14:28:26 +0530
Subject: [PATCH 071/171] [IMP]:mrp:improved Manufacturing Order view with h1
 and h2

bzr revid: apa@tinyerp.com-20120704085826-abq2adz03n0xt8to
---
 addons/mrp/mrp_view.xml | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 06f63462261..e72ae082fcf 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -637,17 +637,20 @@
                     <label for="product_id" class="oe_edit_only"/>
                     <h1>
                         <field name="product_id" on_change="product_id_change(product_id)" domain="[('supply_method','=','produce')]" class="oe_inline"/>
-                        <field name="product_qty" class="oe_inline"/>
-                        <field name="product_uom" class="oe_inline"/>
-                        <button type="action"
-                            icon="terp-accessories-archiver+" class="oe_inline"
-                            name="%(mrp.action_change_production_qty)d"
-                            string="Change Qty" states="ready,confirmed" />
                     </h1>
-                    <label for="routing_id"  groups="mrp.group_mrp_routings"  class="oe_edit_only"/>
+                    <label for="product_qty" class="oe_edit_only"/>
                     <h2>
-                        <field name="routing_id" groups="mrp.group_mrp_routings"/>
+                        <field name="product_qty" class="oe_inline"/>
+                        <label/>
+                        <field name="product_uom" class="oe_inline"/>
+                        <label/>
+                        <button type="action"
+                            icon="terp-accessories-archiver+"
+                            name="%(mrp.action_change_production_qty)d"
+                            string="Change Qty" states="ready,confirmed" class="oe_inline"/>
                     </h2>
+                    <label for="routing_id" class="oe_edit_only" groups="mrp.group_mrp_routings"/>
+                    <field name="routing_id" groups="mrp.group_mrp_routings"/>
                     <group>
                         <group>
                             <field name="name"/>

From 4851d7479b32c428750e76b814a7821be688515e Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Wed, 4 Jul 2012 14:48:06 +0530
Subject: [PATCH 072/171] [IMP]res_user: remove group string

bzr revid: kjo@tinyerp.com-20120704091806-0ie4yp41hvkcn23b
---
 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 38d7526d6aa..7997e476b02 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -202,7 +202,7 @@
                             <field name="name" readonly="1" class="oe_inline oe_edit_only"/>
                             (<field name="login" readonly="1" class="oe_inline oe_edit_only"/>)
                     </h1>
-                    <group col="4" string="Preferences">
+                    <group col="4">
                         <field name="context_lang" readonly="0"/>
                         <field name="company_id" readonly="0"
                             groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>

From 4cbc8a921b107bfaee7db0971aa317bf8b158f6d Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 5 Jul 2012 12:17:52 +0530
Subject: [PATCH 073/171] [IMP]:mrp:removed tabs

bzr revid: apa@tinyerp.com-20120705064752-uzfgjsi0jvbh35vd
---
 addons/mrp/mrp_view.xml | 92 ++++++++++++++++++++---------------------
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index e72ae082fcf..df46d33f255 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -336,52 +336,52 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Bill of Material" version="7.0">
-                	<sheet>
-	                    <label for="product_id" class="oe_edit_only"/>
-	                    <h1>
-	                        <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_inline"/>: 
-	                        <field name="product_qty" class="oe_inline"/>
-	                        <field name="product_uom" class="oe_inline"/>
-	                    </h1>
-	                    <label for="routing_id" class="oe_edit_only"/>
-	                    <h2>
-	                        <field name="routing_id"  groups="mrp.group_mrp_routings"/>
-	                    </h2>
-	                    <group>
-	                        <group>
-	                            <field name="name"/>
-	                            <field name="code" string="Reference"/>
-	                        </group>
-	                        <group>
-	                            <field name="type"/>
-	                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-	                            <label for="product_uos_qty" groups="product.group_uos" string="Product UoS Quantity"/>
+                    <sheet>
+                        <label for="product_id" class="oe_edit_only"/>
+                        <h1>
+                            <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_inline"/>: 
+                            <field name="product_qty" class="oe_inline"/>
+                            <field name="product_uom" class="oe_inline"/>
+                        </h1>
+                        <label for="routing_id" class="oe_edit_only"/>
+                        <h2>
+                            <field name="routing_id"  groups="mrp.group_mrp_routings"/>
+                        </h2>
+                        <group>
+                            <group>
+                                <field name="name"/>
+                                <field name="code" string="Reference"/>
+                            </group>
+                            <group>
+                                <field name="type"/>
+                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                <label for="product_uos_qty" groups="product.group_uos" string="Product UoS Quantity"/>
                                 <div groups="product.group_uos" >
                                     <field name="product_uos_qty" 
                                         class="oe_inline"/>
                                     <label string="-" attrs="{'invisible':[('product_uos','=',False)]}" class="oe_inline"/> 
                                     <field name="product_uos" class="oe_inline"/>
                                 </div>
-	                        </group>
-	                    </group>
-	                    <notebook>
-	                        <page string="Components">
-	                            <field name="bom_lines" widget="one2many_list">
-	                                <tree string="Components" editable="bottom">
-	                                    <field name="product_id" on_change="onchange_product_id(product_id, name)"/>
-	                                    <field name="product_qty" string="Product Quantity"/>
-	                                    <field name="product_uom"/>
-	                                    <field name="name" invisible="1"/>
-	                                    <field name="date_start"/>
-	                                    <field name="date_stop"/>
-	                                </tree>
-	                            </field>
-	                        </page>
-	                        <page string="Revisions" attrs="{'invisible': [('bom_id','!=',False)]}">
-	                            <field name="revision_ids"/>
-	                        </page>
-	                        <page string="Properties" groups="product.group_mrp_properties">
-	                            <group>
+                            </group>
+                        </group>
+                        <notebook>
+                            <page string="Components">
+                                <field name="bom_lines" widget="one2many_list">
+                                    <tree string="Components" editable="bottom">
+                                        <field name="product_id" on_change="onchange_product_id(product_id, name)"/>
+                                        <field name="product_qty" string="Product Quantity"/>
+                                        <field name="product_uom"/>
+                                        <field name="name" invisible="1"/>
+                                        <field name="date_start"/>
+                                        <field name="date_stop"/>
+                                    </tree>
+                                </field>
+                            </page>
+                            <page string="Revisions" attrs="{'invisible': [('bom_id','!=',False)]}">
+                                <field name="revision_ids"/>
+                            </page>
+                            <page string="Properties" groups="product.group_mrp_properties">
+                                <group>
                                         <group>
                                             <field name="position"/>
                                             <field name="bom_id"/>
@@ -394,12 +394,12 @@
                                             <field name="product_rounding"/>
                                             <field name="product_efficiency"/>
                                         </group>
-	                            </group>
-	                            <separator string="Properties"/>
-	                            <field name="property_ids" widget="many2many_tags" />
-	                        </page>
-	                    </notebook>
-	                    <newline/>
+                                </group>
+                                <separator string="Properties"/>
+                                <field name="property_ids" widget="many2many_tags" />
+                            </page>
+                        </notebook>
+                        <newline/>
                     </sheet>
                 </form>
             </field>

From f9f68fb2f17184029f1d0287d486b8068f94af8f Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Thu, 5 Jul 2012 13:13:33 +0530
Subject: [PATCH 074/171] [IMP]MRP :BOM view are improved

bzr revid: hsa@tinyerp.com-20120705074333-re3dyycj5ktkocbq
---
 addons/mrp/mrp_view.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 0b725108be4..149ef5e717f 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -381,8 +381,10 @@
                                         <field name="active"/>
                                     </group>
                                     <group>
-                                        <field name="date_start"/>
-                                        <field name="date_stop"/>
+                                        <label for="date_start" string="Validity"/>
+                                        <div name="validity">
+                                            <field name="date_start" class="oe_inline"/> - <field name="date_stop" class="oe_inline"/>
+                                        </div>
                                         <field name="product_rounding"/>
                                         <field name="product_efficiency"/>
                                     </group>

From cca9a711c5ed92a53e46fdfb456d4e8e55d2b6f8 Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Thu, 5 Jul 2012 15:30:06 +0530
Subject: [PATCH 075/171] [IMP]sale-crm-imp

bzr revid: pna@tinyerp.com-20120705100006-uhhkms5ya687iopc
---
 addons/sale/stock_view.xml  | 2 +-
 addons/stock/stock_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/stock_view.xml b/addons/sale/stock_view.xml
index 242d2c4cef6..9e71f14f49e 100644
--- a/addons/sale/stock_view.xml
+++ b/addons/sale/stock_view.xml
@@ -7,7 +7,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
-                <field name="auto_picking" position="after">
+                <field name="move_type" position="before">
                     <field name="sale_id"/>
                 </field>
             </field>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 55be1fdc267..dfbb1211167 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -864,7 +864,7 @@
                             </group>
                         </page>
                         <page string="Notes">
-                            <field name="note" placeholder="Add an internal note..."/>
+                            <field name="note" placeholder="Add an internal note"/>
                         </page>
                     </notebook>
                 </sheet>

From 502de7ba97ca5d9765601df68db4937690719017 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Thu, 5 Jul 2012 17:06:04 +0530
Subject: [PATCH 076/171] [IMP]MRP :BOM Properties view are improved

bzr revid: hsa@tinyerp.com-20120705113604-0uy5a013eltntp6i
---
 addons/mrp/mrp_view.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 149ef5e717f..1e7a686acc1 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -382,8 +382,10 @@
                                     </group>
                                     <group>
                                         <label for="date_start" string="Validity"/>
-                                        <div name="validity">
-                                            <field name="date_start" class="oe_inline"/> - <field name="date_stop" class="oe_inline"/>
+                                        <div>
+                                            <field name="date_start" class="oe_online" nolabel="1"/>
+                                            <label string="-"/>
+                                            <field name="date_stop" class="oe_online" nolabel="1"/>
                                         </div>
                                         <field name="product_rounding"/>
                                         <field name="product_efficiency"/>

From 62e79c8401e38ea17f622ed999a6b4b6bd0b1899 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 5 Jul 2012 17:36:11 +0530
Subject: [PATCH 077/171] [IMP] change as per review

bzr revid: kjo@tinyerp.com-20120705120611-mavp52c52psenqiw
---
 addons/crm_fundraising/crm_fundraising_menu.xml     |  2 +-
 addons/import_sugarcrm/import_sugarcrm_view.xml     |  2 +-
 addons/membership/membership.py                     | 12 ++++++------
 addons/project_long_term/project_long_term_view.xml |  8 +++++---
 addons/wiki_sale_faq/wiki_sale_faq_view.xml         |  2 +-
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/addons/crm_fundraising/crm_fundraising_menu.xml b/addons/crm_fundraising/crm_fundraising_menu.xml
index 38187ed1d4d..20fcdeee861 100644
--- a/addons/crm_fundraising/crm_fundraising_menu.xml
+++ b/addons/crm_fundraising/crm_fundraising_menu.xml
@@ -9,7 +9,7 @@
         parent="base.menu_base_partner" sequence="8" />
 
     <record model="ir.actions.act_window" id="crm_case_category_act_fund_all1">
-        <field name="name">Funds</field>
+        <field name="name">Fund Raising</field>
         <field name="res_model">crm.fundraising</field>
         <field name="view_mode">tree,form,graph</field>
         <field name="view_id" ref="crm_fundraising.crm_case_tree_view_fund"/>
diff --git a/addons/import_sugarcrm/import_sugarcrm_view.xml b/addons/import_sugarcrm/import_sugarcrm_view.xml
index 7188108ba6c..9f38f4e1959 100644
--- a/addons/import_sugarcrm/import_sugarcrm_view.xml
+++ b/addons/import_sugarcrm/import_sugarcrm_view.xml
@@ -13,7 +13,7 @@
                 <button name="import_all" string="_Import"
                         type="object" class="oe_highlight"/>
                 <button name="import_from_scheduler_all" string="_Schedule Recurrent Imports"
-                        type="object" class="oe_highlight" />
+                        type="object" class="oe_highlight" /> or
                 <button special="cancel" string="_Cancel" class="oe_link"/>
             </header>
             <sheet>
diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index dc4eadbada9..06b84ec80c5 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -315,11 +315,11 @@ class Partner(osv.osv):
         return self._membership_state(*args, **kwargs)
 
     _columns = {
-        'associate_member': fields.many2one('res.partner', 'Associate member',help="A member with whom you want to associate your membership.It will consider the membership state of the associated member."),
+        'associate_member': fields.many2one('res.partner', 'Associate Member',help="A member with whom you want to associate your membership.It will consider the membership state of the associated member."),
         'member_lines': fields.one2many('membership.membership_line', 'partner', 'Membership'),
-        'free_member': fields.boolean('Free member', help = "Select if you want to give membership free of cost."),
+        'free_member': fields.boolean('Free Member', help = "Select if you want to give membership free of cost."),
         'membership_amount': fields.float(
-                    'Membership amount', digits=(16, 2),
+                    'Membership Amount', digits=(16, 2),
                     help = 'The price negotiated by the partner'),
         'membership_state': fields.function(
                     __get_membership_state,
@@ -338,7 +338,7 @@ class Partner(osv.osv):
                     -Paid Member: A member who has paid the membership amount."""),
         'membership_start': fields.function(
                     _membership_date, multi = 'membeship_start',
-                    string = 'Start membership date', type = 'date',
+                    string = 'Start Membership Date', type = 'date',
                     store = {
                         'account.invoice': (_get_invoice_partner, ['state'], 10),
                         'membership.membership_line': (_get_partner_id, ['state'], 10, ),
@@ -346,7 +346,7 @@ class Partner(osv.osv):
                     }, help="Date from which membership becomes active."),
         'membership_stop': fields.function(
                     _membership_date,
-                    string = 'Stop membership date', type='date', multi='membership_stop',
+                    string = 'Stop Membership Date', type='date', multi='membership_stop',
                     store = {
                         'account.invoice': (_get_invoice_partner, ['state'], 10),
                         'membership.membership_line': (_get_partner_id, ['state'], 10),
@@ -354,7 +354,7 @@ class Partner(osv.osv):
                     }, help="Date until which membership remains active."),
         'membership_cancel': fields.function(
                     _membership_date,
-                    string = 'Cancel membership date', type='date', multi='membership_cancel',
+                    string = 'Cancel Membership Date', type='date', multi='membership_cancel',
                     store = {
                         'account.invoice': (_get_invoice_partner, ['state'], 11),
                         'membership.membership_line': (_get_partner_id, ['state'], 10),
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index a98e9088402..7e24c61e769 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -164,10 +164,12 @@
                     <label for="date_start" string="Duration"/>
                     <div>
                         <div>
-                            <field name="duration" class="oe_inline"/>
-                            <field name="product_uom" class="oe_inline"/>
+                            <field name="date_start" class="oe_inline"/>
+                            <label string=" - " class="oe_inline oe_edit_only"/>
+                            <field name="date_end" class="oe_inline"/>
                         </div>
-                        <field name="date_start" class="oe_inline"/><label string=" - " class="oe_inline"/><field name="date_end" class="oe_inline"/>
+                        <field name="duration" class="oe_inline"/>
+                        <field name="product_uom" class="oe_inline"/>
                     </div>
                     </group>
                     <notebook>
diff --git a/addons/wiki_sale_faq/wiki_sale_faq_view.xml b/addons/wiki_sale_faq/wiki_sale_faq_view.xml
index b43649af23a..f3116bc73b5 100644
--- a/addons/wiki_sale_faq/wiki_sale_faq_view.xml
+++ b/addons/wiki_sale_faq/wiki_sale_faq_view.xml
@@ -17,7 +17,7 @@
        </record>
 
        <record model="ir.actions.act_window" id="action_wiki_test">
-           <field name="name">Wiki Pages</field>
+           <field name="name">Sales FAQ</field>
            <field name="res_model">wiki.wiki</field>
            <field name="view_type">form</field>
            <field name="view_mode">tree,form</field>

From 0347a93cda49a84dfec96059a42e279b3722bf69 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 5 Jul 2012 18:12:33 +0530
Subject: [PATCH 078/171] [FIX]: IMprovement in view. duration field also.

bzr revid: atp@tinyerp.com-20120705124233-6jchsxi9m6pvqvtr
---
 addons/account/account_invoice_view.xml       |  7 +++--
 addons/account_budget/account_budget_view.xml |  4 +--
 .../account_payment/account_payment_view.xml  |  4 +--
 .../account_voucher/account_voucher_view.xml  | 25 ++++++++---------
 .../voucher_sales_purchase_view.xml           | 28 +++++++++----------
 .../analytic_contract_project_view.xml        |  2 +-
 addons/l10n_ch/wizard/bvr_import_view.xml     |  4 +--
 .../point_of_sale/account_statement_view.xml  |  2 +-
 8 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 46d3412f3b2..d4b8eac6750 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -51,7 +51,7 @@
             <field name="arch" type="xml">
                 <form string="Invoice Line" version="7.0">
                     <group>
-                    	<group>
+                        <group>
                           <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
                           <field name="name"/>
                           <label string="Quantity" for="quantity" align="1.0"/>
@@ -190,7 +190,7 @@
                           <field name="fiscal_position" widget="selection"/>
                           <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"
                                  groups="account.group_account_user"/>
-                         <field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]"
+                          <field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]"
                                  name="account_id" groups="account.group_account_user"/>
                           <field name="currency_id"/>
                           <field name="type" invisible="1"/>
@@ -227,10 +227,10 @@
                                             <field name="factor_tax" invisible="True"/>
                                         </tree>
                                     </field>
-                                    <button name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" icon="terp-stock_format-scientific" help="This action will erase taxes"/>
                                 </div>
                                 <group class="oe_subtotal_footer">
                                     <field name="amount_untaxed"/>
+                                    <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" icon="terp-stock_format-scientific" help="This action will erase taxes"/>
                                     <field name="amount_tax"/>
                                     <field name="amount_total" class="oe_subtotal_footer_separator"/>
                                     <field name="residual" style="margin-top: 10px"/>
@@ -363,6 +363,7 @@
                                 </div>
                                 <group class="oe_subtotal_footer">
                                     <field name="amount_untaxed"/>
+                                     <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" icon="terp-stock_format-scientific" help="This action will erase taxes"/>
                                     <field name="amount_tax"/>
                                     <field name="amount_total" class="oe_subtotal_footer_separator"/>
 
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 86e7cf3219d..59ae6364ce2 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -156,9 +156,9 @@
                                                 <field name="planned_amount"/>
                                                 <label for="date_from" string="Duration"/>
                                                 <div>
-                                                    <field name="date_from"/>
+                                                    <field name="date_from" class="oe_inline"/>
                                                      <span  attrs="{'invisible':[('date_to','=',False)]}" class="oe_inline"> - </span>
-                                                    <field name="date_to"/>
+                                                    <field name="date_to" class="oe_inline"/>
                                                 </div>
                                             </group>
                                             <group>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index a57721d9657..29da4c12e06 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -334,9 +334,9 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//div[@name='import_buttons']" position="inside">
+                <xpath expr="//button[@string='Import Invoices']" position="before">
                     <button name="%(action_account_populate_statement_confirm)d" attrs="{'invisible':[('state','=','confirm')]}" string="Import Payment Lines" type="action" icon="gtk-execute"/>
-                </xpath>      
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index a53482cf176..383abe92ddc 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -85,23 +85,22 @@
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                 </tree>
                             </field>
-                             <group>
-                             <group>
-                                <field name="narration" colspan="2" nolabel="1"  placeholder="Add an internal note"/>
-                             </group>
-                               <group attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}" class="oe_subtotal_footer oe_right">
+                            <group>
+                               <group>
+                                  <field name="narration" colspan="2" nolabel="1"  placeholder="Add an internal note"/>
+                               </group>
+                               <group class="oe_subtotal_footer oe_right" attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}" >
                                    <group>
-                                     <field name="tax_id" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/>
+                                       <label for="tax_id"/>
+                                       <field name="tax_id" nolabel="1" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/>
+                                       <button type="object" colspan="2" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
                                    </group>
                                    <group>
-                                   <field name="amount_untaxed" readonly="1"/>
-                                     <field name="tax_amount" readonly="1"/>
-                                     <field name="amount" class="oe_subtotal_footer_separator" readonly="1"/>
+                                            <field name="amount_untaxed"/>
+                                            <field name="tax_amount" readonly="1" />
+                                            <field name="amount"  class="oe_subtotal_footer_separator" readonly="1"/>
                                    </group>
-                              </group>
-                              <group>
-                                   <button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
-                              </group>
+                               </group>
                             </group>
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 1c2fb977ea6..61c938e070e 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -131,23 +131,21 @@
                                       <field name="narration" placeholder="Add a internal note." nolabel="1" />
                                 </group>
                                 <group class="oe_subtotal_footer oe_right">
-                                  <group>
-                                     <field name="tax_id"
-                                      on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
-                                      widget="selection"
-                                      domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
-                                  </group>
-                                  <group>
-                                       <field name="amount_untaxed"/>
-                                       <field name="tax_amount" readonly="1"/>
-                                       <field name="amount" class="oe_subtotal_footer_separator" readonly="1"/>
+                                    <group>
+                                        <label for="tax_id"/>
+                                        <field name="tax_id"
+                                           on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
+                                           widget="selection"
+                                           nolabel="1"
+                                           domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
+                                        <button type="object" colspan="2" name="compute_tax" icon="terp-stock_format-scientific" string="Compute Tax" class="oe_inline oe_left" attrs="{'invisible': [('state','!=','draft')]}"/>
+                                    </group>
+                                    <group>
+                                            <field name="amount_untaxed"/>
+                                            <field name="tax_amount" readonly="1" />
+                                            <field name="amount"  class="oe_subtotal_footer_separator" readonly="1"/>
                                     </group>
                                 </group>
-                               <group>
-                                  <button type="object"
-                                        icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax"
-                                         attrs="{'invisible': [('state','!=','draft')]}"/>
-                               </group>
                             </group>
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
diff --git a/addons/analytic_contract_project/analytic_contract_project_view.xml b/addons/analytic_contract_project/analytic_contract_project_view.xml
index 0e61fe08d01..49f5738df59 100644
--- a/addons/analytic_contract_project/analytic_contract_project_view.xml
+++ b/addons/analytic_contract_project/analytic_contract_project_view.xml
@@ -15,7 +15,7 @@
                             <group string="Validity">
                                 <label for="date_start" string="Duration"/>
                                 <div name="duration">
-                                    <field name="date_start" class="oe_inline"/> - <field name="date" class="oe_inline"/>
+                                    <field name="date_start" class="oe_inline"/>  <span  attrs="{'invisible':[('date','=',False)]}" class="oe_inline"> - </span> <field name="date" class="oe_inline"/>
                                 </div>
                                 <label for="quantity_max"/>
                                 <div>
diff --git a/addons/l10n_ch/wizard/bvr_import_view.xml b/addons/l10n_ch/wizard/bvr_import_view.xml
index 0fd445f71bc..e9dab515bf8 100644
--- a/addons/l10n_ch/wizard/bvr_import_view.xml
+++ b/addons/l10n_ch/wizard/bvr_import_view.xml
@@ -34,9 +34,9 @@
             <field name="name">account.bank.statement.form.inherit</field>
             <field name="model">account.bank.statement</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="account.view_bank_statement_form"/>
+            <field name="inherit_id" ref="account_payment.view_bank_statement_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//div[@name='import_buttons']" position="inside">
+                <xpath expr="//button[@string='Import Invoices']" position="after">
                     <button name="%(wizard_bvr_import)d" icon="gtk-execute" string="Import BVR" type="action"/>
                 </xpath>
             </field>
diff --git a/addons/point_of_sale/account_statement_view.xml b/addons/point_of_sale/account_statement_view.xml
index c67fcd0e9fe..e5baaca393d 100644
--- a/addons/point_of_sale/account_statement_view.xml
+++ b/addons/point_of_sale/account_statement_view.xml
@@ -105,7 +105,7 @@
             <field name="inherit_id" ref="account.view_cash_statement_tree"/>
             <field name="arch" type="xml">
                 <field name="journal_id" position="after">
-                    <field name="user_id"/>
+                    <field name="user_id" string="Responsible"/>
                 </field>
             </field>
         </record>

From 0019a9e506b3b7ea004e8b70a29e6030342c8f9b Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 5 Jul 2012 18:30:47 +0530
Subject: [PATCH 079/171] [REM]: REMOVE Duplicate button

bzr revid: atp@tinyerp.com-20120705130047-w757z7ngo2otfo12
---
 addons/account/account_invoice_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index d4b8eac6750..ae47c998d60 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -357,13 +357,13 @@
                                             <field name="factor_tax" invisible="True"/>
                                         </tree>
                                     </field>
-                                    <button name="button_reset_taxes" states="draft,proforma2" string="Compute Taxes"
-                                        type="object" groups="account.group_account_user" icon="terp-stock_format-scientific"
-                                        help="This action will erase taxes"/>
+
                                 </div>
                                 <group class="oe_subtotal_footer">
                                     <field name="amount_untaxed"/>
-                                     <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" icon="terp-stock_format-scientific" help="This action will erase taxes"/>
+                                    <button  colspan="2" name="button_reset_taxes" states="draft,proforma2" string="Compute Taxes"
+                                        type="object" groups="account.group_account_user" icon="terp-stock_format-scientific"
+                                        help="This action will erase taxes"/>
                                     <field name="amount_tax"/>
                                     <field name="amount_total" class="oe_subtotal_footer_separator"/>
 

From 09701b83acbade29fdebc471730ccbafa4d8c75e Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Fri, 6 Jul 2012 11:32:56 +0530
Subject: [PATCH 080/171] [IMP]Sale Quotation : view are improved

bzr revid: hsa@tinyerp.com-20120706060256-ymn92nvfmf1m4ctq
---
 addons/delivery/delivery_view.xml       |  4 ++--
 addons/sale/sale_view.xml               | 12 +++++++-----
 addons/sale_margin/sale_margin_view.xml |  9 +++++++--
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 5e54f74f7f1..094bf426e88 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -256,12 +256,12 @@
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='sale_total']" position="after">
+                <xpath expr="//group[@name='sale_delivery']" position="inside">
                     <group>
                         <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" class="oe_inline"/>
                         </div>
                         <label string="If you do not 'Add to Sale Order', the delivery charges will be added based on the delivery order."/>
                     </group>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index d5d6b5346eb..42a141befd0 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -244,6 +244,9 @@
                                             <field colspan="4" name="invoice_lines" nolabel="1"/>
                                             <separator colspan="4" string="Stock Moves"/>
                                             <field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
+                                            <div>
+                                                <field name="notes" nolabel="1" placeholder="Add a note on order line..."/>
+                                            </div>
                                         </div>
                                     </group>
                                 </form>
@@ -264,11 +267,10 @@
                                 <field name="amount_tax"/>
                                 <field name="amount_total" class="oe_subtotal_footer_separator"/>
                             </group>
-                            <div class="oe_clear">
-                                <label for="note"/>
-                            </div>
+                            <group name="sale_delivery">
+                            </group>
                             <div>
-                                <field name="note" class="oe_inline"/>
+                                <field name="note" nolabel="1" class="oe_online" placeholder="Add a global note on the sale order..."/>
                             </div>
                         </page>
                         <page string="Other Information" groups="base.group_user">
@@ -300,7 +302,7 @@
                                 <tree string="Invoices" colors="blue:state == 'draft';black:state in ('proforma','proforma2','open');gray:state == 'cancel'">
                                     <field name="date_invoice"/>
                                     <field name="number"/>
-                                    <field name="partner_id"/>
+                                    <field name="partner_id" string="Customer"/>
                                     <field name="user_id"/>
                                     <field name="date_due"/>
                                     <field name="amount_total"/>
diff --git a/addons/sale_margin/sale_margin_view.xml b/addons/sale_margin/sale_margin_view.xml
index c45cd228dec..c56e66e5ae2 100644
--- a/addons/sale_margin/sale_margin_view.xml
+++ b/addons/sale_margin/sale_margin_view.xml
@@ -8,8 +8,13 @@
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//group[@name='sale_total']" position="inside">
-                <field name="margin"/>
+            <xpath expr="//group[@name='sale_delivery']" position="inside">
+                <group>
+                    <label for="margin"/>
+                    <div>
+                        <field name="margin"/>
+                    </div>
+                </group>
             </xpath>
         </field>
     </record>

From 907b1ca49f266aeadb82aeed52728a0e9a9f8308 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Fri, 6 Jul 2012 12:15:08 +0530
Subject: [PATCH 081/171] [IMP]project_long_term: set attrs

bzr revid: kjo@tinyerp.com-20120706064508-7s2r3ivfu30vmt0p
---
 addons/project_long_term/project_long_term_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 7e24c61e769..aed6492d78a 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -165,7 +165,7 @@
                     <div>
                         <div>
                             <field name="date_start" class="oe_inline"/>
-                            <label string=" - " class="oe_inline oe_edit_only"/>
+                            <label string=" - " attrs="{'invisible':[('date_start','=', False),('date_end','=', False)]}"/>
                             <field name="date_end" class="oe_inline"/>
                         </div>
                         <field name="duration" class="oe_inline"/>

From ad76a5430f04073fb1fbbf5d836ad167667db75e Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Fri, 6 Jul 2012 13:08:37 +0530
Subject: [PATCH 082/171] [FIX]: Bank statement

bzr revid: atp@tinyerp.com-20120706073837-9exeh7u00caun46s
---
 addons/account_payment/account_payment_view.xml |  6 +++---
 addons/l10n_ch/wizard/bvr_import_view.xml       | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 29da4c12e06..c652d82cfb1 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -334,9 +334,9 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//button[@string='Import Invoices']" position="before">
-                    <button name="%(action_account_populate_statement_confirm)d" attrs="{'invisible':[('state','=','confirm')]}" string="Import Payment Lines" type="action" icon="gtk-execute"/>
-                </xpath>
+             <xpath expr="//div[@name='import_buttons']" position="inside">
+                  <button name="%(action_account_populate_statement_confirm)d" attrs="{'invisible':[('state','=','confirm')]}" string="Import Payment Lines" type="action" icon="gtk-execute"/>
+              </xpath>
             </field>
         </record>
 
diff --git a/addons/l10n_ch/wizard/bvr_import_view.xml b/addons/l10n_ch/wizard/bvr_import_view.xml
index e9dab515bf8..d6b7c9d1314 100644
--- a/addons/l10n_ch/wizard/bvr_import_view.xml
+++ b/addons/l10n_ch/wizard/bvr_import_view.xml
@@ -30,15 +30,15 @@
             <field name="target">new</field>
         </record>
         
-        <record model="ir.ui.view" id="view_bank_statement_form">
+        <record model="ir.ui.view" id="view_bank_statement_form_bvr">
             <field name="name">account.bank.statement.form.inherit</field>
             <field name="model">account.bank.statement</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="account_payment.view_bank_statement_form"/>
+            <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//button[@string='Import Invoices']" position="after">
-                    <button name="%(wizard_bvr_import)d" icon="gtk-execute" string="Import BVR" type="action"/>
-                </xpath>
+            <xpath expr="//div[@name='import_buttons']" position="inside">
+                   <button name="%(wizard_bvr_import)d" icon="gtk-execute" string="Import BVR" type="action"/>
+              </xpath>
             </field>
         </record>
     </data>

From d18206a2251951a19c7646b338394440466e9599 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Fri, 6 Jul 2012 16:00:51 +0530
Subject: [PATCH 083/171] [IMP] change view of sale,stock and membership

bzr revid: kjo@tinyerp.com-20120706103051-k3ep6fibqaxelgj2
---
 addons/membership/membership_view.xml | 9 +++------
 addons/sale/sale_view.xml             | 2 --
 addons/stock/stock_view.xml           | 2 +-
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 0f2ad6836c8..cfc3d855671 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -239,13 +239,10 @@
                 <notebook position="inside">
                     <page string="Membership">
                         <group>
-                            <group>
+                            <group col="3">
                                 <field name="free_member"/>
-                                <label for="membership_state"/>
-                                <div>
-                                    <field name="membership_state" class="oe_inline"/>
-                                    <button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" attrs="{'readonly':[('free_member','=',True)]}" class="oe_inline oe_right"/>
-                                </div>
+                                <button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" attrs="{'readonly':[('free_member','=',True)]}" class="oe_inline oe_right"/>
+                                <field name="membership_state" class="oe_inline"/>
                             </group>
                             <group>
                                 <field name="associate_member" attrs="{'readonly':[('membership_state','!=', 'none')]}"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 42a141befd0..3f774ef3cbb 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -174,8 +174,6 @@
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": true}'/>
                             <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>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index dfbb1211167..5185c22b371 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -850,7 +850,7 @@
                                 </form>
                             </field>
                         </page>
-                        <page string="Additional info">
+                        <page string="Additional Info">
                             <group>
                                 <group>
                                     <field name="move_type"/>

From e99fb67bc66a3d93061b8f1c60072337d5b50dbb Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Fri, 6 Jul 2012 19:09:41 +0530
Subject: [PATCH 084/171] [IMP]crm: improve meeting view

bzr revid: kjo@tinyerp.com-20120706133941-a1spe9qj8dtevco8
---
 addons/account/partner_view.xml | 76 ++++++++++++++++-----------------
 addons/crm/crm_meeting_view.xml | 39 +++++++----------
 addons/wiki/wiki_view.xml       |  2 +-
 3 files changed, 54 insertions(+), 63 deletions(-)

diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index ec3dcba3b84..a916a59c42a 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -76,56 +76,56 @@
             <field name="arch" type="xml">
                 <page string="History" position="before" version="7.0">
                 <page string="Accounting" col="4">
-                    <group col="4">
-                        <group string="Customer Accounting Properties" col="4">
+                    <group>
+                        <group >
                             <field name="property_account_receivable" groups="account.group_account_invoice" />
                             <field name="property_account_position" widget="selection"/>
                             <field name="property_payment_term" widget="selection"/>
                         </group>
-                        <group string="Supplier Accounting Properties" col="4">
+                        <group>
                             <field name="property_account_payable" groups="account.group_account_invoice"/>
                         </group>
-                        <group string="Customer Credit" col="4">
+                        <group>
                             <field name="credit"/>
                             <field name="credit_limit"/>
                         </group>
-                        <group string="Supplier Debit" col="4">
+                        <group>
                             <field name="debit"/>
                         </group>
-                        <field name="bank_ids">
-                            <form string="Bank account" version="7.0">
-                                <field name="state"/>
-                                <field name="acc_number"/>
-                                <group>
-                                    <group name="owner" string="Bank Account Owner">
-                                        <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-                                        <field name="owner_name"/>
-                                        <label for="street" string="Address"/>
-                                        <div>
-                                            <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)"/>
-                                        <field name="bank_name"/>
-                                        <field name="bank_bic" placeholder="[Identifier code]"/>
-                                    </group>
-                                </group>
-                            </form>
-                            <tree string="Bank Details">
-                                <field name="sequence" invisible="1"/>
-                                <field name="acc_number"/>
-                                <field name="bank_name"/>
-                                <field name="owner_name"/>
-                            </tree>
-                        </field>
                     </group>
+                    <field name="bank_ids">
+                        <form string="Bank account" version="7.0">
+                            <field name="state"/>
+                            <field name="acc_number"/>
+                            <group>
+                                <group name="owner" string="Bank Account Owner">
+                                    <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
+                                    <field name="owner_name"/>
+                                    <label for="street" string="Address"/>
+                                    <div>
+                                        <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)"/>
+                                    <field name="bank_name"/>
+                                    <field name="bank_bic" placeholder="[Identifier code]"/>
+                                </group>
+                            </group>
+                        </form>
+                        <tree string="Bank Details">
+                            <field name="sequence" invisible="1"/>
+                            <field name="acc_number"/>
+                            <field name="bank_name"/>
+                            <field name="owner_name"/>
+                        </tree>
+                    </field>
                 </page>
                 </page>
             </field>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 88ef7134735..a007fc99091 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -51,9 +51,9 @@
         <field name="help">Create different meeting categories to better organize and classify your meetings.</field>
     </record>
 
-     <menuitem action="crm_meeting_categ_action"
+     <!--menuitem action="crm_meeting_categ_action"
         groups="base.group_no_one"
-        id="menu_crm_case_meeting-act" parent="base.menu_calendar_configuration" sequence="1"/>
+        id="menu_crm_case_meeting-act" parent="base.menu_calendar_configuration" sequence="1"/-->
 
     <!-- CRM Meetings Form View -->
 
@@ -87,41 +87,32 @@
                     </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"/>
+                            at <label string="in" class="oe_inline" attrs="{'invisible': [('location', '=', False)]}"/> <field name="location" placeholder="Location" 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="partner_id" string="Partner"                            on_change="onchange_partner_id(partner_id)" />
                         <field name="email_from"/>
                     </group>
                     <group colspan="2">
+                        <field name="duration" widget="float_time"
+                                on_change="onchange_dates(date,duration,False,allday)"/> 
+                        <field name="date_deadline" 
+                                string="End Date" required="1"
+                                on_change="onchange_dates(date,False,date_deadline)"/>
+                        <field name="alarm_id" string="Reminder" widget="selection" />
+                        <field name="class" string="Privacy"/>
+                        <field name="show_as" string="Show Time as"/>
                         <field name="categ_id" widget="selection"
                             string="Meeting Type"
                             domain="[('object_id.model', '=', 'crm.meeting')]" />
@@ -129,9 +120,9 @@
                         <field name="recurrent_id" invisible="1"/>
                         <field name="recurrent_uid" invisible="1"/>
                     </group>
+                    <group colspan="2">
+                    </group>
                 </group>
-                <separator string="Description" colspan="4" />
-                <field name="description" nolabel="1" colspan="4" />
                 <notebook>
                     <page string="Invitation Detail">
                         <button string="Invite People"
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 700585122d3..0aabcd5b59f 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -155,7 +155,7 @@
                         </group>
                         <group col="2" colspan="2">
                             <separator colspan="4" string="Meta Information"/>
-                            <field name="tags"/>
+                            <field name="tags" widget="many2many_tags"/>
                             <field name="toc" groups="base.group_no_one"/>
                         </group>
                     </sheet>

From ba6439548a0df4167e6baa3d9095f6c8177dd75f Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 9 Jul 2012 11:10:08 +0530
Subject: [PATCH 085/171] [IMP] change in view

bzr revid: kjo@tinyerp.com-20120709054008-ico77jmm32mcztx2
---
 addons/base_calendar/base_calendar.py         |  6 +++---
 addons/crm/crm_meeting_view.xml               | 10 +++++-----
 addons/document/document_view.xml             |  7 +++----
 .../import_sugarcrm/import_sugarcrm_view.xml  |  3 ++-
 addons/product/product_view.xml               | 19 +++++++------------
 5 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index bbededc8eaf..3b8e37e8697 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1034,7 +1034,7 @@ class calendar_event(osv.osv):
              ('confidential', 'Public for Employees')], 'Mark as', states={'done': [('readonly', True)]}),
         'location': fields.char('Location', size=264, help="Location of Event", states={'done': [('readonly', True)]}),
         'show_as': fields.selection([('free', 'Free'), ('busy', 'Busy')], \
-                                                'Show as', states={'done': [('readonly', True)]}),
+                                                'Show Time As', states={'done': [('readonly', True)]}),
         'base_calendar_url': fields.char('Caldav URL', size=264),
         'state': fields.selection([('tentative', 'Tentative'),
                         ('cancelled', 'Cancelled'),
@@ -1060,8 +1060,8 @@ rule or repeating pattern of time to exclude from the recurring rule."),
         'user_id': fields.many2one('res.users', 'Responsible', states={'done': [('readonly', True)]}),
         'organizer': fields.char("Organizer", size=256, states={'done': [('readonly', True)]}), # Map with Organizer Attribure of VEvent.
         'organizer_id': fields.many2one('res.users', 'Organizer', states={'done': [('readonly', True)]}),
-        'end_type' : fields.selection([('count', 'Number of repetitions'), ('end_date','End date')], 'Recurrence termination'),
-        'interval': fields.integer('Repeat every', help="Repeat every (Days/Week/Month/Year)"),
+        'end_type' : fields.selection([('count', 'Number of repetitions'), ('end_date','End date')], 'Recurrence Termination'),
+        'interval': fields.integer('Repeat Every', help="Repeat every (Days/Week/Month/Year)"),
         'count': fields.integer('Repeat', help="Repeat x times"),
         'mo': fields.boolean('Mon'),
         'tu': fields.boolean('Tue'),
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index a007fc99091..79ed5a3adb2 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -88,7 +88,7 @@
                     <group>
                         <h2>
                             <field name="date" required="1" class="oe_inline"/>
-                            at <label string="in" class="oe_inline" attrs="{'invisible': [('location', '=', False)]}"/> <field name="location" placeholder="Location" class="oe_inline"/>
+                            <label string="at" class="oe_inline" attrs="{'invisible': [('location', '=', False)]}"/> <field name="location" placeholder="Location" class="oe_inline"/>
                         </h2>
                     </group>
                     <group>
@@ -104,15 +104,15 @@
                         <field name="partner_id" string="Partner"                            on_change="onchange_partner_id(partner_id)" />
                         <field name="email_from"/>
                     </group>
-                    <group colspan="2">
-                        <field name="duration" widget="float_time"
-                                on_change="onchange_dates(date,duration,False,allday)"/> 
+                    <group> 
                         <field name="date_deadline" 
                                 string="End Date" required="1"
                                 on_change="onchange_dates(date,False,date_deadline)"/>
+                        <field name="duration" widget="float_time"
+                                on_change="onchange_dates(date,duration,False,allday)"/>
                         <field name="alarm_id" string="Reminder" widget="selection" />
                         <field name="class" string="Privacy"/>
-                        <field name="show_as" string="Show Time as"/>
+                        <field name="show_as"/>
                         <field name="categ_id" widget="selection"
                             string="Meeting Type"
                             domain="[('object_id.model', '=', 'crm.meeting')]" />
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 6fb99d936d4..b8954eb248b 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -250,7 +250,7 @@
                     <notebook colspan="4">
                     <page string="Attachment">
                         <group>
-                            <group string="Data">
+                            <group>
                                 <field name="type"/>
                                 <newline />
                                 <field name="datas" filename="datas_fname" attrs="{'invisible':[('type','=','url')]}"/>
@@ -261,14 +261,13 @@
                                 <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">
+                            <group groups="base.group_no_one">
                                 <field name="create_uid" readonly="1"/>
                                 <field name="create_date" readonly="1"/>
                             </group>
-                            <group groups="base.group_no_one" string="Modified">
+                            <group groups="base.group_no_one">
                                 <field name="write_uid" readonly="1"/>
                                 <field name="write_date" readonly="1"/>
                             </group>
diff --git a/addons/import_sugarcrm/import_sugarcrm_view.xml b/addons/import_sugarcrm/import_sugarcrm_view.xml
index 9f38f4e1959..7f751a38729 100644
--- a/addons/import_sugarcrm/import_sugarcrm_view.xml
+++ b/addons/import_sugarcrm/import_sugarcrm_view.xml
@@ -12,8 +12,9 @@
             <header>
                 <button name="import_all" string="_Import"
                         type="object" class="oe_highlight"/>
+                <label string=" "/>
                 <button name="import_from_scheduler_all" string="_Schedule Recurrent Imports"
-                        type="object" class="oe_highlight" /> or
+                        type="object"/> or
                 <button special="cancel" string="_Cancel" class="oe_link"/>
             </header>
             <sheet>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index cdf4d48c904..25367538c3f 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -313,19 +313,14 @@
             <field name="arch" type="xml">
                 <form string="Product Categories" version="7.0">
                     <sheet>
-                        <div class="oe_title">
-                            <h1>
-                                <label for="name" class="oe_edit_only"/>
-                                <field name="name"/>
-                            </h1>
-                        </div>
                         <group>
-                                <group>
-                                    <field name="type"/>
-                                </group>
-                                <group>
-                                    <field name="parent_id"/>
-                                </group>
+                            <group>
+                                <field name="name"/>
+                                <field name="parent_id"/>
+                            </group>
+                            <group>
+                                <field name="type"/>
+                            </group>
                         </group>
                         <group name="basic">
                             <group name="account_property" string="Account Properties"/>

From 6206d0df144d07e7f0ff5a5e8281b80fc1d987e9 Mon Sep 17 00:00:00 2001
From: "Jalpesh Patel (OpenERP)" <pja@tinyerp.com>
Date: Mon, 9 Jul 2012 13:42:27 +0530
Subject: [PATCH 086/171] [IMP]customer-invoice-view

bzr revid: pja@tinyerp.com-20120709081227-t5bplfrzwv57pdmu
---
 addons/account/account_invoice_view.xml       | 7 +++----
 addons/account/wizard/account_move_journal.py | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index b7e815601ab..49e2d0ea781 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -308,11 +308,10 @@
                         <label string="Pro Forma Invoice " attrs="{'invisible': [('state','not in',('proforma','proforma2'))]}"/>
                         <label string="Invoice " attrs="{'invisible': [('state','in',('draft','proforma','proforma2'))]}"/>
                         <field name="number" readonly="1" class="oe_inline"/>
+                        <label string="-" class="oe_inline"/>
+                        <field name="name" placeholder="Project XYZ" class="oe_inline"/>
                     </h1>
-                    <label string="Concerns" for="name" class="oe_edit_only"/>
-                    <h2>
-                        <field name="name" placeholder="Project XYZ"/>
-                    </h2>
+                    
                     <field name="type" invisible="1"/>
                     <group>
                         <group>
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index c484da72304..cf1c819b19f 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -102,7 +102,7 @@ class account_move_journal(osv.osv_memory):
                 period = period_pool.browse(cr, uid, [period_id], ['name'])[0]['name']
                 period_string = _("Period: %s") % tools.ustr(period)
     
-            separator_string = _("Open Journal Items !")
+            separator_string = _("")
             open_string = _("Open")
             view = """<?xml version="1.0" encoding="utf-8"?>
             <form string="Standard entries" version="7.0">

From b1dc0beb352a5d09632a17897efc46b4e4fa7363 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 9 Jul 2012 15:39:03 +0530
Subject: [PATCH 087/171] [IMP]account: change account.analytic.line view

bzr revid: kjo@tinyerp.com-20120709100903-da6v6cu2ekorm2o2
---
 addons/account/project/project_view.xml       | 34 ++++++++-----------
 .../hr_timesheet_invoice_view.xml             |  2 +-
 .../project_timesheet_view.xml                |  2 +-
 3 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 7658ab111d9..e0e5df040fa 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -123,33 +123,27 @@
                     <group>
                         <group>
                             <field name="name"/>
-                            <field name="account_id"/>
-                            <field name="journal_id"/>
+                            <field name="date"/>
+                            <label for="unit_amount"/>
+                                <group class="oe_inline">
+                                    <field name="unit_amount" nolabel="1"/>
+                                    <field name="product_uom_id" nolabel="1" />
+                                </group>
+                            <field name="amount"/>
+                        </group>
+                        <group>
+                            <field name="account_id"/>
+                            <field name="journal_id"/>
+                            <field name="product_id"/>
                         </group>
                         <group>
-                            <field name="date"/>
                             <field name="ref"/>
                             <field name="company_id" groups="base.group_multi_company"/>
                         </group>
-                        <group string="Amount">
-                            <field name="amount"/>
-                            <label for="amount_currency"/>
-                            <div>
-                                <field name="amount_currency" class="oe_inline"/>
-                                <field name="currency_id" class="oe_inline"/>
-                            </div>
-                        </group>
-                        <group string="Product Information">
-                            <field name="product_id"/>
-                            <label for="unit_amount"/>
-                            <div>
-                                <field name="unit_amount" class="oe_inline"/>
-                                <field name="product_uom_id" class="oe_inline"/>
-                            </div>
-                        </group>
-                        <group string="General Accounting">
+                        <group>
                             <field name="general_account_id"/>
                             <field name="move_id" readonly="1"/>
+                            <field name="amount_currency" class="oe_inline"/>
                         </group>
                     </group>
                 </form>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index d07314498e1..92873614172 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -114,7 +114,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_account_analytic_line_form"/>
             <field name="arch" type="xml">
-                <field name="product_uom_id" position="after">
+                <field name="amount" position="before">
                     <field name="to_invoice"/>
                     <field name="invoice_id"/>
                 </field>
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 2e2ec7f2677..9fb145aa536 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -70,7 +70,7 @@
             <field name="inherit_id" ref="account.view_account_analytic_line_form"/>
             <field name="arch" type="xml">
                 <field name="account_id"  position="replace">
-                   <field name="account_id" string="Analytic account/project" on_change="on_change_account_id(account_id)"/>
+                   <field name="account_id" string="Analytic Account/Project" on_change="on_change_account_id(account_id)"/>
                 </field>
             </field>
         </record>

From 86a0371d00be9bd5252c39cae3f77528e5df3002 Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Mon, 9 Jul 2012 16:00:49 +0530
Subject: [PATCH 088/171] [IMP] improve Accounting reports wizards and Supplier
 invoice/refund.

bzr revid: shp@tinyerp.com-20120709103049-jqoz1opqtsiq3uiy
---
 addons/account/account_invoice_view.xml       | 29 +++++++++----------
 addons/account/account_view.xml               |  2 --
 .../wizard/account_report_common_view.xml     |  8 ++---
 3 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index b7e815601ab..2564f2adc5d 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -163,38 +163,35 @@
                 <sheet string="Supplier Invoice">
                   <div class="oe_title">
                   <h1>
-                     <label string="Draft Invoice " attrs="{'invisible': [('state','not in',('draft',))]}"/>
+                     <label string="Draft Invoice/ref " attrs="{'invisible': [('state','not in',('draft',))]}"/>
                      <label string="Pro Forma Invoice " attrs="{'invisible': [('state','not in',('proforma','proforma2'))]}"/>
                      <label string="Invoice " attrs="{'invisible': [('state','in',('draft','proforma','proforma2'))]}"/>
+                     <span attr="{'invisible': [('origin','=',False)]}"> - </span> 
+                     <field name="origin" placeholder="PO 002" class="oe_inline"/>
                      <field name="number" readonly="1" class="oe_inline"/>
                   </h1>
-                    <label string="Concerns" for="origin" class="oe_edit_only"/>
-                    <h2>
-                        <field name="origin" placeholder="PO 002"/> From
-                        <field string="Supplier" name="partner_id"
-                              on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
-                              context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"
-                              domain="[('supplier', '=', True)]"/>
-                      </h2>
                     </div>
                     <group>
                        <group>
-                         <field name="date_invoice"/>
-                         <field name="date_due"/>
-                         <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
-                         <label for="reference"/>
+                         <field string="Supplier" name="partner_id"
+                              on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
+                              context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"
+                              domain="[('supplier', '=', True)]"/>
+                          <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
+                          <field name="reference_type" class="oe_inline" nolabel="1"/>
                          <div>
-                          <field name="reference_type"/>
-                          <field name="reference" placeholder="Payment Reference"/>
+                          <field name="reference" placeholder="Payment Reference" class="oe_inline"/>
                          </div>
                        </group>
                        <group>
+                          <field name="date_invoice"/>
+                          <field name="date_due"/>
                           <field name="fiscal_position" widget="selection"/>
+                          <field name="currency_id"/>
                           <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"
                                  groups="account.group_account_user"/>
                           <field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]"
                                  name="account_id" groups="account.group_account_user"/>
-                          <field name="currency_id"/>
                           <field name="type" invisible="1"/>
                         </group>
                     </group>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index c525ca9eb78..0fecb8ded12 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -17,7 +17,6 @@
                     <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object" class="oe_highlight"/>
                     <field name="state" widget="statusbar" nolabel="1" />
                 </header>
-                <sheet string="Fiscalyear" >
                     <group>
                         <group>
                             <field name="name"/>
@@ -41,7 +40,6 @@
                             </group>
                         </form>
                     </field>
-                </sheet>
                 </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..ff3c7aef187 100644
--- a/addons/account/wizard/account_report_common_view.xml
+++ b/addons/account/wizard/account_report_common_view.xml
@@ -26,12 +26,12 @@
                             <field name="filter" on_change="onchange_filter(filter, fiscalyear_id)"/>
                         </group>
                         <group string="Dates" col="4">
-                            <field name="date_from" attrs="{'readonly':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}" colspan="4"/>
-                            <field name="date_to" attrs="{'readonly':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}"  colspan="4"/>
+                            <field name="date_from" attrs="{'invisible':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}" colspan="4"/>
+                            <field name="date_to" attrs="{'invisible':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}"  colspan="4"/>
                         </group>
                         <group string="Periods" col="4">
-                            <field name="period_from" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/>
-                            <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/>
+                            <field name="period_from" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'invisible':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/>
+                            <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'invisible':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/>
                         </group>
                     </page>
                     <page string="Journals" name="journal_ids">

From a900a06f9d00aef229d023ed22e1325f347158a0 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 9 Jul 2012 16:10:23 +0530
Subject: [PATCH 089/171] [IMP]l10n_fr_rib: set xpath

bzr revid: kjo@tinyerp.com-20120709104023-31dczp1vq59kyr09
---
 addons/l10n_fr_rib/bank_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_fr_rib/bank_view.xml b/addons/l10n_fr_rib/bank_view.xml
index b3062f4c706..38c51df58e0 100644
--- a/addons/l10n_fr_rib/bank_view.xml
+++ b/addons/l10n_fr_rib/bank_view.xml
@@ -9,7 +9,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//page[@string='Accounting']/group/field[@name='bank_ids']/form/field[@name='acc_number']" position="before">
+                    <xpath expr="//page[@string='Accounting']/field[@name='bank_ids']/form/field[@name='acc_number']" position="before">
                         <newline />
                         <field name="bank_code" />
                         <field name="office" />
@@ -17,7 +17,7 @@
                         <field name="key" />
                         <newline />
                     </xpath>
-                    <xpath expr="//page[@string='Accounting']/group/field[@name='bank_ids']/tree/field[@name='acc_number']" position="after">
+                    <xpath expr="//page[@string='Accounting']/field[@name='bank_ids']/tree/field[@name='acc_number']" position="after">
                         <field name="rib_acc_number"/>
                     </xpath>
                 </data>

From 158ffb05dfa1cd6588256426b8d218b6d1f9263e Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Tue, 10 Jul 2012 11:15:35 +0530
Subject: [PATCH 090/171] [IMP]set priority for account.analytic.line form

bzr revid: kjo@tinyerp.com-20120710054535-ggqe2amf122y6d8s
---
 addons/account/project/project_view.xml         | 5 +++--
 addons/import_sugarcrm/import_sugarcrm_view.xml | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index e0e5df040fa..4af08c7766c 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -118,6 +118,7 @@
             <field name="name">account.analytic.line.form</field>
             <field name="model">account.analytic.line</field>
             <field name="type">form</field>
+            <field name="priority">1</field>
             <field name="arch" type="xml">
                 <form string="Analytic Entry" version="7.0">
                     <group>
@@ -245,8 +246,8 @@
                         <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
                         <field invisible="True" name="general_account_id"/>
                         <field name="amount"/>
-                        <field name="currency_id" />
-                        <field name="amount_currency" />
+                        <field name="currency_id"/>
+                        <field name="amount_currency"/>
                         <field name="company_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
                     </group>
                 </form>
diff --git a/addons/import_sugarcrm/import_sugarcrm_view.xml b/addons/import_sugarcrm/import_sugarcrm_view.xml
index 7f751a38729..6ef9be1a5bd 100644
--- a/addons/import_sugarcrm/import_sugarcrm_view.xml
+++ b/addons/import_sugarcrm/import_sugarcrm_view.xml
@@ -12,7 +12,6 @@
             <header>
                 <button name="import_all" string="_Import"
                         type="object" class="oe_highlight"/>
-                <label string=" "/>
                 <button name="import_from_scheduler_all" string="_Schedule Recurrent Imports"
                         type="object"/> or
                 <button special="cancel" string="_Cancel" class="oe_link"/>

From 58677aa2dffc263d7d8993789fa1e3a77f3ec57b Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Wed, 11 Jul 2012 10:33:09 +0530
Subject: [PATCH 091/171] [IMP]crm: remove duration label

bzr revid: kjo@tinyerp.com-20120711050309-n3tvgy4196q7wdsk
---
 addons/crm/crm_meeting_view.xml | 301 ++++++++++++++++----------------
 1 file changed, 147 insertions(+), 154 deletions(-)

diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 79ed5a3adb2..aef7b411ae9 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -91,162 +91,155 @@
                             <label string="at" class="oe_inline" attrs="{'invisible': [('location', '=', False)]}"/> <field name="location" placeholder="Location" class="oe_inline"/>
                         </h2>
                     </group>
-                    <group>
-                        <h2>
-                            <label for="duration" string="Duration" />
-                            
-                        </h2>
-                    </group>
-                <group colspan="4" col="4">
-                    <group colspan="2">
-                        <field name="user_id" />
-                        <field name="section_id" widget="selection"/>
-                        <field name="partner_id" string="Partner"                            on_change="onchange_partner_id(partner_id)" />
-                        <field name="email_from"/>
-                    </group>
-                    <group> 
-                        <field name="date_deadline" 
-                                string="End Date" required="1"
-                                on_change="onchange_dates(date,False,date_deadline)"/>
-                        <field name="duration" widget="float_time"
-                                on_change="onchange_dates(date,duration,False,allday)"/>
-                        <field name="alarm_id" string="Reminder" widget="selection" />
-                        <field name="class" string="Privacy"/>
-                        <field name="show_as"/>
-                        <field name="categ_id" widget="selection"
-                            string="Meeting Type"
-                            domain="[('object_id.model', '=', 'crm.meeting')]" />
-                        <field name="rrule" invisible="1" readonly="1"/>
-                        <field name="recurrent_id" invisible="1"/>
-                        <field name="recurrent_uid" invisible="1"/>
-                    </group>
-                    <group colspan="2">
-                    </group>
-                </group>
-                <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 colspan="4" col="4">
+                        <group colspan="2">
+                            <field name="user_id" />
+                            <field name="section_id" widget="selection"/>
+                            <field name="partner_id" string="Partner"                            on_change="onchange_partner_id(partner_id)" />
+                            <field name="email_from"/>
                         </group>
+                        <group> 
+                            <field name="date_deadline" 
+                                    string="End Date" required="1"
+                                    on_change="onchange_dates(date,False,date_deadline)"/>
+                            <field name="duration" widget="float_time"
+                                    on_change="onchange_dates(date,duration,False,allday)"/>
+                            <field name="alarm_id" string="Reminder" widget="selection" />
+                            <field name="class" string="Privacy"/>
+                            <field name="show_as"/>
+                            <field name="categ_id" widget="selection"
+                                string="Meeting Type"
+                                domain="[('object_id.model', '=', 'crm.meeting')]" />
+                            <field name="rrule" invisible="1" readonly="1"/>
+                            <field name="recurrent_id" invisible="1"/>
+                            <field name="recurrent_uid" invisible="1"/>
+                        </group>
+                        <group colspan="2">
+                        </group>
+                    </group>
+                    <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 />
 
-                    </page>
-                </notebook>
+
+                                </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"/>

From 3eb495b2846287c366bcf1c30b9fb920f8aecc0f Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 12 Jul 2012 19:03:05 +0530
Subject: [PATCH 092/171] [IMP] Improve code as specified on code review

bzr revid: dbr@tinyerp.com-20120712133305-7os2hdekytjdjt4d
---
 addons/delivery/delivery_view.xml             | 58 ++++++++-----------
 addons/procurement/procurement_view.xml       |  8 +--
 .../wizard/schedulers_all_view.xml            |  2 +-
 addons/stock/stock_view.xml                   | 26 ++++-----
 addons/stock_planning/stock_planning_view.xml |  2 +-
 .../stock_planning_createlines_view.xml       |  4 +-
 6 files changed, 42 insertions(+), 58 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 066643e4811..edd64a431f4 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -28,9 +28,8 @@
                             <field name="partner_id"/>
                             <field name="product_id"/>
                             <field name="active"/>
-                            <separator string="Pricing Information" colspan="4"/>
-                            <group colspan="4" col="4">
-                                <group col="2" colspan="2">
+                            <group string="Pricing Information">
+                                <group>
                                     <field name="normal_price" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
                                     <label for="free_if_more_than"/>
                                     <div>
@@ -42,7 +41,7 @@
                             <newline/>
                             <field name="use_detailed_pricelist"/>
                         </group>
-                        <field name="pricelist_ids" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree,form">
+                        <field name="pricelist_ids" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree">
                             <tree string="Delivery grids">
                                   <field name="sequence"/>
                                   <field name="name"/>
@@ -127,15 +126,13 @@
                             <field name="line_ids"/>
                         </page>
                         <page string="Destination">
-                            <group>
-                                <group>
-                                    <field name="country_ids" widget="many2many_tags"/>
-                                    <field name="state_ids" widget="many2many_tags"/>
-                                </group>
-                                <group>
-                                    <field name="zip_from" class="oe_inline"/>
-                                    <field name="zip_to" class="oe_inline"/>
-                                </group>
+                            <group string="Countries">
+                                <field name="country_ids"/>
+                            </group>
+                            <group string="States">
+                                <field colspan="2" name="state_ids" nolabel="1"/>
+                                <field name="zip_from"/>
+                                <field name="zip_to"/>
                             </group>
                         </page>
                     </notebook>
@@ -158,28 +155,19 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Grid Lines" version="7.0">
-                    <sheet>
-                        <label for="name" class="oe_edit_only"/>
-
-                            <field name="name" col="4"/>
-
-                        <group col="4">
-                            <group>
-                                <label string="Condition" for="type"/>
-                                <div>
-                                    <field name="type"/>
-                                    <field name="operator"/>
-                                    <field name="max_value"/>
-                                </div>
-                            </group>
-                            <group>
-                                <field name="list_price"/>
-                                <field name="standard_price"/>
-                                <field name="price_type"/>
-                                <field name="variable_factor" attrs="{'invisible':[('price_type','=','fixed')]}"/>
-                            </group>
-                        </group>
-                    </sheet>
+                    <field colspan="4" name="name"/>
+                    <div>
+                        <label string="condition" for="type"/>
+                        <field name="type" class="oe_inline"/>
+                        <field name="operator" class="oe_inline"/>
+                        <field name="max_value" class="oe_inline"/>
+                    </div>
+                    <group col="4">
+                        <field name="list_price"/>
+                        <field name="standard_price"/>
+                        <field name="price_type"/>
+                        <field name="variable_factor" attrs="{'invisible':[('price_type','=','fixed')]}"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 65cf94e0168..fcf4992ed2a 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -70,21 +70,21 @@
                             <field name="date_planned"/>
                             <field name="procure_method"/>
                             <field name="priority"/>
-                            <field name="company_id" groups="base.group_multi_company" widget="selection" invisible="1"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                         </group>
                         <group col="2" colspan="2"/>
                     </group>
                     <notebook>
                     <page string="Procurement Details">
-                        <group string="Product &amp; Location" col="4">
+                        <group col="4">
                             <group>
                                 <field name="product_id" on_change="onchange_product_id(product_id)"/>
-                                <label for="product_qty" />
+                                <label for="product_qty"/>
                                 <div>
                                     <field name="product_qty" class="oe_inline"/>
                                     <field name="product_uom" class="oe_inline"/>
                                 </div>
-                                <label for="product_uos_qty" />
+                                <label for="product_uos_qty" string="Quentity UoS"/>
                                 <div>
                                     <field name="product_uos_qty" groups="product.group_uos" class="oe_inline"/>
                                     <field name="product_uos"  groups="product.group_uos" class="oe_inline"/>
diff --git a/addons/procurement/wizard/schedulers_all_view.xml b/addons/procurement/wizard/schedulers_all_view.xml
index 01712a0cedd..ee2a5d33e25 100644
--- a/addons/procurement/wizard/schedulers_all_view.xml
+++ b/addons/procurement/wizard/schedulers_all_view.xml
@@ -10,7 +10,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Scheduler Parameters" version="7.0">
-                    <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.">
+                    <group>
                         <field name="automatic"/>
                     </group>
                     <footer>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 0e6e95a800e..4dc7e3754ea 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -121,16 +121,14 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet>
-                    <label for="name" class="oe_edit_only"/>
-                    <h1>
-                        <field name="name" placeholder="Annual inventory" class="oe_inline"/>
-                        <span> - </span>
-                        <field name="date" class="oe_inline"/>
-                    </h1>
-                    <label for="company_id" class="oe_edit_only"/>
-                    <h2>
+                        <label for="name" class="oe_edit_only"/>
+                        <h1>
+                            <field name="name" placeholder="Annual inventory"  class="oe_inline"/> -
+                            <field name="date" class="oe_inline"/>
+                        </h1>
+                    <group>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    </h2>
+                    </group>
                     <notebook>
                     <page string="General Informations">
                         <field name="inventory_line_id">
@@ -147,11 +145,6 @@
                             </tree>
                             <form string="Products" version="7.0">
                                 <sheet>
-                                    <div class="oe_right oe_button_box">
-                                        <button name="%(stock.action_view_stock_inventory_line_split)d"
-                                            string="Split inventory lines" groups="stock.group_inventory_valuation"
-                                            type="action" icon="terp-stock_effects-object-colorize"/>
-                                    </div>
                                     <group>
                                         <group>
                                             <field domain="[('usage','=','internal')]" name="location_id"/>
@@ -164,6 +157,9 @@
                                                 <field name="product_uom" class="oe_inline" groups="product.group_uom"/>
                                             </div>
                                             <field name="prod_lot_id" groups="stock.group_production_lot"/>
+                                            <button name="%(stock.action_view_stock_inventory_line_split)d"
+                                            string="Split inventory lines" groups="stock.group_inventory_valuation"
+                                            type="action" icon="terp-stock_effects-object-colorize"/>
                                         </group>
                                     </group>
                                 </sheet>
@@ -748,7 +744,7 @@
                     <label for="name" class="oe_edit_only"/>
                     <h1>
                         <field name="name" class="oe_inline"/>
-                        <label string="-" attrs="{'invisible':[('origin','=',False)]}"/> 
+                        <span attr="{'invisible': [('origin','=',False)]}"> - </span>
                         <field name="origin" placeholder="PO0032" class="oe_inline"/>
                     </h1>
                     <label for="partner_id" class="oe_edit_only"/>
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 34a40ac1ae1..1e6a4c01f32 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -246,7 +246,7 @@
                     <sheet>
                         <group>
                             <group string = "General Info">
-                                <field name="company_id" select = "1" widget= "selection"
+                                <field name="company_id" widget= "selection"
                                              on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
                                 <field name="warehouse_id" domain = "[('company_id','=',company_id)] " />
                                 <field name="period_id" />
diff --git a/addons/stock_planning/wizard/stock_planning_createlines_view.xml b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
index 00ee00f1c34..be744987a45 100644
--- a/addons/stock_planning/wizard/stock_planning_createlines_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
@@ -9,16 +9,16 @@
             <field name="arch" type="xml">
                 <form string="Create Stock Planning Lines" version="7.0">
                     <group col="4">
+                        <field name="period_id"/>
                         <field name="company_id" widget= "selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
                         <field name="warehouse_id" domain = "[('company_id','=',company_id)] "/>
                         <field name="forecasted_products"/>
-                        <field name="period_id"/>
                         <field name="product_categ_id" attrs="{'required':[('forecasted_products','=',0)]}"/>
                     </group>
                     <footer>
                         <button name="create_planning" string="Create" type="object" class="oe_highlight"/>
                         or
-                        <button string="Cancel" class="oe_link" special="cancel" />
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </footer>
                 </form>
             </field>

From 45a551051f09967e9de63e9f7b4d32e994173dd4 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 13 Jul 2012 12:03:08 +0530
Subject: [PATCH 093/171] [IMP]stock: little more imp

bzr revid: dbr@tinyerp.com-20120713063308-srzsv9ny85syvj76
---
 addons/stock/stock_view.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 4dc7e3754ea..b44e197ceec 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -121,14 +121,17 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet>
+                    <div>
                         <label for="name" class="oe_edit_only"/>
                         <h1>
                             <field name="name" placeholder="Annual inventory"  class="oe_inline"/> -
                             <field name="date" class="oe_inline"/>
                         </h1>
-                    <group>
+                    </div>
+                    <label for="company_id" groups="base.group_multi_company" class="oe_edit_only"/>
+                    <h2>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    </group>
+                    </h2>
                     <notebook>
                     <page string="General Informations">
                         <field name="inventory_line_id">
@@ -744,7 +747,7 @@
                     <label for="name" class="oe_edit_only"/>
                     <h1>
                         <field name="name" class="oe_inline"/>
-                        <span attr="{'invisible': [('origin','=',False)]}"> - </span>
+                        <span attrs="{'invisible': [('origin','=',False)]}">-</span>
                         <field name="origin" placeholder="PO0032" class="oe_inline"/>
                     </h1>
                     <label for="partner_id" class="oe_edit_only"/>

From ebcc25e7f654f8a563d4487f2d8aabe60ffdfa0b Mon Sep 17 00:00:00 2001
From: "Jalpesh Patel (OpenERP)" <pja@tinyerp.com>
Date: Fri, 13 Jul 2012 17:46:58 +0530
Subject: [PATCH 094/171] [IMP]account:periodical-processing-view-improve

bzr revid: pja@tinyerp.com-20120713121658-ogp9wk3osmyxasvy
---
 addons/account/wizard/account_automatic_reconcile_view.xml    | 2 --
 addons/account/wizard/account_fiscalyear_close_state.xml      | 4 +---
 addons/account/wizard/account_fiscalyear_close_view.xml       | 2 --
 addons/account/wizard/account_subscription_generate_view.xml  | 2 --
 addons/account/wizard/account_use_model_view.xml              | 2 --
 addons/account/wizard/account_validate_move_view.xml          | 2 --
 addons/account_asset/wizard/wizard_asset_compute_view.xml     | 2 --
 .../account_followup/wizard/account_followup_print_view.xml   | 2 --
 8 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/addons/account/wizard/account_automatic_reconcile_view.xml b/addons/account/wizard/account_automatic_reconcile_view.xml
index be1776497b3..b7a22ea9fa8 100644
--- a/addons/account/wizard/account_automatic_reconcile_view.xml
+++ b/addons/account/wizard/account_automatic_reconcile_view.xml
@@ -8,8 +8,6 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                 <form string="Reconciliation" version="7.0">
-                    <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)]"/>
                     <group col="4">
                         <field name="power"/>
diff --git a/addons/account/wizard/account_fiscalyear_close_state.xml b/addons/account/wizard/account_fiscalyear_close_state.xml
index b31213f4bad..3ca769a282a 100644
--- a/addons/account/wizard/account_fiscalyear_close_state.xml
+++ b/addons/account/wizard/account_fiscalyear_close_state.xml
@@ -8,10 +8,8 @@
             <field name="arch" type="xml">
                 <form string="Close states of Fiscal year and periods" version="7.0">
 	                <header>
-	                    <button icon="terp-locked" string="Close Fiscalyear" name="data_save" type="object" class="oe_highlight"  />
+	                    <button icon="terp-locked" string="Close Fiscal Year" name="data_save" type="object" class="oe_highlight"  />
 	                </header>
-	                <separator string="Close states of Fiscal year and periods"/>
-	                <label string ="If no additional entries should be recorded on a fiscal year, you can close it from here. It will close all opened periods in this year that will make impossible any new entry record. Close a fiscal year when you need to finalize your end of year results definitive "/>
 	                <group>
 	                    <field name="fy_id"  domain="[('state','=','draft')]"/>
 	                </group>
diff --git a/addons/account/wizard/account_fiscalyear_close_view.xml b/addons/account/wizard/account_fiscalyear_close_view.xml
index 8c4df8548f6..43850237263 100644
--- a/addons/account/wizard/account_fiscalyear_close_view.xml
+++ b/addons/account/wizard/account_fiscalyear_close_view.xml
@@ -7,8 +7,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Generate Fiscal Year Opening Entries" version="7.0">
-                    <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/>
                     <group col="4">
                         <field name="fy_id" domain = "[('state','=','draft')]"/>
diff --git a/addons/account/wizard/account_subscription_generate_view.xml b/addons/account/wizard/account_subscription_generate_view.xml
index 64ca3beeb11..e32439537d7 100644
--- a/addons/account/wizard/account_subscription_generate_view.xml
+++ b/addons/account/wizard/account_subscription_generate_view.xml
@@ -8,8 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Subscription Compute" version="7.0">
-                    <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>
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index 777ab38fddf..6170ca4fe12 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -8,8 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 	            <form string="Create Entries From Models" version="7.0">
-	                <separator string="This wizard will create recurring accounting entries"/>
-	                <label string="Create manual recurring entries in a chosen journal."/>
 	                <group>
 	                    <field name="model"/>
 	                </group>
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index 0d41279a7ed..991921710a7 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -9,8 +9,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <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"/>
diff --git a/addons/account_asset/wizard/wizard_asset_compute_view.xml b/addons/account_asset/wizard/wizard_asset_compute_view.xml
index 45d3aa22625..e9b64a33a25 100644
--- a/addons/account_asset/wizard/wizard_asset_compute_view.xml
+++ b/addons/account_asset/wizard/wizard_asset_compute_view.xml
@@ -7,8 +7,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Compute Asset" version="7.0">
-                    <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>
diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index 7115fbdc738..c897b283ab0 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -8,8 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Send follow-ups" version="7.0">
-                <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"/>

From 09dda00b77bbc7ae1439b8a706a7d0c4cb59905f Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Sat, 14 Jul 2012 11:57:55 +0530
Subject: [PATCH 095/171] [IMP]mrp: revert change

bzr revid: kjo@tinyerp.com-20120714062755-fyu9lqgn7xpmylz8
---
 addons/mrp/mrp.py       |   4 +-
 addons/mrp/mrp_view.xml | 290 +++++++++++++++++++++++-----------------
 2 files changed, 168 insertions(+), 126 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index e389299002a..56ac47095a1 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -206,7 +206,7 @@ class mrp_bom(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', required=True),
         'product_uos_qty': fields.float('Product UOS Qty'),
         'product_uos': fields.many2one('product.uom', 'Product UOS', help="Product UOS (Unit of Sale) is the unit of measurement for the invoicing and promotion of stock."),
-        'product_qty': fields.float('Product Qty', required=True, digits_compute=dp.get_precision('Product Unit of Measure')),
+        'product_qty': fields.float('Product Quantity', required=True, digits_compute=dp.get_precision('Product Unit of Measure')),
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True, help="Unit of Measure (Unit of Measure) is the unit of measurement for the inventory control"),
         'product_rounding': fields.float('Product Rounding', help="Rounding applied on the product quantity."),
         'product_efficiency': fields.float('Manufacturing Efficiency', required=True, help="A factor of 0.9 means a loss of 10% within the production process."),
@@ -456,7 +456,7 @@ class mrp_production(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'product_qty': fields.float('Product Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True, states={'draft':[('readonly',False)]}, readonly=True),
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True, states={'draft':[('readonly',False)]}, readonly=True),
-        'product_uos_qty': fields.float('Product UoS Qty', states={'draft':[('readonly',False)]}, readonly=True),
+        'product_uos_qty': fields.float('Product UoS Quantity', states={'draft':[('readonly',False)]}, readonly=True),
         'product_uos': fields.many2one('product.uom', 'Product UoS', states={'draft':[('readonly',False)]}, readonly=True),
 
         'location_src_id': fields.many2one('stock.location', 'Raw Materials Location', required=True,
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 0f71d6fc204..9e0c383c473 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -32,12 +32,14 @@
             </field>
         </record>
         <record id="mrp_property_group_action" model="ir.actions.act_window">
-            <field name="name">Property Group</field>
+            <field name="name">Property Groups</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.property.group</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="help">Define specific property groups that can be assigned to the properties of your bill of materials.</field>
+            <field name="help">
+                Define specific property groups that can be assigned to the properties of your bill of materials.
+            </field>
         </record>
         <menuitem
             id="menu_mrp_configuration"
@@ -103,7 +105,13 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_mrp_property_search"/>
-            <field name="help">The Properties in OpenERP are used to select the right bill of materials for manufacturing a product when you have different ways of building the same product. You can assign several properties to each Bill of Materials. When a sales person creates a sales order, he can relate it to several properties and OpenERP will automatically select the BoM to use according the needs.</field>
+            <field name="help">
+                The Properties in OpenERP are used to select the right bill of materials for manufacturing
+            a product when you have different ways of building the same product.
+            You can assign several properties to each bill of materials.
+            When a salesperson creates a sale order, they can relate it to several properties
+            and OpenERP will automatically select the BoM to use according the needs.
+            </field>
         </record>
         <menuitem name="Master Bill of Materials"
             id="menu_mrp_property"
@@ -113,7 +121,7 @@
         <menuitem
             action="mrp_property_action"
             id="menu_mrp_property_action"
-            groups="product.group_mrp_properties"
+            groups="product.group_mrp_properties,product.group_mrp_properties"
             parent="menu_mrp_configuration"
             sequence="30" />
         <menuitem
@@ -146,44 +154,42 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Work Center" version="7.0">
-                    <sheet>
-                        <group col="4">
-                            <group>
-                                <field name="name"/>
-                                <field name="resource_type"/>
-                                <field name="calendar_id" widget="selection"/>
-                            </group>
-                            <group>
-                                <field name="code"/>
-                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                <field name="active"/>
-                            </group>
+                    <group col="4">
+                        <group>
+                            <field name="name"/>
+                            <field name="resource_type"/>
+                            <field name="calendar_id" widget="selection"/>
                         </group>
-                        <notebook>
-                            <page string="General Information">
-                                <group>
-                                    <group string="Capacity Information">
-                                        <field name="time_efficiency"/>
-                                        <field name="capacity_per_cycle"/>
-                                        <field name="time_cycle" widget="float_time"/>
-                                        <field name="time_start" widget="float_time"/>
-                                        <field name="time_stop" widget="float_time"/>
-                                    </group>
-                                    <group string="Costing Information">
-                                        <field name="product_id" on_change="on_change_product_cost(product_id)"/>
-                                        <field name="costs_hour"/>
-                                        <field name="costs_hour_account_id" groups="analytic.group_analytic_accounting"/>
-                                        <field name="costs_cycle"/>
-                                        <field name="costs_cycle_account_id" groups="analytic.group_analytic_accounting"/>
-                                        <field name="costs_journal_id" attrs="{'required':['|',('costs_hour_account_id', '=', True),('costs_cycle_account_id', '=', True)]}" groups="analytic.group_analytic_accounting"/>
-                                        <field name="costs_general_account_id" attrs="{ 'required':['|',('costs_cycle_account_id', '=', True),('costs_hour_account_id', '=', True)]}" groups="analytic.group_analytic_accounting"/>
-                                    </group>
+                        <group>
+                            <field name="code"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <field name="active"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="General Information">
+                            <group>
+                                <group string="Capacity Information">
+                                    <field name="time_efficiency"/>
+                                    <field name="capacity_per_cycle"/>
+                                    <field name="time_cycle" widget="float_time"/>
+                                    <field name="time_start" widget="float_time"/>
+                                    <field name="time_stop" widget="float_time"/>
                                 </group>
-                                <label for="note"/>
-                                <field name="note"/>
-                            </page>
-                        </notebook>
-                    </sheet>
+                                <group string="Costing Information">
+                                    <field name="product_id" on_change="on_change_product_cost(product_id)"/>
+                                    <field name="costs_hour"/>
+                                    <field name="costs_hour_account_id" groups="analytic.group_analytic_accounting"/>
+                                    <field name="costs_cycle"/>
+                                    <field name="costs_cycle_account_id" groups="analytic.group_analytic_accounting"/>
+                                    <field name="costs_journal_id" attrs="{'required':['|',('costs_hour_account_id', '=', True),('costs_cycle_account_id', '=', True)]}" groups="analytic.group_analytic_accounting"/>
+                                    <field name="costs_general_account_id" attrs="{ 'required':['|',('costs_cycle_account_id', '=', True),('costs_hour_account_id', '=', True)]}" groups="analytic.group_analytic_accounting"/>
+                                </group>
+                            </group>
+                            <label for="note"/>
+                            <field name="note"/>
+                        </page>
+                    </notebook>
                 </form>
             </field>
         </record>
@@ -239,18 +245,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Routing Work Centers" version="7.0">
-                    <sheet>
-                        <group col="4" string="General Information">
-                            <field colspan="4" name="name"/>
-                            <field name="sequence"/>
-                            <field name="workcenter_id"/>
-                            <field name="cycle_nbr"/>
-                            <field name="hour_nbr" widget="float_time"/>
-                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                        </group>
-                        <label for="note"/>
-                        <field name="note"/>
-                    </sheet>
+                    <group col="4" string="General Information">
+                        <field colspan="4" name="name"/>
+                        <field name="sequence"/>
+                        <field name="workcenter_id"/>
+                        <field name="cycle_nbr"/>
+                        <field name="hour_nbr" widget="float_time"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    </group>
+                    <label for="note"/>
+                    <field name="note"/>
                 </form>
             </field>
         </record>
@@ -261,26 +265,25 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Routing" version="7.0">
-                    <sheet>
-                        <group col="4">
-                            <group>
-                                <field name="name"/>
-                                <field name="code"/>
-                            </group>
-                            <group>
-                                <field name="location_id"/>
-                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                                <field name="active"/>
-                           </group>
+                    <group col="4">
+                        <group>
+                            <field name="name"/>
+                            <field name="code"/>
                         </group>
-                        <notebook>
-                            <page string="Work Center Operations">
-                                <field name="workcenter_lines"/>
-                                <label string="Notes"/>
-                                <field name="note"/>
-                            </page>
-                        </notebook>
-                    </sheet>
+                        <group>
+                            <field name="location_id"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                            <field name="active"/>
+                       </group>
+                    </group>
+                    <notebook>
+                        <page string="Work Center Operations">
+                            <field name="workcenter_lines"/>
+                        </page>
+                        <page string="Notes">
+                            <field name="note"/>
+                        </page>
+                    </notebook>
                 </form>
             </field>
         </record>
@@ -322,7 +325,11 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="mrp_routing_tree_view"/>
             <field name="search_view_id" ref="mrp_routing_search_view"/>
-            <field name="help">Routings allow you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials.</field>
+            <field name="help">
+                Routings allow you to create and manage the manufacturing operations that should be
+                followed within your work centers in order to produce a product.
+                They are attached to bills of materials that will define the required raw materials.
+            </field>
         </record>
         <menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="mrp.menu_mrp_bom" groups="mrp.group_mrp_routings" sequence="15"/>
 
@@ -337,16 +344,16 @@
             <field name="arch" type="xml">
                 <form string="Bill of Material" version="7.0">
                     <sheet>
-                        <label for="product_id" class="oe_edit_only"/>
+                        <label for="product_id" string="Product and Quantity" class="oe_edit_only"/>
                         <h1>
                             <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_inline"/>: 
                             <field name="product_qty" class="oe_inline"/>
-                            <field name="product_uom" class="oe_inline"/>
+                            <field name="product_uom" class="oe_inline" groups="product.group_uom"/>
                         </h1>
-                        <label for="routing_id" class="oe_edit_only"/>
-                        <h2>
-                            <field name="routing_id"  groups="mrp.group_mrp_routings"/>
-                        </h2>
+                        <div groups="mrp.group_mrp_routings">
+                            <label for="routing_id" class="oe_edit_only"/>
+                            <h2><field name="routing_id" class="oe_inline"/></h2>
+                        </div>
                         <group>
                             <group>
                                 <field name="name"/>
@@ -355,7 +362,7 @@
                             <group>
                                 <field name="type"/>
                                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                <label for="product_uos_qty" groups="product.group_uos" string="Product UoS Quantity"/>
+                                <label for="product_uos_qty" groups="product.group_uos"/>
                                 <div groups="product.group_uos" >
                                     <field name="product_uos_qty" 
                                         class="oe_inline"/>
@@ -369,8 +376,8 @@
                                 <field name="bom_lines" widget="one2many_list">
                                     <tree string="Components" editable="bottom">
                                         <field name="product_id" on_change="onchange_product_id(product_id, name)"/>
-                                        <field name="product_qty" string="Product Quantity"/>
-                                        <field name="product_uom"/>
+                                        <field name="product_qty"/>
+                                        <field name="product_uom" groups="product.group_uom"/>
                                         <field name="name" invisible="1"/>
                                         <field name="date_start"/>
                                         <field name="date_stop"/>
@@ -382,18 +389,18 @@
                             </page>
                             <page string="Properties" groups="product.group_mrp_properties">
                                 <group>
-                                        <group>
-                                            <field name="position"/>
-                                            <field name="bom_id"/>
-                                            <field name="sequence"/>
-                                            <field name="active"/>
-                                        </group>
-                                        <group>
-                                            <field name="date_start"/>
-                                            <field name="date_stop"/>
-                                            <field name="product_rounding"/>
-                                            <field name="product_efficiency"/>
-                                        </group>
+                                    <group>
+                                        <field name="position"/>
+                                        <field name="bom_id"/>
+                                        <field name="sequence"/>
+                                        <field name="active"/>
+                                    </group>
+                                    <group>
+                                        <field name="date_start"/>
+                                        <field name="date_stop"/>
+                                        <field name="product_rounding"/>
+                                        <field name="product_efficiency"/>
+                                    </group>
                                 </group>
                                 <separator string="Properties"/>
                                 <field name="property_ids" widget="many2many_tags" />
@@ -443,7 +450,7 @@
                     <field name="code"/>
                     <field name="product_id"/>
                     <field name="product_qty"/>
-                    <field name="product_uom"/>
+                    <field name="product_uom" groups="product.group_uom"/>
                     <field name="type"/>
                     <field name="method"/>
                     <field name="routing_id" groups="mrp.group_mrp_routings"/>
@@ -464,8 +471,8 @@
                     <field name="code"/>
                     <field name="product_id" string="Component Product"/>
                     <field name="bom_id"/>
-                    <field name="product_qty" string="Product Quantity"/>
-                    <field name="product_uom"/>
+                    <field name="product_qty"/>
+                    <field name="product_uom" groups="product.group_uom"/>
                     <field name="type"/>
                     <field name="method"/>
                     <field name="routing_id" groups="mrp.group_mrp_routings"/>
@@ -481,7 +488,13 @@
             <field name="view_type">form</field>
             <field name="domain">[('bom_id','=',False)]</field>
             <field name="search_view_id" ref="view_mrp_bom_filter"/>
-            <field name="help">Master Bills of Materials allow you to create and manage the list of necessary raw materials used to make a finished product. OpenERP will use these BoMs to automatically propose manufacturing orders according to product needs. You can either create a bill of materials to define specific production steps or define a single multi-level bill of materials.</field>
+            <field name="help">
+                Master Bills of Materials allow you to create and manage the list of necessary
+                raw materials used to make a finished product.
+                OpenERP uses these BoMs to automatically propose manufacturing orders according to product needs.
+                You can either create a bill of materials to define specific production steps,
+                or define a single multi-level bill of materials.
+            </field>
         </record>
         <record id="mrp_bom_form_action2" model="ir.actions.act_window">
             <field name="name">Bill of Material Components</field>
@@ -490,7 +503,10 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="mrp_bom_component_tree_view"/>
             <field name="domain">[('bom_id','!=',False)]</field>
-            <field name="help">Bills of materials components are components and sub-products used to create master bills of materials. Use this menu to search in which BoM a specific component is used.</field>
+            <field name="help">
+                Bills of materials components are components and sub-products used to create master bills of materials.
+                Use this menu to search in which BoM a specific component is used.
+            </field>
         </record>
 
         <!-- BOM menus -->
@@ -567,7 +583,7 @@
                     <field name="date_planned"/>
                     <field name="product_id"/>
                     <field name="product_qty" sum="Total Qty"/>
-                    <field name="product_uom"/>
+                    <field name="product_uom" groups="product.group_uom"/>
                     <field name="routing_id" groups="mrp.group_mrp_routings"/>
                     <field name="hour_total" sum="Total Hours"/>
                     <field name="cycle_total" sum="Total Cycles"/>
@@ -641,16 +657,16 @@
                     <label for="product_qty" class="oe_edit_only"/>
                     <h2>
                         <field name="product_qty" class="oe_inline"/>
-                        <label/>
                         <field name="product_uom" class="oe_inline"/>
-                        <label/>
                         <button type="action"
                             icon="terp-accessories-archiver+"
                             name="%(mrp.action_change_production_qty)d"
                             string="Change Qty" states="ready,confirmed" class="oe_inline"/>
                     </h2>
-                    <label for="routing_id" class="oe_edit_only" groups="mrp.group_mrp_routings"/>
-                    <field name="routing_id" groups="mrp.group_mrp_routings"/>
+                    <div groups="mrp.group_mrp_routings">
+                        <label for="routing_id" class="oe_edit_only"/>
+                        <h2><field name="routing_id" class="oe_inline"/></h2>
+                    </div>
                     <group>
                         <group>
                             <field name="name"/>
@@ -659,7 +675,7 @@
                         </group>
                         <group>
                             <field name="user_id"/>
-                            <label for="product_uos_qty" groups="product.group_uos" string="Product UoS Quantity"/>
+                            <label for="product_uos_qty" groups="product.group_uos"/>
                             <div groups="product.group_uos">
                                 <field name="product_uos_qty" class="oe_inline"/>
                                 <label string="-" attrs="{'invisible':[('product_uos','=',False)]}" class="oe_inline"/>
@@ -669,8 +685,8 @@
                     </group>
                     <notebook>
                         <page string="Consumed Products">
-                            <group col="4">
-                                <group>
+                            <group>
+                                <group groups="stock.group_locations">
                                     <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)"/>
                                 </group>
                                 <group>
@@ -678,14 +694,14 @@
                                     <field name="location_dest_id" domain="[('usage','=','internal')]"/>
                                 </group>
                             </group>
-                            <group col="4">
-                                <group col="1" colspan="2">
+                            <group>
+                                <group>
                                     <separator string="Products to Consume"/>
                                     <field name="move_lines" domain="[('state','&lt;&gt;', ('done', 'cancel'))]" nolabel="1">
                                         <tree colors="blue:state == 'draft';black:state in ('picking_except','confirmed','ready','in_production');gray:state in ('cancel','done') " string="Products to Consume">
                                             <field name="product_id" />
                                             <field name="product_qty"  string="Quantity"/>
-                                            <field name="product_uom"  string="Unit of Measure"/>
+                                            <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
                                             <field name="location_id"  string="Source Loc."/>
                                             <field name="state" invisible="1"/>
                                             <button name="%(stock.move_consume)d"
@@ -704,7 +720,7 @@
                                         </tree>
                                     </field>
                                 </group>
-                                <group col="1" colspan="2">
+                                <group>
                                     <separator string="Consumed Product"/>
                                     <field name="move_lines2" domain="[('state','in', ('done', 'cancel'))]" nolabel="1">
                                        <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state == 'cancel' " string="Consumed Products" editable="bottom">
@@ -725,8 +741,8 @@
                             </group>
                         </page>
                         <page string="Finished Products">
-                            <group col="4">
-                                <group col="1" colspan="2">
+                            <group>
+                                <group>
                                     <separator string="Products to Produce"/>
                                     <field name="move_created_ids" domain="[('state','&lt;&gt;', ('done', 'cancel'))]" nolabel="1">
                                         <tree string="Products to Finish">
@@ -745,7 +761,7 @@
                                         </tree>
                                     </field>
                                 </group>
-                                <group col="1" colspan="2">
+                                <group>
                                     <separator string="Produced Products"/>
                                     <field name="move_created_ids2" domain="[('state','in', ('done', 'cancel'))]" nolabel="1">
                                         <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Finished Products">
@@ -796,7 +812,7 @@
                             <field name="product_lines"/>
                         </page>
                         <page string="Extra Information">
-                            <group col="4">
+                            <group>
                                 <group>
                                 <field name="priority"/>
                                 <field name="date_start"/>
@@ -805,7 +821,7 @@
                                 <group>
                                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                                     <field name="picking_id"/>
-                                    <field name="move_prod_id"/>
+                                    <field name="move_prod_id" groups="stock.group_locations"/>
                                 </group>
                             </group>
                         </page>
@@ -865,7 +881,12 @@
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_mrp_production_filter"/>
             <field name="context">{}</field>
-            <field name="help">Manufacturing Orders are usually proposed automatically by OpenERP based on the bill of materials and the procurement rules, but you can also create manufacturing orders manually. OpenERP will handle the consumption of the raw materials (stock decrease) and the production of the finished products (stock increase) when the order is processed.</field>
+            <field name="help">
+                Click here to create a new Manufacturing Order.
+                &lt;p&gt;
+                To process the production, do not forget to create a Bill of Material.
+                Manufacturing orders can be automatically generated based on procurement    rules specified on the product
+            </field>
         </record>
         <menuitem action="mrp_production_action" id="menu_mrp_production_action"
             parent="menu_mrp_manufacturing" sequence="1"/>
@@ -877,7 +898,14 @@
             <field name="view_type">form</field>
             <field name="view_mode">calendar,tree,form,graph</field>
             <field name="domain">[('state','in',('ready','confirmed','in_production'))]</field>
-            <field name="help">Manufacturing Orders describe the operations that need to be carried out and the raw materials usage for each production stage. You use specifications (bills of materials or BoM) to work out the raw material requirements and the manufacturing orders needed for the finished products. Once the bills of materials have been defined, OpenERP is capable of automatically deciding on the manufacturing route depending on the needs of the company.</field>
+            <field name="help">
+                Manufacturing Orders describe the operations that need to be carried out,
+                and the raw materials usage for each production stage.
+                You use specifications (bills of materials or BoM) to work out the raw material requirements
+                and the manufacturing orders needed for the finished products.
+                Once the bills of materials have been defined, OpenERP is capable of automatically deciding
+                on the manufacturing route depending on the needs of the company.
+            </field>
         </record>
 
         <record id="mrp_production_action2" model="ir.actions.act_window">
@@ -923,7 +951,7 @@
                         <field name="name"/>
                         <field name="product_id"/>
                         <field name="product_qty"/>
-                        <field name="product_uom"/>
+                        <field name="product_uom" groups="product.group_uom"/>
                         <field name="product_uos_qty" groups="product.group_uos"/>
                         <field name="product_uos" groups="product.group_uos"/>
                     </group>
@@ -938,7 +966,7 @@
                 <tree string="Scheduled Products">
                     <field name="product_id"/>
                     <field name="product_qty"/>
-                    <field name="product_uom"/>
+                    <field name="product_uom" groups="product.group_uom"/>
                     <field name="product_uos_qty" groups="product.group_uos"/>
                     <field name="product_uos" groups="product.group_uos"/>
                 </tree>
@@ -974,10 +1002,19 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <group name="misc" position="after">
-                    <separator string="Bill of Materials" colspan="4"/>
-                    <field name="bom_ids" nolabel="1" colspan="4" context="{'default_product_id': active_id}"/>
-                </group>
+                <page string="Procurement &amp; Locations" position="inside">
+                    <separator string="Bill of Materials"/>
+                    <field name="bom_ids" widget="one2many_list" mode="tree" context="{'default_product_id': active_id}">
+                    <tree string="Bill of Materials">
+                    <field name="name" string="Component Name"/>
+                    <field name="bom_id"/>
+                    <field name="product_qty" string="Quantity of Product"/>
+                    <field name="type"/>
+                    <field name="date_start"/>
+                    <field name="date_stop"/>
+                    </tree>
+                    </field>
+                </page>
             </field>
         </record>
 
@@ -1010,7 +1047,12 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="mrp_workcenter_tree_view"/>
             <field name="search_view_id" ref="view_mrp_workcenter_search"/>
-            <field name="help">Work Centers allow you to create and manage manufacturing units.  They consist of workers and/or machines, which are considered as units for capacity and planning forecast.  Keep in mind that the working time and resource leave are not taken into account in the time computation of the work center.</field>
+            <field name="help">
+                Work Centers allow you to create and manage manufacturing units.
+                They consist of workers and/or machines, which are considered as units for capacity and planning forecast.
+                Keep in mind that the working time and resource leave are not taken into account in the time computation
+                of the work center.
+            </field>
         </record>
 
         <menuitem id="menu_pm_resources_config" name="Resources" parent="menu_mrp_configuration"/>

From 84d5f7b7091f0cff634eb32b32c688b20604feb1 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Sat, 14 Jul 2012 12:23:27 +0530
Subject: [PATCH 096/171] [IMP]mrp: remove sheet from Bill of Materials

bzr revid: kjo@tinyerp.com-20120714065327-qof2fo89wt7ysazc
---
 addons/mrp/mrp_view.xml | 120 ++++++++++++++++++++--------------------
 1 file changed, 59 insertions(+), 61 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 9e0c383c473..a2d9f976d82 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -343,71 +343,69 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Bill of Material" version="7.0">
-                    <sheet>
-                        <label for="product_id" string="Product and Quantity" class="oe_edit_only"/>
-                        <h1>
-                            <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_inline"/>: 
-                            <field name="product_qty" class="oe_inline"/>
-                            <field name="product_uom" class="oe_inline" groups="product.group_uom"/>
-                        </h1>
-                        <div groups="mrp.group_mrp_routings">
-                            <label for="routing_id" class="oe_edit_only"/>
-                            <h2><field name="routing_id" class="oe_inline"/></h2>
-                        </div>
+                    <label for="product_id" string="Product and Quantity" class="oe_edit_only"/>
+                    <h1>
+                        <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_inline"/>: 
+                        <field name="product_qty" class="oe_inline"/>
+                        <field name="product_uom" class="oe_inline" groups="product.group_uom"/>
+                    </h1>
+                    <div groups="mrp.group_mrp_routings">
+                        <label for="routing_id" class="oe_edit_only"/>
+                        <h2><field name="routing_id" class="oe_inline"/></h2>
+                    </div>
+                    <group>
                         <group>
-                            <group>
-                                <field name="name"/>
-                                <field name="code" string="Reference"/>
-                            </group>
-                            <group>
-                                <field name="type"/>
-                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                <label for="product_uos_qty" groups="product.group_uos"/>
-                                <div groups="product.group_uos" >
-                                    <field name="product_uos_qty" 
-                                        class="oe_inline"/>
-                                    <label string="-" attrs="{'invisible':[('product_uos','=',False)]}" class="oe_inline"/> 
-                                    <field name="product_uos" class="oe_inline"/>
-                                </div>
-                            </group>
+                            <field name="name"/>
+                            <field name="code" string="Reference"/>
                         </group>
-                        <notebook>
-                            <page string="Components">
-                                <field name="bom_lines" widget="one2many_list">
-                                    <tree string="Components" editable="bottom">
-                                        <field name="product_id" on_change="onchange_product_id(product_id, name)"/>
-                                        <field name="product_qty"/>
-                                        <field name="product_uom" groups="product.group_uom"/>
-                                        <field name="name" invisible="1"/>
-                                        <field name="date_start"/>
-                                        <field name="date_stop"/>
-                                    </tree>
-                                </field>
-                            </page>
-                            <page string="Revisions" attrs="{'invisible': [('bom_id','!=',False)]}">
-                                <field name="revision_ids"/>
-                            </page>
-                            <page string="Properties" groups="product.group_mrp_properties">
+                        <group>
+                            <field name="type"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <label for="product_uos_qty" groups="product.group_uos"/>
+                            <div groups="product.group_uos" >
+                                <field name="product_uos_qty" 
+                                    class="oe_inline"/>
+                                <label string="-" attrs="{'invisible':[('product_uos','=',False)]}" class="oe_inline"/> 
+                                <field name="product_uos" class="oe_inline"/>
+                            </div>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="Components">
+                            <field name="bom_lines" widget="one2many_list">
+                                <tree string="Components" editable="bottom">
+                                    <field name="product_id" on_change="onchange_product_id(product_id, name)"/>
+                                    <field name="product_qty"/>
+                                    <field name="product_uom" groups="product.group_uom"/>
+                                    <field name="name" invisible="1"/>
+                                    <field name="date_start"/>
+                                    <field name="date_stop"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="Revisions" attrs="{'invisible': [('bom_id','!=',False)]}">
+                            <field name="revision_ids"/>
+                        </page>
+                        <page string="Properties" groups="product.group_mrp_properties">
+                            <group>
                                 <group>
-                                    <group>
-                                        <field name="position"/>
-                                        <field name="bom_id"/>
-                                        <field name="sequence"/>
-                                        <field name="active"/>
-                                    </group>
-                                    <group>
-                                        <field name="date_start"/>
-                                        <field name="date_stop"/>
-                                        <field name="product_rounding"/>
-                                        <field name="product_efficiency"/>
-                                    </group>
+                                    <field name="position"/>
+                                    <field name="bom_id"/>
+                                    <field name="sequence"/>
+                                    <field name="active"/>
                                 </group>
-                                <separator string="Properties"/>
-                                <field name="property_ids" widget="many2many_tags" />
-                            </page>
-                        </notebook>
-                        <newline/>
-                    </sheet>
+                                <group>
+                                    <field name="date_start"/>
+                                    <field name="date_stop"/>
+                                    <field name="product_rounding"/>
+                                    <field name="product_efficiency"/>
+                                </group>
+                            </group>
+                            <separator string="Properties"/>
+                            <field name="property_ids" widget="many2many_tags" />
+                        </page>
+                    </notebook>
+                    <newline/>
                 </form>
             </field>
         </record>

From e7fe5125d1f8d3e6932c3c46376e729792f93df4 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Sat, 14 Jul 2012 23:45:25 +0530
Subject: [PATCH 097/171] [FIX]: Add four tab and remove Accounting Name.

bzr revid: atp@tinyerp.com-20120714181525-mrvr9clpzoze09sl
---
 addons/account/wizard/account_chart_view.xml  |  13 +-
 addons/account/wizard/account_move_journal.py |  12 +-
 .../account/wizard/account_tax_chart_view.xml |   9 +-
 .../account_accountant_data.xml               |   6 -
 addons/account_asset/account_asset.py         |   2 +-
 addons/account_asset/account_asset_view.xml   | 133 +++++++++---------
 .../account_voucher/account_voucher_view.xml  | 107 +++++++-------
 .../voucher_payment_receipt_view.xml          |  17 +--
 .../voucher_sales_purchase_view.xml           |   8 +-
 9 files changed, 150 insertions(+), 157 deletions(-)

diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index d3f4dc1a274..5affabdd862 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -7,12 +7,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account charts" version="7.0">
-                    <group colspan="4">
-                        <field name="fiscalyear" on_change="onchange_fiscalyear(fiscalyear)"/>
-                        <label align="0.7" string="(If you do not select Fiscal year it will take all open fiscal years)"/>
-                    </group>
-                    <group>
-                        <field name="target_move"/>
+                    <group col="4">
+                        <label for="fiscalyear"/>
+                        <div> 
+                            <field name="fiscalyear" on_change="onchange_fiscalyear(fiscalyear)" class="oe_inline"/>
+                            <label align="0.7" string="(If you do not select Fiscal year it will take all open fiscal years)" class="oe_inline"/>
+                        </div><newline/>
+                        <field name="target_move"/><newline/>
                         <label for="period_from" string="Periods"/>
                         <div>
                             <field name="period_from" class="oe_inline"/>-
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index 429c0b52373..bc794fdcdd1 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -105,18 +105,18 @@ class account_move_journal(osv.osv_memory):
             open_string = _("Open")
             view = """<?xml version="1.0" encoding="utf-8"?>
             <form string="Standard entries" version="7.0">
-                <header>
-                    <button string="%s" name="action_open_window" default_focus="1" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
                 <group>
                     <field name="target_move"/>
                 </group>
                 <label width="300" string="%s"/>
                 <newline/>
                 <label width="300" string="%s"/>
-            </form>""" % (open_string, journal_string, period_string)
+                <footer>
+                    <button string="%s" name="action_open_window" default_focus="1" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel"/>
+                </footer>
+            </form>""" % (journal_string, period_string, open_string)
     
             view = etree.fromstring(view.encode('utf8'))
             xarch, xfields = self._view_look_dom_arch(cr, uid, view, view_id, context=context)
diff --git a/addons/account/wizard/account_tax_chart_view.xml b/addons/account/wizard/account_tax_chart_view.xml
index bcbab1d26ff..d922fcf6191 100644
--- a/addons/account/wizard/account_tax_chart_view.xml
+++ b/addons/account/wizard/account_tax_chart_view.xml
@@ -8,9 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account tax charts" version="7.0">
-                    <group>
+                    <group col="4">
+                        <label for="period_id"/>
+                        <div>
+                            <field name="period_id" class="oe_inline"/>
+                            <label string="(If you do not select period it will take all open periods)" class="oe_inline"/>
+                        </div><newline/>
                         <field name="target_move"/>
-                    </group>
+	                </group>
                     <footer>
                         <button string="Open Charts" name="account_tax_chart_open_window" type="object" class="oe_highlight"/>
                         or
diff --git a/addons/account_accountant/account_accountant_data.xml b/addons/account_accountant/account_accountant_data.xml
index 3d665e680c3..330da2520c2 100644
--- a/addons/account_accountant/account_accountant_data.xml
+++ b/addons/account_accountant/account_accountant_data.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
-        <!-- rename root menu "Accounting" -->
-        <record id="account.menu_finance" model="ir.ui.menu">
-            <field name="name">Accounting</field>
-        </record>
-
 <!--
         It's easier for new users to not activate this (ex: they misconfigure
         header and footer.)
diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index e491b858286..61d2ce89ac9 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -215,7 +215,7 @@ class account_asset_asset(osv.osv):
         'account_move_line_ids': fields.one2many('account.move.line', 'asset_id', 'Entries', readonly=True, states={'draft':[('readonly',False)]}),
         'name': fields.char('Asset Name', size=64, required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'code': fields.char('Reference', size=32, readonly=True, states={'draft':[('readonly',False)]}),
-        'purchase_value': fields.float('Gross Value ', required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'purchase_value': fields.float('Gross Value', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'currency_id': fields.many2one('res.currency','Currency',required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'company_id': fields.many2one('res.company', 'Company', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'note': fields.text('Note'),
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 712e759eb11..86ae9276870 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -88,18 +88,16 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
                 </header>
                 <sheet>
-                    <div class="oe_title">
-                        <label for="name" class="oe_edit_only"/>
-                        <h1>
-                            <field name="name" class="oe_inline"/> -
-                            <field name="code"  class="oe_inline"  placeholder="Reference"/>
-                            <button name="open_entries" string="Entries" type="object" class="oe_inline"/>
-                        </h1>
-                       <label for="category_id" class="oe_edit_only"/>
-                       <h2>
+                    <label for="name" class="oe_edit_only"/>
+                    <h1>
+                       <field name="name" class="oe_inline"/> -
+                       <field name="code"  class="oe_inline"  placeholder="Reference"/>
+                       <button name="open_entries" string="Entries" type="object" class="oe_inline"/>
+                    </h1>
+                    <label for="category_id" class="oe_edit_only"/>
+                    <h2>
                         <field name="category_id" on_change="onchange_category_id(category_id)"/>
-                      </h2>
-                    </div>
+                    </h2>
                     <group>
                         <group>
                             <field name="parent_id"/>
@@ -113,65 +111,64 @@
                     </group>
                     <notebook colspan="4">
                         <page string="General">
-                        <group>
-                            <group>
-                                <field name="purchase_value"/>
-                                <field name="salvage_value"/>
-                                <field name="value_residual"/>
-                            </group>
-                            <group>
-                                <field name="method"/>
-                                <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
-                                <field name="prorata" attrs="{'invisible': [('method_time','=','end')]}"/>
-                            </group>
-                        </group>
-                        <group>
-                            <group>
-                                <field name="method_time" on_change="onchange_method_time(method_time)"/>
-                                <field name="method_number" attrs="{'invisible':[('method_time','=','end')], 'required':[('method_time','=','number')]}"/>
-                                <field name="method_period"/>
-                                <field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','number')]}"/>
-                                <button name="%(action_asset_modify)d" states="open" string="Change Duration" type="action" icon="terp-stock_effects-object-colorize" colspan="2"/>
-                            </group>
-                        </group>
+	                        <group>
+	                            <group>
+	                                <field name="purchase_value"/>
+	                                <field name="salvage_value"/>
+	                                <field name="value_residual"/>
+	                            </group>
+	                            <group>
+	                                <field name="method"/>
+	                                <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
+	                                <field name="prorata" attrs="{'invisible': [('method_time','=','end')]}"/>
+	                            </group>
+	                        </group>
+	                        <group>
+	                            <group>
+	                                <field name="method_time" on_change="onchange_method_time(method_time)"/>
+	                                <field name="method_number" attrs="{'invisible':[('method_time','=','end')], 'required':[('method_time','=','number')]}"/>
+	                                <field name="method_period"/>
+	                                <field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','number')]}"/>
+	                                <button name="%(action_asset_modify)d" states="open" string="Change Duration" type="action" icon="terp-stock_effects-object-colorize" colspan="2"/>
+	                            </group>
+	                        </group>
                         </page>
                         <page string="Depreciation Board">
                             <field name="depreciation_line_ids" mode="tree,graph">
-                               <tree string="Depreciation Lines" colors="blue:(move_check == False);black:(move_check == True)">
-                                  <field name="depreciation_date"/>
-                                  <field name="sequence" invisible="1"/>
-                                  <field name="depreciated_value" readonly="1"/>
-                                  <field name="amount"/>
-                                  <field name="remaining_value" readonly="1"/>
-                                  <field name="move_check"/>
-                                  <field name="parent_state" invisible="1"/>
-                                  <button name="create_move" attrs="{'invisible':['|',('move_check','!=',False),('parent_state','!=','open')]}" icon="gtk-execute" string="Create Move" type="object"/>
-                               </tree>
-                               <form string="Depriciation Lines"> 
-                                   <group>
-                                       <group>
-                                           <field name="asset_id" invisible="1"/>
-                                           <field name="parent_state" invisible="1"/>
-                                           <field name="name"/>
-                                           <field name="amount"/>
-                                           <field name="move_id"/>
-                                           <field name="move_check"/>
-                                           <field name="parent_state" invisible="1"/>
-                                       </group>
-                                       <group>
-                                           <field name="sequence"/>
-                                           <field name="depreciation_date"/>
-                                           <field name="depreciated_value" readonly="1"/>
+                                <tree string="Depreciation Lines" colors="blue:(move_check == False);black:(move_check == True)">
+                                    <field name="depreciation_date"/>
+                                    <field name="sequence" invisible="1"/>
+                                    <field name="depreciated_value" readonly="1"/>
+                                    <field name="amount"/>
+                                    <field name="remaining_value" readonly="1"/>
+                                    <field name="move_check"/>
+                                    <field name="parent_state" invisible="1"/>
+                                    <button name="create_move" attrs="{'invisible':['|',('move_check','!=',False),('parent_state','!=','open')]}" icon="gtk-execute" string="Create Move" type="object"/>
+                                </tree>
+                                <form string="Depriciation Lines"> 
+                                    <group>
+                                        <group>
+                                            <field name="asset_id" invisible="1"/>
+                                            <field name="parent_state" invisible="1"/>
+                                            <field name="name"/>
+                                            <field name="amount"/>
+                                            <field name="move_id"/>
+                                            <field name="move_check"/>
+                                            <field name="parent_state" invisible="1"/>
+                                        </group>
+                                        <group>
+                                            <field name="sequence"/>
+                                            <field name="depreciation_date"/>
+                                            <field name="depreciated_value" readonly="1"/>
                                            <field name="remaining_value" readonly="1"/>
-                                       </group>
-                                   </group>
-                               </form>
-                               <graph type="bar">
-                                  <field name="name"/>
-                                  <field name="amount"/>
-                                  <field name="depreciated_value"/>
-                               </graph>
-                             
+                                        </group>
+                                    </group>
+                                </form>
+                                <graph type="bar">
+                                    <field name="name"/>
+                                    <field name="amount"/>
+                                    <field name="depreciated_value"/>
+                                </graph>
                             </field>
                             <button type="object" name="compute_depreciation_board" string="Compute" icon="terp-stock_format-scientific" colspan="2" attrs="{'invisible':[('state','=','close')]}"/>
                         </page>
@@ -183,8 +180,8 @@
                             <field name="note"/>
                         </page>
                     </notebook>
-              </sheet>
-           </form>
+                </sheet>
+            </form>
        </field>
     </record>
     
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 4d4b9b6e760..60522168fb4 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -51,29 +51,28 @@
                   </header>
                   <sheet string="Accounting Voucher">
                     <div class="oe_title">
-                     <label for="number" class="oe_edit_only"/>
-                     <h1>
-                        <field name="number"   class="oe_inline"/>
-                        <span attr="{'invisible': [('type','=',False)]}" class="oe_inline"> ( </span>
-                        <field name="type" required="1"  class="oe_inline"/>
-                        <span attr="{'invisible': [('type','=',False)]}" class="oe_inline"> ) </span>
-                     </h1>
-                   </div>  
-                  <group>
-                  <group>
-                     <field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
-                     <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/>
-                     <field name="journal_id" widget="selection" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
-                  </group>
-                  <group>
-                     <field name="currency_id"/>
-                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                     <field name="reference"/>
-                     <field name="name"/>
-                  </group>
-                  </group>
-                   <field name="account_id" widget="selection" invisible="True"/>
-
+	                   <label for="number" class="oe_edit_only"/>
+	                   <h1>
+	                       <field name="number"   class="oe_inline"/>
+	                       <span attr="{'invisible': [('type','=',False)]}" class="oe_inline"> ( </span>
+	                       <field name="type" required="1"  class="oe_inline"/>
+	                       <span attr="{'invisible': [('type','=',False)]}" class="oe_inline"> ) </span>
+	                   </h1>
+                    </div>  
+                    <group>
+                        <group>
+	                       <field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
+	                       <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/>
+	                       <field name="journal_id" widget="selection" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
+                        </group>
+                        <group>
+                            <field name="currency_id"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                            <field name="reference"/>
+                            <field name="name"/>
+                        </group>
+                    </group>
+                    <field name="account_id" widget="selection" invisible="True"/>
                     <notebook colspan="4">
                         <page string="Voucher Entry">
                             <field name="line_ids" on_change="onchange_price(line_ids, tax_id, partner_id)" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
@@ -86,21 +85,21 @@
                                 </tree>
                             </field>
                             <group>
-                               <group>
-                                  <field name="narration" colspan="2" nolabel="1"  placeholder="Add an internal note"/>
-                               </group>
-                               <group class="oe_subtotal_footer oe_right" attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}" >
-                                   <group>
-                                       <label for="tax_id"/>
-                                       <field name="tax_id" nolabel="1" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/>
-                                       <button type="object" colspan="2" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
-                                   </group>
-                                   <group>
-                                            <field name="amount_untaxed"/>
-                                            <field name="tax_amount" readonly="1" />
-                                            <field name="amount"  class="oe_subtotal_footer_separator" readonly="1"/>
-                                   </group>
-                               </group>
+                                <group>
+                                    <field name="narration" colspan="2" nolabel="1"  placeholder="Add an internal note"/>
+                                </group>
+                                <group class="oe_subtotal_footer oe_right" attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}" >
+                                    <group>
+                                        <label for="tax_id"/>
+                                        <field name="tax_id" nolabel="1" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/>
+                                        <button type="object" colspan="2" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
+                                    </group>
+                                    <group>
+                                        <field name="amount_untaxed"/>
+                                        <field name="tax_amount" readonly="1" />
+                                        <field name="amount"  class="oe_subtotal_footer_separator" readonly="1"/>
+                                    </group>
+                                </group>
                             </group>
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
@@ -109,26 +108,26 @@
                                 <field name="audit"/>
                             </group>
                             <field name="move_ids" readonly="1">
-                               <tree string="Journal Items">
-                                   <field name="move_id"/>
-                                   <field name="ref"/>
-                                   <field name="date"/>
-                                   <field name="statement_id"/>
-                                   <field name="partner_id"/>
-                                   <field name="account_id"/>
-                                   <field name="name"/>
-                                   <field name="debit"/>
-                                   <field name="credit"/>
-                                   <field name="state"/>
-                                   <field name="reconcile_id"/>
-                               </tree>
+                                <tree string="Journal Items">
+                                    <field name="move_id"/>
+                                    <field name="ref"/>
+                                    <field name="date"/>
+                                    <field name="statement_id"/>
+                                    <field name="partner_id"/>
+                                    <field name="account_id"/>
+                                    <field name="name"/>
+                                    <field name="debit"/>
+                                    <field name="credit"/>
+                                    <field name="state"/>
+                                    <field name="reconcile_id"/>
+                                </tree>
                             </field>
                         </page>
                     </notebook>
                   </sheet>
-                    <footer>
-                        <field name="message_ids" widget="mail_thread"/>
-                    </footer>
+                  <footer>
+                       <field name="message_ids" widget="mail_thread"/>
+                  </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index e944e62e699..fcf1694dd4c 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -179,9 +179,9 @@
                           <field name="pre_line" invisible="1"/>
                           <field name="type" invisible="1"/>
                           <field name="currency_id" invisible="1" colspan="4"/>
-                        </group>
-                    </group>
-                    <notebook>
+                       </group>
+                   </group>
+                   <notebook>
                         <page string="Payment Information">
                             <field name="line_dr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
                                 <tree string="Supplier Invoices and Outstanding transactions" editable="bottom" colors="gray:amount==0">
@@ -239,9 +239,7 @@
                                         <field name="analytic_id"
                                                groups="analytic.group_analytic_accounting"/>
                                     </group>
-	                                
                                 </group>
-                                
                             </group>
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
@@ -269,10 +267,10 @@
                             </field>
                         </page>
                     </notebook>
-                    </sheet>
-                    <footer>
-                        <field name="message_ids" widget="mail_thread"/>
-                    </footer>
+                </sheet>
+                <footer>
+                    <field name="message_ids" widget="mail_thread"/>
+                </footer>
                 </form>
             </field>
         </record>
@@ -445,7 +443,6 @@
                     <footer>
                         <field name="message_ids" widget="mail_thread"/>
                     </footer>
-
                 </form>
             </field>
         </record>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index aa132b5ee6d..962eb49d61d 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -170,10 +170,10 @@
                             </field>
                         </page>
                     </notebook>
-                    </sheet>
-                    <footer>
-                        <field name="message_ids" widget="mail_thread"/>
-                    </footer>
+                </sheet>
+                <footer>
+                    <field name="message_ids" widget="mail_thread"/>
+                </footer>
                 </form>
             </field>
         </record>

From 87a63b3bdbea426de5664281ab5952e48e35bf86 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 16 Jul 2012 10:24:52 +0530
Subject: [PATCH 098/171] [IMP]delivery,procurement,stock: Remove <sheet> tag

bzr revid: dbr@tinyerp.com-20120716045452-g3j929rtqcen87qq
---
 addons/delivery/delivery_view.xml       | 107 ++++++++---------
 addons/procurement/procurement_view.xml |  12 +-
 addons/stock/stock_view.xml             | 151 ++++++++++++------------
 3 files changed, 131 insertions(+), 139 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index edd64a431f4..0346b75dbe2 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -22,64 +22,61 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Carrier" version="7.0">
-                    <sheet>
-                        <group col="4" name="general">
-                            <field name="name"/>
-                            <field name="partner_id"/>
-                            <field name="product_id"/>
-                            <field name="active"/>
-                            <group string="Pricing Information">
-                                <group>
-                                    <field name="normal_price" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
-                                    <label for="free_if_more_than"/>
-                                    <div>
-                                        <field name="free_if_more_than" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
-                                        <field name="amount" attrs="{'required':[('free_if_more_than','&lt;&gt;',False)], 'invisible':[('free_if_more_than','=',False)]}"/>
-                                    </div>
-                                </group>
-                            </group>
-                            <newline/>
-                            <field name="use_detailed_pricelist"/>
+                    <group col="4" name="general">
+                        <field name="name"/>
+                        <field name="partner_id"/>
+                        <field name="product_id"/>
+                        <field name="active"/>
+                        <group string="Pricing Information">
+                            <field name="normal_price" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
+                            <label for="free_if_more_than"/>
+                            <div>
+                                <field name="free_if_more_than" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
+                                <field name="amount" attrs="{'required':[('free_if_more_than','&lt;&gt;',False)], 'invisible':[('free_if_more_than','=',False)]}"/>
+                            </div>
                         </group>
-                        <field name="pricelist_ids" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree">
-                            <tree string="Delivery grids">
-                                  <field name="sequence"/>
-                                  <field name="name"/>
-                            </tree>
-                            <form string="Delivery grids" version="7.0">
-                                 <group>
+                        <newline/>
+                        <field name="use_detailed_pricelist"/>
+                    </group>
+                    <field name="pricelist_ids" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree">
+                        <tree string="Delivery grids">
+                              <field name="sequence"/>
+                              <field name="name"/>
+                        </tree>
+                        <form string="Delivery grids" version="7.0">
+                             <group>
+                                <group>
+                                    <field name="name"/>
+                                </group>
+                                <group>
+                                    <field name="active"/>
+                                    <field name="sequence"/>
+                                </group>
+                             </group>
+                             <notebook>
+                                <page string="Grid definition">
+                                   <field name="line_ids"/>
+                                </page>
+                                <page string="Destination">
                                     <group>
-                                        <field name="name"/>
-                                    </group>
-                                    <group>
-                                        <field name="active"/>
-                                        <field name="sequence"/>
-                                    </group>
-                                 </group>
-                                 <notebook>
-                                    <page string="Grid definition">
-                                       <field name="line_ids"/>
-                                    </page>
-                                    <page string="Destination">
                                         <group>
-                                            <group>
-                                                <field name="country_ids" widget="many2many_tags"/>
-                                                <field name="state_ids" widget="many2many_tags"/>
-                                            </group>
-                                            <group>
-                                                <label for="zip_from" string="Zip"/>
-                                                <div>
-                                                    <field name="zip_from" class="oe_inline"/>
-                                                    -
-                                                    <field name="zip_to" class="oe_inline"/>
-                                                </div>
-                                            </group>
+                                            <field name="country_ids" widget="many2many_tags"/>
+                                            <field name="state_ids" widget="many2many_tags"/>
                                         </group>
-                                    </page>
-                                </notebook>
-                            </form>
-                       </field>
-                    </sheet>
+                                        <group>
+                                            <label for="zip_from" string="Zip"/>
+                                            <div>
+                                                <field name="zip_from" class="oe_inline"/>
+                                                -
+                                                <field name="zip_to" class="oe_inline"/>
+                                            </div>
+                                        </group>
+                                    </group>
+                                </page>
+                            </notebook>
+                        </form>
+                   </field>
+
                 </form>
             </field>
         </record>
@@ -170,7 +167,7 @@
                     </group>
                 </form>
             </field>
-        </record>
+        </record>delivery.carrier
         <record id="view_delivery_grid_line_tree" model="ir.ui.view">
             <field name="name">delivery.grid.line.tree</field>
             <field name="model">delivery.grid.line</field>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index fcf4992ed2a..c791f61b2a3 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -65,18 +65,18 @@
                     <h2>
                         <field name="message"/>
                     </h2>
-                    <group col="4" colspan="4">
-                        <group col="2" colspan="2">
+                    <group>
+                        <group>
                             <field name="date_planned"/>
                             <field name="procure_method"/>
                             <field name="priority"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                         </group>
-                        <group col="2" colspan="2"/>
+                        <group/>
                     </group>
                     <notebook>
                     <page string="Procurement Details">
-                        <group col="4">
+                        <group>
                             <group>
                                 <field name="product_id" on_change="onchange_product_id(product_id)"/>
                                 <label for="product_qty"/>
@@ -84,7 +84,7 @@
                                     <field name="product_qty" class="oe_inline"/>
                                     <field name="product_uom" class="oe_inline"/>
                                 </div>
-                                <label for="product_uos_qty" string="Quentity UoS"/>
+                                <label for="product_uos_qty" string="Quentity UoS" groups="product.group_uos"/>
                                 <div>
                                     <field name="product_uos_qty" groups="product.group_uos" class="oe_inline"/>
                                     <field name="product_uos"  groups="product.group_uos" class="oe_inline"/>
@@ -96,7 +96,7 @@
                         </group>
                     </page>
                     <page string="Extra Information">
-                        <group string="Details" col="4">
+                        <group string="Details">
                             <field name="move_id"/>
                             <field name="date_close"/>
                             <field name="close_move"/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index b44e197ceec..41b2439c0b2 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -227,6 +227,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Packs" version="7.0">
+                    <div groups="stock.group_tracking_lot" class="oe_button_box">
+                        <button name="action_traceability" icon="gtk-go-up" string="Upstream Traceability" type="object"/>
+                        <button name="action_traceability" icon="gtk-go-down" string="Downstream Traceability" type="object"
+                        context="{'type': 'move_history_ids'}"/>
+                    </div>
                     <group>
                         <group groups="product.group_stock_packaging" string="Pack Identification">
                             <field name="name"/>
@@ -234,12 +239,6 @@
                             <field name="date"/>
                             <field name="active"/>
                         </group>
-                        <group groups="stock.group_tracking_lot" string="Traceability">
-                            <button name="action_traceability" icon="gtk-go-up" string="Upstream Traceability" type="object"
-                                 colspan="2"/>
-                            <button name="action_traceability" icon="gtk-go-down" string="Downstream Traceability" type="object"
-                                context="{'type': 'move_history_ids'}" colspan="2"/>
-                        </group>
                     </group>
                     <field name="move_ids"/>
                 </form>
@@ -338,46 +337,44 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Serial Number" version="7.0">
-                    <sheet>
-                        <group>
-                            <group string="Serial Number Identification">
-                                <field name="product_id"/>
-                                <field name="prefix"/>
-                                <field name="name"/>
-                                <field name="ref"/>
-                                <group string="Dates">
-                                    <field name="date"/>
-                                </group>
-                            </group>
-                            <group string="Traceability">
-                                <field name="stock_available"/>
-                                <button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': '', 'field': 'prodlot_id'}" icon="gtk-go-up" colspan="2"/>
-                                <button name="action_traceability" string="Downstream Traceability" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}" icon="gtk-go-down" colspan="2"/>
+                    <group>
+                        <group string="Serial Number Identification">
+                            <field name="product_id"/>
+                            <field name="prefix"/>
+                            <field name="name"/>
+                            <field name="ref"/>
+                            <group string="Dates">
+                                <field name="date"/>
                             </group>
                         </group>
-                        <notebook>
-                            <page string="Revisions">
-                                <field name="revisions"/>
-                            </page>
-                            <page string="Stock Moves">
-                                <field name="move_ids">
-                                    <tree  string="Stock Moves">
-                                        <field name="picking_id" string="Reference"/>
-                                        <field name="origin"/>
-                                        <field name="product_id"/>
-                                        <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                                        <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
-                                        <field name="tracking_id" groups="stock.group_tracking_lot"/>
-                                        <field name="date"/>
-                                        <field name="prodlot_id"/>
-                                        <field name="location_id" groups="stock.group_locations"/>
-                                        <field name="location_dest_id" groups="stock.group_locations"/>
-                                        <field name="state"/>
-                                    </tree>
-                                 </field>
-                            </page>
-                        </notebook>
-                    </sheet>
+                        <group string="Traceability">
+                            <field name="stock_available"/>
+                            <button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': '', 'field': 'prodlot_id'}" icon="gtk-go-up" colspan="2"/>
+                            <button name="action_traceability" string="Downstream Traceability" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}" icon="gtk-go-down" colspan="2"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="Revisions">
+                            <field name="revisions"/>
+                        </page>
+                        <page string="Stock Moves">
+                            <field name="move_ids">
+                                <tree  string="Stock Moves">
+                                    <field name="picking_id" string="Reference"/>
+                                    <field name="origin"/>
+                                    <field name="product_id"/>
+                                    <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                    <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
+                                    <field name="tracking_id" groups="stock.group_tracking_lot"/>
+                                    <field name="date"/>
+                                    <field name="prodlot_id"/>
+                                    <field name="location_id" groups="stock.group_locations"/>
+                                    <field name="location_dest_id" groups="stock.group_locations"/>
+                                    <field name="state"/>
+                                </tree>
+                             </field>
+                        </page>
+                    </notebook>
                 </form>
             </field>
         </record>
@@ -523,41 +520,39 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Stock Location" version="7.0">
-                    <sheet>
-                        <label for="name" class="oe_edit_only"/>
-                        <h1><field name="name"/></h1>
-                        <label for="location_id" class="oe_edit_only"/>
-                        <h2><field name="location_id"/></h2>
-                        <group>
-                            <group string="Additional Information">
-                                <field name="usage"/>
-                                <field name="partner_id"/>
-                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                <field name="icon"/>
-                                <field name="scrap_location"/>
-                                <field name="active"/>
-                            </group>
-                            <group string="Chained Locations">
-                                <field name="chained_location_type"/>
-                                <field name="chained_location_id"  attrs="{'required':[('chained_location_type','=','fixed')]}"/>
-                                <field name="chained_auto_packing"/>
-                                <field name="chained_delay"/>
-                                <field name="chained_journal_id"/>
-                                <field name="chained_picking_type"/>
-                                <field name="chained_company_id" widget="selection"/>
-                            </group>
-                            <group string="Localization">
-                                <field name="posx"/>
-                                <field name="posy"/>
-                                <field name="posz"/>
-                            </group><group string="Accounting Information">
-                                <field name="valuation_in_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/>
-                                <field name="valuation_out_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/>
-                            </group>
+                    <label for="name" class="oe_edit_only"/>
+                    <h1><field name="name"/></h1>
+                    <label for="location_id" class="oe_edit_only"/>
+                    <h2><field name="location_id"/></h2>
+                    <group>
+                        <group string="Additional Information">
+                            <field name="usage"/>
+                            <field name="partner_id"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <field name="icon"/>
+                            <field name="scrap_location"/>
+                            <field name="active"/>
                         </group>
-                        <separator string="Additional Information"/>
-                        <field name="comment"/>
-                    </sheet>
+                        <group string="Chained Locations">
+                            <field name="chained_location_type"/>
+                            <field name="chained_location_id"  attrs="{'required':[('chained_location_type','=','fixed')]}"/>
+                            <field name="chained_auto_packing"/>
+                            <field name="chained_delay"/>
+                            <field name="chained_journal_id"/>
+                            <field name="chained_picking_type"/>
+                            <field name="chained_company_id" widget="selection"/>
+                        </group>
+                        <group string="Localization">
+                            <field name="posx"/>
+                            <field name="posy"/>
+                            <field name="posz"/>
+                        </group><group string="Accounting Information">
+                            <field name="valuation_in_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/>
+                            <field name="valuation_out_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/>
+                        </group>
+                    </group>
+                    <separator string="Additional Information"/>
+                    <field name="comment"/>
                 </form>
             </field>
         </record>

From a74fbb4de7320f4eee381e0fd2a6d866e1bc5b32 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 16 Jul 2012 12:01:21 +0530
Subject: [PATCH 099/171] [REM]: Remove tips and separator from report popup
 wizard

bzr revid: atp@tinyerp.com-20120716063121-tq9f8b4ntmncxxgc
---
 addons/account/wizard/account_report_account_balance_view.xml | 4 ----
 addons/account/wizard/account_report_general_journal_view.xml | 4 ----
 addons/account/wizard/account_report_general_ledger_view.xml  | 4 ----
 addons/account/wizard/account_report_partner_balance_view.xml | 4 ----
 addons/account/wizard/account_report_partner_ledger_view.xml  | 4 ----
 addons/account/wizard/account_report_print_journal_view.xml   | 4 ----
 6 files changed, 24 deletions(-)

diff --git a/addons/account/wizard/account_report_account_balance_view.xml b/addons/account/wizard/account_report_account_balance_view.xml
index b700ab8a736..c42e0bc38ad 100644
--- a/addons/account/wizard/account_report_account_balance_view.xml
+++ b/addons/account/wizard/account_report_account_balance_view.xml
@@ -13,10 +13,6 @@
             <xpath expr="//field[@name='journal_ids']" position="replace">
                 <field name="journal_ids" colspan="4" nolabel="1" required="0" readonly="1"/>
             </xpath>
-            <xpath expr="/form/label[@string='']" position="replace">
-                <separator string="Trial Balance" colspan="4"/>
-                <label nolabel="1" colspan="4" string="This report allows you to print or generate a pdf of your trial balance allowing you to quickly check the balance of each of your accounts in a single report"/>
-            </xpath>
             <xpath expr="//field[@name='target_move']" position="after">
                 <field name="display_account"/>
                 <newline/>
diff --git a/addons/account/wizard/account_report_general_journal_view.xml b/addons/account/wizard/account_report_general_journal_view.xml
index 96f45f9d028..93c82cd5810 100644
--- a/addons/account/wizard/account_report_general_journal_view.xml
+++ b/addons/account/wizard/account_report_general_journal_view.xml
@@ -9,10 +9,6 @@
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="arch" type="xml">
             <data>
-            <xpath expr="/form/label[@string='']" position="replace">
-                <separator string="General Journals" colspan="4"/>
-                <label nolabel="1" colspan="4" string="This report gives you an overview of the situation of your general journals"/>
-            </xpath>
             <xpath expr="//field[@name='target_move']" position="after">
                <field name="amount_currency"/>
                <newline/>
diff --git a/addons/account/wizard/account_report_general_ledger_view.xml b/addons/account/wizard/account_report_general_ledger_view.xml
index 20b6ab0f042..5078eeac88b 100644
--- a/addons/account/wizard/account_report_general_ledger_view.xml
+++ b/addons/account/wizard/account_report_general_ledger_view.xml
@@ -9,10 +9,6 @@
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="arch" type="xml">
             <data>
-            <xpath expr="/form/label[@string='']" position="replace">
-                <separator string="General Ledger" colspan="4"/>
-                <label nolabel="1" colspan="4" string="This report allows you to print or generate a pdf of your general ledger with details of all your account journals"/>
-            </xpath>
             <xpath expr="//field[@name='target_move']" position="after">
                 <field name="display_account"/>
                 <field name="sortby"/>
diff --git a/addons/account/wizard/account_report_partner_balance_view.xml b/addons/account/wizard/account_report_partner_balance_view.xml
index 6dbe6d7b77b..e8abd1c68a2 100644
--- a/addons/account/wizard/account_report_partner_balance_view.xml
+++ b/addons/account/wizard/account_report_partner_balance_view.xml
@@ -9,10 +9,6 @@
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="arch" type="xml">
             <data>
-            <xpath expr="/form/label[@string='']" position="replace">
-                <separator string="Partner Balance" colspan="4"/>
-                <label nolabel="1" colspan="4" string="This report is an analysis done by a partner. It is a PDF report containing one line per partner representing the cumulative credit balance"/>
-            </xpath>
             <xpath expr="//field[@name='target_move']" position="after">
                 <field name="result_selection"/>
                 <field name="display_partner"/>
diff --git a/addons/account/wizard/account_report_partner_ledger_view.xml b/addons/account/wizard/account_report_partner_ledger_view.xml
index c3c731c1954..1bc223a956d 100644
--- a/addons/account/wizard/account_report_partner_ledger_view.xml
+++ b/addons/account/wizard/account_report_partner_ledger_view.xml
@@ -9,10 +9,6 @@
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="arch" type="xml">
             <data>
-            <xpath expr="/form/label[@string='']" position="replace">
-                <separator string="Partner Ledger" colspan="4"/>
-                <label nolabel="1" colspan="4" string="This report is an analysis done by a partner. It is a PDF report containing one line per partner representing the cumulative credit balance"/>
-            </xpath>
             <xpath expr="//field[@name='target_move']" position="after">
                 <field name="result_selection"/>
                 <field name="amount_currency"/>
diff --git a/addons/account/wizard/account_report_print_journal_view.xml b/addons/account/wizard/account_report_print_journal_view.xml
index cf4eb0a0c9f..9a2ef25a1fe 100644
--- a/addons/account/wizard/account_report_print_journal_view.xml
+++ b/addons/account/wizard/account_report_print_journal_view.xml
@@ -9,10 +9,6 @@
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="arch" type="xml">
             <data>
-            <xpath expr="/form/label[@string='']" position="replace">
-                <separator string="Journals" colspan="4"/>
-                <label nolabel="1" colspan="4" string="This report gives you an overview of the situation of a specific journal"/>
-            </xpath>
             <xpath expr="//field[@name='target_move']" position="after">
                 <field name="sort_selection"/>
                 <field name="amount_currency"/>

From 1f28307c833cb4ef19d29ff2af9b1d6c70aff332 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 16 Jul 2012 12:03:02 +0530
Subject: [PATCH 100/171] [IMP]stock: Improve view for button setting

bzr revid: dbr@tinyerp.com-20120716063302-9m418ukyom2h6h75
---
 addons/stock/stock_view.xml | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 605f886180d..7f998a432a4 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -227,11 +227,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Packs" version="7.0">
-                    <div groups="stock.group_tracking_lot" class="oe_button_box">
-                        <button name="action_traceability" icon="gtk-go-up" string="Upstream Traceability" type="object"/>
-                        <button name="action_traceability" icon="gtk-go-down" string="Downstream Traceability" type="object"
-                        context="{'type': 'move_history_ids'}"/>
-                    </div>
                     <group>
                         <group groups="product.group_stock_packaging" string="Pack Identification">
                             <field name="name"/>
@@ -239,6 +234,12 @@
                             <field name="date"/>
                             <field name="active"/>
                         </group>
+                        <group groups="stock.group_tracking_lot" string="Traceability">
+                            <button name="action_traceability" icon="gtk-go-up" string="Upstream Traceability" type="object"
+                                 colspan="2"/>
+                            <button name="action_traceability" icon="gtk-go-down" string="Downstream Traceability" type="object"
+                                context="{'type': 'move_history_ids'}" colspan="2"/>
+                        </group>
                     </group>
                     <field name="move_ids"/>
                 </form>
@@ -337,22 +338,29 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Serial Number" version="7.0">
-                    <group>
-                        <group string="Serial Number Identification">
+                    <group string="Serial Number Identification" col="3">
+                        <group>
                             <field name="product_id"/>
-                            <field name="prefix"/>
                             <field name="name"/>
+                        </group>
+                        <group>
+                            <field name="prefix"/>
                             <field name="ref"/>
-                            <group string="Dates">
-                                <field name="date"/>
-                            </group>
+                        </group>
+                        <group class="oe_button_box">
+
+                                <button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': '', 'field': 'prodlot_id'}" icon="gtk-go-up"/>
+                                <button name="action_traceability" string="Downstream Traceability" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}" icon="gtk-go-down"/>
+
+                        </group>
+                        <group string="Dates">
+                            <field name="date"/>
                         </group>
                         <group string="Traceability">
                             <field name="stock_available"/>
-                            <button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': '', 'field': 'prodlot_id'}" icon="gtk-go-up" colspan="2"/>
-                            <button name="action_traceability" string="Downstream Traceability" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}" icon="gtk-go-down" colspan="2"/>
                         </group>
                     </group>
+                    
                     <notebook>
                         <page string="Revisions">
                             <field name="revisions"/>

From d0f22185a20bbb66f79bd71b45883629419db11e Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 16 Jul 2012 12:38:11 +0530
Subject: [PATCH 101/171] [IMP] Little view IMp

bzr revid: dbr@tinyerp.com-20120716070811-wcd4napbeba0gwv1
---
 addons/delivery/delivery_view.xml |  2 +-
 addons/stock/stock_view.xml       | 34 +++++++++++++++----------------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 10b6dec28c6..85315721a73 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -167,7 +167,7 @@
                     </group>
                 </form>
             </field>
-        </record>delivery.carrier
+        </record>
         <record id="view_delivery_grid_line_tree" model="ir.ui.view">
             <field name="name">delivery.grid.line.tree</field>
             <field name="model">delivery.grid.line</field>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 7f998a432a4..8c0fb1a29e8 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -147,25 +147,23 @@
                                 <field name="state" invisible="True"/>
                             </tree>
                             <form string="Products" version="7.0">
-                                <sheet>
+                                <group>
                                     <group>
-                                        <group>
-                                            <field domain="[('usage','=','internal')]" name="location_id"/>
-                                            <field context="{'location':location_id, 'uom':product_uom, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)"  domain="[('type','&lt;&gt;','service')]"/>
-                                        </group>
-                                        <group>
-                                            <label for="product_qty"/>
-                                            <div>
-                                                <field name="product_qty" class="oe_inline"/>
-                                                <field name="product_uom" class="oe_inline" groups="product.group_uom"/>
-                                            </div>
-                                            <field name="prod_lot_id" groups="stock.group_production_lot"/>
-                                            <button name="%(stock.action_view_stock_inventory_line_split)d"
-                                            string="Split inventory lines" groups="stock.group_inventory_valuation"
-                                            type="action" icon="terp-stock_effects-object-colorize"/>
-                                        </group>
+                                        <field domain="[('usage','=','internal')]" name="location_id"/>
+                                        <field context="{'location':location_id, 'uom':product_uom, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)"  domain="[('type','&lt;&gt;','service')]"/>
                                     </group>
-                                </sheet>
+                                    <group>
+                                        <label for="product_qty"/>
+                                        <div>
+                                            <field name="product_qty" class="oe_inline"/>
+                                            <field name="product_uom" class="oe_inline" groups="product.group_uom"/>
+                                        </div>
+                                        <field name="prod_lot_id" groups="stock.group_production_lot"/>
+                                        <button name="%(stock.action_view_stock_inventory_line_split)d"
+                                        string="Split inventory lines" groups="stock.group_inventory_valuation"
+                                        type="action" icon="terp-stock_effects-object-colorize"/>
+                                    </group>
+                                </group>
                             </form>
                         </field>
                     </page>
@@ -750,7 +748,7 @@
                     <label for="name" class="oe_edit_only"/>
                     <h1>
                         <field name="name" class="oe_inline"/>
-                        <span attrs="{'invisible': [('origin','=',False)]}">-</span>
+                        <span attrs="{'invisible': [('origin','=',False)]}"> - </span>
                         <field name="origin" placeholder="PO0032" class="oe_inline"/>
                     </h1>
                     <label for="partner_id" class="oe_edit_only"/>

From b3ea75636d17db12dc37cb5d4e05c8200f7cf4c3 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 16 Jul 2012 12:44:55 +0530
Subject: [PATCH 102/171] [FIX]: Fix general issue.  Unknown field state in
 domain [["state","in",["done"]]] for period form "Could not get field with
 name payment_rate_currency_id "Could not get field with name algorithm

bzr revid: atp@tinyerp.com-20120716071455-r30romahsfg1zvxr
---
 addons/account/account_view.xml                     | 1 +
 addons/account_voucher/account_voucher_view.xml     | 1 +
 addons/l10n_be_invoice_bba/account_invoice_view.xml | 3 ++-
 addons/l10n_be_invoice_bba/invoice.py               | 8 ++++----
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 27590b8a34c..6bfaf23abfe 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -37,6 +37,7 @@
                                 <field name="date_start"/>
                                 <field name="date_stop"/>
                                 <field name="special"/>
+                                <field name="state"/>
                             </group>
                         </form>
                     </field>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index c69e386e879..6ab2ba3ade7 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -67,6 +67,7 @@
                         </group>
                         <group>
                             <field name="currency_id"/>
+                            <field name="payment_rate_currency_id"  invisible="1"/>
                             <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                             <field name="reference"/>
                             <field name="name"/>
diff --git a/addons/l10n_be_invoice_bba/account_invoice_view.xml b/addons/l10n_be_invoice_bba/account_invoice_view.xml
index 51c39a4b3be..ffa6ad68d65 100644
--- a/addons/l10n_be_invoice_bba/account_invoice_view.xml
+++ b/addons/l10n_be_invoice_bba/account_invoice_view.xml
@@ -11,8 +11,9 @@
       <field name="arch" type="xml">
         <field name="payment_term" position="after">
           <group col="4" colspan="2">
+              <!-- "algorithm" not a field in any account related module.so pass it as False argument in generate_bbacomm() function. -->
               <field name="reference_type" nolabel="1"  size="0" attrs="{'readonly':[('state','!=','draft')]}"
-                 on_change="generate_bbacomm(type,reference_type,algorithm,partner_id,reference)" colspan="1"/>
+                 on_change="generate_bbacomm(type,reference_type,partner_id,reference)" colspan="1"/>
               <field name="reference" nolabel="1"  colspan="3" attrs="{'readonly':[('state','!=','draft')]}"/>
           </group>
         </field>
diff --git a/addons/l10n_be_invoice_bba/invoice.py b/addons/l10n_be_invoice_bba/invoice.py
index 4cdbca84c0a..0c767f3a54c 100644
--- a/addons/l10n_be_invoice_bba/invoice.py
+++ b/addons/l10n_be_invoice_bba/invoice.py
@@ -64,7 +64,7 @@ class account_invoice(osv.osv):
         return True
 
     def onchange_partner_id(self, cr, uid, ids, type, partner_id,
-            date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False):       
+            date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False):
         result = super(account_invoice, self).onchange_partner_id(cr, uid, ids, type, partner_id,
             date_invoice, payment_term, partner_bank_id, company_id)
 #        reference_type = self.default_get(cr, uid, ['reference_type'])['reference_type']
@@ -78,15 +78,15 @@ class account_invoice(osv.osv):
                     algorithm = self.pool.get('res.partner').browse(cr, uid, partner_id).out_inv_comm_algorithm
                     if not algorithm:
                         algorithm = 'random' 
-                    reference = self.generate_bbacomm(cr, uid, ids, type, reference_type, algorithm, partner_id, '')['value']['reference']
+                    reference = self.generate_bbacomm(cr, uid, ids, type, reference_type, partner_id, '', algorithm)['value']['reference']
         res_update = {       
             'reference_type': reference_type or 'none',
             'reference': reference,
         }
         result['value'].update(res_update)
         return result                    
-
-    def generate_bbacomm(self, cr, uid, ids, type, reference_type, algorithm, partner_id, reference):
+#algorithm is not defined as field in any account related modules.so pass it as false argument.
+    def generate_bbacomm(self, cr, uid, ids, type, reference_type, partner_id, reference, algorithm=False):
         partner_obj =  self.pool.get('res.partner')
         reference = reference or ''  
         if (type == 'out_invoice'):

From c146212da505b5067e8d83e1f72905bdec0da96e Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 16 Jul 2012 12:50:02 +0530
Subject: [PATCH 103/171] [IMP]mrp: set group and remove separator

bzr revid: kjo@tinyerp.com-20120716072002-n4qznh0zxgten01c
---
 addons/mrp/mrp_view.xml | 42 +++++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index e62b3ab4183..df29cb8585b 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -107,10 +107,10 @@
             <field name="search_view_id" ref="view_mrp_property_search"/>
             <field name="help">
                 The Properties in OpenERP are used to select the right bill of materials for manufacturing
-            a product when you have different ways of building the same product.
-            You can assign several properties to each bill of materials.
-            When a salesperson creates a sale order, they can relate it to several properties
-            and OpenERP will automatically select the BoM to use according the needs.
+                a product when you have different ways of building the same product.
+                You can assign several properties to each bill of materials.
+                When a salesperson creates a sale order, they can relate it to several properties
+                and OpenERP will automatically select the BoM to use according the needs.
             </field>
         </record>
         <menuitem name="Master Bill of Materials"
@@ -121,13 +121,13 @@
         <menuitem
             action="mrp_property_action"
             id="menu_mrp_property_action"
-            groups="product.group_mrp_properties,product.group_mrp_properties"
+            groups="product.group_mrp_properties"
             parent="menu_mrp_configuration"
             sequence="30" />
         <menuitem
             action="mrp_property_group_action"
             parent="menu_mrp_configuration"
-            groups="base.group_no_one"
+            groups="base.group_no_one,product.group_mrp_properties"
             id="menu_mrp_property_group_action"
             sequence="35" />
 
@@ -693,8 +693,7 @@
                                 </group>
                             </group>
                             <group>
-                                <group>
-                                    <separator string="Products to Consume"/>
+                                <group string="Products to Consume">
                                     <field name="move_lines" domain="[('state','&lt;&gt;', ('done', 'cancel'))]" nolabel="1">
                                         <tree colors="blue:state == 'draft';black:state in ('picking_except','confirmed','ready','in_production');gray:state in ('cancel','done') " string="Products to Consume">
                                             <field name="product_id" />
@@ -718,8 +717,7 @@
                                         </tree>
                                     </field>
                                 </group>
-                                <group>
-                                    <separator string="Consumed Product"/>
+                                <group string="Consumed Product">
                                     <field name="move_lines2" domain="[('state','in', ('done', 'cancel'))]" nolabel="1">
                                        <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state == 'cancel' " string="Consumed Products" editable="bottom">
                                            <field name="product_id" readonly="1"/>
@@ -740,8 +738,7 @@
                         </page>
                         <page string="Finished Products">
                             <group>
-                                <group>
-                                    <separator string="Products to Produce"/>
+                                <group string="Products to Produce">
                                     <field name="move_created_ids" domain="[('state','&lt;&gt;', ('done', 'cancel'))]" nolabel="1">
                                         <tree string="Products to Finish">
                                             <field name="product_id" />
@@ -759,8 +756,7 @@
                                         </tree>
                                     </field>
                                 </group>
-                                <group>
-                                    <separator string="Produced Products"/>
+                                <group string="Produced Products">
                                     <field name="move_created_ids2" domain="[('state','in', ('done', 'cancel'))]" nolabel="1">
                                         <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Finished Products">
                                             <field name="product_id" readonly="1"/>
@@ -883,7 +879,7 @@
                 Click here to create a new Manufacturing Order.
                 &lt;p&gt;
                 To process the production, do not forget to create a Bill of Material.
-                Manufacturing orders can be automatically generated based on procurement    rules specified on the product
+                Manufacturing orders can be automatically generated based on procurement    rules specified on the product.
             </field>
         </record>
         <menuitem action="mrp_production_action" id="menu_mrp_production_action"
@@ -1003,14 +999,14 @@
                 <page string="Procurement &amp; Locations" position="inside">
                     <separator string="Bill of Materials"/>
                     <field name="bom_ids" widget="one2many_list" mode="tree" context="{'default_product_id': active_id}">
-                    <tree string="Bill of Materials">
-                    <field name="name" string="Component Name"/>
-                    <field name="bom_id"/>
-                    <field name="product_qty" string="Quantity of Product"/>
-                    <field name="type"/>
-                    <field name="date_start"/>
-                    <field name="date_stop"/>
-                    </tree>
+                        <tree string="Bill of Materials">
+                            <field name="name" string="Component Name"/>
+                            <field name="bom_id"/>
+                            <field name="product_qty" string="Quantity of Product"/>
+                            <field name="type"/>
+                            <field name="date_start"/>
+                            <field name="date_stop"/>
+                        </tree>
                     </field>
                 </page>
             </field>

From c96f2f4ddac34d2996a6e1bbd4da4e49f7f83502 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 16 Jul 2012 12:52:26 +0530
Subject: [PATCH 104/171] [IMP]stock_plannig: Remove sheet

bzr revid: dbr@tinyerp.com-20120716072226-albme40xuxinzmhn
---
 addons/stock_planning/stock_planning_view.xml | 108 +++++++++---------
 1 file changed, 53 insertions(+), 55 deletions(-)

diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 1e6a4c01f32..d15a6d43653 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -243,66 +243,64 @@
             <field name="priority">50</field>
             <field name="arch" type="xml">
                 <form string="Stock Planning" version="7.0">
-                    <sheet>
-                        <group>
-                            <group string = "General Info">
-                                <field name="company_id" widget= "selection"
-                                             on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
-                                <field name="warehouse_id" domain = "[('company_id','=',company_id)] " />
-                                <field name="period_id" />
-                                <field name="product_id" on_change="product_id_change(product_id)"  />
-                                <field name="product_uom_categ"  invisible = "True"/>
-                                <field name="product_uos_categ"  invisible = "True"/>
-                                <field name="product_uom"
-                                             domain = "[('category_id','in',[product_uom_categ,product_uos_categ])]"
-                                             on_change = "onchange_uom(product_uom, product_id, active_uom, planned_outgoing, to_procure)"/>
-                                <field name="active_uom" invisible = "True" />
-                            </group>
-                            <group string = "Minimum Stock Rule Indicators">
-                                <field name="minimum_op"/>
-                                <field name="maximum_op"/>
-                            </group>
+                    <group>
+                        <group string = "General Info">
+                            <field name="company_id" widget= "selection"
+                                         on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
+                            <field name="warehouse_id" domain = "[('company_id','=',company_id)] " />
+                            <field name="period_id" />
+                            <field name="product_id" on_change="product_id_change(product_id)"  />
+                            <field name="product_uom_categ"  invisible = "True"/>
+                            <field name="product_uos_categ"  invisible = "True"/>
+                            <field name="product_uom"
+                                         domain = "[('category_id','in',[product_uom_categ,product_uos_categ])]"
+                                         on_change = "onchange_uom(product_uom, product_id, active_uom, planned_outgoing, to_procure)"/>
+                            <field name="active_uom" invisible = "True" />
                         </group>
-                        <group>
-                            <group string = "Current Period Situation">
-                                <field name="stock_start"/>
-                                <field name="already_out"/>
-                                <field name="already_in"/>
-                            </group>
-                            <group string = "Forecasts">
-                                <field name="warehouse_forecast"/>
-                                <field name="company_forecast"/>
-                                <field name="confirmed_forecasts_only"/>
-                            </group>
+                        <group string = "Minimum Stock Rule Indicators">
+                            <field name="minimum_op"/>
+                            <field name="maximum_op"/>
                         </group>
-                        <group>
-                            <group string = "Planning and Situation for Calculated Period">
-                                <field name="planned_outgoing"/>
-                                <field name="outgoing"/>
-                                <field name="outgoing_left"/>
-                                <field name="to_procure"/>
-                                <field name="incoming"/>
-                                <field name="incoming_left"/>
-                                <button name="calculate_planning" string="Calculate Planning" type="object" icon="gtk-execute" colspan="2"/>
-                                <field name="stock_only"/>
-                            </group>
-                            <group string = "Calculated Period Simulation">
-                                <field name="outgoing_before"/>
-                                <field name="incoming_before"/>
-                                <field name="stock_simulation"/>
-                                <button name="procure_incomming_left" icon="gtk-convert" string="Procure Incoming Left" type="object" colspan="2"/>
-                                <field name="procure_to_stock"/>
-                            </group>
+                    </group>
+                    <group>
+                        <group string = "Current Period Situation">
+                            <field name="stock_start"/>
+                            <field name="already_out"/>
+                            <field name="already_in"/>
                         </group>
-                        <group string = "Internal Supply">
-                            <button name="internal_supply" string="Supply from Another Warehouse" icon="gtk-convert"  type="object" colspan="2"/>
-                            <field name="supply_warehouse_id" domain = "[('company_id','=',company_id)] "/>
-                            <field name="stock_supply_location"/>
+                        <group string = "Forecasts">
+                            <field name="warehouse_forecast"/>
+                            <field name="company_forecast"/>
+                            <field name="confirmed_forecasts_only"/>
                         </group>
-                        <group string="Procurement History">
-                            <field name="history" nolabel = "1"/>
+                    </group>
+                    <group>
+                        <group string = "Planning and Situation for Calculated Period">
+                            <field name="planned_outgoing"/>
+                            <field name="outgoing"/>
+                            <field name="outgoing_left"/>
+                            <field name="to_procure"/>
+                            <field name="incoming"/>
+                            <field name="incoming_left"/>
+                            <button name="calculate_planning" string="Calculate Planning" type="object" icon="gtk-execute" colspan="2"/>
+                            <field name="stock_only"/>
                         </group>
-                    </sheet>
+                        <group string = "Calculated Period Simulation">
+                            <field name="outgoing_before"/>
+                            <field name="incoming_before"/>
+                            <field name="stock_simulation"/>
+                            <button name="procure_incomming_left" icon="gtk-convert" string="Procure Incoming Left" type="object" colspan="2"/>
+                            <field name="procure_to_stock"/>
+                        </group>
+                    </group>
+                    <group string = "Internal Supply">
+                        <button name="internal_supply" string="Supply from Another Warehouse" icon="gtk-convert"  type="object" colspan="2"/>
+                        <field name="supply_warehouse_id" domain = "[('company_id','=',company_id)] "/>
+                        <field name="stock_supply_location"/>
+                    </group>
+                    <group string="Procurement History">
+                        <field name="history" nolabel = "1"/>
+                    </group>
                 </form>
             </field>
         </record>

From 55709d16ad7e6d6f87256fa489cada60a9946a09 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 16 Jul 2012 12:55:59 +0530
Subject: [PATCH 105/171] [IMP]mrp_operation: set tab

bzr revid: kjo@tinyerp.com-20120716072559-arupshu08x0qg2b9
---
 addons/mrp_operations/mrp_operations_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 9c1666a7deb..6fbd6a667bf 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -9,7 +9,7 @@
         <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
         <field name="arch" type="xml">
            <xpath expr="//field[@name='workcenter_lines']/form//field[@name='name']" position="before">
-            <header colspan="8">
+                <header colspan="8">
                    <button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr" help="Start Working"/>
                    <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop" help="Cancel Order"/>
                    <button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert" help="Set to Draft"/>
@@ -17,7 +17,7 @@
                    <button name="button_pause" string="Pending" states="startworking" icon="gtk-media-pause" help="Pause Work Order"/>
                    <button name="button_done" string="Finished" states="startworking" icon="terp-check" help="Finish Order"/>
                    <field name="state" widget="statusbar"/>
-            </header>
+                </header>
            </xpath>
         </field>
     </record>

From 7bbf0254346298859192f9c5b76b5000985254f7 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 16 Jul 2012 13:00:05 +0530
Subject: [PATCH 106/171] [IMP]mrp_operation: remove tab

bzr revid: kjo@tinyerp.com-20120716073005-bfh6wepqjxfsp7ml
---
 addons/mrp_operations/mrp_operations_view.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 6fbd6a667bf..2dccc92a51e 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -8,17 +8,17 @@
         <field name="type">form</field>
         <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
         <field name="arch" type="xml">
-           <xpath expr="//field[@name='workcenter_lines']/form//field[@name='name']" position="before">
+            <xpath expr="//field[@name='workcenter_lines']/form//field[@name='name']" position="before">
                 <header colspan="8">
-                   <button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr" help="Start Working"/>
-                   <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop" help="Cancel Order"/>
-                   <button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert" help="Set to Draft"/>
-                   <button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause" help="Resume Work Order"/>
-                   <button name="button_pause" string="Pending" states="startworking" icon="gtk-media-pause" help="Pause Work Order"/>
-                   <button name="button_done" string="Finished" states="startworking" icon="terp-check" help="Finish Order"/>
-                   <field name="state" widget="statusbar"/>
+                    <button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr" help="Start Working"/>
+                    <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop" help="Cancel Order"/>
+                    <button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert" help="Set to Draft"/>
+                    <button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause" help="Resume Work Order"/>
+                    <button name="button_pause" string="Pending" states="startworking" icon="gtk-media-pause" help="Pause Work Order"/>
+                    <button name="button_done" string="Finished" states="startworking" icon="terp-check" help="Finish Order"/>
+                    <field name="state" widget="statusbar"/>
                 </header>
-           </xpath>
+            </xpath>
         </field>
     </record>
 

From 13e691d4dace4fdc6a0e63967c7a692b1a14ca7e Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 16 Jul 2012 13:15:59 +0530
Subject: [PATCH 107/171] [IMP]mrp: set groups

bzr revid: kjo@tinyerp.com-20120716074559-5ert6z9zlz3b7j1p
---
 addons/mrp/mrp_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index df29cb8585b..877758d660a 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -655,7 +655,7 @@
                     <label for="product_qty" class="oe_edit_only"/>
                     <h2>
                         <field name="product_qty" class="oe_inline"/>
-                        <field name="product_uom" class="oe_inline"/>
+                        <field name="product_uom" groups="product.group_uom" class="oe_inline"/>
                         <button type="action"
                             icon="terp-accessories-archiver+"
                             name="%(mrp.action_change_production_qty)d"
@@ -699,7 +699,7 @@
                                             <field name="product_id" />
                                             <field name="product_qty"  string="Quantity"/>
                                             <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
-                                            <field name="location_id"  string="Source Loc."/>
+                                            <field name="location_id"  string="Source Loc." groups="stock.group_locations"/>
                                             <field name="state" invisible="1"/>
                                             <button name="%(stock.move_consume)d"
                                                 string="Consume Products" type="action"
@@ -722,7 +722,7 @@
                                        <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state == 'cancel' " string="Consumed Products" editable="bottom">
                                            <field name="product_id" readonly="1"/>
                                            <field name="product_qty" readonly="1"/>
-                                           <field name="product_uom" readonly="1" string="Unit of Measure"/>
+                                           <field name="product_uom" readonly="1" string="Unit of Measure" groups="product.group_uom"/>
                                            <field name="prodlot_id" context="{'product_id': product_id}"/>
                                            <field name="state" invisible="1"/>
                                            <field name="scrapped" invisible="1"/>
@@ -743,7 +743,7 @@
                                         <tree string="Products to Finish">
                                             <field name="product_id" />
                                             <field name="product_qty"/>
-                                            <field name="product_uom"  string="Unit of Measure"/>
+                                            <field name="product_uom"  string="Unit of Measure" groups="product.group_uom"/>
                                             <field name="state" invisible="1"/>
                                             <button name="%(stock.action_partial_move_server)d"
                                                 string="Partial"

From efe9365e449d4eada1742dfc3ad1986e6d977e63 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 16 Jul 2012 14:19:32 +0530
Subject: [PATCH 108/171] [IMP]mrp: remove unused code

bzr revid: kjo@tinyerp.com-20120716084932-9k6epzcpjjf0ukev
---
 addons/mrp/mrp_view.xml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 877758d660a..923a14f74a3 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -405,7 +405,6 @@
                             <field name="property_ids" widget="many2many_tags" />
                         </page>
                     </notebook>
-                    <newline/>
                 </form>
             </field>
         </record>
@@ -685,7 +684,7 @@
                         <page string="Consumed Products">
                             <group>
                                 <group groups="stock.group_locations">
-                                    <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)"/>
+                                    <field name="bom_id" domain="[('product_id','=',product_id)]" context="{'default_product_id': product_id}" on_change="bom_id_change(bom_id)"/>
                                 </group>
                                 <group>
                                     <field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
@@ -808,9 +807,9 @@
                         <page string="Extra Information">
                             <group>
                                 <group>
-                                <field name="priority"/>
-                                <field name="date_start"/>
-                                <field name="date_finished"/>
+                                    <field name="priority"/>
+                                    <field name="date_start"/>
+                                    <field name="date_finished"/>
                                 </group>
                                 <group>
                                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
@@ -879,7 +878,7 @@
                 Click here to create a new Manufacturing Order.
                 &lt;p&gt;
                 To process the production, do not forget to create a Bill of Material.
-                Manufacturing orders can be automatically generated based on procurement    rules specified on the product.
+                Manufacturing orders can be automatically generated based on procurement rules specified on the product.
             </field>
         </record>
         <menuitem action="mrp_production_action" id="menu_mrp_production_action"

From a8db458c549c0470cc5dc4fa759336a8f430aff5 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 16 Jul 2012 14:25:57 +0530
Subject: [PATCH 109/171] [IMP]mrp: assign group

bzr revid: kjo@tinyerp.com-20120716085557-yipr924zh1bfpems
---
 addons/mrp/mrp_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 923a14f74a3..932f4ac2928 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -760,8 +760,8 @@
                                         <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Finished Products">
                                             <field name="product_id" readonly="1"/>
                                             <field name="product_qty" readonly="1"/>
-                                            <field name="product_uom" readonly="1" string="Unit of Measure"/>
-                                            <field name="location_dest_id"  readonly="1" string="Destination Loc." widget="selection"/>
+                                            <field name="product_uom" readonly="1" string="Unit of Measure" groups="product.group_uom"/>
+                                            <field name="location_dest_id"  readonly="1" string="Destination Loc." widget="selection" groups="stock.group_locations"/>
                                             <field name="prodlot_id" context="{'product_id': product_id}"/>
                                             <field name="scrapped" invisible="1"/>
                                             <field name="state" invisible="1"/>

From 49ff421fb65524b8b90db1bf3bd4b98732a8c719 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 16 Jul 2012 17:25:05 +0530
Subject: [PATCH 110/171] [IMP]: ADD Menu Accounting inplace of invoicing

bzr revid: atp@tinyerp.com-20120716115505-17bb9ut14yvt1rl4
---
 addons/account_accountant/account_accountant_data.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/account_accountant/account_accountant_data.xml b/addons/account_accountant/account_accountant_data.xml
index 330da2520c2..3d665e680c3 100644
--- a/addons/account_accountant/account_accountant_data.xml
+++ b/addons/account_accountant/account_accountant_data.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
+        <!-- rename root menu "Accounting" -->
+        <record id="account.menu_finance" model="ir.ui.menu">
+            <field name="name">Accounting</field>
+        </record>
+
 <!--
         It's easier for new users to not activate this (ex: they misconfigure
         header and footer.)

From 0de4e0115509777879261783d80aea4f7dc29ac9 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 16 Jul 2012 17:30:46 +0530
Subject: [PATCH 111/171] [REM]: Remove col 4 from period

bzr revid: atp@tinyerp.com-20120716120046-ofhyhl7tb7vxaaqk
---
 addons/account/account_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 38e2a0bb621..12ec848bb9a 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2615,7 +2615,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
                             </field>
                         </page>
                         <page string="CashBox">
-                            <group col="4">
+                            <group>
                                 <group>
                                     <group string="Opening Operations">
                                         <field name="starting_details_ids" attrs="{'readonly':[('state','!=','draft')]}" nolabel="1">

From 0193e070e83384c9cbda349a29e770219dac2483 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 16 Jul 2012 14:13:10 +0200
Subject: [PATCH 112/171] [IMP] pruchase, stock: usability imp

bzr revid: qdp-launchpad@openerp.com-20120716121310-ul37v4slifh38aa2
---
 addons/purchase/purchase.py                   |  2 +-
 addons/purchase/stock.py                      |  4 +--
 addons/stock/stock_view.xml                   | 29 +++++++++----------
 addons/stock_planning/stock_planning_view.xml | 16 +++++-----
 4 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index f768f293434..547902b4635 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -167,7 +167,7 @@ class purchase_order(osv.osv):
             help="Put an address if you want to deliver directly from the supplier to the customer. " \
                 "Otherwise, keep empty to deliver to your own company."
         ),
-        'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}),
+        'warehouse_id': fields.many2one('stock.warehouse', 'Destination Warehouse', states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}),
         'location_id': fields.many2one('stock.location', 'Destination', required=True, domain=[('usage','<>','view')]),
         'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, help="The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."),
         'state': fields.selection(STATE_SELECTION, 'Status', readonly=True, help="The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception.", select=True),
diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index a3de0f0e4dc..b5b708119cc 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -39,8 +39,8 @@ class stock_picking(osv.osv):
     _columns = {
         'purchase_id': fields.many2one('purchase.order', 'Purchase Order',
             ondelete='set null', select=True),
-        
     }
+
     _defaults = {
         'purchase_id': False,
     }
@@ -134,6 +134,6 @@ class stock_picking_in(osv.osv):
     _columns = {
         'purchase_id': fields.many2one('purchase.order', 'Purchase Order',
             ondelete='set null', select=True),
-        'warehouse_id': fields.related('purchase_id', 'warehouse_id', type='many2one', relation='stock.warehouse', string='Warehouse'),
+        'warehouse_id': fields.related('purchase_id', 'warehouse_id', type='many2one', relation='stock.warehouse', string='Destination Warehouse'),
     }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 8c0fb1a29e8..934e1e19da0 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -336,29 +336,27 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Serial Number" version="7.0">
-                    <group string="Serial Number Identification" col="3">
+                    <div class="oe_button_box">
+                        <button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': '', 'field': 'prodlot_id'}" icon="gtk-go-up"/>
+                        <button name="action_traceability" string="Downstream Traceability" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}" icon="gtk-go-down"/>
+                    </div>
+                    <div class="oe_title">
+                        <label for="name" class="oe_edit_only"/>
+                        <h1>
+                            <field name="name"/>
+                        </h1>
+                    </div>
+                    <group string="Serial Number Identification">
                         <group>
                             <field name="product_id"/>
-                            <field name="name"/>
-                        </group>
-                        <group>
                             <field name="prefix"/>
                             <field name="ref"/>
                         </group>
-                        <group class="oe_button_box">
-
-                                <button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': '', 'field': 'prodlot_id'}" icon="gtk-go-up"/>
-                                <button name="action_traceability" string="Downstream Traceability" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}" icon="gtk-go-down"/>
-
-                        </group>
-                        <group string="Dates">
+                        <group>
                             <field name="date"/>
-                        </group>
-                        <group string="Traceability">
                             <field name="stock_available"/>
                         </group>
                     </group>
-                    
                     <notebook>
                         <page string="Revisions">
                             <field name="revisions"/>
@@ -825,8 +823,7 @@
                                                 <field name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
                                             </div>
                                             <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
-                                         </group>
-
+                                        </group>
                                         <group>
                                             <field name="create_date" invisible="1"/>
                                             <field name="date"/>
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index d15a6d43653..31276b15f50 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -244,8 +244,8 @@
             <field name="arch" type="xml">
                 <form string="Stock Planning" version="7.0">
                     <group>
-                        <group string = "General Info">
-                            <field name="company_id" widget= "selection"
+                        <group string="General Info">
+                            <field name="company_id" widget="selection"
                                          on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
                             <field name="warehouse_id" domain = "[('company_id','=',company_id)] " />
                             <field name="period_id" />
@@ -257,25 +257,25 @@
                                          on_change = "onchange_uom(product_uom, product_id, active_uom, planned_outgoing, to_procure)"/>
                             <field name="active_uom" invisible = "True" />
                         </group>
-                        <group string = "Minimum Stock Rule Indicators">
+                        <group string="Minimum Stock Rule Indicators">
                             <field name="minimum_op"/>
                             <field name="maximum_op"/>
                         </group>
                     </group>
                     <group>
-                        <group string = "Current Period Situation">
+                        <group string="Current Period Situation">
                             <field name="stock_start"/>
                             <field name="already_out"/>
                             <field name="already_in"/>
                         </group>
-                        <group string = "Forecasts">
+                        <group string="Forecasts">
                             <field name="warehouse_forecast"/>
                             <field name="company_forecast"/>
                             <field name="confirmed_forecasts_only"/>
                         </group>
                     </group>
                     <group>
-                        <group string = "Planning and Situation for Calculated Period">
+                        <group string="Planning and Situation for Calculated Period">
                             <field name="planned_outgoing"/>
                             <field name="outgoing"/>
                             <field name="outgoing_left"/>
@@ -285,7 +285,7 @@
                             <button name="calculate_planning" string="Calculate Planning" type="object" icon="gtk-execute" colspan="2"/>
                             <field name="stock_only"/>
                         </group>
-                        <group string = "Calculated Period Simulation">
+                        <group string="Calculated Period Simulation">
                             <field name="outgoing_before"/>
                             <field name="incoming_before"/>
                             <field name="stock_simulation"/>
@@ -293,7 +293,7 @@
                             <field name="procure_to_stock"/>
                         </group>
                     </group>
-                    <group string = "Internal Supply">
+                    <group string="Internal Supply">
                         <button name="internal_supply" string="Supply from Another Warehouse" icon="gtk-convert"  type="object" colspan="2"/>
                         <field name="supply_warehouse_id" domain = "[('company_id','=',company_id)] "/>
                         <field name="stock_supply_location"/>

From cb13892b69896d132d5b7272a6dd3631d3cfc51b Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 16 Jul 2012 18:59:10 +0530
Subject: [PATCH 113/171] [FIX]: Fix some view regarding space problem.

bzr revid: atp@tinyerp.com-20120716132910-8fsw4ncbw0jov4rc
---
 addons/account/account_view.xml               |  5 +-
 addons/account/wizard/account_move_journal.py |  5 +-
 .../wizard/account_report_common_view.xml     | 14 +++---
 addons/account_budget/account_budget_view.xml |  2 +-
 .../account_voucher_view.xml                  | 46 +++++++++----------
 .../account_invoice_view.xml                  |  2 +-
 addons/l10n_be_invoice_bba/invoice.py         |  4 +-
 7 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 12ec848bb9a..b21c4239e3b 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1086,8 +1086,7 @@
 	                                    <field name="analytic_account_id" domain="[('parent_id','!=',False)]"/>
 	                                </group>
 	                            </group>
-	                            <separator string="Internal Note" colspan="4"/>
-	                            <field name="narration" colspan="4" nolabel="1"/>
+	                            <field name="narration" colspan="4" nolabel="1" placeholder="Add an internal note."/>
 	                        </page>
 	                        <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
 	                            <field name="analytic_lines" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
@@ -2631,7 +2630,6 @@ action = pool.get('res.config').next(cr, uid, [], context)
 	                                        </form>
                                         </field>
                                     </group> 
-                                    <newline/>
                                     <group class="oe_subtotal_footer oe_right">
                                         <field name="balance_start" readonly="1" string="Total"/>
                                         <field name="total_entry_encoding"/>
@@ -2652,7 +2650,6 @@ action = pool.get('res.config').next(cr, uid, [], context)
 		                                    </form>
                                         </field>
                                     </group>  
-	                                <newline/>
 	                                <group class="oe_subtotal_footer oe_right">
 	                                    <field name="balance_end" />
 	                                    <field name="balance_end_cash"/>
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index bc794fdcdd1..419f2e2d09e 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -107,10 +107,9 @@ class account_move_journal(osv.osv_memory):
             <form string="Standard entries" version="7.0">
                 <group>
                     <field name="target_move"/>
+                    <label string="%s"/>
+                    <label  string="%s"/>
                 </group>
-                <label width="300" string="%s"/>
-                <newline/>
-                <label width="300" string="%s"/>
                 <footer>
                     <button string="%s" name="action_open_window" default_focus="1" type="object" class="oe_highlight"/>
                     or
diff --git a/addons/account/wizard/account_report_common_view.xml b/addons/account/wizard/account_report_common_view.xml
index 89bfc4d4b7c..aa09e7fd3a8 100644
--- a/addons/account/wizard/account_report_common_view.xml
+++ b/addons/account/wizard/account_report_common_view.xml
@@ -17,16 +17,16 @@
                 </group>
                 <notebook tabpos="up" colspan="4">
                     <page string="Filters" name="filters">
-                        <group col="4">
+                        <group>
                             <field name="filter" on_change="onchange_filter(filter, fiscalyear_id)"/>
                         </group>
-                        <group string="Dates"  attrs="{'invisible':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}" col="4" >
-                            <field name="date_from"  colspan="4"/>
-                            <field name="date_to"    colspan="4"/>
+                        <group string="Dates"  attrs="{'invisible':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}">
+                            <field name="date_from" />
+                            <field name="date_to" />
                         </group>
-                        <group string="Periods" attrs="{'invisible':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" col="4">
-                            <field name="period_from" domain="[('fiscalyear_id', '=', fiscalyear_id)]"   colspan="4"/>
-                            <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]"  colspan="4"/>
+                        <group string="Periods" attrs="{'invisible':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}">
+                            <field name="period_from" domain="[('fiscalyear_id', '=', fiscalyear_id)]"/>
+                            <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]"  />
                         </group>
                     </page>
                     <page string="Journals" name="journal_ids">
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index f653a9d3691..16f13881034 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -117,7 +117,7 @@
                         <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                     </header>
                     <sheet string="Budget">
-                        <group col="4">
+                        <group>
                             <group>
                                 <field name="name" colspan="1" attrs="{'readonly':[('state','!=','draft')]}"/>
                                 <field name="creating_user_id" attrs="{'readonly':[('state','!=','draft')]}"/>
diff --git a/addons/account_check_writing/account_voucher_view.xml b/addons/account_check_writing/account_voucher_view.xml
index b725c1c2d06..9fafdcd30c3 100644
--- a/addons/account_check_writing/account_voucher_view.xml
+++ b/addons/account_check_writing/account_voucher_view.xml
@@ -82,35 +82,33 @@
 	                                    <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
 	                                </tree>
 	                            </field>
-	                            <group>
-	                                <group string="Internal Notes">
-	                                    <field name="narration" colspan="2" nolabel="1"/>
-	                                </group>
+	                            <group col="3">
 	                                <group>
-	                                    <group col="4" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
-	                                        <separator string="Currency Options" colspan="4"/>
-	                                        <field name="is_multi_currency" invisible="1"/>
-	                                        <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
-	                                        <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
-	                                        <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
-	                                    </group>
-	                                    <group col="2">
-	                                        <separator string="Payment Options" colspan="2"/>
-	                                        <field name="writeoff_amount"/>
-	                                        <field name="payment_option" required="1"/>
-	                                        <field name="writeoff_acc_id"
-	                                               attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
-	                                               domain="[('type','=','other')]"/>
-	                                        <field name="comment"
-	                                               attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
-	                                        <field name="analytic_id"
-	                                               groups="analytic.group_analytic_accounting"/>
-	                                    </group>
+	                                    <field name="narration"  placeholder="Add an internal note." nolabel="1"/>
 	                                </group>
+                                    <group  string="Currency Options" col="5" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
+                                        <field name="is_multi_currency" invisible="1"/>
+                                        <field name="payment_rate" required="1" 
+                                            on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)"/>
+                                        <field name="payment_rate_currency_id" nolabel="1" 
+                                            on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
+                                        <field name="paid_amount_in_company_currency" invisible="1"/>
+                                    </group>
+                                    <group string="Payment Options">
+                                        <field name="writeoff_amount"/>
+                                        <field name="payment_option" required="1"/>
+                                        <field name="writeoff_acc_id"
+                                               attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
+                                               domain="[('type','=','other')]"/>
+                                        <field name="comment"
+                                               attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
+                                        <field name="analytic_id"
+                                               groups="analytic.group_analytic_accounting"/>
+                                    </group>
 	                            </group>
 	                        </page>
 	                        <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
-	                            <group col="4">
+	                            <group>
 	                                <field name="period_id"/>
 	                                <field name="audit"/>
 	                                <field name="number" attrs="{'readonly':[('allow_check','!=',1)]}" />
diff --git a/addons/l10n_be_invoice_bba/account_invoice_view.xml b/addons/l10n_be_invoice_bba/account_invoice_view.xml
index ffa6ad68d65..2d3ebbd4cd2 100644
--- a/addons/l10n_be_invoice_bba/account_invoice_view.xml
+++ b/addons/l10n_be_invoice_bba/account_invoice_view.xml
@@ -13,7 +13,7 @@
           <group col="4" colspan="2">
               <!-- "algorithm" not a field in any account related module.so pass it as False argument in generate_bbacomm() function. -->
               <field name="reference_type" nolabel="1"  size="0" attrs="{'readonly':[('state','!=','draft')]}"
-                 on_change="generate_bbacomm(type,reference_type,partner_id,reference)" colspan="1"/>
+                 on_change="generate_bbacomm(type,reference_type, False, partner_id,reference)" colspan="1"/>
               <field name="reference" nolabel="1"  colspan="3" attrs="{'readonly':[('state','!=','draft')]}"/>
           </group>
         </field>
diff --git a/addons/l10n_be_invoice_bba/invoice.py b/addons/l10n_be_invoice_bba/invoice.py
index 0c767f3a54c..0cf55e5be64 100644
--- a/addons/l10n_be_invoice_bba/invoice.py
+++ b/addons/l10n_be_invoice_bba/invoice.py
@@ -78,7 +78,7 @@ class account_invoice(osv.osv):
                     algorithm = self.pool.get('res.partner').browse(cr, uid, partner_id).out_inv_comm_algorithm
                     if not algorithm:
                         algorithm = 'random' 
-                    reference = self.generate_bbacomm(cr, uid, ids, type, reference_type, partner_id, '', algorithm)['value']['reference']
+                    reference = self.generate_bbacomm(cr, uid, ids, type, reference_type, algorithm, partner_id, '')['value']['reference']
         res_update = {       
             'reference_type': reference_type or 'none',
             'reference': reference,
@@ -86,7 +86,7 @@ class account_invoice(osv.osv):
         result['value'].update(res_update)
         return result                    
 #algorithm is not defined as field in any account related modules.so pass it as false argument.
-    def generate_bbacomm(self, cr, uid, ids, type, reference_type, partner_id, reference, algorithm=False):
+    def generate_bbacomm(self, cr, uid, ids, type, reference_type, algorithm, partner_id, reference):
         partner_obj =  self.pool.get('res.partner')
         reference = reference or ''  
         if (type == 'out_invoice'):

From dc3d09bd463ad18a8eb8673fdde420019de01865 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 16 Jul 2012 19:05:21 +0530
Subject: [PATCH 114/171] [FIX]: Fix attr into attrs

bzr revid: atp@tinyerp.com-20120716133521-qtq9u2ihrcr73elf
---
 addons/account/account_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index b21c4239e3b..0681acddb42 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -110,7 +110,7 @@
 		                        <label for="date_start" string="Duration" />
 		                        <div>
 		                            <field name="date_start" class="oe_inline" nolabel="1"/> 
-		                            <span attr="{'invisible': [('date_stop','=',False)]}"> - </span> 
+		                            <span attrs="{'invisible': [('date_stop','=',False)]}"> - </span> 
 		                            <field name="date_stop" nolabel="1" class="oe_inline"/>
 		                        </div>
 		                    </group>

From 3d3b98a202630f338fb8fb4252e3363d6d1c337f Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 16 Jul 2012 19:12:33 +0530
Subject: [PATCH 115/171] [REVERT]: Revert account_vocher changes

bzr revid: atp@tinyerp.com-20120716134233-85pnxh0in2kqbmzm
---
 .../account_voucher/account_voucher_view.xml  | 145 +++++++++---------
 1 file changed, 72 insertions(+), 73 deletions(-)

diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index dc816a129e1..bb1d989606a 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -42,79 +42,78 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form version="7.0">
-                    <header>
-                        <button name="proforma_voucher" string="Post" states="draft" class="oe_highlight"/>
-                        <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to unreconcile this record?"/>
-                        <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
-                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
-                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                    </header>
-                    <sheet string="Accounting Voucher">
-                        <group col="6" colspan="4">
-	                        <field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
-	                        <field name="payment_rate_currency_id" invisible="1"/>
-	                        <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/>
-	                        <field name="journal_id" widget="selection" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
-	                        <field name="type" required="1"/>
-	                        <field name="name" colspan="2"/>
-	                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-	                        <field name="reference"/>
-	                        <field name="account_id" widget="selection" invisible="True"/>
-                        </group>
-	                    <notebook colspan="4">
-	                        <page string="Voucher Entry">
-	                            <field name="line_ids" on_change="onchange_price(line_ids, tax_id, partner_id)" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
-	                                <tree string="Voucher Items" editable="bottom">
-	                                    <field name="account_id"/>
-	                                    <field name="name"/>
-	                                    <field name="amount" sum="Total Amount"/>
-	                                    <field name="type"/>
-	                                    <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
-	                                </tree>
-	                            </field>
-	                            <group col="3">
-	                                <group string="Internal Notes">
-	                                    <field name="narration" colspan="2" nolabel="1"/>
-	                                </group>
-	                                <group string="Other Information">
-	                                    <field name="number"/>
-	                                    <field name="currency_id"/>
-	                                </group>
-	                                <group col="4" attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}">
-	                                    <separator string="Total" colspan="4"/>
-	                                    <field name="tax_id" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/>
-	                                    <field name="tax_amount" nolabel="1"/>
-	                                    <button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
-	                                    <label colspan="1" string=""/><field name="amount" string="Total"/>
-	                                </group>
-	                            </group>
-	                        </page>
-	                        <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
-	                            <group col="4">
-	                                <field name="period_id"/>
-	                                <field name="audit"/>
-	                            </group>
-	                            <field name="move_ids" readonly="1">
-	                                <tree string="Journal Items">
-	                                    <field name="move_id"/>
-	                                    <field name="ref"/>
-	                                    <field name="date"/>
-	                                    <field name="statement_id"/>
-	                                    <field name="partner_id"/>
-	                                    <field name="account_id"/>
-	                                    <field name="name"/>
-	                                    <field name="debit"/>
-	                                    <field name="credit"/>
-	                                    <field name="state"/>
-	                                    <field name="reconcile_id"/>
-	                                </tree>
-	                            </field>
-	                        </page>
-	                    </notebook>
-                    </sheet>
-                    <div class="oe_chatter">
-                        <field name="message_ids" widget="mail_thread"/>
-                    </div>
+                  <header>
+                      <button name="proforma_voucher" string="Post" states="draft" class="oe_highlight"/>
+                      <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to unreconcile this record?"/>
+                      <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
+                      <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
+                      <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
+                  </header>
+                  <sheet string="Accounting Voucher">
+                    <group col="6" colspan="4">
+                        <field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
+                        <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/>
+                        <field name="journal_id" widget="selection" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
+                        <field name="type" required="1"/>
+                        <field name="name" colspan="2"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        <field name="reference"/>
+                        <field name="account_id" widget="selection" invisible="True"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Voucher Entry">
+                            <field name="line_ids" on_change="onchange_price(line_ids, tax_id, partner_id)" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
+                                <tree string="Voucher Items" editable="bottom">
+                                    <field name="account_id"/>
+                                    <field name="name"/>
+                                    <field name="amount" sum="Total Amount"/>
+                                    <field name="type"/>
+                                    <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
+                                </tree>
+                            </field>
+                            <group col="3">
+                                <group string="Internal Notes">
+                                    <field name="narration" colspan="2" nolabel="1"/>
+                                </group>
+                                <group string="Other Information">
+                                    <field name="number"/>
+                                    <field name="currency_id"/>
+                                </group>
+                                <group col="4" attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}">
+                                    <separator string="Total" colspan="4"/>
+                                    <field name="tax_id" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/>
+                                    <field name="tax_amount" nolabel="1"/>
+                                    <button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
+                                    <label colspan="1" string=""/><field name="amount" string="Total"/>
+                                </group>
+                            </group>
+                        </page>
+                        <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
+                            <group col="4">
+                                <field name="period_id"/>
+                                <field name="audit"/>
+                            </group>
+                            <field name="move_ids" readonly="1">
+                               <tree string="Journal Items">
+                                   <field name="move_id"/>
+                                   <field name="ref"/>
+                                   <field name="date"/>
+                                   <field name="statement_id"/>
+                                   <field name="partner_id"/>
+                                   <field name="account_id"/>
+                                   <field name="name"/>
+                                   <field name="debit"/>
+                                   <field name="credit"/>
+                                   <field name="state"/>
+                                   <field name="reconcile_id"/>
+                               </tree>
+                            </field>
+                        </page>
+                    </notebook>
+                  </sheet>
+                  <div class="oe_chatter">
+                      <field name="message_ids" widget="mail_thread"/>
+                  </div>
                 </form>
             </field>
         </record>

From d48686d7f63ca475aa1a71946ad06d51cce99890 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Tue, 17 Jul 2012 08:44:10 +0200
Subject: [PATCH 116/171] [IMP] remove menu_tips code

bzr revid: fp@openerp.com-20120717064410-c5leu36ixz7utje8
---
 openerp/addons/base/ir/ir_actions.py       | 6 ------
 openerp/addons/base/res/res_users.py       | 4 +---
 openerp/addons/base/res/res_users_view.xml | 6 +++---
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py
index 1d91ab823db..8861a59c368 100644
--- a/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@ -210,10 +210,6 @@ class act_window(osv.osv):
             res[act.id] = str(field_get)
         return res
 
-    def _get_help_status(self, cr, uid, ids, name, arg, context=None):
-        activate_tips = self.pool.get('res.users').browse(cr, uid, uid).menu_tips
-        return dict([(id, activate_tips) for id in ids])
-
     _columns = {
         'name': fields.char('Action Name', size=64, translate=True),
         'type': fields.char('Action Type', size=32, required=True),
@@ -251,8 +247,6 @@ class act_window(osv.osv):
         'help': fields.text('Action description',
             help='Optional help text for the users with a description of the target view, such as its usage and purpose.',
             translate=True),
-        'display_menu_tip':fields.function(_get_help_status, type='boolean', string='Display Menu Tips',
-            help='It gives the status if the tip has to be displayed or not when a user executes an action'),
         'multi': fields.boolean('Action on Multiple Doc.', help="If set to true, the action will not be displayed on the right toolbar of a form view"),
     }
 
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index e22b5addf48..97ca6ec32dc 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -231,7 +231,6 @@ class users(osv.osv):
             help="The user's timezone, used to output proper date and time values inside printed reports. "
                  "It is important to set a value for this field. You should use the same timezone "
                  "that is otherwise used to pick and render date and time values: your computer's timezone."),
-        'menu_tips': fields.boolean('Menu Tips', help="Check out this box if you want to always display tips on each menu action"),
         'date': fields.datetime('Latest Connection', readonly=True),
     }
 
@@ -336,11 +335,10 @@ class users(osv.osv):
         'company_id': _get_company,
         'company_ids': _get_companies,
         'groups_id': _get_group,
-        'menu_tips': False
     }
 
     # User can write to a few of her own fields (but not her groups for example)
-    SELF_WRITEABLE_FIELDS = ['menu_tips','password', 'signature', 'action_id', 'company_id', 'user_email', 'name', 'avatar', 'avatar_big']
+    SELF_WRITEABLE_FIELDS = ['password', 'signature', 'action_id', 'company_id', 'user_email', 'name', 'avatar', 'avatar_big']
 
     def write(self, cr, uid, ids, values, context=None):
         if not hasattr(ids, '__iter__'):
diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index 98ee6d5a1dc..31b5fbffa0d 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -85,14 +85,15 @@
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
                             <h1><field name="name"/></h1>
+                            <label for="login" class="oe_edit_only"/>
+                            <h2><field name="login"/></h2>
                         </div>
                         <group>
                             <group>
-                                <field name="login"/>
                                 <field name="new_password" password="True" attrs="{'required': [('id','=',False)]}"/>
+                                <field name="company_id" context="{'user_preference': 0}"/>
                             </group>
                             <group>
-                                <field name="company_id" context="{'user_preference': 0}"/>
                                 <field name="active"/>
                             </group>
                         </group>
@@ -103,7 +104,6 @@
                                     <group name="preferences">
                                         <field name="context_lang"/>
                                         <field name="context_tz"/>
-                                        <field name="menu_tips"/>
                                     </group>
                                     <group groups="base.group_no_one">
                                         <field name="action_id"/>

From 7d1d50403661b6981148f4b31d157e88958f4777 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Tue, 17 Jul 2012 08:44:31 +0200
Subject: [PATCH 117/171] [IMP] remove menu_tips old code

bzr revid: fp@openerp.com-20120717064431-qtn1zooodo71iezt
---
 addons/web/static/src/js/views.js | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 5fc1463232a..bd102d867de 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -657,32 +657,6 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({
 
         this.$element.find('.oe_debug_view').change(this.on_debug_changed);
         this.$element.addClass("oe_view_manager_" + (this.action.target || 'current'));
-
-        if (this.action.help && !this.flags.low_profile) {
-            var Users = new instance.web.DataSet(self, 'res.users'),
-                $tips = this.$element.find('.oe_view_manager_menu_tips');
-            $tips.delegate('blockquote button', 'click', function() {
-                var $this = $(this);
-                //noinspection FallthroughInSwitchStatementJS
-                switch ($this.attr('name')) {
-                case 'disable':
-                    Users.write(self.session.uid, {menu_tips:false});
-                case 'hide':
-                    $this.closest('blockquote').hide();
-                    self.session.hidden_menutips[self.action.id] = true;
-                }
-            });
-            if (!(self.action.id in self.session.hidden_menutips)) {
-                Users.read_ids([this.session.uid], ['menu_tips']).then(function(users) {
-                    var user = users[0];
-                    if (!(user && user.id === self.session.uid)) {
-                        return;
-                    }
-                    $tips.find('blockquote').toggle(user.menu_tips);
-                });
-            }
-        }
-
         return manager_ready;
     },
     on_debug_changed: function (evt) {

From 6c524cf107025999740788718fea82b5722b470b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Tue, 17 Jul 2012 08:46:38 +0200
Subject: [PATCH 118/171] [IMP] remove menu tips

bzr revid: fp@openerp.com-20120717064638-pg19mfj959vttw20
---
 addons/share/wizard/share_wizard.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index 41871480f45..23245e12a2d 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -274,7 +274,6 @@ class share_wizard(osv.TransientModel):
                 'name': new_login,
                 'groups_id': [(6,0,[group_id])],
                 'share': True,
-                'menu_tips' : False,
                 'company_id': current_user.company_id.id
             }, context)
             new_line = { 'user_id': user_id,

From 74bbdf0f6fd44d22897f3f1945c534ed951ad4e8 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Tue, 17 Jul 2012 08:52:40 +0200
Subject: [PATCH 119/171] [IMP] clear separator

bzr revid: fp@openerp.com-20120717065240-l9cdhc1ti34sqkkr
---
 addons/web/static/src/xml/base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 2d9caa43bbd..70b0cd85cc5 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -787,7 +787,7 @@
     </div>
 </t>
 <t t-name="FormRenderingSeparator">
-    <div t-attf-class="oe_horizontal_separator #{classnames}">
+    <div t-attf-class="oe_horizontal_separator oe_clear #{classnames}">
         <t t-esc="string"/>
     </div>
 </t>

From 048e3b91f5fd9e25a2972eaa49f0feb78e1beb1a Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 17 Jul 2012 09:42:52 +0200
Subject: [PATCH 120/171] [IMP] removed separator='vertical'

bzr revid: fp@tinyerp.com-20120717074252-t5zmgchkzfub5l0b
---
 .../publisher_warranty_view.xml               | 34 ++++++-------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
index 334dbc93199..1071c2024e7 100644
--- a/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
+++ b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
@@ -94,32 +94,20 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Register a Contract" version="7.0">
-                    <header>
+                    <field name="state" invisible="1"/>
+                    <separator string="Register a Contract"/>
+                    <group states="draft">
+                        <label string="Please enter the serial key provided in your contract document:" colspan="2"/>
+                        <field name="name">
+                    </group>
+                    <group states="finished">
+                        <label string="Publisher warranty contract successfully registered!" colspan="4"/>
+                    </group>
+                    <footer>
                         <button name="action_validate" string="Register" type="object" states="draft" class="oe_highlight"  />
                         <label string="or" states="draft"/>
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <group colspan="4" col="8">
-                        <group colspan="1">
-                            <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
-                            <newline/>
-                            <label colspan="4" width="220" string="This wizard helps you register a publisher warranty contract in your OpenERP system. After the contract has been registered, you will be able to send issues directly to OpenERP."/>
-                            <label colspan="4" width="220"/>
-                            <label colspan="4" width="220" string=""/>
-                            <field name="state" invisible="1"/>
-                        </group>
-                        <separator orientation="vertical" rowspan="12" colspan="1"/>
-                        <group colspan="6">
-                            <separator string="Register a Contract" colspan="4"/>
-                            <group states="draft" colspan="4">
-                                <label string="Please enter the serial key provided in your contract document:" colspan="4"/>
-                                <field name="name" colspan="4"/>
-                            </group>
-                            <group states="finished" colspan="4">
-                                <label string="Publisher warranty contract successfully registered!" colspan="4"/>
-                            </group>
-                        </group>
-                    </group>
+                    </footer>
                 </form>
             </field>
         </record>

From d4f5d52177b9b2fbc38bcf780eac12290223448b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 17 Jul 2012 09:44:28 +0200
Subject: [PATCH 121/171] [IMP] remove unused code

bzr revid: fp@tinyerp.com-20120717074428-rx5ats1eie4ct432
---
 addons/web/static/src/js/view_form.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 8fdaffa81eb..3f389d3d41f 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1212,12 +1212,6 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
                     $child = $td.children(':first');
                 switch ($child[0].tagName.toLowerCase()) {
                     case 'separator':
-                        if ($child.attr('orientation') === 'vertical') {
-                            $td.addClass('oe_vertical_separator').attr('width', '1');
-                            $td.empty();
-                            row_cols-= $td.attr('colspan') || 1;
-                            total--;
-                        }
                         break;
                     case 'label':
                         if ($child.attr('for')) {

From 0306e9ba297b589b7db5b4be0cef9b4cd981c3b3 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 17 Jul 2012 10:27:00 +0200
Subject: [PATCH 122/171] [FIX] base/publisher_warranty: fix xml in view

bzr revid: rco@openerp.com-20120717082700-2iup9hv0xrmdqk18
---
 .../base/publisher_warranty/publisher_warranty_view.xml     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
index 1071c2024e7..97fa2b50c3a 100644
--- a/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
+++ b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
@@ -98,15 +98,15 @@
                     <separator string="Register a Contract"/>
                     <group states="draft">
                         <label string="Please enter the serial key provided in your contract document:" colspan="2"/>
-                        <field name="name">
+                        <field name="name"/>
                     </group>
                     <group states="finished">
                         <label string="Publisher warranty contract successfully registered!" colspan="4"/>
                     </group>
                     <footer>
-                        <button name="action_validate" string="Register" type="object" states="draft" class="oe_highlight"  />
+                        <button name="action_validate" string="Register" type="object" states="draft" class="oe_highlight"/>
                         <label string="or" states="draft"/>
-                        <button string="Cancel" class="oe_link" special="cancel" />
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </footer>
                 </form>
             </field>

From 27e1a25325faebf59112fe03f5f89467800e0c10 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 17 Jul 2012 15:07:27 +0200
Subject: [PATCH 123/171] [ADD] a group dedicated to the anonymous user

bzr revid: abo@openerp.com-20120717130727-v05g228h11jmjq28
---
 addons/anonymous/anonymous.xml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/addons/anonymous/anonymous.xml b/addons/anonymous/anonymous.xml
index 36be96db5ad..82e679acb1b 100644
--- a/addons/anonymous/anonymous.xml
+++ b/addons/anonymous/anonymous.xml
@@ -1,12 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
   <data>
-    <record model="res.users" id="user">
+    <record id="anonymous_user" model="res.users">
         <field name="name">Anonymous</field>
         <field name="login">anonymous</field>
         <field name="password">anonymous</field>
+        <!-- Avoid auto-including this demo user in any default group -->
         <field name="groups_id" eval="[(5,)]"/>
         <field name="avatar">iVBORw0KGgoAAAANSUhEUgAAAJYAAACWCAAAAAAZai4+AAAMQElEQVR4nO2ce4wV1R3Hv7/fmbvrPliQZWEXWFgWEFgQBRNI0dZW7euPxliTRhNbW5NatammoaaPNKmpKRYiUunDFzEU28YYkRaiaX0hYhUELApaKG90l2VZdmVl2WXvnPPrH/c1M3d2uWdmePzB75+9d+7Mmc/8zjm/+T3OWRJciMLnGyBcLmLZyEUsG7mIZSNOAm2IQAAQQAAEAhBRrCYprjkVI6GPpkXFIIuHJYYJ6D/Wsb+97fiJk339A0ZVDa8bP3lG4xhAjDofWGIUcOifW3ceOFr026Q5V980CSbq2I2B5To49dILL/YAQE4tkhlf0ABG3Pzta+FG7EqJKEZL1/IZANgJuzMrBpxvvCuio7QeFcsVWTsLUEMogxSh7IEBcc8dVlrabyeoM40cRfjS3ihc0bC0bJoOp5R5lkLT1ghckbC0WV1bqiF20PCB/fiKpq30VUiVRgUozOgUY3mDaHaFKkmXeq5O/XehsTVDEc2dzX3Szqp1XPJTZCRRD4KYw+yFyBJtaVSTxGIxRkKmp6ZNG9nYNZUQEgAyo66ZnQrTizLPw250JYfF+OmHG7ZsukWKuQzeH1B2XJEMhHt10fM4+HHGDPwQRf1IqD1oZ7uS0hbpkfcYDWj51VgT1Jeo4+12vZhYJ8qoOlaAkrqWsGdtt2stMW3lfC6RyWG/n7ZrLvnIh04mcJ+ksYzqWE8hNmqYXTMRAzJWAXvOxABgDN/XporeNEL1sLLzEbF6deDWGr0AtOKFzxa//8g01Nq1HxFrfmUq0FO6UYmb6r37GcctOptkyuhzoS1+NGibBMSU2nTfu1xMBZYpZdoqZoyGRcVevGF1YvGy/lQ65HQj11m+EyMHZH4xrpi/zRpkYhPVHbH0T5PBckVeuQYYJDpTuM82ykgEKy2d38Wg4RnzsI+MZZCRBJaWVy4DDzqkU1hsHZIlgOXKCmeIQMjBl11jG/nEx3JllaJB32GUwhWt1lTxsbS8VD44FQM3tEbIjsTFMuZkS7E7moNycMnP+qPkbOJiubJ8MJNMCvjKZrGOqBPAMiZ9HYUqixygeZVIOgpVeDq2dBFufR9hIaDSbt1d99RDR7tBXCx0HA+LTJUu+8G9U+CWlGxKHivcSSfS1y5aAM2RWz8rVQymn7+6QJsYifkkqhhBYf3gL030nDxwVrSlzNd/4cZs+CxgGbqbB7f7pUn8TuQAAUnVVbGfNjaWMUX2IV0et9H4WJWTHT8X6ZpYoz3TSNzCnT5VbAaq4hUTkQDW2ZH4Qz77XCIioEwKILayktJWvqKpQ3PN1pIMllY4/f7h42r8lfUwiZjCeP5WRlxp/3VLJQA0LjwWrYAYkCSwXHm1GQA7DgPTdyfBlUhAtiYFJzvYHUw7oiM5pAljabO7xjOhU7gtUr3VL/HHp9BDPZ6clque26zsKikhEhtL+MA6b7JUaGBN3DYTwDK0q0vEd2BT/D5IwMik/VUekb2nbJNsRZIAVlFWpNeyNhAiCah7Qk1ANzWXxG00PhaZGXN9LjLTnIqQ4p2dJGAg+E4fBcnXwsoYdhL/VS3QX329YLhS6VnvVMV3bWIbZDFycAJSTABIpVD/XgIvxWRe1R/NBaAUA5gfYY1IsSTk2PQsagaAinlP9SXi2CTjBhpG95ZuU9Ewj5JxAxNzmjOOjZELyWkGIEZAcWP8vFygAdkFukr3IpaNXMSykeg5CI/bEMgk5X/QkVeCRzMQIia8duE/iwDRFMXAWmPliU6o6uwhs9eT6qZ09dgsVNdT82aOBgAtbKk1m04UgYCZobt27HhLLctm14w8s2RYbkkGG17dIAyAzMhh1zW3tMyb05gCRJO3e0u4V0lidDoTK3e/ufLez9cqVG7PuwpGfwsOcsH+s/mg2pUHAaBq7veffKNLRETSbol5gBKwjE6ntYhI/4F/PXzjpDIAoIo3CyG9lr4FcEBE5GCRJ9R35TsoZwBINd+8fENbBi1dQo5iaCxjXNcVETndvfH3d3wus1BGOaqMVspA4TQthyeDATDu9FbqjHtyPhSxykyP8Tfc/+yeUyIi2nWH9soGxzI6nbnDwO7V919bT1kiJoLCbyTtPdeVrWNAYHzTrwotB5vAAIiVwwBQOev2Fe/1ioiYoXo0FMtoN3PJwKH1S2+9fExmMDu5ma5wh0n7r0jLYjhEFfsCvqkr/x6WNxCUXV0/fPpNi9d/rEVE9CBsRTNRRDKrP/p2bv5o5+4OAHBgRPJlAaVv/ENw1SuZk4DA9AXsjXIXPHkrZa2QaIDA9NmJXWtQP+PK2dc0OQxooMi0ebEERkgRYPbv2rHzncMaABPE+BYZsZ73VEVwQRLTAQiQPjozwOW4t+x5wJOSkCyFtLevR/nsBbNmT68BoIXYG8XlsTSYoKAPtW3btr31GAAwS3HlBISb69ygkknvgoDNkaKkCJvvLT4VMNoGADHM6S1bUFl/+fx5k8aVAzCeCqSnQ/v3vHD/9fWZxkL3fWR+QsuJ4JIZIx0jQFBYKoFBJ2n50aA2mzhbNK79wsJ/7Pdemcd6+6HbWioZAKngur+AKPwlmIbU8hYDcPCTIJY2H1YPadyJM/Glqp57558O5NaXZLCMkesBwEmVUMhlXNUXmD6urAABDm4JArty16CrNzxsynEA4Jnc5Rl/iwyanXKGm9ZnfnUbtW1dYHOBoBUMCHrAvgYM/++vJSRKRLsuOFU5MzfsOdfuBNctPc/yWGAmEvaDAMGJgYC26dHPuEQnRdIVjQEswujSE4uaNmz0reIUdg9CAEHHp75mDO9YWXJWiTBlZO5zHmt86OKPcFHmCb+jRt1tGZyj/pXDgiWnSlUWCNNY/NoCGpzSk1Ka1273rhURnGiDAMI9x73aMvzBmtJ3OxCmIu+25Q6Nqyn1ckCod6nvOw71cmZD52H/eb/rLdn9JYOW/Jc8Vk1d6VgwtHa3Tw37cqr+xKMtrXY8V7y+efBGKxrznZf7a6jWIrMo3LPSd/a+3IdDvvMW9ZbcJAijJuYR8lhlE2wSnoZWdhbGMmFPFheefZ1GbX3eKrnbWCdBLNBEGyxR7U/nx6ewuy/Td4SufCsCLHNLnoYAoblgpAtRdVPpUAA0Huss7JHp+iyDJWjPJwPtpiEAzCh8zDVCaLQq1Ig6uDrXQ4JPjufU8ml3buqR/LbPQlkQzCn0VwGrPlgjOUMr9ETOjTI42MPZpk92ZZ/O8NvP22xoI6meWowFNIwo2p8zlBj+z4v5PtqdP9zTmf/4SNoqZJfLxoRpa/gltrWHx3N1Q9mVGwA0kH0pat60tvQ9jAAY44aJ51u2PakaaYel6fUXM6OLB/ZksYTRkZuTj7hWSSrCJOjiTjSYYNMKAMbjGXWw25bXFg6DAGje+He7rZLiefX40m7jLLE0vbyNDWDQ6jGinRmdm0VpuyGhaaoHxoM10RILnP4jAAj29ecXAOEoGNDqjdfsbBbBOxG9WPW2WIbX7WUD4KDHtB/JeBKPpG3r1RO99/dgNdpWJ4W7l8NAsN/TzLEBiOENL1uuhWBMTZkQbRHGVNvWcjX9+bAjjD0ebbX3ADLwYNi+mqGEMM2rXg9WlY1rk4GgnhXQ3F+IpQV9ndDq9ddsdywLZoRiATWWG6oAgFZ1KnS1FuIAlm6QWWLdjuZxXpaCtkzFKNvGYPjQGsLRo4W3DA+0Qb1su18ZhNomr1IKhELjI1S+aWk3DnntuXyC9MMh+8jOJOObJBwLY+3XoGjevUYO+B7nY7xgabMAMGb6pm4BizAqwtIYweO0y3fkY3dZlNLFXN837+u00SKCzYmhLRtafWk1943NVq5D9rLJ/hHkSQZtt4hg86Loi/63xuXFW8HPKISyHb6sawHLSJela5OcMCZ3+DbeeB+sujESVvCaKJUnNF7qO+Ad8qmmSFjBeRKh5kZodnz/GsGjLYNo2kpADFr8T+M1hLDcZZycCKb4NeLDsvVPkxKS8mmDYgHjYBWTJSgN4/0kni+EusrYy9QiCaGp3G+BfVijLVJvSQqhJeWfvz6s2gRWz0URwhWBI14sqR5zTmnyImWBEe8baOfLcJEe0zwEFjD2XNLkhTC8PgDi/2Yb7ycjhCnBf+PgxxoXe410NGkJ3teLRZhwnrCmBw/4tXVpVezVyBHE8LTgIb+2Kkach6lIMnps0KH1YZnhDecBizFhZHDs/B9R17D2kvkawAAAAABJRU5ErkJggg==</field>
     </record>
+
+    <!--
+        A group dedicated to the anonymous user only, making groups
+        restrictions more convenient.
+    -->
+    <record id="group_anonymous" model="res.groups">
+        <field name="name">Anonymous Group</field>
+    </record>
+
+    <!-- Insert the anonymous user in its group -->
+    <record id="portal" model="res.portal">
+        <field name="users" eval="[(4,ref('anonymous_user'))]"/>
+    </record>
   </data>
 </openerp>

From 2cab96413b418548bbf7bd6c5f5b238ed2b9106a Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 17 Jul 2012 15:24:47 +0200
Subject: [PATCH 124/171] [FIX] stupid error

bzr revid: abo@openerp.com-20120717132447-t14of0bhlqfybwcu
---
 addons/anonymous/anonymous.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/addons/anonymous/anonymous.xml b/addons/anonymous/anonymous.xml
index 82e679acb1b..8ce9177aba1 100644
--- a/addons/anonymous/anonymous.xml
+++ b/addons/anonymous/anonymous.xml
@@ -16,10 +16,6 @@
     -->
     <record id="group_anonymous" model="res.groups">
         <field name="name">Anonymous Group</field>
-    </record>
-
-    <!-- Insert the anonymous user in its group -->
-    <record id="portal" model="res.portal">
         <field name="users" eval="[(4,ref('anonymous_user'))]"/>
     </record>
   </data>

From a3aad2fe1c2c6ad4f7f6a73d06ec2c8289c93379 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Jul 2012 16:13:54 +0200
Subject: [PATCH 125/171] [FIX] some problem with browser caching, now uses
 Cache-Control: no-cache

bzr revid: nicolas.vanhoren@openerp.com-20120717141354-3dw33sh8oohtbte0
---
 addons/web/common/http.py | 62 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 61 insertions(+), 1 deletion(-)

diff --git a/addons/web/common/http.py b/addons/web/common/http.py
index cc76a554693..a1d28536cd4 100644
--- a/addons/web/common/http.py
+++ b/addons/web/common/http.py
@@ -452,7 +452,7 @@ class Root(object):
 
         static_dirs = self._load_addons(openerp_addons_namespace)
         if options.serve_static:
-            self.dispatch = werkzeug.wsgi.SharedDataMiddleware(
+            self.dispatch = SuperSharedDataMiddleware(
                 self.dispatch, static_dirs, cache=False)
 
         if options.session_storage:
@@ -555,6 +555,66 @@ class Root(object):
                         return m
                 ps, _slash, meth = ps.rpartition('/')
         return None
+    
+class SuperSharedDataMiddleware(werkzeug.wsgi.SharedDataMiddleware):
+    def __call__(self, environ, start_response):
+        import os
+        import mimetypes
+        import werkzeug.http
+        # sanitize the path for non unix systems
+        cleaned_path = environ.get('PATH_INFO', '').strip('/')
+        for sep in os.sep, os.altsep:
+            if sep and sep != '/':
+                cleaned_path = cleaned_path.replace(sep, '/')
+        path = '/'.join([''] + [x for x in cleaned_path.split('/')
+                                if x and x != '..'])
+        file_loader = None
+        for search_path, loader in self.exports.iteritems():
+            if search_path == path:
+                real_filename, file_loader = loader(None)
+                if file_loader is not None:
+                    break
+            if not search_path.endswith('/'):
+                search_path += '/'
+            if path.startswith(search_path):
+                real_filename, file_loader = loader(path[len(search_path):])
+                if file_loader is not None:
+                    break
+        if file_loader is None or not self.is_allowed(real_filename):
+            return self.app(environ, start_response)
+
+        guessed_type = mimetypes.guess_type(real_filename)
+        mime_type = guessed_type[0] or self.fallback_mimetype
+        f, mtime, file_size = file_loader()
+        
+        etag = self.generate_etag(mtime, file_size, real_filename)
+        modified = werkzeug.http.is_resource_modified(environ, etag, last_modified=mtime)
+        
+        headers = [('Date', werkzeug.http.http_date())]
+        if self.cache:
+            timeout = self.cache_timeout
+            headers += [
+                ('Etag', '"%s"' % etag),
+                ('Cache-Control', 'max-age=%d, public' % timeout)
+            ]
+            if modified:
+                headers.append(('Expires', werkzeug.http.http_date(time() + timeout)))
+        else:
+            headers.append(('Cache-Control', 'no-cache'))
+            
+        if not modified:
+            f.close()
+            start_response('304 Not Modified', headers)
+            return []
+
+        headers.extend((
+            ('Content-Type', mime_type),
+            ('Content-Length', str(file_size)),
+            ('Last-Modified', werkzeug.http.http_date(mtime))
+        ))
+        start_response('200 OK', headers)
+        return werkzeug.wsgi.wrap_file(environ, f)
+
 
 class LibException(Exception):
     """ Base of all client lib exceptions """

From 7bc0699330ba6f477c14b5f5c366ea564ac17c6d Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Tue, 17 Jul 2012 16:47:33 +0200
Subject: [PATCH 126/171] various improvements

bzr revid: mit@openerp.com-20120717144733-jxlf113kuwga98ug
---
 addons/web/static/src/css/base.css           | 26 +++++++++-----------
 addons/web/static/src/css/base.sass          | 19 ++++++--------
 addons/web/static/src/xml/base.xml           |  4 +--
 addons/web_kanban/static/src/css/kanban.css  |  6 +++--
 addons/web_kanban/static/src/css/kanban.sass | 17 +++++++------
 5 files changed, 33 insertions(+), 39 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index c48ab0e3012..0a3d24d41f4 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;
@@ -234,14 +234,13 @@
 .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;
+  margin: 0;
 }
 .openerp.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
   float: left;
@@ -1855,9 +1854,12 @@
   font-weight: bold;
   font-size: 18px;
 }
+.openerp .oe_form .oe_subtotal_footer label:after {
+  content: ":";
+}
 .openerp .oe_form .oe_subtotal_footer label.oe_subtotal_footer_separator {
   font-weight: bold !important;
-  padding: 2px 8px 2px 0px !important;
+  padding: 2px 11px 2px 0px !important;
 }
 .openerp .oe_form .oe_subtotal_footer label.oe_form_label_help {
   font-weight: normal;
@@ -2061,15 +2063,6 @@
 .openerp .oe_form .oe_form_field_with_button.oe_no_button > .oe_button {
   display: none;
 }
-.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;
@@ -2148,9 +2141,12 @@
 }
 .openerp .oe_form_field_many2one span.oe_m2o_drop_down_button {
   position: absolute;
-  top: 1px;
+  top: 2px;
   right: 0px;
 }
+.openerp .oe_form_field_many2one .oe_m2o_cm_button {
+  line-height: 14px;
+}
 .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 8a2c510ec42..fb67945a02d 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -232,11 +232,10 @@ $sheet-max-width: 860px
         .ui-dialog-buttonpane
             border-top: 1px solid #e0e0e0
             background: #f5f7f9
-            padding: 8px
             margin: 0
             @include radius(0 0 2px 2px)
             button
-                margin-left: 8px
+                margin: 0
             .ui-dialog-buttonset
                 float: left
         .ui-dialog-titlebar-close
@@ -1444,9 +1443,11 @@ $sheet-max-width: 860px
             border-top: 1px solid #cacaca
             font-weight: bold
             font-size: 18px
+        label:after
+            content: ":"
         label.oe_subtotal_footer_separator
             font-weight: bold !important
-            padding: 2px 8px 2px 0px !important
+            padding: 2px 11px 2px 0px !important
         label.oe_form_label_help
             font-weight: normal
     // no sheet in popups
@@ -1610,14 +1611,6 @@ $sheet-max-width: 860px
         .oe_form_field_with_button.oe_no_button > .oe_button
             display: none
         .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
             > .oe_button
                 float: right
                 @include radius(0)
@@ -1691,8 +1684,10 @@ $sheet-max-width: 860px
             position: relative
         span.oe_m2o_drop_down_button
             position: absolute
-            top: 1px
+            top: 2px
             right: 0px
+        .oe_m2o_cm_button
+            line-height: 14px
     // }}}
     // 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 2d9caa43bbd..0ade5dd4d89 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -945,9 +945,7 @@
     <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">
-                <img t-att-src='_s + "/web/static/src/img/icons/terp-folder-yellow.png"'/>
-            </button>
+            <a href="#" class="oe_m2o_cm_button oe_e oe_right">/</a>
             <div>
                 <input type="text"
                     t-att-id="widget.id_for_label"
diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index bfb10793b77..868fa9783fd 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -1,6 +1,5 @@
-@charset "utf-8";
 .openerp .oe_kanban_view {
-  background: url(data:image/pngbase64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAAKElEQVQIHWP8DwTv379nAAFBQUEGhnfv3oHEwADEZgJLIRGMIClkLQCr3x2Htp/lLwAAAABJRU5ErkJggg==);
+  background: url(/web/static/src/img/form_sheetbg.png);
   height: inherit;
 }
 .openerp .oe_kanban_view .ui-sortable-placeholder {
@@ -239,6 +238,9 @@
 .openerp .oe_kanban_view .oe_kanban_grouped .oe_kanban_show_more .oe_button {
   width: 100%;
 }
+.openerp .oe_kanban_view .oe_kanban_ungrouped {
+  background: white;
+}
 .openerp .oe_kanban_view .oe_kanban_ungrouped .oe_kanban_record {
   float: left;
   padding: 2px;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 6a601ec9988..fb5bdc9dcbb 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -21,7 +21,8 @@
 
 .openerp .oe_kanban_view
     // KanbanView {{{
-    background: url(data:image/pngbase64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAAKElEQVQIHWP8DwTv379nAAFBQUEGhnfv3oHEwADEZgJLIRGMIClkLQCr3x2Htp/lLwAAAABJRU5ErkJggg==)
+    //background: url(data:image/pngbase64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAAKElEQVQIHWP8DwTv379nAAFBQUEGhnfv3oHEwADEZgJLIRGMIClkLQCr3x2Htp/lLwAAAABJRU5ErkJggg==)
+    background: url(/web/static/src/img/form_sheetbg.png)
     height: inherit
     .ui-sortable-placeholder
         border: 1px dotted black
@@ -214,12 +215,14 @@
         text-align: center
     .oe_kanban_grouped .oe_kanban_show_more .oe_button
         width: 100%
-    .oe_kanban_ungrouped .oe_kanban_record
-        float: left
-        padding: 2px
-        box-sizing: border-box
-        -moz-box-sizing: border-box
-        -webkit-box-sizing: border-box
+    .oe_kanban_ungrouped
+        background: white
+        .oe_kanban_record
+            float: left
+            padding: 2px
+            box-sizing: border-box
+            -moz-box-sizing: border-box
+            -webkit-box-sizing: border-box
     .oe_kanban_action_button
         height: 22px
         margin: 0

From 8f247dcab52a89172855dc2a14d2a7d4fdae351b Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Jul 2012 16:55:25 +0200
Subject: [PATCH 127/171] [IMP] improved static files delivery

bzr revid: nicolas.vanhoren@openerp.com-20120717145525-hfs15vizjdzdwuht
---
 addons/web/common/http.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/addons/web/common/http.py b/addons/web/common/http.py
index a1d28536cd4..cd17f5711e0 100644
--- a/addons/web/common/http.py
+++ b/addons/web/common/http.py
@@ -557,10 +557,15 @@ class Root(object):
         return None
     
 class SuperSharedDataMiddleware(werkzeug.wsgi.SharedDataMiddleware):
+    """Redefine SharedDataMiddleware to better handle the cache = False directive.
+    Also desactivate 304 Not Modified headers only when the referer has 'debug' in its
+    arguments.
+    """
     def __call__(self, environ, start_response):
         import os
         import mimetypes
         import werkzeug.http
+        import urlparse
         # sanitize the path for non unix systems
         cleaned_path = environ.get('PATH_INFO', '').strip('/')
         for sep in os.sep, os.altsep:
@@ -602,7 +607,11 @@ class SuperSharedDataMiddleware(werkzeug.wsgi.SharedDataMiddleware):
         else:
             headers.append(('Cache-Control', 'no-cache'))
             
-        if not modified:
+        referer = environ.get('HTTP_REFERER', '')
+        parsed = urlparse.urlparse(referer)
+        debug = not urlparse.parse_qs(parsed.query).has_key('debug')
+        # it's important to put it at the end
+        if not debug and not modified:
             f.close()
             start_response('304 Not Modified', headers)
             return []

From 3b271f68ee95c11e78c64c9de830a4515dc38258 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 17 Jul 2012 17:19:01 +0200
Subject: [PATCH 128/171] [IMP] warehouse: usability, review of form views

bzr revid: qdp-launchpad@openerp.com-20120717151901-nfrwk9h2h5pb9s0z
---
 addons/account/account_view.xml               |   8 +-
 addons/delivery/delivery_view.xml             |  73 ++++++-----
 addons/procurement/procurement_view.xml       |  20 ++-
 addons/purchase/stock_view.xml                |   4 +-
 addons/sale/stock_view.xml                    |   4 +-
 addons/stock/stock_view.xml                   | 117 ++++--------------
 addons/stock_planning/stock_planning_view.xml |  48 ++++---
 7 files changed, 100 insertions(+), 174 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index f2c24feacb7..d6650ce4999 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -921,15 +921,15 @@
             <field name="arch" type="xml">
                 <form string="Account Tax" version="7.0">
                     <group>
-			<group>
+                        <group>
                             <field name="name"/>
                             <field name="description"/>
-			<group>
-			</group>
+                        </group>
+                        <group>
                             <field name="type_tax_use"/>
                             <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                             <field name="active"/>
-			</group>
+                        </group>
                     </group>
                     <notebook>
                         <page string="Tax Definition">
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 85315721a73..457b2d38c90 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -22,11 +22,22 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Carrier" version="7.0">
-                    <group col="4" name="general">
-                        <field name="name"/>
-                        <field name="partner_id"/>
-                        <field name="product_id"/>
+                    <div class="oe_title">
+                        <label for="name" class="oe_edit_only"/>
+                        <h1>
+                            <field name="name"/>
+                        </h1>
+                    </div>
+                    <group>
+                        <group name="general">
+                            <field name="partner_id"/>
+                            <field name="product_id"/>
+                        </group>
+                        <group>
                         <field name="active"/>
+                        </group>
+                    </group>
+                    <group col="4">
                         <group string="Pricing Information">
                             <field name="normal_price" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
                             <label for="free_if_more_than"/>
@@ -76,7 +87,6 @@
                             </notebook>
                         </form>
                    </field>
-
                 </form>
             </field>
         </record>
@@ -152,18 +162,28 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Grid Lines" version="7.0">
-                    <field colspan="4" name="name"/>
-                    <div>
-                        <label string="condition" for="type"/>
-                        <field name="type" class="oe_inline"/>
-                        <field name="operator" class="oe_inline"/>
-                        <field name="max_value" class="oe_inline"/>
-                    </div>
-                    <group col="4">
-                        <field name="list_price"/>
-                        <field name="standard_price"/>
-                        <field name="price_type"/>
-                        <field name="variable_factor" attrs="{'invisible':[('price_type','=','fixed')]}"/>
+                    <group>
+                        <field name="name"/>
+                    </group>
+                    <group>
+                        <group>
+                            <label for="type" string="Condition"/>
+                            <div>
+                                <field name="type" class="oe_inline"/>
+                                <field name="operator" class="oe_inline"/>
+                                <field name="max_value" class="oe_inline"/>
+                            </div>
+                            <label for="price_type"/>
+                            <div>
+                                <field name="price_type" class="oe_inline"/>
+                                <label string=" in Function of " class="oe_inline" attrs="{'invisible':[('price_type','=','fixed')]}"/>
+                                <field name="variable_factor" attrs="{'invisible':[('price_type','=','fixed')]}" class="oe_inline"/>
+                            </div>
+                        </group>
+                        <group>
+                            <field name="list_price"/>
+                            <field name="standard_price"/>
+                        </group>
                     </group>
                 </form>
             </field>
@@ -242,23 +262,10 @@
             <field name="model">stock.move</field>
             <field name="inherit_id" ref="stock.view_move_form"/>
             <field name="arch" type="xml">
-                <field name="picking_id" position="after">
+                <xpath expr="//group[@name='main_grp']" position="inside">
                     <field name="weight"/>
                     <field name="weight_net"/>
-                </field>
-            </field>
-        </record>
-
-        <record id="view_move_reception_picking_withweight_form" model="ir.ui.view">
-            <field name="name">stock.move.reception.packing.form.weight</field>
-            <field name="type">form</field>
-            <field name="model">stock.move</field>
-            <field name="inherit_id" ref="stock.view_move_form_reception_picking"/>
-            <field name="arch" type="xml">
-                <field name="picking_id">
-                    <field name="weight"/>
-                    <field name="weight_net"/>
-                </field>
+                </xpath>
             </field>
         </record>
 
@@ -276,7 +283,7 @@
                             <button name="delivery_set" string="Add in Quote" type="object"
                                 class="oe_edit_only"
                                 attrs="{'invisible':['|',('carrier_id','=',False),('state','not in',('draft','sent'))]}"/>
-        		    <br/>
+                            <br/>
                             <label string="If you don't 'Add in Quote', the exact price will be computed when invoicing based on delivery order(s)."
                                 class="oe_edit_only"
                                 attrs="{'invisible':['|',('carrier_id','=',False),('state','not in',('draft','sent'))]}"/>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 9e50f788c43..3085eb6d672 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -59,20 +59,18 @@
                     <h1>
                         <field name="name" class="oe_inline"/>
                         <label string="-" attrs="{'invisible':[('origin','=',False)]}"/>
-                        <field name="origin"  class="oe_inline"/>
+                        <field name="origin" class="oe_inline"/>
                     </h1>
-                    <label for="message" class="oe_edit_only"/>
-                    <h2>
-                        <field name="message"/>
-                    </h2>
                     <group>
                         <group>
                             <field name="date_planned"/>
                             <field name="procure_method"/>
                             <field name="priority"/>
+                        </group>
+                        <group>
+                            <field name="message"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                         </group>
-                        <group/>
                     </group>
                     <notebook>
                     <page string="Procurement Details">
@@ -84,10 +82,10 @@
                                     <field name="product_qty" class="oe_inline"/>
                                     <field name="product_uom" class="oe_inline"/>
                                 </div>
-                                <label for="product_uos_qty" string="Quentity UoS" groups="product.group_uos"/>
-                                <div>
-                                    <field name="product_uos_qty" groups="product.group_uos" class="oe_inline"/>
-                                    <field name="product_uos"  groups="product.group_uos" class="oe_inline"/>
+                                <label for="product_uos_qty" groups="product.group_uos"/>
+                                <div groups="product.group_uos">
+                                    <field name="product_uos_qty" class="oe_inline"/>
+                                    <field name="product_uos" class="oe_inline"/>
                                 </div>
                             </group>
                             <group>
@@ -96,7 +94,7 @@
                         </group>
                     </page>
                     <page string="Extra Information">
-                        <group string="Details">
+                        <group>
                             <field name="move_id"/>
                             <field name="date_close"/>
                             <field name="close_move"/>
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 43dad88c4f9..94210926075 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -7,8 +7,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="stock.view_move_form"/>
             <field name="arch" type="xml">
-                 <xpath expr="//field[@name='tracking_id']" position="before">
-                    <field name="purchase_line_id" colspan="2" />
+                 <xpath expr="//group[@name='destination_grp']" position="inside">
+                    <field name="purchase_line_id"/>
                 </xpath>
             </field>
         </record>      
diff --git a/addons/sale/stock_view.xml b/addons/sale/stock_view.xml
index 242d2c4cef6..daef529b97b 100644
--- a/addons/sale/stock_view.xml
+++ b/addons/sale/stock_view.xml
@@ -19,8 +19,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="stock.view_move_form"/>
             <field name="arch" type="xml">
-                 <xpath expr="//field[@name='tracking_id']"  position="before">
-                    <field name="sale_line_id" colspan="2"/>
+                 <xpath expr="//group[@name='origin_grp']"  position="inside">
+                    <field name="sale_line_id"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 934e1e19da0..ceed0808ef4 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -124,14 +124,13 @@
                     <div>
                         <label for="name" class="oe_edit_only"/>
                         <h1>
-                            <field name="name" placeholder="Annual inventory"  class="oe_inline"/> -
+                            <field name="name" placeholder="e.g. Annual inventory" class="oe_inline"/> -
                             <field name="date" class="oe_inline"/>
                         </h1>
                     </div>
-                    <label for="company_id" groups="base.group_multi_company" class="oe_edit_only"/>
-                    <h2>
+                    <group>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    </h2>
+                    </group>
                     <notebook>
                     <page string="General Informations">
                         <field name="inventory_line_id">
@@ -336,7 +335,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Serial Number" version="7.0">
-                    <div class="oe_button_box">
+                    <div class="oe_button_box oe_right">
                         <button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': '', 'field': 'prodlot_id'}" icon="gtk-go-up"/>
                         <button name="action_traceability" string="Downstream Traceability" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}" icon="gtk-go-down"/>
                     </div>
@@ -346,7 +345,7 @@
                             <field name="name"/>
                         </h1>
                     </div>
-                    <group string="Serial Number Identification">
+                    <group>
                         <group>
                             <field name="product_id"/>
                             <field name="prefix"/>
@@ -1227,14 +1226,15 @@
                 <form string="Stock Moves" version="7.0">
                 <header>
                     <button name="action_confirm" states="draft" string="Process Later" type="object" class="oe_highlight"/>
-                    <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object" class="oe_highlight"/>
+                    <button name="%(action_partial_move_server)d" string="Process Partially" type="action" states="assigned" class="oe_highlight"/>
+                    <button name="action_done" states="draft,assigned,confirmed" string="Process Entirely" type="object" class="oe_highlight"/>
                     <button name="force_assign" states="confirmed" string="Set Available" type="object" class="oe_highlight"/>
                     <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
                 </header>
                 <sheet>
                     <group>
-                        <group>
+                        <group name="main_grp" string="Details">
                             <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
                             <label for="product_qty"/>
                             <div>
@@ -1247,29 +1247,28 @@
                                         icon="gtk-convert" context="{'scrap': True}"
                                         states="draft,waiting,confirmed,assigned" colspan="1"/>
                             </div>
-                            <label for="product_uso_qty" />
-                            <div>
+                            <label for="product_uos_qty" groups="product.group_uos"/>
+                            <div groups="product.group_uos">
                                 <field name="product_uos_qty" 
-                                    groups="product.group_uos" 
                                     on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" 
                                     class="oe_inline"/>
-                                <field name="product_uos" groups="product.group_uos" colspan="4" class="oe_inline"/>
+                                <field name="product_uos" class="oe_inline"/>
                             </div>
                             <field name="name" string="Reason"/>
-                        </group>
-                        <group>
-                            <field name="picking_id"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            <field name="location_id" groups="stock.group_locations"/>
-                            <field name="location_dest_id" groups="stock.group_locations"/>
-                            <field name="create_date" groups="base.group_no_one" />
-                            <field name="date" groups="base.group_no_one" />
                         </group>
-                        <group>
+                        <group name="origin_grp" string="Origin">
+                            <field name="picking_id"/>
+                            <field name="location_id" groups="stock.group_locations"/>
+                            <field name="create_date" groups="base.group_no_one"/>
+                        </group>
+                        <group name="destination_grp" string="Destination">
+                            <field name="location_dest_id" groups="stock.group_locations"/>
                             <field name="partner_id" context="{'contact_display':'partner'}"/>
                             <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
+                            <field name="date" groups="base.group_no_one" />
                         </group>
-                        <group>
+                        <group string="Tracability">
                             <label for="tracking_id"/>
                             <div>
                                 <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/>
@@ -1409,80 +1408,6 @@
             </field>
         </record>
 
-
-        <record id="view_move_form_reception_picking" model="ir.ui.view">
-            <field name="name">stock.move.form2</field>
-            <field name="model">stock.move</field>
-            <field name="type">form</field>
-            <field eval="6" name="priority"/>
-            <field name="arch" type="xml">
-                <form string="Receive Products" version="7.0">
-                <header>
-                    <button name="action_confirm" states="draft" string="Process Later" type="object" class="oe_highlight"/>
-                    <button name="force_assign" states="confirmed" string="Set Available" type="object" class="oe_highlight"/>
-                    <button name="%(action_partial_move_server)d" string="Process" type="action" states="assigned" class="oe_highlight"/>
-                    <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object"/>
-                    <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
-                </header>
-                <sheet>
-                <group>
-                    <group>
-                        <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
-                        <label for="product_qty"/>
-                        <div>
-                            <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
-                            <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_inline"/> 
-                            <button name="%(stock.move_scrap)d"
-                                string="Scrap" type="action"
-                                icon="gtk-convert" context="{'scrap': True}"
-                                states="draft,waiting,confirmed,assigned" colspan="1"/>
-                        </div>
-                        <label for="product_uos_qty"/>
-                        <div>
-                            <field name="product_uos_qty" groups="product.group_uos" class="oe_inline"
-                                on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)"/>
-                            <field name="product_uos" groups="product.group_uos" class="oe_inline"/>
-                        </div>
-                        <field name="name" string="Reason"/>
-                        <field name="company_id" groups="base.group_multi_company"/>
-                        <field name="location_id" groups="stock.group_locations"/>
-                        <field name="location_dest_id" groups="stock.group_locations"/>
-                        <field name="partner_id" groups="stock.group_locations"/>
-                    </group>
-                    <group>
-                        <field name="picking_id"/>
-                        <field name="create_date" groups="base.group_no_one" />
-                        <field name="date" groups="base.group_no_one" string="Move Date"/>
-                    </group>
-                    <group>
-                        <field name="partner_id" groups="stock.group_locations"/>
-                        <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
-                        <label for="tracking_id"/>
-                        <div>
-                            <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/>
-                            <button name="%(split_into)d" string="New Pack" type="action"
-                              groups="product.group_stock_packaging"
-                              icon="terp-stock_effects-object-colorize"
-                              states="draft,assigned,confirmed,done" class="oe_inline"/>
-                        </div>
-                        <label for="prodlot_id"/>
-                        <div>
-                            <field name="prodlot_id" groups="stock.group_production_lot"
-                                context="{'location_id':location_id, 'product_id':product_id}"
-                                domain="[('product_id','=?',product_id)]" class="oe_inline"
-                                on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)"/>
-                            <button name="%(track_line)d"
-                                groups="stock.group_tracking_lot" class="oe_inline"
-                                states="draft,waiting,confirmed,assigned,done"
-                                string="Split" type="action" icon="terp-stock_effects-object-colorize" />
-                        </div>
-                    </group>
-                </group>
-                </sheet>
-                </form>
-            </field>
-        </record>
-
         <record id="view_move_search_reception_incoming_picking" model="ir.ui.view">
             <field name="name">stock.move.incoming.search2</field>
             <field name="model">stock.move</field>
@@ -1567,7 +1492,7 @@
         <record model="ir.actions.act_window.view" id="action_move_reception_picking_form">
             <field name="sequence" eval="2"/>
             <field name="view_mode">form</field>
-            <field name="view_id" ref="view_move_form_reception_picking"/>
+            <field name="view_id" ref="view_move_form"/>
             <field name="act_window_id" ref="action_reception_picking_move"/>
         </record>
 
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 31276b15f50..a2fdc9788e1 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -255,51 +255,47 @@
                             <field name="product_uom"
                                          domain = "[('category_id','in',[product_uom_categ,product_uos_categ])]"
                                          on_change = "onchange_uom(product_uom, product_id, active_uom, planned_outgoing, to_procure)"/>
-                            <field name="active_uom" invisible = "True" />
-                        </group>
-                        <group string="Minimum Stock Rule Indicators">
-                            <field name="minimum_op"/>
-                            <field name="maximum_op"/>
-                        </group>
-                    </group>
-                    <group>
-                        <group string="Current Period Situation">
+                            <field name="active_uom" invisible = "True"/>
+                            <separator string="Current Period Situation" colspan="2"/>
                             <field name="stock_start"/>
                             <field name="already_out"/>
                             <field name="already_in"/>
-                        </group>
-                        <group string="Forecasts">
+                            <separator string="Minimum Stock Rule Indicators" colspan="2"/>
+                            <field name="minimum_op"/>
+                            <field name="maximum_op"/>
+                            <separator string="Forecasts" colspan="2"/>
                             <field name="warehouse_forecast"/>
                             <field name="company_forecast"/>
                             <field name="confirmed_forecasts_only"/>
                         </group>
-                    </group>
-                    <group>
-                        <group string="Planning and Situation for Calculated Period">
+ 
+                        <group>
+                            <button name="calculate_planning" string="Compute Planning" type="object" icon="gtk-execute"/>
+                            <separator string="Planning and Situation for Calculated Period" colspan="2"/>
                             <field name="planned_outgoing"/>
                             <field name="outgoing"/>
                             <field name="outgoing_left"/>
                             <field name="to_procure"/>
                             <field name="incoming"/>
-                            <field name="incoming_left"/>
-                            <button name="calculate_planning" string="Calculate Planning" type="object" icon="gtk-execute" colspan="2"/>
+                            <label for="incoming_left"/>
+                            <div>
+                                <field name="incoming_left" class="oe_inline"/>
+                                <button name="procure_incomming_left" icon="gtk-convert" string="Make Procurement" type="object" class="oe_inline"/>
+                                <button name="internal_supply" string="Make Picking" help="Supply from Another Warehouse" icon="gtk-convert" type="object" class="oe_inline"/>
+                            </div>
                             <field name="stock_only"/>
-                        </group>
-                        <group string="Calculated Period Simulation">
+                            <separator string="Calculated Period Simulation" colspan="2"/>
                             <field name="outgoing_before"/>
                             <field name="incoming_before"/>
                             <field name="stock_simulation"/>
-                            <button name="procure_incomming_left" icon="gtk-convert" string="Procure Incoming Left" type="object" colspan="2"/>
                             <field name="procure_to_stock"/>
+                            <separator string="Internal Supply" colspan="2"/>
+                            <field name="supply_warehouse_id" domain = "[('company_id','=',company_id)] "/>
+                            <field name="stock_supply_location"/>
                         </group>
                     </group>
-                    <group string="Internal Supply">
-                        <button name="internal_supply" string="Supply from Another Warehouse" icon="gtk-convert"  type="object" colspan="2"/>
-                        <field name="supply_warehouse_id" domain = "[('company_id','=',company_id)] "/>
-                        <field name="stock_supply_location"/>
-                    </group>
-                    <group string="Procurement History">
-                        <field name="history" nolabel = "1"/>
+                    <group string="Procurement History" colspan="4">
+                        <field name="history" nolabel="1" colspan="4"/>
                     </group>
                 </form>
             </field>

From 0aa8726201cbc014b06ccaf9d6c536f893167f58 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 17 Jul 2012 17:55:39 +0200
Subject: [PATCH 129/171] [FIX] web_dashboard: allow columns without actions

bzr revid: chs@openerp.com-20120717155539-dludvgbvhzfpsx83
---
 addons/web_dashboard/static/src/js/dashboard.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js
index 0754bfd7e2b..a19151af33c 100644
--- a/addons/web_dashboard/static/src/js/dashboard.js
+++ b/addons/web_dashboard/static/src/js/dashboard.js
@@ -37,11 +37,12 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
                 delete(action.attrs.width);
                 delete(action.attrs.height);
                 delete(action.attrs.colspan);
-                self.rpc('/web/action/load', {
-                    action_id: parseInt(action.attrs.name, 10)
-                }, function(result) {
-                    self.on_load_action(result, column_index + '_' + action_index, action.attrs);
-                });
+                var action_id = _.str.toNumber(action.attrs.name);
+                if (!_.isNaN(action_id)) {
+                    self.rpc('/web/action/load', {action_id: action_id}, function(result) {
+                        self.on_load_action(result, column_index + '_' + action_index, action.attrs);
+                    });
+                }
             });
         });
     },

From c1d7f61d1fef37609179edee3d5e0374c9f25ca7 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 17 Jul 2012 17:56:11 +0200
Subject: [PATCH 130/171] [FIX] web_dashboard: generate a valid view

bzr revid: chs@openerp.com-20120717155611-ns8w0u1u0niq1q30
---
 addons/web_dashboard/static/src/xml/web_dashboard.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web_dashboard/static/src/xml/web_dashboard.xml b/addons/web_dashboard/static/src/xml/web_dashboard.xml
index 5ca2551255c..68dda7d7f67 100644
--- a/addons/web_dashboard/static/src/xml/web_dashboard.xml
+++ b/addons/web_dashboard/static/src/xml/web_dashboard.xml
@@ -48,7 +48,7 @@
     </div>
 </t>
 <t t-name="DashBoard.xml">
-    <form t-att-string="form_title">
+    <form t-att-string="form_title" version="7.0">
         <board t-att-style="style">
             <column t-foreach="columns" t-as="column">
                 <action t-foreach="column" t-as="action" t-att="action"/>

From bed5bf4804480c0b38d9fccef855db2b292e8025 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Tue, 17 Jul 2012 19:30:02 +0200
Subject: [PATCH 131/171] improved task kanban view

bzr revid: mit@openerp.com-20120717173002-0m3f3uicefpmcu2l
---
 addons/project/project_view.xml | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 9e4f3c44a27..a70bc504299 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -517,22 +517,16 @@
                     <t t-name="kanban-box">
                         <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card 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>
                                     <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                                 </ul>
                             </div>
+
                             <div class="oe_kanban_content">
-                                <div>
-                                    <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);"/>
-                                    <b><field name="name"/></b>
-                                </div>
-                                <div>
-                                    <field name="partner_id"/>
-                                </div>
+                                <div><b><field name="name"/></b></div>
                                 <div>
                                     <field name="project_id"/>
                                     <t t-esc="kanban_text_ellipsis(record.description.value, 160)"/><br/>
@@ -551,13 +545,14 @@
                                                 <a name="do_open" states="draft" string="Validate planned time" type="object" class="oe_kanban_button oe_kanban_button_active">!</a>
                                     </span>
                                 </div>
-                                <div class="oe_kanban_footer_left" style="margin-top:5px;">
-                                    <div class="oe_right">
-                                        <a t-if="record.kanban_state.raw_value === 'normal'" type="object" string="" name="set_kanban_state_done" class="oe_kanban_status"> </a>
-                                        <a t-if="record.kanban_state.raw_value === 'done'" type="object" string="Ready" name="set_kanban_state_blocked" class="oe_kanban_status oe_kanban_status_green"> </a>
-                                        <a t-if="record.kanban_state.raw_value === 'blocked'" type="object" string="Blocked" name="set_kanban_state_normal" class="oe_kanban_status oe_kanban_status_red"> </a>
-                                        <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
-                                    </div>
+
+                                <div class="oe_kanban_bottom_right">
+                                    <a t-if="record.kanban_state.raw_value === 'normal'" type="object" string="" name="set_kanban_state_done" class="oe_kanban_status"> </a>
+                                    <a t-if="record.kanban_state.raw_value === 'done'" type="object" string="Ready" name="set_kanban_state_blocked" class="oe_kanban_status oe_kanban_status_green"> </a>
+                                    <a t-if="record.kanban_state.raw_value === 'blocked'" type="object" string="Blocked" name="set_kanban_state_normal" class="oe_kanban_status oe_kanban_status_red"> </a>
+                                    <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>
+                                    <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
                                 </div>
                             </div>
                             <div class="oe_clear"></div>

From 005f7a3180f03ee03075cb7e5bb46910a8994644 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Tue, 17 Jul 2012 19:30:27 +0200
Subject: [PATCH 132/171] improved task kanban view

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

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 868fa9783fd..36dbab57559 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -402,16 +402,19 @@
   top: 2px;
 }
 .openerp .oe_kanban_view .oe_kanban_status {
+  position: relative;
+  top: 4px;
   display: inline-block;
   height: 12px;
   width: 12px;
-  margin: 4px auto;
   -moz-border-radius: 6px;
   -webkit-border-radius: 6px;
   border-radius: 6px;
-  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6);
-  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6);
-  -box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6);
+  background-position: center center;
+  background-image: -webkit-radial-gradient(circle, #eeeeee 0%, #cccccc 40%, #bbbbbb 100%);
+  background-image: -moz-radial-gradient(#eeeeee 0%, #cccccc 40%, #bbbbbb 100%);
+  background-image: -ms-radial-gradient(#eeeeee 0%, #cccccc 40%, #bbbbbb 100%);
+  background-image: radial-gradient(#eeeeee 0%, #cccccc 40%, #bbbbbb 100%);
 }
 .openerp .oe_kanban_view .oe_kanban_status_green {
   background: green;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index fb5bdc9dcbb..f4c13cc7bd2 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -338,12 +338,13 @@
         top: 2px
        
     .oe_kanban_status
+        position: relative
+        top: 4px
         display: inline-block
         height: 12px
         width: 12px
-        margin: 4px auto
         @include radius(6px)
-        @include box-shadow(0 1px 3px rgba(0,0,0,0.6))
+        @include radial-gradient((#eee 0%, #ccc 40%, #bbb 100%))
     .oe_kanban_status_green
         background: green
         @include radial-gradient((#55dd55 0%, #44aa44 40%, #339933 100%))

From afd02c77dc20cfcbfe23c5d8edeeb1c6f11dbb75 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 18 Jul 2012 12:24:44 +0530
Subject: [PATCH 133/171] [FIX]: Payment_rate_Currency_id field in
 account_voucher

bzr revid: atp@tinyerp.com-20120718065444-d13waj4x9x0quin3
---
 addons/account_voucher/account_voucher_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 09fe0d23842..552e2e5a1f0 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -52,6 +52,7 @@
                   <sheet string="Accounting Voucher">
                     <group col="6" colspan="4">
                         <field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
+                        <field name="payment_rate_currency_id" invisible="1"/>
                         <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/>
                         <field name="journal_id" widget="selection" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
                         <field name="type" required="1"/>

From c11281fddd42101951980250022d5329771cfa77 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 18 Jul 2012 12:11:17 +0200
Subject: [PATCH 134/171] [FIX] l10n_be_invoice_bba: fixed the algorithm
 missing argument correctly

bzr revid: qdp-launchpad@openerp.com-20120718101117-oekq03q72j90avp0
---
 addons/l10n_be_invoice_bba/account_invoice_view.xml | 3 +--
 addons/l10n_be_invoice_bba/invoice.py               | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/l10n_be_invoice_bba/account_invoice_view.xml b/addons/l10n_be_invoice_bba/account_invoice_view.xml
index 2d3ebbd4cd2..924cc0fcd48 100644
--- a/addons/l10n_be_invoice_bba/account_invoice_view.xml
+++ b/addons/l10n_be_invoice_bba/account_invoice_view.xml
@@ -11,9 +11,8 @@
       <field name="arch" type="xml">
         <field name="payment_term" position="after">
           <group col="4" colspan="2">
-              <!-- "algorithm" not a field in any account related module.so pass it as False argument in generate_bbacomm() function. -->
               <field name="reference_type" nolabel="1"  size="0" attrs="{'readonly':[('state','!=','draft')]}"
-                 on_change="generate_bbacomm(type,reference_type, False, partner_id,reference)" colspan="1"/>
+                 on_change="generate_bbacomm(type,reference_type, partner_id.out_inv_comm_algorithm, partner_id,reference)" colspan="1"/>
               <field name="reference" nolabel="1"  colspan="3" attrs="{'readonly':[('state','!=','draft')]}"/>
           </group>
         </field>
diff --git a/addons/l10n_be_invoice_bba/invoice.py b/addons/l10n_be_invoice_bba/invoice.py
index 0cf55e5be64..93f9f22b1fa 100644
--- a/addons/l10n_be_invoice_bba/invoice.py
+++ b/addons/l10n_be_invoice_bba/invoice.py
@@ -85,7 +85,7 @@ class account_invoice(osv.osv):
         }
         result['value'].update(res_update)
         return result                    
-#algorithm is not defined as field in any account related modules.so pass it as false argument.
+
     def generate_bbacomm(self, cr, uid, ids, type, reference_type, algorithm, partner_id, reference):
         partner_obj =  self.pool.get('res.partner')
         reference = reference or ''  

From e4c1ca04a11db2da818cbec650b241f6febbc674 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 18 Jul 2012 12:13:39 +0200
Subject: [PATCH 135/171] [FIX] account: date_stop is required on
 account.period, there is no need to check if it's filled\!

bzr revid: qdp-launchpad@openerp.com-20120718101339-qe7sfe5ql370fn8j
---
 addons/account/account_view.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index e1cf268115b..8ed796eebd7 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -107,10 +107,9 @@
 		                    <group>
 		                        <field name="name"/>
 		                        <field name="fiscalyear_id" widget="selection"/>
-		                        <label for="date_start" string="Duration" />
+		                        <label for="date_start" string="Duration"/>
 		                        <div>
-		                            <field name="date_start" class="oe_inline" nolabel="1"/> 
-		                            <span attrs="{'invisible': [('date_stop','=',False)]}"> - </span> 
+		                            <field name="date_start" class="oe_inline" nolabel="1"/> - 
 		                            <field name="date_stop" nolabel="1" class="oe_inline"/>
 		                        </div>
 		                    </group>

From 0f74f43fdf3372adc582f559a9dc787402371f12 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 18 Jul 2012 12:15:07 +0200
Subject: [PATCH 136/171] [FIX] account: bad merge had duplicated some fields\!

bzr revid: qdp-launchpad@openerp.com-20120718101507-lj66v0k3lm2tt5av
---
 addons/account/account_view.xml | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 8ed796eebd7..0172fa7429a 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -627,13 +627,8 @@
                     </div>
                     <label for="name" class="oe_edit_only"/>
                     <h1>
-                        <field name="name" class="oe_inline"/>-
-                        <field name="period_id" class="oe_inline"/>
+                        <field name="name" class="oe_inline"/>
                     </h1>
-                    <label for="journal_id" class="oe_edit_only"/>
-                    <h2>
-                        <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" widget="selection"/>                        
-                    </h2>
                     <group>
                         <group>
                             <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" widget="selection"/>
@@ -642,7 +637,6 @@
                                 <field name="date" on_change="onchange_date(date, company_id)" class="oe_inline"/>
                                 <field name="period_id" class="oe_inline"/>
                             </div>
-                            <field name="name"/>
                             <field name='company_id' widget="selection" groups="base.group_multi_company" />
                         </group><group>
                             <label for="balance_start"/>
@@ -1130,7 +1124,7 @@
 	                                    <field name="analytic_account_id" domain="[('parent_id','!=',False)]"/>
 	                                </group>
 	                            </group>
-	                            <field name="narration" colspan="4" nolabel="1" placeholder="Add an internal note."/>
+	                            <field name="narration" colspan="4" nolabel="1" placeholder="Add an internal note..."/>
 	                        </page>
 	                        <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
 	                            <field name="analytic_lines" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
@@ -1441,7 +1435,7 @@
                                     <field name="reconcile_partial_id"/>
                                 </tree>
                             </field>
-                            <field name="narration" colspan="4" placeholder="Add an internal note." nolabel="1" height="50"/>
+                            <field name="narration" colspan="4" placeholder="Add an internal note..." nolabel="1" height="50"/>
                         </page>
                     </notebook>
                     </sheet>

From 87d0d213ea061e90f041993eea5bec138763f808 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 18 Jul 2012 12:16:26 +0200
Subject: [PATCH 137/171] [FIX] account: bad parameters during string
 formatting\!\!\!

bzr revid: qdp-launchpad@openerp.com-20120718101626-4h0z8qyq8mx1jg5h
---
 addons/account/wizard/account_move_journal.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index 5986bfc3bd3..66f634bd59f 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -115,7 +115,7 @@ class account_move_journal(osv.osv_memory):
                     or
                     <button string="Cancel" class="oe_link" special="cancel"/>
                 </footer>
-            </form>""" % (journal_string, period_string, open_string)
+            </form>""" % (_('Journal'), journal_string, _('Period'), period_string, open_string)
     
             view = etree.fromstring(view.encode('utf8'))
             xarch, xfields = self._view_look_dom_arch(cr, uid, view, view_id, context=context)

From aad9ce6416a96c8368def382c4ec96aec77a53aa Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 18 Jul 2012 12:17:29 +0200
Subject: [PATCH 138/171] [IMP] added possibility to only highlight the first
 line in read only m2o

bzr revid: nicolas.vanhoren@openerp.com-20120718101729-k1rxexdzozy5cx5i
---
 addons/web/static/src/js/view_form.js | 15 +++++++++++++--
 addons/web/static/src/xml/base.xml    |  5 ++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 3f389d3d41f..2e404a6bfdd 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2739,10 +2739,20 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
             this.$input.val(str.split("\n")[0]);
             this.current_display = this.$input.val();
         } else {
-            str = _.escape(str).split("\n").join("<br />");
+            var lines = _.escape(str).split("\n");
+            var link = "";
+            var follow = "";
+            if (! this.get_definition_options().highlight_first_line) {
+                link = lines.join("<br />");
+            } else {
+                link = lines[0];
+                follow = _.rest(lines).join("<br />");
+                if (follow)
+                    link += "<br />";
+            }
             this.$element.find('a')
                  .unbind('click')
-                 .html(str)
+                 .html(link)
                  .click(function () {
                     self.do_action({
                         type: 'ir.actions.act_window',
@@ -2754,6 +2764,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
                     });
                     return false;
                  });
+            $(".oe_form_m2o_follow").html(follow);
         }
     },
     set_value: function(value_) {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 70b0cd85cc5..3389e016486 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -943,7 +943,10 @@
 </t>
 <t t-name="FieldMany2One">
     <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')">
+            <a href="#" class="oe_form_uri"/>
+            <span class="oe_form_m2o_follow"/>
+        </t>
         <t t-if="!widget.get('effective_readonly')">
             <button class="oe_button oe_m2o_cm_button" title="Open Resource">
                 <img t-att-src='_s + "/web/static/src/img/icons/terp-folder-yellow.png"'/>

From 674104d3fbaf257b87d87da6a24bdbd25dbd6ce3 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 18 Jul 2012 12:17:42 +0200
Subject: [PATCH 139/171] [FIX] account_asset: bad context handling\!\!\!

bzr revid: qdp-launchpad@openerp.com-20120718101742-in5xt5k7uz3hmecb
---
 addons/account_asset/account_asset.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index 61d2ce89ac9..2e9df0b5693 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -318,13 +318,16 @@ class account_asset_asset(osv.osv):
         return asset_id
     
     def open_entries(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        context.update({'search_default_asset_id': ids, 'default_asset_id': ids})
         return {
             'view_type': 'form',
             'view_mode': 'tree,form',
             'res_model': 'account.move.line',
             'view_id': False,
             'type': 'ir.actions.act_window',
-            'context':{'search_default_asset_id': ids, 'default_asset_id': ids},
+            'context': context,
         }
 
 account_asset_asset()

From 305ee2dc0891a4e8f8b2a7faa421f9f709575a00 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 18 Jul 2012 12:18:05 +0200
Subject: [PATCH 140/171] [FIX] account_asset: typo\!\!

bzr revid: qdp-launchpad@openerp.com-20120718101805-qcpiyvh5frgh9mqe
---
 addons/account_asset/account_asset_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index dadc9edcf81..90c4db33ac6 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -70,7 +70,7 @@
             </search>
         </field>
     </record>
-    
+
     <!--
         Asset
      -->
@@ -145,7 +145,7 @@
                                     <field name="parent_state" invisible="1"/>
                                     <button name="create_move" attrs="{'invisible':['|',('move_check','!=',False),('parent_state','!=','open')]}" icon="gtk-execute" string="Create Move" type="object"/>
                                 </tree>
-                                <form string="Depriciation Lines"> 
+                                <form string="Depreciation Lines"> 
                                     <group>
                                         <group>
                                             <field name="asset_id" invisible="1"/>
@@ -184,7 +184,7 @@
             </form>
         </field>
     </record>
-    
+
     <record model="ir.ui.view" id="view_account_asset_asset_tree">
         <field name="name">account.asset.asset.tree</field>
         <field name="model">account.asset.asset</field>

From 0d1aa39f36c987678276da4129b8cd55eee6f19d Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 18 Jul 2012 12:18:09 +0200
Subject: [PATCH 141/171] [IMP] cosmetic change in sale order view

bzr revid: nicolas.vanhoren@openerp.com-20120718101809-w0os8ywew5yw6ntq
---
 addons/sale/sale_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index e7420edb910..619ea161f28 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -171,7 +171,7 @@
                     </h1>
                     <group>
                         <group>
-                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": true}'/>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": true, "highlight_first_line": true}'/>
                             <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"/>
 

From d9f2652e37f54dadd462dfcf4f5a2d09261658e1 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 18 Jul 2012 12:19:23 +0200
Subject: [PATCH 142/171] [FIX] account_budget: date_stop is required on budget
 and budget lines, there is no need to check if it's filled\!\!\!\!\!

bzr revid: qdp-launchpad@openerp.com-20120718101923-rq7392ya0qudqpaf
---
 addons/account_budget/account_budget_view.xml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 16f13881034..3ab8a23c6ee 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -119,16 +119,15 @@
                     <sheet string="Budget">
                         <group>
                             <group>
-                                <field name="name" colspan="1" attrs="{'readonly':[('state','!=','draft')]}"/>
+                                <field name="name" attrs="{'readonly':[('state','!=','draft')]}"/>
                                 <field name="creating_user_id" attrs="{'readonly':[('state','!=','draft')]}"/>
                                 <field name="validating_user_id" readonly="True" attrs="{'readonly':[('state','!=','draft')]}"/>
                             </group>
                             <group>
-                                <field name="code" colspan="1" attrs="{'readonly':[('state','!=','draft')]}"/>
+                                <field name="code" attrs="{'readonly':[('state','!=','draft')]}"/>
                                 <label for="date_from" string="Duration"/>
                                 <div>
-                                    <field name="date_from" class="oe_inline" attrs="{'readonly':[('state','!=','draft')]}"/>
-                                    <span  attrs="{'invisible':[('date_to','=',False)]}" class="oe_inline"> - </span> 
+                                    <field name="date_from" class="oe_inline" attrs="{'readonly':[('state','!=','draft')]}"/> - 
                                     <field name="date_to" class="oe_inline" attrs="{'readonly':[('state','!=','draft')]}" nolabel="1"/>
                                 </div>
                                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
@@ -156,8 +155,7 @@
                                                 <field name="planned_amount"/>
                                                 <label for="date_from" string="Duration"/>
                                                 <div>
-                                                    <field name="date_from" class="oe_inline"/>
-                                                    <span  attrs="{'invisible':[('date_to','=',False)]}" class="oe_inline"> - </span>
+                                                    <field name="date_from" class="oe_inline"/> - 
                                                     <field name="date_to" class="oe_inline"/>
                                                 </div>
                                             </group>

From 3bd0b83f601039e27f18701d39b208783109ee7a Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 18 Jul 2012 12:20:29 +0200
Subject: [PATCH 143/171] [REV] account_check_writing: why should define a NEW
 form view of voucher AGAIN??\!

bzr revid: qdp-launchpad@openerp.com-20120718102029-nbvg98ojon60e12f
---
 .../account_voucher_view.xml                  | 138 ++----------------
 1 file changed, 13 insertions(+), 125 deletions(-)

diff --git a/addons/account_check_writing/account_voucher_view.xml b/addons/account_check_writing/account_voucher_view.xml
index 9fafdcd30c3..07d73188db8 100644
--- a/addons/account_check_writing/account_voucher_view.xml
+++ b/addons/account_check_writing/account_voucher_view.xml
@@ -8,132 +8,20 @@
             <field name="name">account.voucher.payment.check.form</field>
             <field name="model">account.voucher</field>
             <field name="type">form</field>
+            <field name="inherit_id" ref="account_voucher.view_vendor_payment_form" />
             <field name="arch" type="xml">
-                <form version="7.0">
-	                <header>
-	                    <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)"/>
-	                    <button name="print_check" icon="gtk-print" string="Print Check" type="object" attrs="{'invisible':['|',('allow_check','!=',1),('state','!=','posted') ]}" class="oe_highlight"/>
-	                    <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
-	                    <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
-	                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)"/>
-	                    <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-	                </header>
-	                <sheet string="Bill Payment">
-	                    <group> 
-	                        <group>
-	                            <field name="partner_id" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id, 'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"  string="Supplier"/>
-	                            <label for="amount" string="Total"/>
-	                            <div>
-	                                <field name="amount" class="oe_inline" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/> -
-	                                <field name="amount_in_word" class="oe_inline" attrs="{'invisible':[('allow_check','!=',1)]}" nolabel="1" colspan="1"/> 
-	                            </div>
-	                            <field name="date" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
-	                        </group>
-	                        <group>
-	                            <field name="journal_id"
-	                             domain="[('type','in',['bank', 'cash'])]"
-	                             invisible="context.get('line_type', False)"
-	                             widget="selection"
-	                             on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, company_id, context)"
-	                             string="Payment Method"/>
-	                            <field name="reference" invisible="context.get('line_type', False)" string="Payment Ref" placeholder="003/10"/>
-	                            <field name="name" colspan="2" invisible="context.get('line_type', False)" placeholder="Invoice SAJ/0042"/>
-	                            <field name="allow_check" invisible="1"/>
-	                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-	                            <field name="account_id"
-	                             widget="selection"
-	                             invisible="True"/>
-	                            <field name="pre_line" invisible="1"/>
-	                            <field name="type" invisible="True"/>
-	                            <field name="currency_id" invisible="1" colspan="4"/>
-	                        </group>
-	                    </group>
-	                    <notebook>
-	                        <page string="Payment Information">
-	                            <field name="line_dr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
-	                                <tree string="Supplier Invoices and Outstanding transactions" editable="bottom" colors="gray:amount==0">
-	                                    <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
-	                                        on_change="onchange_move_line_id(move_line_id)"
-	                                        domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
-	                                        required="1"
-	                                        />
-	                                    <field name="account_id" groups="base.group_no_one" domain="[('type','=','payable')]"/>
-	                                    <field name="date_original" readonly="1"/>
-	                                    <field name="date_due" readonly="1"/>
-	                                    <field name="amount_original" readonly="1"/>
-	                                    <field name="amount_unreconciled" readonly="1"/>
-	                                    <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)"/>
-	                                    <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
-	                                </tree>
-	                            </field>
-	                            <field name="line_cr_ids" attrs="{'invisible': [('pre_line','=',False)]}" context="{'journal_id':journal_id, 'partner_id':partner_id}">
-	                                <tree string="Credits" editable="bottom" colors="gray:amount==0">
-	                                    <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
-	                                        on_change="onchange_move_line_id(move_line_id)"
-	                                        domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
-	                                        required="1"
-	                                        />
-	                                    <field name="account_id" groups="base.group_no_one" domain="[('type','=','payable')]"/>
-	                                    <field name="date_original" readonly="1"/>
-	                                    <field name="date_due" readonly="1"/>
-	                                    <field name="amount_original" readonly="1"/>
-	                                    <field name="amount_unreconciled" readonly="1"/>
-	                                    <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)"/>
-	                                    <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
-	                                </tree>
-	                            </field>
-	                            <group col="3">
-	                                <group>
-	                                    <field name="narration"  placeholder="Add an internal note." nolabel="1"/>
-	                                </group>
-                                    <group  string="Currency Options" col="5" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
-                                        <field name="is_multi_currency" invisible="1"/>
-                                        <field name="payment_rate" required="1" 
-                                            on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)"/>
-                                        <field name="payment_rate_currency_id" nolabel="1" 
-                                            on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
-                                        <field name="paid_amount_in_company_currency" invisible="1"/>
-                                    </group>
-                                    <group string="Payment Options">
-                                        <field name="writeoff_amount"/>
-                                        <field name="payment_option" required="1"/>
-                                        <field name="writeoff_acc_id"
-                                               attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
-                                               domain="[('type','=','other')]"/>
-                                        <field name="comment"
-                                               attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
-                                        <field name="analytic_id"
-                                               groups="analytic.group_analytic_accounting"/>
-                                    </group>
-	                            </group>
-	                        </page>
-	                        <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
-	                            <group>
-	                                <field name="period_id"/>
-	                                <field name="audit"/>
-	                                <field name="number" attrs="{'readonly':[('allow_check','!=',1)]}" />
-	                            </group>
-	                            <field name="move_ids" readonly="1">
-	                                <tree string="Journal Items">
-	                                    <field name="move_id"/>
-	                                    <field name="ref"/>
-	                                    <field name="date"/>
-	                                    <field name="statement_id"/>
-	                                    <field name="partner_id"/>
-	                                    <field name="account_id"/>
-	                                    <field name="name"/>
-	                                    <field name="debit"/>
-	                                    <field name="credit"/>
-	                                    <field name="state"/>
-	                                    <field name="reconcile_id"/>
-	                                    <field name="amount_currency"/>
-	                                    <field name="currency_id"/>
-	                                </tree>
-	                            </field>
-	                        </page>
-	                    </notebook>
-	                </sheet>
-                </form>
+                <field name="journal_id" position="after">
+                    <newline/>
+                    <field name="allow_check" invisible="1"/>
+                    <field name="amount_in_word" attrs="{'invisible':[('allow_check','!=',1)]}" nolabel="1" colspan="6"/>
+                    <newline/>
+                </field>
+                <field name="number" position="replace">
+                    <field name="number" attrs="{'readonly':[('allow_check','!=',1)]}" />
+                </field>
+                <button name="proforma_voucher" position="after">
+                    <button name="print_check" icon="gtk-print" string="Print Check" type="object" attrs="{'invisible':['|',('allow_check','!=',1),('state','!=','posted') ]}" class="oe_highlight"/>
+                </button>
             </field>
         </record>
 

From 803220f3b7c893824cecb09763155a99436a1524 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 18 Jul 2012 12:21:09 +0200
Subject: [PATCH 144/171] [IMP] account: usability, review of form views

bzr revid: qdp-launchpad@openerp.com-20120718102109-prtl3sb28xehgnlh
---
 addons/account/account_view.xml                      | 7 ++++---
 addons/account/wizard/account_chart_view.xml         | 5 ++---
 addons/account/wizard/account_report_common_view.xml | 2 +-
 addons/account/wizard/account_use_model_view.xml     | 4 ++--
 addons/account_voucher/account_voucher_view.xml      | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 0172fa7429a..ecdcdaf4924 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2603,20 +2603,21 @@ action = pool.get('res.config').next(cr, uid, [], context)
                 </header>
                 <sheet string="Statement">
                     <label for="name" class="oe_edit_only"/>
-                    <h1><field name="name" class="oe_inline"/>-<field name="period_id" class="oe_inline"/></h1>
+                    <h1><field name="name" class="oe_inline"/></h1>
                     <label for="journal_id" class="oe_edit_only"/>
                     <h2>
-                        <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/>	
+                        <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/>
                     </h2>
                     <group>
                         <group>
                             <field name="user_id" readonly="1" string="Responsible"/>
                             <field name="total_entry_encoding"/>
-                            <field name='company_id' widget="selection" groups="base.group_multi_company" />     
+                            <field name='company_id' widget="selection" groups="base.group_multi_company" />
                         </group>
                         <group>
                             <field name="date" attrs="{'readonly':[('state','!=','draft')]}"  on_change="onchange_date(date, company_id)"/>
                             <field name="closing_date" readonly="1"/>
+                            <field name="period_id" class="oe_inline"/>
                             <field name="currency" invisible="1"/>
                         </group>
                     </group>
diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index fbb509a52e3..553d83fa01c 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -16,7 +16,7 @@
                         <field name="target_move"/>
                         <label for="period_from" string="Periods"/>
                         <div>
-                            <field name="period_from" class="oe_inline"/>-
+                            <field name="period_from" class="oe_inline"/> - 
                             <field name="period_to" class="oe_inline"/>
                         </div>
                     </group>
@@ -30,7 +30,7 @@
         </record>
 
         <record id="action_account_chart" model="ir.actions.act_window">
-            <field name="name">Select an Accounting Setup</field>
+            <field name="name">Chart of Accounts</field>
             <field name="res_model">account.chart</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -41,7 +41,6 @@
 
         <menuitem icon="STOCK_INDENT" action="action_account_chart"
             id="menu_action_account_tree2"
-            name="Chart of Accounts"
             parent="account.menu_finance_charts" />
     </data>
 </openerp>
diff --git a/addons/account/wizard/account_report_common_view.xml b/addons/account/wizard/account_report_common_view.xml
index aa09e7fd3a8..18953270e09 100644
--- a/addons/account/wizard/account_report_common_view.xml
+++ b/addons/account/wizard/account_report_common_view.xml
@@ -26,7 +26,7 @@
                         </group>
                         <group string="Periods" attrs="{'invisible':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}">
                             <field name="period_from" domain="[('fiscalyear_id', '=', fiscalyear_id)]"/>
-                            <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]"  />
+                            <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]"/>
                         </group>
                     </page>
                     <page string="Journals" name="journal_ids">
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index b128292271c..6170ca4fe12 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -8,8 +8,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 	            <form string="Create Entries From Models" version="7.0">
-	                <group string="Create Entries From Models">
-	                    <field name="model" nolabel="1"/>
+	                <group>
+	                    <field name="model"/>
 	                </group>
 	                <footer>
 	                    <button string="Create Entries" name="create_entries" type="object" class="oe_highlight"/>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 552e2e5a1f0..d1912a58d1c 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -118,7 +118,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="view_voucher_filter" model="ir.ui.view">
             <field name="name">account.voucher.select</field>
             <field name="model">account.voucher</field>

From d713f209543c35bcb1966e03d85a5cb2c44509ba Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 18 Jul 2012 13:28:16 +0200
Subject: [PATCH 145/171] [FIX] point_of_sale: remove auto_install on module

bzr revid: rco@openerp.com-20120718112816-sby6j51xnevm0rzk
---
 addons/point_of_sale/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index 5e7e5578f72..4c0bb14cc10 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -99,6 +99,6 @@ Main features :
         'static/src/css/keyboard.css'
     ],
     'qweb': ['static/src/xml/pos.xml'],
-    'auto_install': True,
+    'auto_install': False,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 38b6a92f0113f3c8eaee425b900c4190c1c93266 Mon Sep 17 00:00:00 2001
From: Kuldeep <th_dev2@openerp.co.in>
Date: Wed, 18 Jul 2012 17:48:17 +0530
Subject: [PATCH 146/171] [IMP] set name in xpath

bzr revid: th_dev2@openerp.co.in-20120718121817-le2288em9d23740w
---
 addons/account/partner_view.xml                |  2 +-
 addons/crm_claim/crm_claim_view.xml            |  6 +++---
 addons/event/res_partner_view.xml              | 10 +++++-----
 addons/marketing_campaign/res_partner_view.xml |  6 +++---
 addons/project/res_partner_view.xml            |  6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index a916a59c42a..53f556b77c2 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -77,7 +77,7 @@
                 <page string="History" position="before" version="7.0">
                 <page string="Accounting" col="4">
                     <group>
-                        <group >
+                        <group>
                             <field name="property_account_receivable" groups="account.group_account_invoice" />
                             <field name="property_account_position" widget="selection"/>
                             <field name="property_payment_term" widget="selection"/>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 0444479ee14..6317d53a1cc 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -254,10 +254,10 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//page[@string='History']" position="attributes">
+                <xpath expr="//page[@name='History']" position="attributes">
                     <attribute name="invisible">False</attribute>
                 </xpath>
-                <xpath expr="//group[@string='Claim']" position="attributes">
+                <xpath expr="//group[@name='Claim']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
             </field>
@@ -270,7 +270,7 @@
             <field name="priority">20</field>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//group[@string='Claim']" position="inside">
+                    <xpath expr="//group[@name='Claim']" position="inside">
                         <field name="claims_ids" colspan="4" nolabel="1">
                             <tree string="Partners Claim" editable="bottom">
                                 <field name="name"/>
diff --git a/addons/event/res_partner_view.xml b/addons/event/res_partner_view.xml
index 478ffd0fb2e..007feb5ec02 100644
--- a/addons/event/res_partner_view.xml
+++ b/addons/event/res_partner_view.xml
@@ -13,13 +13,13 @@
                 <field name="supplier" position="after">
                     <field name="speaker"/>
                 </field>
-                <xpath expr="//page[@string='History']" position="attributes">
+                <xpath expr="//page[@name='History']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
-                <xpath expr="//group[@string='Event']" position="attributes">
+                <xpath expr="//group[@name='Event']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
-                <xpath expr="//group[@string='Registration']" position="attributes">
+                <xpath expr="//group[@name='Registration']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
             </field>
@@ -30,7 +30,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <group string="Event" position="inside">
+                <group name="Event" position="inside">
                     <field name="event_ids" colspan="4" nolabel="1">
                         <tree string="Events">
                             <field name="name" string="Event"/>
@@ -38,7 +38,7 @@
                         </tree>
                     </field>
                    </group>
-                   <group string="Registration" position="inside">
+                   <group name="Registration" position="inside">
                     <field name="event_registration_ids" colspan="4" nolabel="1">
                         <tree string="Events Registration">
                             <field name="event_begin_date" string="Date"/>
diff --git a/addons/marketing_campaign/res_partner_view.xml b/addons/marketing_campaign/res_partner_view.xml
index ee512f61049..b8ff13367d1 100644
--- a/addons/marketing_campaign/res_partner_view.xml
+++ b/addons/marketing_campaign/res_partner_view.xml
@@ -9,10 +9,10 @@
            <field name="type">form</field>
            <field name="inherit_id" ref="base.view_partner_form"/>
            <field name="arch" type="xml">
-                <xpath expr="//page[@string='History']" position="attributes">
+                <xpath expr="//page[@name='History']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
-                <xpath expr="//group[@string='Campaign']" position="attributes">
+                <xpath expr="//group[@name='Campaign']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
            </field>
@@ -23,7 +23,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                    <group string="Campaign" position="inside">
+                    <group name="Campaign" position="inside">
                             <field name="workitem_ids" colspan="4" nolabel="1"/>
                     </group>
             </field>
diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml
index 1d4c63fc0ef..5d0544b78ef 100644
--- a/addons/project/res_partner_view.xml
+++ b/addons/project/res_partner_view.xml
@@ -9,10 +9,10 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//page[@string='History']" position="attributes">
+                <xpath expr="//page[@name='History']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
-                <xpath expr="//group[@string='Tasks']" position="attributes">
+                <xpath expr="//group[@name='Tasks']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
              </field>
@@ -23,7 +23,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                   <group string="Tasks" position="inside">
+                   <group name="Tasks" position="inside">
                     <field name="task_ids" colspan="4" nolabel="1">
                         <tree string="Tasks" editable="bottom">
                             <field name="name"/>

From a93a1a0937208bb4a8c3421386a61fa7ed2a89dc Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 18 Jul 2012 14:26:36 +0200
Subject: [PATCH 147/171] [FIX] l10n_be_invoice_bba: correct fix of algorithm
 stuff, previous commit was pure bullshit

bzr revid: qdp-launchpad@openerp.com-20120718122636-3njcyy79d35k3rnt
---
 .../account_invoice_view.xml                  |  2 +-
 addons/l10n_be_invoice_bba/invoice.py         | 23 ++++++++-----------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/addons/l10n_be_invoice_bba/account_invoice_view.xml b/addons/l10n_be_invoice_bba/account_invoice_view.xml
index 924cc0fcd48..bf1cf96f537 100644
--- a/addons/l10n_be_invoice_bba/account_invoice_view.xml
+++ b/addons/l10n_be_invoice_bba/account_invoice_view.xml
@@ -12,7 +12,7 @@
         <field name="payment_term" position="after">
           <group col="4" colspan="2">
               <field name="reference_type" nolabel="1"  size="0" attrs="{'readonly':[('state','!=','draft')]}"
-                 on_change="generate_bbacomm(type,reference_type, partner_id.out_inv_comm_algorithm, partner_id,reference)" colspan="1"/>
+                 on_change="generate_bbacomm(type,reference_type, partner_id,reference, context)" colspan="1"/>
               <field name="reference" nolabel="1"  colspan="3" attrs="{'readonly':[('state','!=','draft')]}"/>
           </group>
         </field>
diff --git a/addons/l10n_be_invoice_bba/invoice.py b/addons/l10n_be_invoice_bba/invoice.py
index 93f9f22b1fa..bb03e4d6d02 100644
--- a/addons/l10n_be_invoice_bba/invoice.py
+++ b/addons/l10n_be_invoice_bba/invoice.py
@@ -44,7 +44,7 @@ class account_invoice(osv.osv):
         #l_logger.warning('reference_type =  %s' %res ) 
         return res
 
-    def check_bbacomm(self, val):
+    def check_bbacomm(self, val):
         supported_chars = '0-9+*/ '
         pattern = re.compile('[^' + supported_chars + ']')
         if pattern.findall(val or ''):
@@ -64,7 +64,7 @@ class account_invoice(osv.osv):
         return True
 
     def onchange_partner_id(self, cr, uid, ids, type, partner_id,
-            date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False):
+            date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False):       
         result = super(account_invoice, self).onchange_partner_id(cr, uid, ids, type, partner_id,
             date_invoice, payment_term, partner_bank_id, company_id)
 #        reference_type = self.default_get(cr, uid, ['reference_type'])['reference_type']
@@ -75,10 +75,7 @@ class account_invoice(osv.osv):
             if (type == 'out_invoice'):
                 reference_type = self.pool.get('res.partner').browse(cr, uid, partner_id).out_inv_comm_type
                 if reference_type:
-                    algorithm = self.pool.get('res.partner').browse(cr, uid, partner_id).out_inv_comm_algorithm
-                    if not algorithm:
-                        algorithm = 'random' 
-                    reference = self.generate_bbacomm(cr, uid, ids, type, reference_type, algorithm, partner_id, '')['value']['reference']
+                    reference = self.generate_bbacomm(cr, uid, ids, type, reference_type, partner_id, '', context={})['value']['reference']
         res_update = {       
             'reference_type': reference_type or 'none',
             'reference': reference,
@@ -86,17 +83,15 @@ class account_invoice(osv.osv):
         result['value'].update(res_update)
         return result                    
 
-    def generate_bbacomm(self, cr, uid, ids, type, reference_type, algorithm, partner_id, reference):
+    def generate_bbacomm(self, cr, uid, ids, type, reference_type, partner_id, reference, context=None):
         partner_obj =  self.pool.get('res.partner')
-        reference = reference or ''  
+        reference = reference or ''
+        algorithm = False
+        if partner_id:
+            algorithm = partner_obj.browse(cr, uid, partner_id, context=context).out_inv_comm_algorithm
+        algorithm = algorithm or 'random'
         if (type == 'out_invoice'):
             if reference_type == 'bba':
-                if not algorithm:
-                    if partner_id:
-                        algorithm = partner_obj.browse(cr, uid, partner_id).out_inv_comm_algorithm
-                    if not algorithm:
-                        if not algorithm:   
-                            algorithm = 'random'
                 if algorithm == 'date':
                     if not self.check_bbacomm(reference):
                         doy = time.strftime('%j')

From 11255b9a3b81a2f33764aa9508874670318c46f8 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 18 Jul 2012 14:27:19 +0200
Subject: [PATCH 148/171] [IMP] account_budget: usability, review of form views

bzr revid: qdp-launchpad@openerp.com-20120718122719-x90uevtkjqqgw71w
---
 addons/account_budget/account_budget_view.xml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 3ab8a23c6ee..db83df9c07f 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -117,9 +117,14 @@
                         <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                     </header>
                     <sheet string="Budget">
+                        <div class="oe_title">
+                            <label for="name" class="oe_edit_only"/>
+                            <h1>
+                                <field name="name" attrs="{'readonly':[('state','!=','draft')]}"/>
+                            </h1>
+                        </div>
                         <group>
                             <group>
-                                <field name="name" attrs="{'readonly':[('state','!=','draft')]}"/>
                                 <field name="creating_user_id" attrs="{'readonly':[('state','!=','draft')]}"/>
                                 <field name="validating_user_id" readonly="True" attrs="{'readonly':[('state','!=','draft')]}"/>
                             </group>
@@ -153,15 +158,15 @@
                                                 <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                                                 <field name="general_budget_id"/>
                                                 <field name="planned_amount"/>
+                                            </group>
+                                            <group>
                                                 <label for="date_from" string="Duration"/>
                                                 <div>
                                                     <field name="date_from" class="oe_inline"/> - 
                                                     <field name="date_to" class="oe_inline"/>
                                                 </div>
-                                            </group>
-                                            <group>
-                                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                                                 <field name="paid_date"/>
+                                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                                             </group>
                                         </group>
                                     </form>

From cfc2c74e37d4ec56b37c0913bbeed586b8816e61 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 18 Jul 2012 14:27:30 +0200
Subject: [PATCH 149/171] [IMP] account_asset: usability, review of form views

bzr revid: qdp-launchpad@openerp.com-20120718122730-kvmfa63h5zlxj59v
---
 addons/account_asset/account_asset.py       |  2 +-
 addons/account_asset/account_asset_view.xml | 36 ++++++++++-----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index 2e9df0b5693..8cd73c60aa7 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -233,7 +233,7 @@ class account_asset_asset(osv.osv):
             "  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n" \
             "  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"),
         'method_number': fields.integer('Number of Depreciations', readonly=True, states={'draft':[('readonly',False)]}, help="Calculates Depreciation within specified interval"),
-        'method_period': fields.integer('Period Length', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="State here the time during 2 depreciations, in months"),
+        'method_period': fields.integer('Number of Months in a Period', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="State here the time during 2 depreciations, in months"),
         'method_end': fields.date('Ending Date', readonly=True, states={'draft':[('readonly',False)]}),
         'method_progress_factor': fields.float('Degressive Factor', readonly=True, states={'draft':[('readonly',False)]}),
         'value_residual': fields.function(_amount_residual, method=True, digits_compute=dp.get_precision('Account'), string='Residual Value'),
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 90c4db33ac6..dec5f3714d6 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -88,25 +88,25 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
                 </header>
                 <sheet>
-                    <label for="name" class="oe_edit_only"/>
-                    <h1>
-                        <field name="name" class="oe_inline"/> -
-                        <field name="code"  class="oe_inline"  placeholder="Reference"/>
+                    <div class="oe_button_box oe_right">
                         <button name="open_entries" string="Entries" type="object" class="oe_inline"/>
-                    </h1>
-                    <label for="category_id" class="oe_edit_only"/>
-                    <h2>
-                        <field name="category_id" on_change="onchange_category_id(category_id)"/>
-                    </h2>
+                    </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="category_id" on_change="onchange_category_id(category_id)"/>
+                            <field name="code"/>
                             <field name="parent_id"/>
-                            <field name="partner_id"/>
                         </group>
                         <group>
-                            <field name="company_id" widget="selection" groups="base.group_multi_company" on_change="onchange_company_id(company_id)"/>
                             <field name="purchase_date"/>
                             <field name="currency_id"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company" on_change="onchange_company_id(company_id)"/>
                         </group>
                     </group>
                     <notebook colspan="4">
@@ -116,20 +116,20 @@
 	                                <field name="purchase_value"/>
 	                                <field name="salvage_value"/>
 	                                <field name="value_residual"/>
+                                    <field name="partner_id"/>
 	                            </group>
 	                            <group>
 	                                <field name="method"/>
 	                                <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
+                                    <label for="method_time"/>
+                                    <div>
+	                                    <field name="method_time" on_change="onchange_method_time(method_time)" class="oe_inline"/>
+	                                    <button name="%(action_asset_modify)d" states="open" string="Change Duration" type="action" icon="terp-stock_effects-object-colorize" class="oe_inline" colspan="1"/>
+                                    </div>
 	                                <field name="prorata" attrs="{'invisible': [('method_time','=','end')]}"/>
-	                            </group>
-	                        </group>
-	                        <group>
-	                            <group>
-	                                <field name="method_time" on_change="onchange_method_time(method_time)"/>
 	                                <field name="method_number" attrs="{'invisible':[('method_time','=','end')], 'required':[('method_time','=','number')]}"/>
 	                                <field name="method_period"/>
 	                                <field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','number')]}"/>
-	                                <button name="%(action_asset_modify)d" states="open" string="Change Duration" type="action" icon="terp-stock_effects-object-colorize" colspan="2"/>
 	                            </group>
 	                        </group>
                         </page>
@@ -177,7 +177,7 @@
                             <field name="history_ids" readonly="1"/>
                         </page>
                         <page string="Notes">
-                            <field name="note"/>
+                            <field name="note" placeholder="Add an internal note here..."/>
                         </page>
                     </notebook>
                 </sheet>

From ebec068b6b52983040240bc55fbf07a82a0e97d5 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 18 Jul 2012 15:08:03 +0200
Subject: [PATCH 150/171] [IMP] in wizards, move buttons in the footer

bzr revid: rco@openerp.com-20120718130803-hl42sgc8i0z7f0nu
---
 openerp/addons/base/res/res_config.xml | 86 +++++++++++++-------------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/openerp/addons/base/res/res_config.xml b/openerp/addons/base/res/res_config.xml
index 0541bf46b48..37e50e91492 100644
--- a/openerp/addons/base/res/res_config.xml
+++ b/openerp/addons/base/res/res_config.xml
@@ -1,54 +1,54 @@
 <openerp>
-  <data>
+<data>
     <record id="res_config_view_base" model="ir.ui.view">
-      <field name="name">res.config.view.base</field>
-      <field name="model">res.config</field>
-      <field name="type">form</field>
-      <field name="arch" type="xml">
-          <form version="7.0">
-             <header>
-               <button name="action_next" type="object" string="Apply" class="oe_highlight"/>
-               or
-               <button name="action_skip" type="object" special="cancel" string="Cancel" class="oe_link"/>
-             </header>
-             <group string="res_config_contents"/>
-          </form>
-      </field>
+        <field name="name">res.config.view.base</field>
+        <field name="model">res.config</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form version="7.0">
+                <group string="res_config_contents"/>
+                <footer>
+                    <button name="action_next" type="object" string="Apply" class="oe_highlight"/>
+                    or
+                    <button name="action_skip" type="object" special="cancel" string="Cancel" class="oe_link"/>
+                </footer>
+            </form>
+        </field>
     </record>
 
     <record id="view_config_wizard_form" model="ir.ui.view">
-      <field name="name">Compabitiliby configuration wizard</field>
-      <field name="model">ir.actions.configuration.wizard</field>
-      <field name="type">form</field>
-      <field name="arch" type="xml">
-        <form string="Next Configuration Step" version="7.0">
-            <header>
-                <button name="action_next" type="object" string="Continue" class="oe_highlight"/>
-                or
-                <button string="Cancel" class="oe_link" special="cancel" />
-            </header>
-            <group>
-                <field name="note"/>
-            </group>
-        </form>
-      </field>
+        <field name="name">Compabitiliby configuration wizard</field>
+        <field name="model">ir.actions.configuration.wizard</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Next Configuration Step" version="7.0">
+                <group>
+                    <field name="note"/>
+                </group>
+                <footer>
+                    <button name="action_next" type="object" string="Continue" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
+            </form>
+        </field>
     </record>
 
     <record id="res_config_installer" model="ir.ui.view">
-      <field name="name">Inheritable view for installer objects</field>
-      <field name="model">res.config.installer</field>
-      <field name="type">form</field>
-      <field name="arch" type="xml">
-        <form version="7.0">
-            <header>
-                <button name="action_next" type="object" string="Install Modules"  class="oe_highlight"/>
-                or
-                <button string="Cancel" class="oe_link" special="cancel" />
-            </header>
-            <separator string="title" colspan="4"/>
-        </form>
-      </field>
+        <field name="name">Inheritable view for installer objects</field>
+        <field name="model">res.config.installer</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form version="7.0">
+                <separator string="title" colspan="4"/>
+                <footer>
+                    <button name="action_next" type="object" string="Install Modules"  class="oe_highlight"/>
+                    or
+                    <button string="Skip" class="oe_link" special="cancel" />
+                </footer>
+            </form>
+        </field>
     </record>
 
-  </data>
+</data>
 </openerp>

From 8c403c671c20a0b45adb367b5510f8a6f91ad8a2 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 18 Jul 2012 15:08:22 +0200
Subject: [PATCH 151/171] [FIX] in all wizards, move buttons to footer

bzr revid: rco@openerp.com-20120718130822-wn71hhjukhqblijc
---
 addons/plugin_outlook/plugin_outlook.xml         | 2 +-
 addons/plugin_thunderbird/plugin_thunderbird.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index 0340a7c502f..811661bf127 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -14,7 +14,7 @@
                     <separator string="title" position="before">
                         <label string="This plug-in allows you to create and link outlook emails with openerp objects."/>
                     </separator>
-                    <xpath expr="//header" position="replace"/>
+                    <xpath expr="//footer" position="replace"/>
                     <xpath expr="//separator[@string='title']" position="after" version="7.0">
                         <group>
                             <field name="plugin32" widget="url"/>
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index fef7772dfdf..69e83bf6df2 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -14,7 +14,7 @@
                      <separator string="title" position="before">
                         <label string="This plug-in allows you to link your email to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."/>
                     </separator>
-                    <xpath expr="//header" position="replace"/>
+                    <xpath expr="//footer" position="replace"/>
                     <xpath expr="//separator[@string='title']" position="after">
                         <group>
                             <field name="thunderbird" invisible="1"/>

From 6001d4fcb4e8b7eebe83789f44219a76b489355f Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 18 Jul 2012 15:27:35 +0200
Subject: [PATCH 152/171] [FIX] temporarily desactivate commits 2748 & 2747
 because there are problems with werkzeug versions

bzr revid: nicolas.vanhoren@openerp.com-20120718132735-t2lg790pl9g4ccgj
---
 addons/web/common/http.py | 71 +--------------------------------------
 1 file changed, 1 insertion(+), 70 deletions(-)

diff --git a/addons/web/common/http.py b/addons/web/common/http.py
index cd17f5711e0..cc76a554693 100644
--- a/addons/web/common/http.py
+++ b/addons/web/common/http.py
@@ -452,7 +452,7 @@ class Root(object):
 
         static_dirs = self._load_addons(openerp_addons_namespace)
         if options.serve_static:
-            self.dispatch = SuperSharedDataMiddleware(
+            self.dispatch = werkzeug.wsgi.SharedDataMiddleware(
                 self.dispatch, static_dirs, cache=False)
 
         if options.session_storage:
@@ -555,75 +555,6 @@ class Root(object):
                         return m
                 ps, _slash, meth = ps.rpartition('/')
         return None
-    
-class SuperSharedDataMiddleware(werkzeug.wsgi.SharedDataMiddleware):
-    """Redefine SharedDataMiddleware to better handle the cache = False directive.
-    Also desactivate 304 Not Modified headers only when the referer has 'debug' in its
-    arguments.
-    """
-    def __call__(self, environ, start_response):
-        import os
-        import mimetypes
-        import werkzeug.http
-        import urlparse
-        # sanitize the path for non unix systems
-        cleaned_path = environ.get('PATH_INFO', '').strip('/')
-        for sep in os.sep, os.altsep:
-            if sep and sep != '/':
-                cleaned_path = cleaned_path.replace(sep, '/')
-        path = '/'.join([''] + [x for x in cleaned_path.split('/')
-                                if x and x != '..'])
-        file_loader = None
-        for search_path, loader in self.exports.iteritems():
-            if search_path == path:
-                real_filename, file_loader = loader(None)
-                if file_loader is not None:
-                    break
-            if not search_path.endswith('/'):
-                search_path += '/'
-            if path.startswith(search_path):
-                real_filename, file_loader = loader(path[len(search_path):])
-                if file_loader is not None:
-                    break
-        if file_loader is None or not self.is_allowed(real_filename):
-            return self.app(environ, start_response)
-
-        guessed_type = mimetypes.guess_type(real_filename)
-        mime_type = guessed_type[0] or self.fallback_mimetype
-        f, mtime, file_size = file_loader()
-        
-        etag = self.generate_etag(mtime, file_size, real_filename)
-        modified = werkzeug.http.is_resource_modified(environ, etag, last_modified=mtime)
-        
-        headers = [('Date', werkzeug.http.http_date())]
-        if self.cache:
-            timeout = self.cache_timeout
-            headers += [
-                ('Etag', '"%s"' % etag),
-                ('Cache-Control', 'max-age=%d, public' % timeout)
-            ]
-            if modified:
-                headers.append(('Expires', werkzeug.http.http_date(time() + timeout)))
-        else:
-            headers.append(('Cache-Control', 'no-cache'))
-            
-        referer = environ.get('HTTP_REFERER', '')
-        parsed = urlparse.urlparse(referer)
-        debug = not urlparse.parse_qs(parsed.query).has_key('debug')
-        # it's important to put it at the end
-        if not debug and not modified:
-            f.close()
-            start_response('304 Not Modified', headers)
-            return []
-
-        headers.extend((
-            ('Content-Type', mime_type),
-            ('Content-Length', str(file_size)),
-            ('Last-Modified', werkzeug.http.http_date(mtime))
-        ))
-        start_response('200 OK', headers)
-        return werkzeug.wsgi.wrap_file(environ, f)
-
 
 class LibException(Exception):
     """ Base of all client lib exceptions """

From 26665b774376068a93b887a2818ae98a22f23ae7 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 18 Jul 2012 15:50:10 +0200
Subject: [PATCH 153/171] [IMP] after a module installation, reload the client
 and open the menu Feeds

bzr revid: rco@openerp.com-20120718135010-4933mmgw3n18epvy
---
 openerp/addons/base/module/module.py  | 28 +++------------------------
 openerp/addons/base/res/res_config.py | 12 ++++++++----
 2 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index fde8fcf5b9a..1a0932ac7cf 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -363,8 +363,9 @@ class module(osv.osv):
         if config.get('type') not in ('ir.actions.reload', 'ir.actions.act_window_close'):
             return config
 
-        # reload the client
-        menu_ids = self.root_menus(cr,uid,ids,context)
+        # reload the client; open the first available root menu
+        menu_obj = self.pool.get('ir.ui.menu')
+        menu_ids = menu_obj.search(cr, uid, [('parent_id', '=', False)], context=context)
         return {
             'type': 'ir.actions.client',
             'tag': 'reload',
@@ -649,29 +650,6 @@ class module(osv.osv):
                     _logger.critical('module %s: invalid quality certificate: %s', mod.name, mod.certificate)
                     raise osv.except_osv(_('Error'), _('Module %s: Invalid Quality Certificate') % (mod.name,))
 
-    def root_menus(self, cr, uid, ids, context=None):
-        """ Return root menu ids the menus created by the modules whose ids are
-        provided.
-
-        :param list[int] ids: modules to get menus from
-        """
-        values = self.read(cr, uid, ids, ['name'], context=context)
-        module_names = [i['name'] for i in values]
-
-        ids = self.pool.get('ir.model.data').search(cr, uid, [ ('model', '=', 'ir.ui.menu'), ('module', 'in', module_names) ], context=context)
-        values = self.pool.get('ir.model.data').read(cr, uid, ids, ['res_id'], context=context)
-        all_menu_ids = [i['res_id'] for i in values]
-
-        root_menu_ids = []
-        for menu in self.pool.get('ir.ui.menu').browse(cr, uid, all_menu_ids, context=context):
-            while menu.parent_id:
-                menu = menu.parent_id
-            if not menu.id in root_menu_ids:
-                root_menu_ids.append((menu.sequence,menu.id))
-        root_menu_ids.sort()
-        root_menu_ids = [i[1] for i in root_menu_ids]
-        return root_menu_ids
-
 class module_dependency(osv.osv):
     _name = "ir.module.module.dependency"
     _description = "Module dependency"
diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py
index 9277184a822..3f4a052a36b 100644
--- a/openerp/addons/base/res/res_config.py
+++ b/openerp/addons/base/res/res_config.py
@@ -70,10 +70,14 @@ class res_config_configurable(osv.osv_memory):
             res = next.action_launch(context=context)
             res['nodestroy'] = False
             return res
-        #if there is no next action and if html is in the context: reload instead of closing
-        if context and 'html' in context:
-            return {'type' : 'ir.actions.reload'}
-        return {'type' : 'ir.actions.act_window_close'}
+        # reload the client; open the first available root menu
+        menu_obj = self.pool.get('ir.ui.menu')
+        menu_ids = menu_obj.search(cr, uid, [('parent_id', '=', False)], context=context)
+        return {
+            'type': 'ir.actions.client',
+            'tag': 'reload',
+            'params': {'menu_id': menu_ids and menu_ids[0] or False},
+        }
 
     def start(self, cr, uid, ids, context=None):
         return self.next(cr, uid, ids, context)

From 531444a6f6b1d94e8ab4893a8f976e32e038bfff Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 18 Jul 2012 15:51:02 +0200
Subject: [PATCH 154/171] [IMP] account: do not open a non-existing view after
 setting taxes

bzr revid: rco@openerp.com-20120718135102-34gvep3dbpqznozc
---
 addons/account/account.py | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index b6fd7232a25..fab9de5407c 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -3351,15 +3351,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
 
         # Create Bank journals
         self._create_bank_journals_from_o2m(cr, uid, obj_wizard, company_id, acc_template_ref, context=context)
-        action = {
-            'type': 'ir.actions.act_window',
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'board.board',
-            'view_id': self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'board_account_form')[1],
-            'menu_id': self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'menu_finance')[1]
-        }
-        return action
+        return {}
 
     def _prepare_bank_journal(self, cr, uid, line, current_num, default_account_id, company_id, context=None):
         '''

From bfe3afcbd8ac214487c57731c850c199f8a6a3c5 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Wed, 18 Jul 2012 15:55:03 +0200
Subject: [PATCH 155/171] improved project kanban vignette

bzr revid: mit@openerp.com-20120718135503-gi222ulbtmhyesq8
---
 addons/web_kanban/static/src/css/kanban.css  | 3 +++
 addons/web_kanban/static/src/css/kanban.sass | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 36dbab57559..5a7c1b84067 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -401,6 +401,9 @@
   position: relative;
   top: 2px;
 }
+.openerp .oe_kanban_view .oe_kanban_project_times li {
+  float: left;
+}
 .openerp .oe_kanban_view .oe_kanban_status {
   position: relative;
   top: 4px;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index f4c13cc7bd2..cea95f2ce53 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -336,6 +336,9 @@
         float: right
         position: relative
         top: 2px
+
+    .oe_kanban_project_times li
+        float: left
        
     .oe_kanban_status
         position: relative

From 607c1670314a00cb3cd5b28ba495f950104d776f Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Wed, 18 Jul 2012 15:55:14 +0200
Subject: [PATCH 156/171] improved project kanban vignette

bzr revid: mit@openerp.com-20120718135514-ojyvli4qyresvsmf
---
 addons/project/project_view.xml | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index a70bc504299..dbc4007bf8c 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -521,6 +521,15 @@
                                 <ul class="oe_dropdown_menu">
                                     <li><a type="edit" >Edit...</a></li>
                                     <li><a type="delete">Delete</a></li>
+                                    <li>
+                                      <ul class="oe_kanban_project_times">
+                                        <li><a name="set_remaining_time_1" type="object" class="oe_kanban_button">1</a></li>
+                                        <li><a name="set_remaining_time_2" type="object" class="oe_kanban_button">2</a></li>
+                                        <li><a name="set_remaining_time_5" type="object" class="oe_kanban_button">5</a></li>
+                                        <li><a name="set_remaining_time_10" type="object" class="oe_kanban_button">10</a></li>
+                                        <li><a name="do_open" states="draft" string="Validate planned time" type="object" class="oe_kanban_button oe_kanban_button_active">!</a></li>
+                                      </ul>
+                                    </li>
                                     <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                                 </ul>
                             </div>
@@ -531,19 +540,6 @@
                                     <field name="project_id"/>
                                     <t t-esc="kanban_text_ellipsis(record.description.value, 160)"/><br/>
                                     <i><field name="date_deadline"/></i>
-                                    <span class="oe_kanban_project_times" style="white-space: nowrap; padding-left: 5px;">
-                                                <t t-set="hours" t-value="record.remaining_hours.raw_value"/>
-                                                <t t-set="times" t-value="[
-                                                     [1, (hours gte 1 and hours lt 2)]
-                                                    ,[2, (hours gte 2 and hours lt 5)]
-                                                    ,[5, (hours gte 5 and hours lt 10)]
-                                                    ,[10, (hours gte 10)]
-                                                ]"/>
-                                                <t t-foreach="times" t-as="time"><a 
-                                                    t-if="!time[1]" t-attf-data-name="set_remaining_time_#{time[0]}" type="object" class="oe_kanban_button"><t t-esc="time[0]"/></a><b
-                                                    t-if="time[1]" class="oe_kanban_button oe_kanban_button_active"><t t-esc="Math.round(hours)"/></b></t>
-                                                <a name="do_open" states="draft" string="Validate planned time" type="object" class="oe_kanban_button oe_kanban_button_active">!</a>
-                                    </span>
                                 </div>
 
                                 <div class="oe_kanban_bottom_right">
@@ -554,6 +550,12 @@
                                     <a t-if="record.priority.raw_value != 1" type="object" name="set_high_priority" class="oe_e oe_star_off">7</a>
                                     <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
                                 </div>
+                                <div class="oe_kanban_footer_left">
+                                    <span>
+                                        <span class="oe_e">N</span>
+                                        <t t-esc="Math.round(record.remaining_hours.raw_value)"/>
+                                    </span>
+                                </div>
                             </div>
                             <div class="oe_clear"></div>
                         </div>

From a824028878037b2e1bac655390ea77808feb7c11 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 18 Jul 2012 16:06:13 +0200
Subject: [PATCH 157/171] [IMP] initial mail message sale

bzr revid: fp@tinyerp.com-20120718140613-3urmqhtng63lc23f
---
 addons/sale/sale_data.xml               | 26 +++++++++++++++++++++++++
 addons/sale/wizard/sale_make_invoice.py |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/addons/sale/sale_data.xml b/addons/sale/sale_data.xml
index 4622577ac3d..b0fd5ed6d10 100644
--- a/addons/sale/sale_data.xml
+++ b/addons/sale/sale_data.xml
@@ -26,5 +26,31 @@
 
         <function eval="('default',False,'shop_id', [('sale.order', False)], shop, True, False, False, False, True)" id="sale_default_set" model="ir.values" name="set"/>
 
+            
+        <record id="message_welcome_sale" model="mail.message">
+            <field name="subject">Module sale installed!</field>
+            <field name="type">comment</field>
+            <field name="subtype">html</field>
+            <field name="body_text">Welcome to OpenERP
+                Second Line
+            </field>
+            <field name="body_html" type="xml">
+                <h2>OpenERP Sale module just installed!</h2>
+                <p>
+                    You can click on the top menu <b>Sales</b> to manage your
+                    customers, your quotations and sales orders.
+                </p>
+                <p>
+                    If you need to manage your sales pipeline (leads,
+                    opportunities, phonecalls), you can install the CRM module
+                    from the <b>Settings</b> top menu.
+                </p>
+            </field>
+        </record>
+        <record id="message_welcome_sale_root" model="mail.notification">
+            <field name="user_id" ref="base.user_root"/>
+            <field name="message_id" ref="message_welcome_sale"/>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/sale/wizard/sale_make_invoice.py b/addons/sale/wizard/sale_make_invoice.py
index 5265afb9bff..b4b3772a91a 100644
--- a/addons/sale/wizard/sale_make_invoice.py
+++ b/addons/sale/wizard/sale_make_invoice.py
@@ -68,4 +68,4 @@ class sale_make_invoice(osv.osv_memory):
 
 sale_make_invoice()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 5510ee74b2f97959d129aa4e45933bd65bd42981 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 18 Jul 2012 16:11:12 +0200
Subject: [PATCH 158/171] [IMP] sale: in customer form, move action 'Quotations
 and Sales' from contextual menu to button

bzr revid: rco@openerp.com-20120718141112-tdw4vb1c2am6rwl3
---
 addons/sale/res_partner_view.xml | 34 +++++++++++++++++++++++++++++++-
 addons/sale/sale_view.xml        |  8 --------
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/addons/sale/res_partner_view.xml b/addons/sale/res_partner_view.xml
index bb5695eac39..9c557620e75 100644
--- a/addons/sale/res_partner_view.xml
+++ b/addons/sale/res_partner_view.xml
@@ -1,7 +1,24 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-       <!-- Partner kanban view inherte -->
+        <record id="act_res_partner_2_sale_order" model="ir.actions.act_window">
+            <field name="name">Quotations and Sales</field>
+            <field name="res_model">sale.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,graph</field>
+            <field name="context">{'search_default_partner_id': active_id}</field>
+            <field name="groups_id" eval="[(4, ref('base.group_sale_salesman'))]"/>
+            <field name="help">
+                This customer has no quotation or sale order.
+                Click here to create a new quotation.
+                &lt;p&gt;
+                The "Quotation" is the first step of the Sales flow.  Manage your sales from quotation to invoice.
+                &lt;p&gt;
+                You will be able to sell products (manage deliveries) as well as services (create projects).
+            </field>
+        </record>
+
+        <!-- Partner kanban view inherte -->
         <record model="ir.ui.view" id="crm_lead_partner_kanban_view">
             <field name="name">res.partner.kanban.saleorder.inherit</field>
             <field name="model">res.partner</field>
@@ -18,6 +35,21 @@
                 </xpath>
             </field>
         </record>
+
+        <record id="res_partner_view_buttons" model="ir.ui.view">
+            <field name="name">res.partner.view.buttons</field>
+            <field name="model">res.partner</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_partner_form" />
+            <field name="arch" type="xml">
+                <xpath expr="//div[@name='buttons']" position="inside">
+                    <button name="%(sale.act_res_partner_2_sale_order)d" type="action"
+                        string="Quotations and Sales"
+                        groups="base.group_sale_salesman"/>
+                </xpath>
+            </field>
+        </record>
+
     </data>
 </openerp>
 
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 619ea161f28..aa30f023ae8 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -569,14 +569,6 @@
             <field name="filter" eval="True"/>
         </record>
 
-        <act_window
-            context="{'search_default_partner_id': active_id, 'default_partner_id': active_id}"
-            id="act_res_partner_2_sale_order"
-            name="Quotations and Sales"
-            groups="base.group_sale_salesman"
-            res_model="sale.order"
-            src_model="res.partner"/>
-
         <act_window
             context="{'search_default_product_id': active_id, 'default_product_id': active_id}"
             id="action_order_line_product_tree"

From 51f5471b83b7c8ff70a4e9a1c1026f72bb13f8cb Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 18 Jul 2012 16:12:54 +0200
Subject: [PATCH 159/171] [FIX] account: fixed untested code (that certainly
 never worked) when creating a cash register \!\!\!

bzr revid: qdp-launchpad@openerp.com-20120718141254-vy7cinlhy39c4295
---
 addons/account/account_cash_statement.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index bea48528f63..927ce94db31 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -132,18 +132,18 @@ class account_cash_statement(osv.osv):
 
         for obj in self.browse(cr, uid, ids, context=context):
             if obj.state == 'draft':
-                self.search(cr, uid,
-                    [('journal_id', '=', journal_id),('state', '=', 'confirm')],
+                statement_ids = self.search(cr, uid,
+                    [('journal_id', '=', obj.journal_id.id),('state', '=', 'confirm')],
                     order='create_date desc',
                     limit=1,
                     context=context
                 )
 
                 if not statement_ids:
-                    return result
-
-                st = self.browse(cr, uid, statement_ids[0], context=context)
-                result[obj.id] = st.balance_end_real
+                    continue
+                else:
+                    st = self.browse(cr, uid, statement_ids[0], context=context)
+                    result[obj.id] = st.balance_end_real
 
         return result
 

From 8ac5c9c0ac978d50d637b79ceaaaf5676a19a3be Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 18 Jul 2012 16:14:36 +0200
Subject: [PATCH 160/171] [IMP] crm, sale: put priorities in inherited views to
 control the order of buttons

bzr revid: rco@openerp.com-20120718141436-k19c7g3lz5gu2iqo
---
 addons/crm/res_partner_view.xml  | 1 +
 addons/sale/res_partner_view.xml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 29e733e2496..482a0d37e97 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -123,6 +123,7 @@
             <field name="model">res.partner</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form" />
+            <field name="priority" eval="10">
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
                     <button type="action"
diff --git a/addons/sale/res_partner_view.xml b/addons/sale/res_partner_view.xml
index 9c557620e75..55a049376bd 100644
--- a/addons/sale/res_partner_view.xml
+++ b/addons/sale/res_partner_view.xml
@@ -41,6 +41,7 @@
             <field name="model">res.partner</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form" />
+            <field name="priority" eval="20">
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
                     <button name="%(sale.act_res_partner_2_sale_order)d" type="action"

From e0aafd1c5ebffe791fddf07c01b71b1cc52cd24a Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 18 Jul 2012 16:22:35 +0200
Subject: [PATCH 161/171] [FIX] Disable cache middleware for debug mode

bzr revid: al@openerp.com-20120718142235-x4uwzsar7ak6sxgk
---
 addons/web/common/http.py | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/addons/web/common/http.py b/addons/web/common/http.py
index cc76a554693..7b73c2169ea 100644
--- a/addons/web/common/http.py
+++ b/addons/web/common/http.py
@@ -417,6 +417,20 @@ class ControllerType(type):
 class Controller(object):
     __metaclass__ = ControllerType
 
+class DisableCacheMiddleware(object):
+    def __init__(self, app):
+        self.app = app
+    def __call__(self, environ, start_response):
+        def start_wrapped(status, headers):
+            debug = environ.get('HTTP_REFERER', '').find('debug') != -1
+            filtered_headers = [(k,v) for k,v in headers if not (k=='Last-Modified' or (debug and k=='Cache-Control'))] 
+            if debug:
+                filtered_headers.append(('Cache-Control', 'no-cache'))
+            print headers
+            print filtered_headers
+            start_response(status, filtered_headers)
+        return self.app(environ, start_wrapped)
+
 class Root(object):
     """Root WSGI application for the OpenERP Web Client.
 
@@ -452,8 +466,8 @@ class Root(object):
 
         static_dirs = self._load_addons(openerp_addons_namespace)
         if options.serve_static:
-            self.dispatch = werkzeug.wsgi.SharedDataMiddleware(
-                self.dispatch, static_dirs, cache=False)
+            app = werkzeug.wsgi.SharedDataMiddleware( self.dispatch, static_dirs)
+            self.dispatch = DisableCacheMiddleware(app)
 
         if options.session_storage:
             if not os.path.exists(options.session_storage):

From e2e15fe6347b9a484cf1bc1568e18219c6f77e3a Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 18 Jul 2012 16:25:24 +0200
Subject: [PATCH 162/171] [FIX] crm, sale: fix xml missing end tag

bzr revid: rco@openerp.com-20120718142524-7mw10njirqy70tkd
---
 addons/crm/res_partner_view.xml  | 2 +-
 addons/sale/res_partner_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 482a0d37e97..26c74427009 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -123,7 +123,7 @@
             <field name="model">res.partner</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form" />
-            <field name="priority" eval="10">
+            <field name="priority" eval="10"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
                     <button type="action"
diff --git a/addons/sale/res_partner_view.xml b/addons/sale/res_partner_view.xml
index 55a049376bd..11ac318b7a7 100644
--- a/addons/sale/res_partner_view.xml
+++ b/addons/sale/res_partner_view.xml
@@ -41,7 +41,7 @@
             <field name="model">res.partner</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form" />
-            <field name="priority" eval="20">
+            <field name="priority" eval="20"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
                     <button name="%(sale.act_res_partner_2_sale_order)d" type="action"

From be4e0b19a8881ec6a4b7eb214205be3644509640 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 18 Jul 2012 16:25:34 +0200
Subject: [PATCH 163/171] [FIX] remove print statements

bzr revid: al@openerp.com-20120718142534-lbanv7do95szh4j5
---
 addons/web/common/http.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/web/common/http.py b/addons/web/common/http.py
index 7b73c2169ea..87748d2e6d9 100644
--- a/addons/web/common/http.py
+++ b/addons/web/common/http.py
@@ -426,8 +426,6 @@ class DisableCacheMiddleware(object):
             filtered_headers = [(k,v) for k,v in headers if not (k=='Last-Modified' or (debug and k=='Cache-Control'))] 
             if debug:
                 filtered_headers.append(('Cache-Control', 'no-cache'))
-            print headers
-            print filtered_headers
             start_response(status, filtered_headers)
         return self.app(environ, start_wrapped)
 

From 13f368707df5ebae09d79f87b899a34cf8f62a35 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 18 Jul 2012 16:28:10 +0200
Subject: [PATCH 164/171] [IMP] accounting: usability, review of form views

bzr revid: qdp-launchpad@openerp.com-20120718142810-guj4aekt9v02jgfw
---
 addons/account/account_view.xml               | 104 ++++++++----------
 addons/account/project/project_view.xml       |   2 +-
 .../account/test/account_cash_statement.yml   |   2 +-
 .../account_automatic_reconcile_view.xml      |   2 +
 .../wizard/account_fiscalyear_close_view.xml  |   2 +
 .../account_payment/account_payment_view.xml  |  13 ++-
 addons/account_sequence/account_sequence.xml  |   2 +-
 7 files changed, 63 insertions(+), 64 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index ecdcdaf4924..1e1f7b91851 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -466,62 +466,61 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Journal" version="7.0">
+                    <div class="oe_title">
+                        <label for="name" class="oe_edit_only"/>
+                        <h1><field name="name"/></h1>
+                    </div>
                     <group>
-                        <field name="name"/>
-                        <field name="type" on_change="onchange_type(type, currency, context)"/>
+                        <group>
+                            <field name="code"/>
+                            <field name="type" on_change="onchange_type(type, currency, context)"/>
+                        </group>
+                        <group>
+                            <field name="default_debit_account_id" attrs="{'required':[('type','in', ('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                            <field name="default_credit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                            <field name="currency"/>
+                            <field name="company_id" groups="base.group_multi_company"/>
+                        </group>
                     </group>
                     <notebook>
-                        <page string="Journal Configuration">
+                        <page string="Advanced Settings">
                             <group>
                                 <group>
-                                    <field name="code"/>
-                                    <field name="currency"/>
-                                </group>
-                                <group>
-                                    <field name="company_id" groups="base.group_multi_company"/>
                                     <field name="user_id"/>
-                                </group>
-                                <group>
-                                    <field name="default_debit_account_id" attrs="{'required':[('type','in', ('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                                    <field name="default_credit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                                     <field name="view_id" widget="selection"/>
-                                        <field name="sequence_id" required="0"/>
+                                    <field name="sequence_id" required="0"/>
                                 </group>
                                 <group>
                                     <field name="centralisation"/>
                                     <field name="entry_posted"/>
-                                    <field name="with_last_closing_balance" />
                                     <field name="allow_date"/>
                                     <field name="group_invoice_lines"/>
                                 </group>
-                                <group>
-                                    <field name="type_control_ids" widget="many2many_tags"/>
-                                    <field name="account_control_ids" widget="many2many_tags"/>
+                            </group>
+                        </page>
+                        <page string="Entry Controls">
+                            <separator colspan="4" string="Accounts Type Allowed (empty for no control)"/>
+                            <field colspan="4" name="type_control_ids" nolabel="1"/>
+                            <separator colspan="4" string="Accounts Allowed (empty for no control)"/>
+                            <field colspan="4" name="account_control_ids" nolabel="1"/>
+                        </page>
+                        <page string="Cash Registers" attrs="{'invisible':[('type', '!=', 'cash')]}">
+                            <group>
+                                <group string="Accounts">
+                                    <field name="profit_account_id"/>
+                                    <field name="loss_account_id"/>
+                                    <field name="internal_account_id"/>
+                                </group>
+                                <group string="Miscellaneous">
+                                    <field name="with_last_closing_balance"/>
                                 </group>
                             </group>
-                            <page string="Entry Controls">
-                                <separator colspan="4" string="Accounts Type Allowed (empty for no control)"/>
-                                <field colspan="4" name="type_control_ids" nolabel="1"/>
-                                <separator colspan="4" string="Accounts Allowed (empty for no control)"/>
-                                <field colspan="4" name="account_control_ids" nolabel="1"/>
-                            </page>
-                            <page string="Cash">
-                                <group string="Profit &amp; Loss Accounts">
-                                    <field name="profit_account_id" />
-                                    <field name="loss_account_id" />
-                                </group>
-
-                                <group string="Internal Transfer Account">
-                                    <field name="internal_account_id" />
-                                </group>
-
-                                <separator string="Available Currencies" colspan="4" />
-                                <field name="cashbox_line_ids" nolabel="1" string="Unit Of Currency Definition" colspan="4">
-                                    <tree string="CashBox Lines" editable="bottom">
-                                        <field name="pieces" />
-                                    </tree>
-                                </field>
-                            </page>
+                            <separator string="Available Coins" colspan="4" />
+                            <field name="cashbox_line_ids" nolabel="1" string="Unit Of Currency Definition" colspan="4">
+                                <tree string="CashBox Lines" editable="bottom">
+                                    <field name="pieces" />
+                                </tree>
+                            </field>
                         </page>
                     </notebook>
                 </form>
@@ -625,9 +624,9 @@
                     <div class="oe_right oe_button_box" name="import_buttons">
                        <!-- Put here related buttons -->
                     </div>
-                    <label for="name" class="oe_edit_only"/>
+                    <label for="name" class="oe_edit_only" attrs="{'invisible':[('name','=','/')]}"/>
                     <h1>
-                        <field name="name" class="oe_inline"/>
+                        <field name="name" attrs="{'invisible':[('name','=','/')]}"/>
                     </h1>
                     <group>
                         <group>
@@ -1086,40 +1085,33 @@
 	                                    <field name="credit"/>
 	                                    <field name="quantity"/>
 	                                </group>
-	
 	                                <group string="Accounting Documents">
 	                                    <field name="invoice" readonly="True"/>
 	                                    <field name="move_id" required="False"/>
 	                                    <field name="statement_id" readonly="True"/>
 	                                </group>
-	
 	                                <group string="Dates">
 	                                    <field name="date"/>
 	                                    <field name="date_maturity"/>
 	                                    <field name="date_created" readonly="True"/>
 	                                </group>
-	
 	                                <group string="Taxes">
 	                                    <field name="tax_code_id"/>
 	                                    <field name="tax_amount"/>
 	                                    <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
 	                                </group>
-	
 	                                <group attrs="{'readonly':[('state','=','valid')]}" string="Currency">
 	                                    <field name="currency_id"/>
 	                                    <field name="amount_currency"/>
 	                                </group>
-	
 	                                <group string="Reconciliation">
 	                                    <field name="reconcile_id"/>
 	                                    <field name="reconcile_partial_id"/>
 	                                </group>
-	
 	                                <group string="States">
 	                                    <field name="state"/>
 	                                    <field name="blocked"/>
 	                                </group>
-	
 	                                <group groups="analytic.group_analytic_accounting" string="Analytic">
 	                                    <field name="analytic_account_id" domain="[('parent_id','!=',False)]"/>
 	                                </group>
@@ -1330,9 +1322,12 @@
                     <field name="state" widget="statusbar"/>
                 </header>
                 <sheet string="Journal Entries" >
+                    <label for="name" class="oe_edit_only" attrs="{'invisible':[('name','=','/')]}"/>
+                    <h1>
+                        <field name="name" readonly="True" attrs="{'invisible':[('name','=','/')]}"/>
+                    </h1>
                     <group>
                         <group>
-                            <field name="name" readonly="True"/>
                             <field name="journal_id"/>
                             <field name="period_id"/>
                             <field name="company_id" required="1" groups="base.group_multi_company"/>
@@ -2602,14 +2597,11 @@ action = pool.get('res.config').next(cr, uid, [], context)
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet string="Statement">
-                    <label for="name" class="oe_edit_only"/>
-                    <h1><field name="name" class="oe_inline"/></h1>
-                    <label for="journal_id" class="oe_edit_only"/>
-                    <h2>
-                        <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/>
-                    </h2>
+                    <label for="name" class="oe_edit_only" attrs="{'invisible':[('name','=','/')]}"/>
+                    <h1><field name="name" class="oe_inline" attrs="{'invisible':[('name','=','/')]}"/></h1>
                     <group>
                         <group>
+                            <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/>
                             <field name="user_id" readonly="1" string="Responsible"/>
                             <field name="total_entry_encoding"/>
                             <field name='company_id' widget="selection" groups="base.group_multi_company" />
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 492ab249a39..5c1542abc29 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -385,7 +385,7 @@
             <field name="inherit_id" ref="account.view_account_journal_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <field name="currency" position="after">
+                <field name="type" position="after">
                     <field name="analytic_journal_id"/>
                 </field>
             </field>
diff --git a/addons/account/test/account_cash_statement.yml b/addons/account/test/account_cash_statement.yml
index 5ead46522bd..6bff530bb54 100644
--- a/addons/account/test/account_cash_statement.yml
+++ b/addons/account/test/account_cash_statement.yml
@@ -1,5 +1,5 @@
 -
-  In order to test Cash statement I create a Cash statement and confirm it and check it's move created
+  In order to test Cash statement I create a Cash statement and confirm it and check its move created
 -
  !record {model: account.bank.statement, id: account_bank_statement_1}:
     date: !eval time.strftime('%Y-%m-%d')
diff --git a/addons/account/wizard/account_automatic_reconcile_view.xml b/addons/account/wizard/account_automatic_reconcile_view.xml
index b7a22ea9fa8..be1776497b3 100644
--- a/addons/account/wizard/account_automatic_reconcile_view.xml
+++ b/addons/account/wizard/account_automatic_reconcile_view.xml
@@ -8,6 +8,8 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                 <form string="Reconciliation" version="7.0">
+                    <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)]"/>
                     <group col="4">
                         <field name="power"/>
diff --git a/addons/account/wizard/account_fiscalyear_close_view.xml b/addons/account/wizard/account_fiscalyear_close_view.xml
index 43850237263..8c4df8548f6 100644
--- a/addons/account/wizard/account_fiscalyear_close_view.xml
+++ b/addons/account/wizard/account_fiscalyear_close_view.xml
@@ -7,6 +7,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Generate Fiscal Year Opening Entries" version="7.0">
+                    <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/>
                     <group col="4">
                         <field name="fy_id" domain = "[('state','=','draft')]"/>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index cae9efcd515..1577d1b86bd 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -113,13 +113,18 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
                 </header>
                 <sheet string="Payment order">
+                    <div class="oe_button_box">
+                        <button name="%(action_create_payment_order)d" string="Select Invoices to Pay"
+                               type="action" attrs="{'invisible':[('state','=','done')]}" icon="gtk-find"/>
+                    </div>
+                    <div class="oe_title">
+                        <label for="reference" class="oe_edit_only"/>
+                        <h1><field name="reference"/></h1>
+                    </div>
                     <group>
                         <group>
-                            <field name="reference"/>
                             <field name="user_id"/>
                             <field name="mode"/>
-                            <button name="%(action_create_payment_order)d" string="Select Invoices to Pay"
-                               type="action" attrs="{'invisible':[('state','=','done')]}" icon="gtk-find"/>
                         </group>
                         <group>
                             <field name="date_prefered"/>
@@ -181,8 +186,6 @@
                             <field name="amount" sum="Total in Company Currency" invisible="1"/>
                         </tree>
                     </field>
-                    <field name="date_created"/>
-                    <field name="date_done"/>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/account_sequence/account_sequence.xml b/addons/account_sequence/account_sequence.xml
index a82a041d6ec..3ed16cfa58e 100644
--- a/addons/account_sequence/account_sequence.xml
+++ b/addons/account_sequence/account_sequence.xml
@@ -44,7 +44,7 @@
             <field name="inherit_id" ref="account.view_account_move_filter"/>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="//field[@name='name']" position="before">
+                <xpath expr="//field[@name='name']" position="after">
                     <field name="internal_sequence_number"/>
                 </xpath>
             </data>

From 97bbacfaf01a2a954b254fd6a4588cccb89a989d Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 19 Jul 2012 04:46:00 +0000
Subject: [PATCH 165/171] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120719044600-emnku3b8yb0nxddf
---
 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       |   8 +-
 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       | 923 ++++++++++++++++++++++++---
 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    |   4 +-
 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       |  81 ++-
 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       |   4 +-
 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       |  72 ++-
 openerp/addons/base/i18n/mk.po       |   4 +-
 openerp/addons/base/i18n/mn.po       | 368 ++++++++++-
 openerp/addons/base/i18n/nb.po       |   4 +-
 openerp/addons/base/i18n/nl.po       |   6 +-
 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       | 141 ++--
 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, 1528 insertions(+), 295 deletions(-)

diff --git a/openerp/addons/base/i18n/ab.po b/openerp/addons/base/i18n/ab.po
index 3863eeeb3e9..e7888a8a720 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-07-05 04:39+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:36+0000\n"
+"X-Generator: Launchpad (build 15637)\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 afa156164f2..4f2dd5fb776 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-07-05 04:39+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:36+0000\n"
+"X-Generator: Launchpad (build 15637)\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 c7d08cdb7ed..1ccb028cac0 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-07-05 04:40+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:37+0000\n"
+"X-Generator: Launchpad (build 15637)\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 1b8a8314f6d..1a2642d9e1f 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-07-05 04:40+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:37+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -4155,7 +4155,9 @@ msgstr ""
 msgid ""
 "Your OpenERP Publisher's Warranty Contract unique key, also called serial "
 "number."
-msgstr "شفرة ضمان الناشر لأوبنيرب."
+msgstr ""
+"رمز اتفاقية ضمان الناشر الخاص بك لنظام أوبن إي آر بي، يدعى أيضاً الرقم "
+"التسلسلي."
 
 #. module: base
 #: model:ir.module.module,description:base.module_base_setup
diff --git a/openerp/addons/base/i18n/bg.po b/openerp/addons/base/i18n/bg.po
index 1eb843e2024..ab9556f269c 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-07-05 04:40+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:37+0000\n"
+"X-Generator: Launchpad (build 15637)\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 bc4ba16f8c8..778679bb04d 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-07-05 04:40+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:37+0000\n"
+"X-Generator: Launchpad (build 15637)\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 c138fdcc5ef..fa5f95b14da 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-07-05 04:41+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:37+0000\n"
+"X-Generator: Launchpad (build 15637)\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 a04a19a13d7..4819a321dda 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-07-05 04:41+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:38+0000\n"
+"X-Generator: Launchpad (build 15637)\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 f0b7a105877..2710b5c4629 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-07-05 04:41+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:38+0000\n"
+"X-Generator: Launchpad (build 15637)\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 e4d2feeccac..9db01f56eb0 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-07-07 05:12+0000\n"
-"X-Generator: Launchpad (build 15558)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:39+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -72,6 +72,20 @@ msgid ""
 "    * Graph of My Remaining Hours by Project\n"
 "    "
 msgstr ""
+"\n"
+"Das Projektmanagement-Modul verwaltet mehrstufige Projekte, Aufgaben, "
+"Aufgabenerfolge, usw.\n"
+"============================================================================="
+"===\n"
+"\n"
+"Es ist in der Lage Planung, Aufgabenreihenfolge usw. zu errechnen.\n"
+"\n"
+"Es bietet eine Pinnwand für Projektteilnehmer mit:\n"
+"    * Liste der ausstehenden Aufgaben\n"
+"    * Liste der zugewiesenen Aufgaben\n"
+"    * Graph von \"Meine Aufgaben : Geplant vs. Gesamtstunden\"\n"
+"    * Graph von \"Meine verbleibenden Stunden per Projekt\"\n"
+"    "
 
 #. module: base
 #: field:base.language.import,code:0
@@ -184,7 +198,7 @@ msgstr "Zielzeitraum"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_analytic_plans
 msgid "Sales Analytic Distribution"
-msgstr ""
+msgstr "Kostenverrechnung des Verkaufs"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_process
@@ -194,7 +208,7 @@ msgstr "Prozess"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_analytic_journal_billing_rate
 msgid "Billing Rates on Contracts"
-msgstr ""
+msgstr "Verrechnungssätze in Verträgen"
 
 #. module: base
 #: code:addons/base/res/res_users.py:558
@@ -228,7 +242,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 "Umbenennen des Ersatzfeldes \"%s\" ist nicht erlaubt"
 
 #. module: base
 #: model:res.country,name:base.sz
@@ -356,6 +370,12 @@ msgid ""
 "  - tree_but_open\n"
 "For defaults, an optional condition"
 msgstr ""
+"Bei Aktionen eine der folgenen Wahlmöglichkeiten: \n"
+"  -client_action_multi\n"
+"  -client_print_multi\n"
+"  -client_action_relate\n"
+"  -tree_but_open\n"
+"Bei Vorgabefeldern eine wahlfreie Einstellung"
 
 #. module: base
 #: sql_constraint:res.lang:0
@@ -370,6 +390,11 @@ msgid ""
 "        complex data from other software\n"
 "    "
 msgstr ""
+"\n"
+"        Dieses Modul bietet eine Klasse import_framework, welche beim Import "
+"\n"
+"        komplexer Daten aus anderen Anwendungen behilflich ist\n"
+"    "
 
 #. module: base
 #: field:ir.actions.wizard,wiz_name:0
@@ -631,6 +656,30 @@ msgid ""
 "    Accounting/Reporting/Generic Reporting/Partners/Follow-ups Sent\n"
 "\n"
 msgstr ""
+"\n"
+"Modul zum automatisieren der Anschreiben für ein mehrstufiges Mahnwesen.\n"
+"=================================================================\n"
+"\n"
+"Sie können mehrere Mahnstufen über das Menü:\n"
+"    Finanzen/Konfiguration/Weitere Einstellungen/Erinnerungen\n"
+"\n"
+"Einmal eingerichtet können Sie auf täglicher Basis automatisch "
+"Zahlungserinnerungen drucken, über das Menü:\n"
+"    Finanzen/Periodische Buchungen/Zahlungserinnerungen/Sende "
+"Zahlungserinnerung\n"
+"\n"
+"Dies generiert ein PDF mit allen Briefen in den jeweils definierten "
+"Mahnstufen. Sie können verschiedene\n"
+"Verfahrensvorschriften für unterschiedliche Unternehmen definieren. Sie "
+"können auch eMail an den\n"
+"Kunden versenden.\n"
+"\n"
+"Beachten Sie, dass Sie die Mahnstufe eines Partners/Kontos überprüfen "
+"möchten können Sie diese über das Menü\n"
+"    Finanzen/Berichtswesen/Standard Auswertungen/Partner/Versendete "
+"Erinnerungen\n"
+"einsehen.\n"
+"\n"
 
 #. module: base
 #: field:res.country,name:0
@@ -921,6 +970,15 @@ msgid ""
 "delete on objects and can check logs.\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul lässt den Administrator alle Benutzeraktivitäten an allen "
+"Objekten des Systems verfolgen.\n"
+"============================================================================="
+"========\n"
+"\n"
+"Der Administrator kann sich selbst Regeln für das Lesen, Schreiben und \n"
+"Löschen von Objekten zulassen und kann Protokolle einsehen.\n"
+"    "
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_4
@@ -1184,6 +1242,25 @@ 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 ""
+"Gehen Sie Ihrer Planung nach\n"
+"Dieses Modul hilft Ihnen Ihre Planung zu Verwalten.\n"
+"===========================================\n"
+"\n"
+"Dieses Modul basiert auf dem Kostenstellen-Modul und ist vollständig "
+"integriert in\n"
+"* die Stundennachweisverwaltung\n"
+"* die Feiertagsverwaltung\n"
+"* die Projektverwaltung\n"
+"\n"
+"Jeder Abteilungsleiter kann so erfahren kann, ob ein Mitarbeiter seines "
+"Teams noch verfügbare\n"
+"Zeit für eine gegebene Planung (und unter Berücksichtigung von genehmigtem "
+"Urlaub) hat, oder\n"
+"ob er noch zu erledigende Aufgaben eröffnen muss.\n"
+"\n"
+"Am Ende des Monats kann der Planungsverantwortliche auch überprüfen, ob die "
+"eingereichten \n"
+"Stundenachweise die zugerechnete Zeit der Kostenstellen berücksichtigen.\n"
 
 #. module: base
 #: selection:ir.property,type:0
@@ -1356,7 +1433,7 @@ msgstr "Dokumentenverwaltungssystem"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_claim
 msgid "Claims Management"
-msgstr ""
+msgstr "Nachforderungsmanagement"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_purchase_root
@@ -1405,6 +1482,14 @@ msgid ""
 "    * Commitment Date\n"
 "    * Effective Date\n"
 msgstr ""
+"\n"
+"Zusätzliche Datumseinträge für Verkaufsaufträge.\n"
+"===========================================\n"
+"\n"
+"Sie können zusätzlich die folgenden Daten einem Verkaufsauftrag hinzufügen:\n"
+"    * Anforderungsdatum\n"
+"    * Zusagedatum\n"
+"    * Wirksamkeitsdatum\n"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_sequence
@@ -1446,6 +1531,27 @@ msgid ""
 "database,\n"
 "      but in the servers rootpad like /server/bin/filestore.\n"
 msgstr ""
+"\n"
+"Dies ist ein vollständiges Dokumenten-Verwaltungs-System.\n"
+"===================================================\n"
+"\n"
+"    * Benutzer Legitimation\n"
+"    * Dokumentenindizierung: *.pptx und *.docx von der Windows-Plattform "
+"werden nicht unterstützt.\n"
+"    * Pinnwand für Dokumente einschließlich:\n"
+"        * Neue Dateien (Liste)\n"
+"        *  Dateien nach Typ (Diagramm)\n"
+"        * Dateien nach Partner (Diagramm)\n"
+"        * Dateigrößen nach Monat (Diagramm)\n"
+"\n"
+"ACHTUNG:\n"
+"    - Wenn Sie dieses Modul in einem laufenden System, mit bereits in der "
+"Datenbank abgespeicherten \n"
+"      PDF-Dateien installieren, werden Sie diese alle verlieren.\n"
+"    - Nach der Installation dieses Moduls werden PDF-Dateien nicht mehr in "
+"die Datenbank eingelagert,\n"
+"      sondern im Stammverzeichnis des Servers, z. B. /server/bin/filestore  "
+"abgelegt\n"
 
 #. module: base
 #: view:res.lang:0
@@ -1514,6 +1620,15 @@ msgid ""
 "Web.\n"
 "    "
 msgstr ""
+"\n"
+"Dies ist ein Testmodul welches HTML-Tag-Unterstützung in normaler XML-"
+"Formularsicht zeigt.\n"
+"============================================================================="
+"==\n"
+"\n"
+"Erzeugt ein Beispiel einer Formaularsicht unter Verwendung von HTML-Tags. \n"
+"Es ist nur in OpenERP Web darstellbar.\n"
+"    "
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_purchase_management
@@ -1521,6 +1636,8 @@ msgid ""
 "Helps you manage your purchase-related processes such as requests for "
 "quotations, supplier invoices, etc..."
 msgstr ""
+"Unterstützung aller Beschaffungsvorgänge, wie z. B. Angebotsanfragen, "
+"Bestellungen und Lieferanteneingangsrechnungen, usw...."
 
 #. module: base
 #: help:base.language.install,overwrite:0
@@ -1608,6 +1725,20 @@ msgid ""
 "    - You can define new types of events in\n"
 "        Association / Configuration / Types of Events\n"
 msgstr ""
+"\n"
+"Organisation und Verwaltung von Veranstaltungen.\n"
+"==========================================\n"
+"\n"
+"Dieses Modul ermöglich Ihnen\n"
+"    * Ihre Veranstaltungen und deren Anmeldungen zu verwalten\n"
+"    * eMails zu verwenden, um Anmeldungen zu einer Veranstaltung automatisch "
+"zu bestätigen\n"
+"    * ...\n"
+"\n"
+"Beachten Sie:\n"
+"    - Sie können neue Arten von Veranstaltungen im Menü\n"
+"        Gesellschaft/Konfiguration/Arten von Veranstaltungen\n"
+"       festlegen\n"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_tools
@@ -1712,6 +1843,26 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Werkzeug fügt allgemeine Freigaben-Hilfsmittel Ihrer OpenERP-"
+"Datenbank hinzu.\n"
+"=======================================================================\n"
+"\n"
+"Insbesondere wird der Web-Oberfläche ein \"Freigeben\"-Button hinzugefügt, "
+"um alle Arten \n"
+"von OpenERP-Daten mit Kollegen, Kunden, Freunden usw. zu teilen.\n"
+"\n"
+"Das System funktioniert durch kurzfristige Einrichtung von Benutzern und "
+"Benutzergruppen\n"
+"und durch passende Kombination von Zugriffsrechten und ir.rules-Regeln um "
+"sicherzustellen, \n"
+"dass nur die freigegebenen Benutzer Zugriff zu den Daten erhalten.\n"
+"\n"
+"Dies ist ausserordentlich nützlich für Arbeitsgruppen, Mitteilung von "
+"Wissen,\n"
+"Abgleich/Synchronisation mit anderen Unternehmen usw.\n"
+"\n"
+"    "
 
 #. module: base
 #: field:res.currency,accuracy:0
@@ -1794,6 +1945,43 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Validierung von USt-Identnummern von Partnern\n"
+"=========================================\n"
+"\n"
+"Nach der Installation dieses Moduls werden Eintragungen im UStId. -Feld der "
+"Partner\n"
+"aus unterstützten Ländern auf Gültigkeit geprüft. Das Land wird aus dem 2\n"
+"Buchstaben umfassenden Ländercode hergeleitet, das der UStId.-Nummer\n"
+"vorangestellt ist, z. B. wird 'DE4711471147' nach deutschen Regeln geprüft.\n"
+"\n"
+"Es gibt zwei Ausprägungen der Umsatzsteueridentnummern-Prüfung:\n"
+"\n"
+" * Per Vorgabe wird eine einfache off-line Überprüfung unter Anwendung "
+"bekannter\n"
+"   landesspezifischer Regeln durchgeführt für gewöhnlich eine einfache "
+"Ziffernkontrolle.\n"
+"   Dies ist schnell und jederzeit verfügbar, erlaubt jedoch auch nicht "
+"zugewiesene \n"
+"   oder mittlerweile ungültige Nummern.\n"
+" * Wenn die \"UStId Prüfung nach VIES\" aktiviert ist (in den Einstellungen "
+"des jeweiligen \n"
+"   Unternehmens), wird stattdessen die UStId-Nummer on-line an die EU VIES\n"
+"   Datenbank übermittelt. Aus dieser Übertragung wird die Gültigkeit dieser\n"
+"   Nummer bestätigt.Dies ist etwas langsamer als die Einfachprüfung, "
+"erfordert eine \n"
+"   Internetverbindung und mag nicht jederzeit zur Verfügung stehen. Sollte "
+"der\n"
+"   on-line Dienst nicht verfügbar sein oder für dieses Land nicht existieren "
+"(z. B.\n"
+"   für nicht-EU-Länder), so wird auf die Einfachprüfung zurückgegriffen.\n"
+"\n"
+"Unterstützt werden gegenwärtig alle EU-Länder und ein paar nicht-EU-Länder,\n"
+"wie z. B. Chile, Kulumbien, Mexiko, Norwegen und Russland. Bei nicht "
+"unterstützten\n"
+"Ländern wird lediglich der Landesschlüssel überprüft.\n"
+"\n"
+"    "
 
 #. module: base
 #: view:ir.sequence:0
@@ -1831,6 +2019,19 @@ msgid ""
 "The managers can obtain an easy view of best ideas from all the users.\n"
 "Once installed, check the menu 'Ideas' in the 'Tools' main menu."
 msgstr ""
+"\n"
+"Dieses Modul ermöglicht dem Benutzer auf effiziente Weise an Unternehmens-"
+"Innovation teilzuhaben.\n"
+"============================================================================="
+"========\n"
+"\n"
+"Es ermöglicht jedem Ideen zu unterschiedlichen Themen mitzuteilen.\n"
+"Daraufhin können andere Benutzer diese kommentieren und darüber abstimmen.\n"
+"Jede Idee erhält aus den Abstimmungen abgeleitete Bewertungen.\n"
+"Die Manager erhalten eine einfache Übersicht über die besten Ideen aller "
+"Benutzer.\n"
+"Nach der Installation schauen Sie bitte in das Menü Ideen im Werkzeug-Haupt-"
+"Menü."
 
 #. module: base
 #: model:ir.model,name:base.model_ir_rule
@@ -1866,6 +2067,7 @@ msgstr "Unternehmens Prozess"
 #: help:ir.cron,function:0
 msgid "Name of the method to be called when this job is processed."
 msgstr ""
+"Name der aufzurufenden Methode, wenn diese Aufgabe abgearbeitet wird."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_evaluation
@@ -1887,7 +2089,7 @@ msgstr " (Kopie)"
 #. module: base
 #: field:res.company,rml_footer1:0
 msgid "General Information Footer"
-msgstr ""
+msgstr "Fusszeile mit allgemein gültiger Information"
 
 #. module: base
 #: view:res.lang:0
@@ -1986,6 +2188,12 @@ msgid ""
 "Accounting chart and localization for Ecuador.\n"
 "    "
 msgstr ""
+"\n"
+"Dies ist das Haupt-Modul der Buchführung für Ecuador mit OpenERP.\n"
+"============================================================\n"
+"\n"
+"Kontenplan und Landesanpassungen für Ecuador.\n"
+"    "
 
 #. module: base
 #: code:addons/base/ir/ir_filters.py:38
@@ -2104,7 +2312,7 @@ msgstr "Baum"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_analytic_multicurrency
 msgid "Multi-Currency in Analytic"
-msgstr ""
+msgstr "Mehrfachwährungen in Kostenstellen"
 
 #. module: base
 #: view:base.language.export:0
@@ -2188,6 +2396,35 @@ msgid ""
 "Some statistics by journals are provided.\n"
 "    "
 msgstr ""
+"\n"
+"Das Verkaufsbericht-Modul ermöglicht Ihnen Ihre Verkäufe und Auslieferungen "
+"(Kommissionen) in verschiedenen\n"
+"Berichten zu Kategorisieren.\n"
+"============================================================================="
+"=================\n"
+"\n"
+"Dieses Modul ist für größere, in Abteilungen gegliederte Unternehmen sehr "
+"nützlich.\n"
+"\n"
+"Sie können Berichte für verschiedene Zwecke einrichten, einige Beispiele:\n"
+"    * Verkäufe unterschiedlicher Abteilungen trennen\n"
+"    * Berichte über Lieferung per LKW oder UPS\n"
+"\n"
+"Berichte haben einen Verantwortlichen und entwickeln sich in Stadien:\n"
+"    * Entwurf, Offen, Storniert, Abgeschlossen.\n"
+"\n"
+"Stapelverabeitung kann auf die verschiednen Berichte angewendet werden um\n"
+"alle Verkäufe auf einmal zu bestätigen, zu prüfen oder Verpackung in "
+"Rechnung zu stellen...\n"
+"\n"
+"Es unterstützt auch Methoden der Massen-Rechnungstellung die auf Partnern "
+"und \n"
+"Aufträgen eingestellt werden können, Beispielsweise:\n"
+"    * tägliche Rechnungsstellung,\n"
+"    * monatliche Rechnungsstellung, ...\n"
+"\n"
+"Einige Statistikberichte sind enthalten.\n"
+"    "
 
 #. module: base
 #: field:res.company,logo:0
@@ -2223,6 +2460,22 @@ msgid ""
 "re-invoice your customer's expenses if your work by project.\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul dient der Spesenverwaltung der Mitarbeiter.\n"
+"=================================================\n"
+"\n"
+"Der gesamte Geschäftsprozess ist eingebaut:\n"
+"    * Spesen-Eingabeentwurf\n"
+"    * Bestätigung durch den Mitarbeiter\n"
+"    * Prüfung durch den Vorgesetzten\n"
+"    * Prüfung der Buchhaltung und Rechnungsstellung (Zahlschein)\n"
+"    * Auszahlung der Ansprüche an den Mitarbeiter\n"
+"\n"
+"Dieses Modul nutzt auch das Kostenstellen-Modul und ist mit dem\n"
+"Modul \"Rechnung gemäß Stundennachweis\" kompatibel, so dass Sie \n"
+"bei Projektbezogener Abrechnung diese Kosten automatisch \n"
+"weiterverrechnen können.\n"
+"    "
 
 #. module: base
 #: field:ir.values,action_id:0
@@ -2349,6 +2602,18 @@ msgid ""
 "system to store and search in your CV base.\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul verwaltet Stellenausschreibungen und den Einstellungsprozess.\n"
+"================================================================\n"
+"\n"
+"Es ist eingebunden in das Umfrage-Modul (survey) um die Befragung für\n"
+"verschieden Stellen zu defnieren.\n"
+"\n"
+"Dieses Modul nutzt das EMail-Modul um automatisch Nachrichten zu erkennen,\n"
+"die an die Adresse jobs@UNTERNEHMEN.COM gerichtet sind. Ebenfalls wird\n"
+"das Dokementen Verwatungs System (DMS) unterstützt, um dort Lebensläufe \n"
+"bzw. Bewerbungen ablegen und recherchieren zu können.\n"
+"    "
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_widget_wizard
@@ -2426,6 +2691,20 @@ msgid ""
 "and categorize your interventions with a channel and a priority level.\n"
 "    "
 msgstr ""
+"\n"
+"Helpdesk-Verwaltung.\n"
+"===================\n"
+"\n"
+"Wie Karteikarten/Datensätze und Forderungsverwaltung, so sind auch der "
+"Helpdesk\n"
+"und techn. Betreuung wichtige und gute Hilfmittel Ihre Maßnahmen "
+"festzuhalten.\n"
+"Diese Erweiterung ist eher auf die (fern-) mündliche Hilfestellung "
+"ausgerichtet, was\n"
+"nicht notwendigerweise an eine Forderung geknüpft ist. Wählen Sie den Kunden "
+"aus,\n"
+"fügen Notizen hinzu und kategorisieren Sie die Ausrichtung und Priorität.\n"
+"    "
 
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
@@ -2446,6 +2725,17 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Modul für die Verwaltung von Resourcen.\n"
+"===================================\n"
+"\n"
+"Eine Resource wird durch etwas planbares repräsentiert (ein\n"
+"zugeteilter Entwickler oder ein Leitstand für Fertigungsaufträge).\n"
+"Dieses Modul verwaltet einen Terminkalender dem jede Resource \n"
+"zugewiesen wird. Der Kalender verwaltet auch die Abwesenheiten \n"
+"(Zeiten der nicht-verfügbarkeit) jeder Resource.\n"
+"\n"
+"    "
 
 #. module: base
 #: view:ir.rule:0
@@ -2486,6 +2776,12 @@ msgid ""
 "\n"
 "Configure servers and trigger synchronization with its database objects.\n"
 msgstr ""
+"\n"
+"Synchronisation mit allen Objekten.\n"
+"===============================\n"
+"\n"
+"Einstellen der Server und Abgleich der Auslöser (Trigger) mit ihren "
+"Datenbank-Objekten\n"
 
 #. module: base
 #: model:res.country,name:base.mg
@@ -2539,6 +2835,12 @@ msgid ""
 "orders.\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul ermöglicht die Kostenverrechnung zu Aufträgen.\n"
+"=====================================================\n"
+"\n"
+"Mit diesem Modul können Sie Kostenstellen an Aufträge binden.\n"
+"    "
 
 #. module: base
 #: field:ir.actions.url,target:0
@@ -2626,6 +2928,8 @@ msgstr "Server Aktion"
 #: help:ir.actions.client,params:0
 msgid "Arguments sent to the client along withthe view tag"
 msgstr ""
+"Argumente die zusammen mit der Sicht-Kennung an die Anwendung (client) "
+"gesendet werden"
 
 #. module: base
 #: model:ir.module.module,description:base.module_project_gtd
@@ -2656,6 +2960,33 @@ msgid ""
 "performing those tasks.\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul führt das Konzept der \"Dinge erledigt kriegen\" -Methodik.\n"
+"(Getting Things Done = GTD)\n"
+"============================================================\n"
+"\n"
+"Dieses Modul implementiert eine einfache auf Aufgaben basierende \"Zu "
+"Erledigen\"-Liste. \n"
+"Es fügt dem Projekt-Modul ein veränderliche Aufgabenliste mit dem Minimum an "
+"\n"
+"erforderlichen Feldern hinzu.\n"
+"\n"
+"Die Aufgabenliste ist an die GTD (Getting Things Done) -Methodik angelehnt.\n"
+"Diese weltweit genutzte Methodik wirdzur Verbesserung der persönlichen \n"
+"Zeitverwaltung benutzt.\n"
+"\n"
+"Getting Things Done (oft auch GTD abgekürzt) ist eine Methode zur \n"
+"Handlungs-Verwaltung, durch David Allen entworfen und im gleichnamigen\n"
+"Buch beschrieben.\n"
+"\n"
+"GTD beruht auf dem Prinzip, dass eine Person Aufgaben aus dem Gedächtnis "
+"entfernt \n"
+"werden müssen indem sie ausserhalb aufgezeichnet werden.Auf diesem Wege "
+"wird\n"
+"das Gedächtnis von der Aufgabe befreit sich an alles zu erledigende zu "
+"erinnern und \n"
+"sich auf die tatsächliche Durchführung konzentrieren kann.\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.tt
@@ -2731,7 +3062,7 @@ msgstr "Vererbt"
 #. module: base
 #: field:ir.model.fields,serialization_field_id:0
 msgid "Serialization Field"
-msgstr ""
+msgstr "Serialisierungs-Feld"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_report_designer
@@ -2827,6 +3158,10 @@ msgid ""
 "==================================================\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul fügt jeder Kanban-Sicht des Projekts einen PAD hinzu\n"
+"=========================================================\n"
+"    "
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_country
@@ -2904,6 +3239,14 @@ msgid ""
 "\n"
 "The decimal precision is configured per company.\n"
 msgstr ""
+"\n"
+"Einstellung der Genauigkeit für Preise in verschiedenen Anwendungen: "
+"Finanzen, Verkauf, Beschaffung, usw.\n"
+"============================================================================="
+"============\n"
+"\n"
+"Die Anzahl der Nachkommastellen (Auflösung) wird je Unternehmen "
+"eingestellt.\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_pl
@@ -2925,7 +3268,7 @@ msgstr ""
 #. module: base
 #: field:ir.actions.client,params_store:0
 msgid "Params storage"
-msgstr ""
+msgstr "Ablage für Parameter"
 
 #. module: base
 #: code:addons/base/module/module.py:409
@@ -2956,12 +3299,27 @@ msgid ""
 "since it's the same which has been renamed.\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul ermöglicht die Segmentierung der Partner.\n"
+"===============================================\n"
+"\n"
+"Es nutzt die Profil-Kriterien des ursprünglichen Segmentierungs-Moduls und "
+"erweitert diese. Dank des neuen Fragebogen-Konzepts können Sie nun Fragen zu "
+"einem Fragebogen umgruppieren und diesen unmittelbar auf Partner anwenden.\n"
+"\n"
+"Ebenfalls wurden die früheren Kunden- bzw- Lieferantenverwaltungen "
+"zusammengeführt, da diese sich überschnitten haben.\n"
+"\n"
+"    * BEMERKUNG: Dieses Modul ist nicht mit dem Modul \"Segmentierung\" "
+"verwendbar, da es \n"
+"       der umbenannte Nachfolger ist.\n"
+"    "
 
 #. module: base
 #: code:addons/report_sxw.py:434
 #, python-format
 msgid "Unknown report type: %s"
-msgstr ""
+msgstr "Unbekannte Berichtsart: %s"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:282
@@ -3081,7 +3439,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_wiki_quality_manual
 msgid "Wiki: Quality Manual"
-msgstr ""
+msgstr "Wiki: Qualitätshandbuch"
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
@@ -3168,7 +3526,7 @@ msgstr ""
 #. module: base
 #: model:res.groups,name:base.group_survey_user
 msgid "Survey / User"
-msgstr ""
+msgstr "Überwachung / Benutzer"
 
 #. module: base
 #: view:ir.module.module:0
@@ -3212,6 +3570,13 @@ msgid ""
 "for Wiki FAQ.\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul stellt eine Wiki FAQ - Vorlage bereit.\n"
+"==========================================\n"
+"\n"
+"Es hat Demo-Daten, womit zugleich eine Wiki Gruppe und eine Wiki-Seite \n"
+"für eine Wiki FAQ erstellt wird.\n"
+"    "
 
 #. module: base
 #: view:ir.actions.server:0
@@ -3384,6 +3749,43 @@ msgid ""
 "    * Graph of Sales by Product's Category in last 90 days\n"
 "    "
 msgstr ""
+"\n"
+"Das Haupt-Modul zur Verwaltung von Angeboten und Aufträgen.\n"
+"=====================================================\n"
+"\n"
+"Arbeitsabläufe mit Prüfschritten:\n"
+"---------------------------------------\n"
+"    * Angebotsanfrage -> Verkaufsauftrag -> Rechnung\n"
+"\n"
+"Methoden der Rechnungsstellung:\n"
+"-----------------------------------------\n"
+"    * Rechnung bei Auftrag (vor oder nach Auslieferung)\n"
+"    * Rechnung bei Lieferung\n"
+"    * Rechnung gemäß Stundennachweis\n"
+"    * Rechnung vorab\n"
+"\n"
+"Partner Voreinstellungen:\n"
+"    * Versandart\n"
+"    * Rechnungsstellung\n"
+"    * Handelabwicklung\n"
+"\n"
+"Produktbestände und -preise\n"
+"----------------------------------\n"
+"\n"
+"Liefermethoden:\n"
+"---------------------\n"
+"    * Alles gemeinsam\n"
+"    * Mehrfachsendung\n"
+"    * geringste Lieferkosten\n"
+"\n"
+"Pinnwand für Verkaufsleitung einschließlich:\n"
+"---------------------------------------------------\n"
+"    * Angebotsübersicht\n"
+"    * Monatliche Verkäufe\n"
+"    * Diagramm: Verkäufe der letzten 90 Tage je Verkäufer\n"
+"    * Diagramm: Verkäufe der letzten 90 Tage je Kunde\n"
+"    * Diagramm: Verkäufe der letzten 90 Tage je Produktkategorie\n"
+"    "
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -3463,6 +3865,20 @@ msgid ""
 "module 'share'.\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul definiert 'Portale' um den Zugriff auf Ihre OpenERP-Datenbank \n"
+"durch externe Benutzer zu reglementieren.\n"
+"===================================================================\n"
+"\n"
+"Ein Portal stellt einstallbare Menüs und Zugriffsrechte für eine (dem Portal "
+"\n"
+"zugewiesene) Benutzergruppe. Es stellt auch Beziehungen von Anwendergruppen\n"
+"zu Portalbenutzern her (eine Gruppe dem Portal hinzufügen verknüpft die "
+"Gruppe \n"
+"automatisch mit den Portalbenutzern usw.). Dies ist sehr nützlich in "
+"Verbindung mit \n"
+"dem dem Freigaben-Modul.\n"
+"    "
 
 #. module: base
 #: selection:res.request,priority:0
@@ -3552,7 +3968,7 @@ msgstr "Mayotte"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_todo
 msgid "Tasks on CRM"
-msgstr ""
+msgstr "Aufgaben der Kundenverwaltung"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_generic_modules_accounting
@@ -3573,6 +3989,16 @@ msgid ""
 "* a basic mechanism to easily plug various automated payment.\n"
 "    "
 msgstr ""
+"\n"
+"Modul das Begleichen von Eingangsrechnungen zu verwalten.\n"
+"===================================================\n"
+"\n"
+"Dieses Modul liefert:\n"
+"-------------------------\n"
+"    * einen effizienteren Weg den Rechnungsausgleich zu verwalten,\n"
+"    * einen Grundmechanismus einfach verschiedene \n"
+"       Zahlungsautomatismen einzusetzen.\n"
+"    "
 
 #. module: base
 #: view:ir.rule:0
@@ -3599,11 +4025,33 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul bietet einige Möglichkeiten das Erscheinungsbild von Rechnungen "
+"zu verbessern.\n"
+"============================================================================="
+"===\n"
+"\n"
+"Es bietet die folgenden Möglichkeiten:\n"
+"---------------------------------------------\n"
+"    * Positionen einer Rechnung sortieren,\n"
+"    * Überschriften, Kommentare, Zwischensummen hinzufügen\n"
+"    * Waagerechte Trennlinie\n"
+"    * Seitenumbruch erzwingen\n"
+"\n"
+"Darüber hinaus gibt es die Möglichkeit alle ausgewählten Rechnungen mit "
+"einer \n"
+"besonderen Nachricht am Ende zu versehen. Dies kann für Wünsche zum "
+"Jahresende \n"
+"ebenso genutzt werden wie für Terminhinweise oder ähnliches.\n"
+"\n"
+"    "
 
 #. module: base
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr "Fehler! Sie können keine rekursive assoziierte Mitglieder anlegen."
+msgstr ""
+"Fehler! Sie können keine rekursiv assoziierten (sich selbst einschließende) "
+"Mitglieder anlegen."
 
 #. module: base
 #: view:res.payterm:0
@@ -3654,6 +4102,9 @@ msgid ""
 "        OpenERP Web chat module.\n"
 "        "
 msgstr ""
+"\n"
+"        OpenERP Web Chat-Modul\n"
+"        "
 
 #. module: base
 #: field:res.partner.address,title:0
@@ -3676,7 +4127,7 @@ msgstr "Rekursive Einträge entdeckt"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_report_webkit_sample
 msgid "Webkit Report Samples"
-msgstr ""
+msgstr "Webkit Berichtsbeispiele"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_point_of_sale
@@ -3768,6 +4219,8 @@ msgstr "RML  (nunmehr ungültig - verwende Report)"
 #: sql_constraint:ir.translation:0
 msgid "Language code of translation item must be among known languages"
 msgstr ""
+"Sprachenschlüssel des zu übersetzenden Ausdrucks muss aus einer der "
+"bekannten Sprachen gewählt werden."
 
 #. module: base
 #: view:ir.rule:0
@@ -3791,6 +4244,14 @@ msgid ""
 "templates to target objects.\n"
 "    "
 msgstr ""
+"\n"
+"    * Unterstützung der Mehrsprachigkeit für Kontenpläne, Steuern, "
+"Steuerschlüssel, Journale, FiBu-Vorlagen,\n"
+"        Kostenstellen und Betriebsabrechnungs-Berichte.\n"
+"    * Änderungen durch den Assistenten:\n"
+"        - Übersetzungen für Kontenplan, Steuern, Steuerschlüssel und Bilanz "
+"von Vorlagen in die Zielobjekte kopieren.\n"
+"    "
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -3835,6 +4296,9 @@ msgid ""
 "        OpenERP Web mobile.\n"
 "        "
 msgstr ""
+"\n"
+"        OpenERP Web - Mobil\n"
+"        "
 
 #. module: base
 #: view:res.lang:0
@@ -3993,6 +4457,16 @@ msgid ""
 "user rights to Demo user.\n"
 "    "
 msgstr ""
+"\n"
+"Zugriffsrechte zur Finanzierung.\n"
+"===========================\n"
+"\n"
+"Diese Modul gibt dem Administrator Zugriff auf sämtliche Finanz-Bereiche\n"
+"wie Berichte / Listen und den Kontenplan.\n"
+"\n"
+"Es weist dem Administrator Manager- und Benutzer-Zugriffsrechte zu,\n"
+"einem Benutzer namens Demo nur die Benutzer-Zugriffsrechte.\n"
+"    "
 
 #. module: base
 #: selection:ir.module.module,state:0
@@ -4018,12 +4492,12 @@ msgstr "Liechtenstein"
 #. module: base
 #: model:ir.module.module,description:base.module_web_rpc
 msgid "Openerp web web"
-msgstr ""
+msgstr "OpenERP web web"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_issue_sheet
 msgid "Timesheet on Issues"
-msgstr ""
+msgstr "Stundennachweis für Anliegen"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_ltd
@@ -4125,7 +4599,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_it
 msgid "Italy - Accounting"
-msgstr ""
+msgstr "Italienische Buchführung"
 
 #. module: base
 #: field:ir.actions.act_window,help:0
@@ -4169,6 +4643,16 @@ msgid ""
 "automatically new claims based on incoming emails.\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul gibt Ihnen Überblick über Kunden-/Lierantenforderungen und über "
+"Mißstande.\n"
+"============================================================================="
+"\n"
+"\n"
+"Es ist vollständig mit dem EMail-Modul verwendbar, so dass Sie automatisch "
+"auf eingehende \n"
+"Nachrichten hin neue Forderungen erstellen können.\n"
+"    "
 
 #. module: base
 #: selection:workflow.activity,join_mode:0
@@ -4293,7 +4777,7 @@ msgstr "SXW Inhalt"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_pl
 msgid "Poland - Accounting"
-msgstr ""
+msgstr "Polen - Buchführung"
 
 #. module: base
 #: view:ir.cron:0
@@ -4323,6 +4807,19 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Das Beschaffungs-Modul dient der Erstellung von Beschaffungsaufträgen \n"
+"für den Wareneinkauf beim Lieferanten.\n"
+"===============================================================\n"
+"\n"
+"Eine Lieferrechnung wird für die jeweilige Bestellung erstellt.\n"
+"\n"
+"Ein Pinnwand für die Beschaffungsverwaltung schließt ein:\n"
+"    * Aktuelle Bestellungen\n"
+"    * Bestellungen im Entwurf\n"
+"    * Diagramm über monatliche Mengen udn Beträge\n"
+"\n"
+"    "
 
 #. module: base
 #: view:ir.model.fields:0
@@ -4367,6 +4864,9 @@ msgid ""
 "When no specific mail server is requested for a mail, the highest priority "
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
+"Wenn kein spezifischer Mailserver für die Mail ausgewählt ist wird der "
+"Server mit der höchsten Priorität genutzt. Standardmässige Priorität ist 10 "
+"(kleinere Nummer = höhere Priorität)"
 
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
@@ -4423,7 +4923,7 @@ msgstr "`code` muss eindeutig sein"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_expense
 msgid "Expenses Management"
-msgstr ""
+msgstr "Spesen-Verwaltung"
 
 #. module: base
 #: view:workflow.activity:0
@@ -4444,7 +4944,7 @@ msgstr "Surinam"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_timesheet
 msgid "Bill Time on Tasks"
-msgstr ""
+msgstr "Berechne geleistete Arbeitszeit"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_marketing
@@ -4461,7 +4961,7 @@ msgstr "Bankkonto"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_gr
 msgid "Greece - Accounting"
-msgstr ""
+msgstr "Griechische Buchführung"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -4481,7 +4981,7 @@ msgstr "Individualanpassung"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_gantt
 msgid "web Gantt"
-msgstr ""
+msgstr "Gantt-Diagramm im OpenERP web"
 
 #. module: base
 #: field:ir.module.module,license:0
@@ -4491,7 +4991,7 @@ msgstr "Lizenz"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_graph
 msgid "web Graph"
-msgstr ""
+msgstr "Graph im OpenERP web"
 
 #. module: base
 #: field:ir.attachment,url:0
@@ -4538,6 +5038,20 @@ msgid ""
 "above. Specify the interval information and partner to be invoice.\n"
 "    "
 msgstr ""
+"\n"
+"Erzeuge wiederkehrende Dokumente.\n"
+"================================\n"
+"\n"
+"Dieses Modul die Erstellung neuer Dokumente und jeweiliger Abonnements "
+"hierzu.\n"
+"\n"
+"Um z. B. eine Rechnung automatisch, periodisch zu erstellen:\n"
+"    * Legen Sie den Dokument-Typ auf \"Rechnungsobjekt\" fest\n"
+"    * Erstellen Sie ein Abonnement mit dem oben festgelegten Dokument "
+"(Quelle). \n"
+"    * Legen Sie nun das Intervall fest und den Partner als "
+"Dokumentempfänger.\n"
+"    "
 
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
@@ -4585,7 +5099,7 @@ msgstr "Modul Import"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ch
 msgid "Switzerland - Accounting"
-msgstr ""
+msgstr "Schweizer Buchführung"
 
 #. module: base
 #: field:res.bank,zip:0
@@ -4735,7 +5249,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.category,name:base.module_category_specific_industry_applications
 msgid "Specific Industry Applications"
-msgstr ""
+msgstr "Spezielle industrielle Anwendungen"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_retailers0
@@ -4760,7 +5274,7 @@ msgstr "Umsatzsteuer Nummer Überprüfung"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_partner_assign
 msgid "Partners Geo-Localization"
-msgstr ""
+msgstr "Geo-Ortung für Partner"
 
 #. module: base
 #: model:res.country,name:base.ke
@@ -4837,6 +5351,33 @@ msgid ""
 "Also implements IETF RFC 5785 for services discovery on a http server,\n"
 "which needs explicit configuration in openerp-server.conf, too.\n"
 msgstr ""
+"\n"
+"Mit diesem Modul wird der WebDAV-Server für Dokumente aktiviert.\n"
+"=========================================================\n"
+"\n"
+"Sie können dann jeden kompatiblen Browser verwenden, um Anhänge aus "
+"OpenObjects einzusehen.\n"
+"\n"
+"Nach der Installation wird der WebDAV-Server durch einen [webdav]-Abschnitt "
+"in der \n"
+"Konfigurationsdatei des OpenERP-Servers kontrolliert. Die Konfigurations-"
+"Parameter sind\n"
+"die folgenden:\n"
+"    [webdav]\n"
+"    ;enable = True   ;webdav mittels http(s)-Server bedienen\n"
+"    ;vdir = webdav    ; das Verzeichnis, das angeboten wird\n"
+"    ;   diese Vorgabe gibt an, dass WebDAV auf "
+"http://server.com:8069/webdav/ erscheint\n"
+"    ;verbose = True  ; ausführliche Meldungen für webdav\n"
+"    ;debug = True     ; Meldungen für Fehlerbeseitigung zusätzlich ausgeben\n"
+"    ;   da diese Ausgaben an die Python-Protokollierung mit den "
+"Einstellungen 'debug' und \n"
+"    ;   'debug_rpc'weitergeleitet werden können sie beide eingeschaltet "
+"lassen\n"
+"\n"
+"Die Dienst-Erkennung aud http-Servern nach IETF RFC 5785 ist auch "
+"eingebaut,\n"
+"diese Bedarf in der openerp-server.conf zusätzlich explizite Einstellungen.\n"
 
 #. module: base
 #: model:res.country,name:base.sm
@@ -4955,7 +5496,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_chat
 msgid "Web Chat"
-msgstr ""
+msgstr "Webchat"
 
 #. module: base
 #: field:res.company,rml_footer2:0
@@ -5326,7 +5867,7 @@ msgstr "Feld"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_long_term
 msgid "Long Term Projects"
-msgstr ""
+msgstr "Langzeitprojekte"
 
 #. module: base
 #: model:res.country,name:base.ve
@@ -5712,6 +6253,47 @@ msgid ""
 "of distribution models.\n"
 "        "
 msgstr ""
+"\n"
+"Dieses Modul ermöglicht die Erstellung mehrerer Kostenpläne und "
+"Zusammenfassung mittels Hauptplan.\n"
+"============================================================================="
+"===========\n"
+"\n"
+"Es werden hier mehrere Kostenstellen berührt, wenn eine Rechnung oder deren "
+"Positionen bestätigt werden.\n"
+"\n"
+"Zum Beispiel können Sie die folgende Kosten-Struktur  festlegen:\n"
+"  Projekte\n"
+"      Projekt 1\n"
+"          Unterproj. 1.1\n"
+"          Unterproj. 1.2\n"
+"\n"
+"      Projekt 2\n"
+"  Verkäufer\n"
+"      Eric\n"
+"      Fabien\n"
+"\n"
+"Wir haben also zwei Haupt-Pläne. Projekte und Verkäufer. Eine "
+"Rechnungsposition soll\n"
+"nun in der Lage sein in die Kostenstellen Unterproj 1.1 und Fabien der zwei "
+"Pläne zu \n"
+"buchen. Der Betrag kann aber auch gesplittet werden. In folgendem Beispiel "
+"würde \n"
+"die Rechnung auf beide Unterprojekte aber nur einem Verkäufer gebucht "
+"werden:\n"
+"\n"
+"Plan 1:\n"
+"    Unterproj 1.1: 50%\n"
+"    Unterproj 1.2: 50%\n"
+"Plan 2:\n"
+"    Eric: 100%\n"
+"\n"
+"Wenn diese Position der Rechnung also bestätigt wird, werden drei "
+"Kostenstellen \n"
+"für eine Kostenposition bebucht. Bei der einrichtung des Plans werden "
+"Minimal-\n"
+"und Maximalanteile der Verteilung überprüft.\n"
+"        "
 
 #. module: base
 #: help:res.country.state,code:0
@@ -5767,6 +6349,17 @@ msgid ""
 "You can also view the report of account analytic summary\n"
 "user-wise as well as month wise.\n"
 msgstr ""
+"\n"
+"Mit diesem Modul können Kostenstellen-Sichten angepasst werden um "
+"Projektverwaltern von\n"
+"Dienstleister-Unternehmen relevante Daten anzuzeigen.\n"
+"============================================================================="
+"==\n"
+"\n"
+"Es fügt ein Menü hinzu, mit dem für jeden Manager jeweils relevante "
+"Information angezeigt wird.\n"
+"Ebenso können die Kostenstellensummen nach Benutzern oder nach Monaten "
+"berichtet werden.\n"
 
 #. module: base
 #: model:ir.model,name:base.model_base_language_install
@@ -5925,7 +6518,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll
 msgid "Belgium - Payroll"
-msgstr ""
+msgstr "Belgien - Lohn und Gehalt"
 
 #. module: base
 #: view:publisher_warranty.contract.wizard:0
@@ -6053,11 +6646,19 @@ msgid ""
 "The user can also publish notes.\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul ermöglich dem Benutzer individuelle Pinnwände zu erstellen.\n"
+"=============================================================\n"
+"\n"
+"Dieses Modul erstellt auch die Administrations-Pinnwand.\n"
+"\n"
+"Der Anwender kann auch Notizen veröffentlichen.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_scrum
 msgid "Methodology: SCRUM"
-msgstr ""
+msgstr "SCRUM Methodik"
 
 #. module: base
 #: view:ir.attachment:0
@@ -6205,6 +6806,8 @@ msgid ""
 "- Action: an action attached to one slot of the given model\n"
 "- Default: a default value for a model field"
 msgstr ""
+"- Aktion: Eine Aktion, die für ein vorgegebenes Modell definiert wird.\n"
+"- Standard: ein Vorgabewert für ein Feld"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_addess_tree
@@ -6236,7 +6839,7 @@ msgstr "vsep"
 #. module: base
 #: model:res.widget,title:base.openerp_favorites_twitter_widget
 msgid "OpenERP Tweets"
-msgstr ""
+msgstr "OpenERP Tweets"
 
 #. module: base
 #: code:addons/base/module/module.py:392
@@ -6398,7 +7001,7 @@ msgstr "Inhalt"
 #: field:ir.module.module,menus_by_module:0
 #: view:res.groups:0
 msgid "Menus"
-msgstr "Menü"
+msgstr "Menüs"
 
 #. module: base
 #: selection:ir.actions.todo,type:0
@@ -6423,7 +7026,7 @@ msgstr "Israel"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_syscohada
 msgid "OHADA - Accounting"
-msgstr ""
+msgstr "OHADA Buchführung"
 
 #. module: base
 #: help:res.bank,bic:0
@@ -6589,12 +7192,12 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_profiling
 msgid "Customer Profiling"
-msgstr ""
+msgstr "Kundenprofil"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_issue
 msgid "Issues Tracker"
-msgstr ""
+msgstr "Problemverfolgung"
 
 #. module: base
 #: selection:ir.cron,interval_type:0
@@ -6938,7 +7541,7 @@ msgstr "Der Name des Moduls muss eindeutig sein!"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_contact
 msgid "Contacts Management"
-msgstr ""
+msgstr "Verwaltung von Kontakten"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_fr_rib
@@ -7064,7 +7667,7 @@ msgstr "Hinzufügen"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ec
 msgid "Ecuador - Accounting"
-msgstr ""
+msgstr "Ecuador Buchführung"
 
 #. module: base
 #: field:res.partner.category,name:0
@@ -7095,6 +7698,16 @@ msgid ""
 "    * HR Jobs\n"
 "    "
 msgstr ""
+"\n"
+"Modul für Personalverwaltung.\n"
+"=============================\n"
+"\n"
+"Sie verwalten:\n"
+"    * Mitarbeiter und Hierarchien. Sie legen den Mitarbeiter mit Nutzungs- "
+"und Anzeigehierarchien fest.\n"
+"    * Personalabteilungen\n"
+"    * Personalverwaltung: Positionen\n"
+"    "
 
 #. module: base
 #: view:res.widget.wizard:0
@@ -7104,7 +7717,7 @@ msgstr "Assistent Widgets"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
-msgstr ""
+msgstr "Honduras Buchführung"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_report_intrastat
@@ -7171,7 +7784,7 @@ msgstr "Aktiv"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ma
 msgid "Maroc - Accounting"
-msgstr ""
+msgstr "Marokko Buchführung"
 
 #. module: base
 #: model:res.country,name:base.mn
@@ -7226,6 +7839,22 @@ msgid ""
 "crm modules.\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul fügt eine Abkürzung zu einer oder mehreren "
+"Geschäftsgelegenheiten im Kundenmanagement hinzu.\n"
+"============================================================================="
+"====================\n"
+"\n"
+"Diese Abkürzung ermöglicht die Generierung eines Verkaufsauftrags auf Basis "
+"des ausgewählten Falles.\n"
+"Sind verschiedene Fälle geöffnet (Liste), wird fallweise je ein "
+"Verkaufsauftrag generiert und der Fall dann,\n"
+"mit Bezug auf den generierten Auftrag, geschlossen.\n"
+"\n"
+"Wir empfehlen den Einsatz dieses Moduls, wenn Sie sowohl das Modul Verkauf "
+"wie auch die \n"
+"Kundenverwaltung installiert haben.\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.bi
@@ -7343,6 +7972,17 @@ msgid ""
 "\n"
 "     "
 msgstr ""
+"\n"
+"Ermöglicht Ihnen das Ergänzen von Lieferarten in Verkaufsaufträgen und bei "
+"der Kommissionierung.\n"
+"============================================================================="
+"=======\n"
+"\n"
+"Sie können Ihre eigene Spedition und das Raster der Preise festlegen.\n"
+"Beim erzeugen von Rechnungen aus Kommissionierung, kann OpenERP den\n"
+"den Versandweg ermitteln und die Kosten der Rechnung hinzufügen.\n"
+"\n"
+"     "
 
 #. module: base
 #: view:workflow.workitem:0
@@ -7798,6 +8438,10 @@ msgid ""
 "    Module for the Check writing and check printing  \n"
 "    "
 msgstr ""
+"\n"
+"    Modul für das Ausfüllen und Drucken von Schecks.\n"
+"    ===========================================  \n"
+"    "
 
 #. module: base
 #: model:res.partner.bank.type,name:base.bank_normal
@@ -8078,7 +8722,7 @@ msgstr "ir.server.object.lines"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_be
 msgid "Belgium - Accounting"
-msgstr ""
+msgstr "Belgische Buchführung"
 
 #. module: base
 #: code:addons/base/module/module.py:622
@@ -8324,12 +8968,12 @@ msgstr "XSL Pfad"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_invoice_layout
 msgid "Invoice Layouts"
-msgstr ""
+msgstr "Rechnungsdruck mit Erweiterungen"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_stock_location
 msgid "Advanced Routes"
-msgstr ""
+msgstr "Erweiterte Lieferketten"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_pad
@@ -8414,7 +9058,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account
 msgid "eInvoicing"
-msgstr ""
+msgstr "eRechnung"
 
 #. module: base
 #: model:ir.module.module,description:base.module_association
@@ -8427,6 +9071,13 @@ msgid ""
 "memberships, membership products (schemes), etc.\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul richtet Module ein, die sich auf Gesellschaften beziehen.\n"
+"============================================================\n"
+"\n"
+"Es installiert Profile um Veranstaltungen, Registrierung, Mitgliedschaften, "
+"Mitgliederprodukte (Schemen), usw. von Gesellschaften zu verwalten.\n"
+"    "
 
 #. module: base
 #: code:addons/orm.py:2693
@@ -8477,6 +9128,14 @@ msgid ""
 "German accounting chart and localization.\n"
 "    "
 msgstr ""
+"\n"
+"Dieses  Modul beinhaltet einen deutschen Kontenrahmen basierend auf dem "
+"SKR03.\n"
+"============================================================================="
+"=\n"
+"\n"
+"Deutscher Kontenrahmen und Übersetzung.\n"
+"    "
 
 #. module: base
 #: field:ir.actions.report.xml,attachment_use:0
@@ -8508,6 +9167,30 @@ msgid ""
 "depending on the product's configuration.\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul dient der Berechnung von Beschaffungsaufträgen.\n"
+"======================================================\n"
+"\n"
+"Im Prozess der Materialbedarfsplanung, werden Beschaffungsaufträge erstellt. "
+"Diese\n"
+"stossen Fertigungsaufträge, Bestellanfragen/-aufträge, Lagerentnahmen an. \n"
+"Beschaffungsaufträge werden automatisch durch das System generiert und der\n"
+"Nutzer wird darüber nicht weiter informiert, es seie denn ein Problem tritt "
+"dabei auf.\n"
+"In diesem Fall wird das System über den Ausnahmezustand informieren, so dass "
+"das \n"
+"hindernde Problem manuell behoben werden kann (so kann z. B. eine Stückliste "
+"nicht \n"
+"definiert worden sein oder die Angabe eine Lieferanten fehlt).\n"
+"\n"
+"Der Beschaffungsauftrag legt einen Terminvorschlag für die automatische "
+"Beschaffung\n"
+"des nachzubestellenden Produktes an. Dieser Beschaffungsauftrag leitet eine "
+"Aufgabe \n"
+"ein, entweder ein Einkaufsauftrag beim Lieferanten oder auch einen "
+"Fertigungsauftrag,\n"
+"abhängig von der Produktzusammensetzung.\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.mx
@@ -8770,7 +9453,7 @@ msgstr "Iteration"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_planning
 msgid "Resources Planing"
-msgstr ""
+msgstr "Ressourcenplanung"
 
 #. module: base
 #: field:ir.module.module,complexity:0
@@ -8872,12 +9555,12 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_mrp_repair
 msgid "Repairs Management"
-msgstr ""
+msgstr "Verwaltung von Reparaturen"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_asset
 msgid "Assets Management"
-msgstr ""
+msgstr "Anlagenverwaltung"
 
 #. module: base
 #: view:ir.model.access:0
@@ -9148,7 +9831,7 @@ msgstr "Nördliche Marianen"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_claim_from_delivery
 msgid "Claim on Deliveries"
-msgstr ""
+msgstr "Forderungen aus Lieferung"
 
 #. module: base
 #: model:res.country,name:base.sb
@@ -9199,6 +9882,17 @@ msgid ""
 "    * Generates Relationship Graph\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul generiert technische Leitfäden der ausgewählten Module im "
+"Restruktured Text -Format (RST).\n"
+"============================================================================="
+"=============\n"
+"\n"
+"    * Es verwendet Sphinx (http://sphinx.pocoo.org) Implementierung von RST\n"
+"    * Es erzeugt ein tar-Archiv (.tgz Dateiendung) welches eine Dateiliste "
+"und eine Datei pro Modul\n"
+"    * Erzeugt einen Beziehungsgraphen\n"
+"    "
 
 #. module: base
 #: field:res.log,create_date:0
@@ -9214,7 +9908,7 @@ msgstr "Übersetzungen"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_gtd
 msgid "Todo Lists"
-msgstr ""
+msgstr "ToDo-Listen"
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -9447,7 +10141,7 @@ msgstr "Allgemeine Einstellungen"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_uy
 msgid "Uruguay - Chart of Accounts"
-msgstr ""
+msgstr "Urugay - Kontenführung"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_administration_shortcut
@@ -9467,7 +10161,7 @@ msgstr "Algerien"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_plugin
 msgid "CRM Plugins"
-msgstr ""
+msgstr "Plugins für die Kundenverwaltung"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_model_model
@@ -9565,11 +10259,15 @@ msgid ""
 "=====================================================\n"
 "\n"
 msgstr ""
+"\n"
+"Eine gemeinsame Schnittstelle für Plugins.\n"
+"======================================\n"
+"\n"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_mrp_jit
 msgid "Just In Time Scheduling"
-msgstr ""
+msgstr "Just in Time Terminierung"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_bank_statement_extensions
@@ -9601,7 +10299,7 @@ msgstr "osv_memory.autovacuum"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_us
 msgid "United States - Chart of accounts"
-msgstr ""
+msgstr "USA - Kontenführung"
 
 #. module: base
 #: view:base.language.install:0
@@ -9657,7 +10355,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_margin
 msgid "Margins in Sales Orders"
-msgstr ""
+msgstr "Margen in Kundenaufträgen"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_9
@@ -9668,7 +10366,7 @@ msgstr "Komponenten Lieferant"
 #: model:ir.module.category,name:base.module_category_purchase_management
 #: model:ir.module.module,shortdesc:base.module_purchase
 msgid "Purchase Management"
-msgstr ""
+msgstr "Beschaffung"
 
 #. module: base
 #: field:ir.module.module,published_version:0
@@ -9792,6 +10490,9 @@ msgid ""
 "        OpenERP Web example module.\n"
 "        "
 msgstr ""
+"\n"
+"        OpenERP Web Beispiel-Modul\n"
+"        "
 
 #. module: base
 #: model:res.country,name:base.gy
@@ -9966,6 +10667,10 @@ msgid ""
 "Todo list for CRM leads and opportunities.\n"
 "    "
 msgstr ""
+"\n"
+"Liste zu erledigender Aufgaben für Leads und Gelegenheiten der "
+"Kundenverwaltung.\n"
+"    "
 
 #. module: base
 #: field:ir.actions.act_window.view,view_id:0
@@ -10121,7 +10826,7 @@ msgstr "Berichtsvorschau"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_purchase_analytic_plans
 msgid "Purchase Analytic Plans"
-msgstr ""
+msgstr "Beschaffungsplanung"
 
 #. module: base
 #: model:ir.module.module,description:base.module_analytic_journal_billing_rate
@@ -10303,7 +11008,7 @@ msgstr "ID des Zieldatensatzes in der DB"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_analytic_analysis
 msgid "Contracts Management"
-msgstr ""
+msgstr "Vertragsverwaltung"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -10359,6 +11064,23 @@ msgid ""
 "account numbers\n"
 "    "
 msgstr ""
+"\n"
+"Das Modul erweitert das Standard-Objekt account_bank_statement_line "
+"(Auszugszeile) für verbessertes eBanking.\n"
+"============================================================================="
+"================\n"
+"\n"
+"Ergänzt:\n"
+"- Wertstellungsdatum (Valuta)\n"
+"- Mehrfachanweisungen\n"
+"- Nachverfolgung von Änderungen zu Auszugszeilen\n"
+"- Bank-Auszugszeilen Sicht\n"
+"- Bericht der Kontostände per Bank-Auszug\n"
+"- Leistungsteigerung für digitalen Import der Kontoauszüge (via "
+"\"ebanking_import\" Kontext-Kennung) \n"
+"- Namenssuche in res.partner.bank verbessert, um Suche nach Bankkonto oder "
+"IBAN zu ermöglichen\n"
+"    "
 
 #. module: base
 #: code:addons/orm.py:1895
@@ -10436,6 +11158,14 @@ msgid ""
 "journal. If set to true it allows user to cancel entries & invoices.\n"
 "    "
 msgstr ""
+"\n"
+"Erlaubt die Annullierung von Buchungen.\n"
+"====================================\n"
+"\n"
+"Dieses Modul fügt ein Feld  \"Erlaube Löschung von Buchungen\" in der Sicht "
+"Kontenbuch hinzu. Wenn auf Wahr gesetzt läßt dies die Löschung von Buchungen "
+"und Rechnungen zu.\n"
+"    "
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_rule
@@ -10641,6 +11371,12 @@ msgid ""
 "\n"
 "Using this you can directly open Google Map from the URL widget."
 msgstr ""
+"\n"
+"Das Modul fügt ein Google-Map Feld in die Partneraddresse-Sicht ein.\n"
+"===========================================================\n"
+"\n"
+"Mit der hier eingerichteten URL-Verknüpfung können Sie unmittelbar eine "
+"Google-Map öffnen."
 
 #. module: base
 #: field:workflow.activity,action:0
@@ -10805,6 +11541,12 @@ msgid ""
 "the bounds of global ones. The first group rules restrict further than "
 "global rules, but any additional group rule will add more permissions"
 msgstr ""
+"Globale -nicht gruppenspezifische- Regeln sind  Einschränkungen, die nicht "
+"umgangen werden können.\r\n"
+"Lokale Gruppenrechte erweitern die Berechtigungen innerhalb der Globalen "
+"Regeln.\r\n"
+"Die erste Gruppe beschränkt die globalen Rechte, alle zusätzlichen erweitern "
+"die gruppenlokalen Rechte."
 
 #. module: base
 #: field:res.currency.rate,rate:0
@@ -11024,7 +11766,7 @@ msgstr "Oder"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_br
 msgid "Brazilian - Accounting"
-msgstr ""
+msgstr "Brasilianische Buchführung"
 
 #. module: base
 #: model:res.country,name:base.pk
@@ -11162,7 +11904,7 @@ msgstr "Aktionen"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_event_project
 msgid "Retro-Planning on Events"
-msgstr ""
+msgstr "Retrograde Planung von Veranstaltungen"
 
 #. module: base
 #: code:addons/custom.py:555
@@ -11632,7 +12374,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr
 msgid "Employee Directory"
-msgstr ""
+msgstr "Angestelltenverzeichnis"
 
 #. module: base
 #: view:ir.cron:0
@@ -11882,7 +12624,7 @@ msgstr "Kopiere Objekt"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_mail
 msgid "Emails Management"
-msgstr ""
+msgstr "Verwaltung von Emails"
 
 #. module: base
 #: field:ir.actions.server,trigger_name:0
@@ -12060,7 +12802,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_uk
 msgid "UK - Accounting"
-msgstr ""
+msgstr "Großbritannien Buchführung"
 
 #. module: base
 #: model:ir.module.module,description:base.module_project_scrum
@@ -12133,7 +12875,7 @@ msgstr "Konfiguration"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_in
 msgid "India - Accounting"
-msgstr ""
+msgstr "Indische Buchführung"
 
 #. module: base
 #: field:ir.actions.server,expression:0
@@ -12148,7 +12890,7 @@ msgstr "Anfangsdatum"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_gt
 msgid "Guatemala - Accounting"
-msgstr ""
+msgstr "Guatemala Buchführung"
 
 #. module: base
 #: help:ir.cron,args:0
@@ -12530,7 +13272,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_users_ldap
 msgid "Authentication via LDAP"
-msgstr ""
+msgstr "Authentifizierung mit LDAP"
 
 #. module: base
 #: view:workflow.activity:0
@@ -12665,12 +13407,12 @@ msgstr "Pinnwände"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_procurement
 msgid "Procurements"
-msgstr ""
+msgstr "Beschaffungsvorgänge"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_payroll_account
 msgid "Payroll Accounting"
-msgstr ""
+msgstr "Lohnbuchhaltung"
 
 #. module: base
 #: help:ir.attachment,type:0
@@ -13046,6 +13788,8 @@ msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
 "explicitly."
 msgstr ""
+"Bitte tragen sie mindestens einen SMTP-Server ein, oder geben sie die SMTP "
+"Parameter explizit an"
 
 #. module: base
 #: view:ir.attachment:0
@@ -13127,7 +13871,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_th
 msgid "Thailand - Accounting"
-msgstr ""
+msgstr "Thailändische Buchführung"
 
 #. module: base
 #: view:res.lang:0
@@ -13372,6 +14116,21 @@ msgid ""
 "\n"
 "\n"
 msgstr ""
+"\n"
+"Schweizer Übersetzung :\n"
+"- DTA-Generierung für viele Zahlungstypen\n"
+"- ESR-Verwaltung (Nummerngenerierung, Berichte, etc..)\n"
+"- Zahlungsbewegungen von der Bankdatei importieren (wie v11 etc..)\n"
+"- Vereinfachen für das Abstimmen von Konten\n"
+"\n"
+"Sie können PLZ- und Bank-AutoVervollständigung hinzufügen mit:\n"
+"- l10n_ch_zip\n"
+"- l10n_ch_bank\n"
+"\n"
+"Author: Camptocamp SA\n"
+"Donatoren: Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+"\n"
 
 #. module: base
 #: help:multi_company.default,expression:0
@@ -13773,7 +14532,7 @@ msgstr "Diagramm"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_es
 msgid "Spanish - Accounting (PGCE 2008)"
-msgstr ""
+msgstr "Spanische Buchführung (PGCE 2008)"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_stock_no_autopicking
@@ -13870,7 +14629,7 @@ msgstr "Export"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_nl
 msgid "Netherlands - Accounting"
-msgstr ""
+msgstr "Holländische Buchführung"
 
 #. module: base
 #: field:res.bank,bic:0
@@ -14158,7 +14917,7 @@ msgstr "_Export"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_followup
 msgid "Followup Management"
-msgstr ""
+msgstr "Offene Posten Verwaltung"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_fr
@@ -14328,7 +15087,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,description:base.module_auth_openid
 msgid "Allow users to login through OpenID."
-msgstr ""
+msgstr "Benutzern erlauben sich mit OpenID zu authentifizieren"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_payment
@@ -14441,7 +15200,7 @@ msgstr "Objekt Beziehungen"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_voucher
 msgid "eInvoicing & Payments"
-msgstr ""
+msgstr "eRechnung & Zahlungen"
 
 #. module: base
 #: view:ir.rule:0
@@ -14599,12 +15358,12 @@ msgstr "zulässige Unternehmen"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_de
 msgid "Deutschland - Accounting"
-msgstr ""
+msgstr "Deutsche Buchführung"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_auction
 msgid "Auction Houses"
-msgstr ""
+msgstr "Auktionen & Versteigerungen"
 
 #. module: base
 #: field:ir.ui.menu,web_icon:0
@@ -14857,7 +15616,7 @@ msgstr "Betreuung nach Verkauf"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_fr
 msgid "France - Accounting"
-msgstr ""
+msgstr "Französische Buchführung"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -14867,7 +15626,7 @@ msgstr "Ausführen"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_caldav
 msgid "Share Calendar using CalDAV"
-msgstr ""
+msgstr "Kalender mit CalDAV freigeben"
 
 #. module: base
 #: field:ir.actions.act_window,limit:0
@@ -14886,7 +15645,7 @@ msgstr ""
 #: code:addons/orm.py:791
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
-msgstr ""
+msgstr "Serialisierungsfeld `%s` für Ersatzfeld `%s` nicht  gefunden!"
 
 #. module: base
 #: model:res.country,name:base.jm
@@ -15128,7 +15887,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_plugin_thunderbird
 msgid "Thunderbird Plug-In"
-msgstr ""
+msgstr "Thunderbird Plug-In"
 
 #. module: base
 #: model:ir.model,name:base.model_res_country
@@ -15287,7 +16046,7 @@ msgstr "ir.actions.server"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ca
 msgid "Canada - Accounting"
-msgstr ""
+msgstr "Kanadische Buchführung"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
@@ -15326,7 +16085,7 @@ msgstr "Implementierung"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ve
 msgid "Venezuela - Accounting"
-msgstr ""
+msgstr "Venezuelanische Buchführung"
 
 #. module: base
 #: model:res.country,name:base.cl
diff --git a/openerp/addons/base/i18n/el.po b/openerp/addons/base/i18n/el.po
index 97686885d41..7a9c9db6811 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-07-05 04:42+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:39+0000\n"
+"X-Generator: Launchpad (build 15637)\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 9926427d9d0..d7bc4f79bbf 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-07-05 04:47+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:44+0000\n"
+"X-Generator: Launchpad (build 15637)\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 bf6d7b43643..ef47237de9f 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-07-05 04:46+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:43+0000\n"
+"X-Generator: Launchpad (build 15637)\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 6bfbedefca5..fdc9c0340dd 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-07-05 04:47+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:44+0000\n"
+"X-Generator: Launchpad (build 15637)\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 b2e08ace3eb..9c200b406c5 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-07-05 04:48+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:44+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/es_CR.po b/openerp/addons/base/i18n/es_CR.po
index 3f9f047efd9..a5124cc2596 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-07-05 04:48+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:45+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 "Language: \n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/es_EC.po b/openerp/addons/base/i18n/es_EC.po
index 104d244a736..9a8ee789f45 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-07-05 04:48+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:45+0000\n"
+"X-Generator: Launchpad (build 15637)\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 5fd1fd28561..92461a33610 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-07-05 04:41+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:38+0000\n"
+"X-Generator: Launchpad (build 15637)\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 2a6c8bb8057..cac59f27002 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-07-05 04:40+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:37+0000\n"
+"X-Generator: Launchpad (build 15637)\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 2ef57e23fd9..74885636856 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-07-05 04:44+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:41+0000\n"
+"X-Generator: Launchpad (build 15637)\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 bd49d236ec2..99a346be694 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-07-05 04:48+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:45+0000\n"
+"X-Generator: Launchpad (build 15637)\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 63d22e5273e..c2de09b902d 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-07-05 04:41+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:38+0000\n"
+"X-Generator: Launchpad (build 15637)\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 4bcc31bc392..3f755a59d14 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-07-05 04:42+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:38+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -6490,6 +6490,83 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"    Module d'importation des états bancaires CODA.\n"
+"\n"
+"    Les fichiers supportés sont les fichiers plats CODA en version v2 des "
+"comptes bancaires Belges.\n"
+"    - CODA v1 supporté.\n"
+"    - CODA v2.2 supporté.\n"
+"    - Devises Étrangères supportées.\n"
+"    - Support pour tous les enregistrements de type (0, 1, 2, 3, 4, 8, 9).\n"
+"    - Parsing & logging pour tous les Types de Transactions et les Formats "
+"Structurés de Communications.\n"
+"    - Imputation Automatique des Journaux Financiers via les paramètres de "
+"configuration CODA.\n"
+"    - Support des Journaux multiples par numéro de compte bancaire.\n"
+"    - Support des états multiples de différents comptes bancaires sur un "
+"fichier CODA unique.\n"
+"    - Support pour \"analyse seule\" ('parsing only') CODA des comptes "
+"bancaires (définis comme type='info' dans les enregistrements de "
+"configuration CODA du compte bancaire).\n"
+"    - Analyse CODA mulit-langues, données de configuration pour l'analyse "
+"fournie en EN, NL, FR.\n"
+"\n"
+"    Les fichiers CODA informatiquement lisibles sont analysés et enregistrés "
+"en format texte dans des états bancaires CODA.\n"
+"    Also Bank Statements are generated containing a subset of the CODA "
+"information (only those transaction lines\n"
+"    that are required for the creation of the Financial Accounting "
+"records).\n"
+"    The CODA Bank Statement is a 'read-only' object, hence remaining a "
+"reliable representation of the original CODA file\n"
+"    whereas the Bank Statement will get modified as required by accounting "
+"business processes.\n"
+"\n"
+"    CODA Bank Accounts configured as type 'Info' will only generate CODA "
+"Bank Statements.\n"
+"\n"
+"    A removal of one object in the CODA processing results in the removal of "
+"the associated objects.\n"
+"    The removal of a CODA File containing multiple Bank Statements will also "
+"remove those associated\n"
+"    statements.\n"
+"\n"
+"    The following reconciliation logic has been implemented in the CODA "
+"processing:\n"
+"    1) The Company's Bank Account Number of the CODA statement is compared "
+"against the Bank Account Number field\n"
+"       of the Company's CODA Bank Account configuration records (whereby "
+"bank accounts defined in type='info' configuration records are ignored).\n"
+"       If this is the case an 'internal transfer' transaction is generated "
+"using the 'Internal Transfer Account' field of the CODA File Import wizard.\n"
+"    2) As a second step the 'Structured Communication' field of the CODA "
+"transaction line is matched against\n"
+"       the reference field of in- and outgoing invoices (supported : Belgian "
+"Structured Communication Type).\n"
+"    3) When the previous step doesn't find a match, the transaction "
+"counterparty is located via the\n"
+"       Bank Account Number configured on the OpenERP Customer and Supplier "
+"records.\n"
+"    4) In case the previous steps are not successful, the transaction is "
+"generated by using the 'Default Account\n"
+"       for Unrecognized Movement' field of the CODA File Import wizard in "
+"order to allow further manual processing.\n"
+"\n"
+"    In stead of a manual adjustment of the generated Bank Statements, you "
+"can also re-import the CODA\n"
+"    after updating the OpenERP database with the information that was "
+"missing to allow automatic reconciliation.\n"
+"\n"
+"    Remark on CODA V1 support:\n"
+"    In some cases a transaction code, transaction category or structured "
+"communication code has been given a new or clearer description in CODA V2.\n"
+"    The description provided by the CODA configuration tables is based upon "
+"the CODA V2.2 specifications.\n"
+"    If required, you can manually adjust the descriptions via the CODA "
+"configuration menu.\n"
+"\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.et
diff --git a/openerp/addons/base/i18n/gl.po b/openerp/addons/base/i18n/gl.po
index 4efb155de8c..91ac9510620 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-07-05 04:42+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:39+0000\n"
+"X-Generator: Launchpad (build 15637)\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 49b43c872f0..91597862bf5 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-07-05 04:42+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:39+0000\n"
+"X-Generator: Launchpad (build 15637)\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 4b353ccc8f6..967b11c89a0 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-07-05 04:42+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:39+0000\n"
+"X-Generator: Launchpad (build 15637)\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 71764eba76d..e50c21bd73c 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-07-05 04:45+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:42+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 "Language: hr\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/hu.po b/openerp/addons/base/i18n/hu.po
index e32c2abe895..d98ee515473 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-07-05 04:43+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:40+0000\n"
+"X-Generator: Launchpad (build 15637)\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 d2594e495d4..2c5ed383c32 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-07-05 04:40+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:37+0000\n"
+"X-Generator: Launchpad (build 15637)\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 281c26be5f0..de2d31683ee 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-07-05 04:43+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:40+0000\n"
+"X-Generator: Launchpad (build 15637)\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 c8663a081eb..bab1f557502 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-07-05 04:43+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:40+0000\n"
+"X-Generator: Launchpad (build 15637)\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 70a8e7d3a1a..5fc3ece66a8 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-07-05 04:43+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:40+0000\n"
+"X-Generator: Launchpad (build 15637)\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 ed37324ec10..0e756def3ee 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-07-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15558)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:40+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/ka.po b/openerp/addons/base/i18n/ka.po
index 784c92e5c4c..a7a4c233c3c 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-07-05 04:42+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:39+0000\n"
+"X-Generator: Launchpad (build 15637)\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 154e7e179af..09a985213b8 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-07-05 04:43+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:40+0000\n"
+"X-Generator: Launchpad (build 15637)\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 0f517691472..b66cb25933e 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-07-05 04:43+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:40+0000\n"
+"X-Generator: Launchpad (build 15637)\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 5a6da9f839a..eb59a102506 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-07-05 04:44+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:41+0000\n"
+"X-Generator: Launchpad (build 15637)\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 a6048b6b687..0a83e177d06 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-07-05 04:44+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:41+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -107,6 +107,8 @@ msgid ""
 "Helps you manage your projects and tasks by tracking them, generating "
 "plannings, etc..."
 msgstr ""
+"Palīdz pārvaldīt projektus un uzdevumus, tiem sekojot, ģenerējot plānojumus "
+"utt."
 
 #. module: base
 #: field:ir.actions.act_window,display_menu_tip:0
@@ -220,7 +222,7 @@ msgstr "Svazilenda"
 #: code:addons/orm.py:4206
 #, python-format
 msgid "created."
-msgstr ""
+msgstr "izveidots."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_tr
@@ -264,7 +266,7 @@ msgstr ""
 #: model:ir.module.category,name:base.module_category_sales_management
 #: model:ir.module.module,shortdesc:base.module_sale
 msgid "Sales Management"
-msgstr ""
+msgstr "Tirdzniecības Vadība"
 
 #. module: base
 #: view:res.partner:0
@@ -365,7 +367,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.category,name:base.module_category_customer_relationship_management
 msgid "Customer Relationship Management"
-msgstr ""
+msgstr "Klientu Attiecību Vadība (CRM)"
 
 #. module: base
 #: view:ir.module.module:0
@@ -693,7 +695,7 @@ msgstr "Exports veikts"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_plugin_outlook
 msgid "Outlook Plug-In"
-msgstr ""
+msgstr "Outlook spraudnis"
 
 #. module: base
 #: view:ir.model:0
@@ -1057,7 +1059,7 @@ msgstr "Tips"
 #. module: base
 #: field:ir.mail_server,smtp_user:0
 msgid "Username"
-msgstr ""
+msgstr "Lietotājvārds"
 
 #. module: base
 #: code:addons/orm.py:398
@@ -1205,7 +1207,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_import_sugarcrm
 msgid "SugarCRM Import"
-msgstr ""
+msgstr "SugarCRM Imports"
 
 #. module: base
 #: view:res.lang:0
@@ -1228,7 +1230,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_tests
 msgid "Tests"
-msgstr ""
+msgstr "Pārbaudes"
 
 #. module: base
 #: field:ir.ui.view_sc,res_id:0
@@ -1355,7 +1357,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_sequence
 msgid "Entries Sequence Numbering"
-msgstr ""
+msgstr "Ierakstu Kārtas Numerācija"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_exports
@@ -1461,6 +1463,8 @@ msgid ""
 "Helps you manage your purchase-related processes such as requests for "
 "quotations, supplier invoices, etc..."
 msgstr ""
+"Palīdz pārvaldīt ar iepirkumiem saistītus procesus, kā pieprasījumus pēc "
+"cenas piedāvājumiem, piegādātāju rēķinus utt."
 
 #. module: base
 #: help:base.language.install,overwrite:0
@@ -1556,7 +1560,7 @@ msgstr "Float"
 #: model:ir.module.category,name:base.module_category_warehouse_management
 #: model:ir.module.module,shortdesc:base.module_stock
 msgid "Warehouse Management"
-msgstr ""
+msgstr "Noliktavas Vadība"
 
 #. module: base
 #: model:ir.model,name:base.model_res_request_link
@@ -1585,7 +1589,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_lu
 msgid "Luxembourg - Accounting"
-msgstr ""
+msgstr "Luksemburga - Grāmatvedība"
 
 #. module: base
 #: model:res.country,name:base.tp
@@ -1987,12 +1991,12 @@ msgstr "Somija"
 #: code:addons/base/res/res_company.py:156
 #, python-format
 msgid "Website: "
-msgstr ""
+msgstr "Vietne: "
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_administration
 msgid "Settings"
-msgstr ""
+msgstr "Uzstādījumi"
 
 #. module: base
 #: selection:ir.actions.act_window,view_type:0
@@ -2093,7 +2097,7 @@ msgstr "Logotips"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_cr
 msgid "Costa Rica - Accounting"
-msgstr ""
+msgstr "Kostarika - Grāmatvedība"
 
 #. module: base
 #: view:ir.module.module:0
@@ -2166,7 +2170,7 @@ msgstr "Jaunināto moduļu skaits"
 #. module: base
 #: field:ir.cron,function:0
 msgid "Method"
-msgstr ""
+msgstr "Metode"
 
 #. module: base
 #: view:res.partner.event:0
@@ -2300,7 +2304,7 @@ msgstr ""
 #. module: base
 #: field:ir.mail_server,smtp_debug:0
 msgid "Debugging"
-msgstr ""
+msgstr "Atkļūdošana"
 
 #. module: base
 #: model:ir.module.module,description:base.module_crm_helpdesk
@@ -2410,12 +2414,12 @@ msgstr "Esošā Likme"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_idea
 msgid "Ideas"
-msgstr ""
+msgstr "Idejas"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_crm
 msgid "Opportunity to Quotation"
-msgstr ""
+msgstr "Konvertēt Potenciālo darījumu uz Cenas Pieprasījumu"
 
 #. module: base
 #: model:ir.module.module,description:base.module_sale_analytic_plans
@@ -2452,7 +2456,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_invoiced
 msgid "Invoicing"
-msgstr ""
+msgstr "Rēķinu izrakstīšana"
 
 #. module: base
 #: field:ir.ui.view_sc,name:0
@@ -2577,7 +2581,7 @@ msgstr ""
 #: model:res.groups,name:base.group_sale_manager
 #: model:res.groups,name:base.group_tool_manager
 msgid "Manager"
-msgstr ""
+msgstr "Menedžeris"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_custom
@@ -2627,6 +2631,8 @@ msgid ""
 "Lets you install various tools to simplify and enhance OpenERP's report "
 "creation."
 msgstr ""
+"Ļauj instalēt dažādus rīkus, lai vienkāršotu un uzlabotu OpenERP atskaišu "
+"izveidi."
 
 #. module: base
 #: view:res.lang:0
@@ -2637,7 +2643,7 @@ msgstr "%y - Gads bez gadsimta [00,99]."
 #: code:addons/base/res/res_company.py:155
 #, python-format
 msgid "Fax: "
-msgstr ""
+msgstr "Fakss: "
 
 #. module: base
 #: model:res.country,name:base.si
@@ -2647,7 +2653,7 @@ msgstr "Slovēnija"
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
-msgstr ""
+msgstr "Valūtas kods (ISO 4217)"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_log_act_window
@@ -2769,7 +2775,7 @@ msgstr ""
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
 msgid "Application"
-msgstr ""
+msgstr "Programma"
 
 #. module: base
 #: selection:publisher_warranty.contract,state:0
@@ -2963,7 +2969,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_wiki_quality_manual
 msgid "Wiki: Quality Manual"
-msgstr ""
+msgstr "Wiki: Kvalitātes rokasgrāmata"
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
@@ -2991,7 +2997,7 @@ msgstr "HR Sektors"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_dashboard_admin
 msgid "Administration Dashboard"
-msgstr ""
+msgstr "Administrēšanas instrumentu panelis"
 
 #. module: base
 #: code:addons/orm.py:4408
@@ -3076,7 +3082,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_contract
 msgid "Employee Contracts"
-msgstr ""
+msgstr "Darbinieku līgumi"
 
 #. module: base
 #: model:ir.module.module,description:base.module_wiki_faq
@@ -3140,7 +3146,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_survey
 msgid "Survey"
-msgstr ""
+msgstr "Aptauja"
 
 #. module: base
 #: view:base.language.import:0
@@ -3432,7 +3438,7 @@ msgstr ""
 #: model:ir.module.category,name:base.module_category_generic_modules_accounting
 #: view:res.company:0
 msgid "Accounting"
-msgstr ""
+msgstr "Grāmatvedība"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_payment
@@ -15131,7 +15137,7 @@ msgstr "Partneri: "
 #. module: base
 #: field:res.partner.bank,name:0
 msgid "Bank Account"
-msgstr ""
+msgstr "Bankas Konts"
 
 #. module: base
 #: model:res.country,name:base.kp
@@ -15147,7 +15153,7 @@ msgstr "Izveidot Objektu"
 #: view:ir.filters:0
 #: field:res.log,context:0
 msgid "Context"
-msgstr ""
+msgstr "Konteksts"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_mrp
@@ -15162,12 +15168,12 @@ msgstr ""
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Prospect"
-msgstr ""
+msgstr "Nākotnes Plāni"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_stock_invoice_directly
 msgid "Invoice Picking Directly"
-msgstr ""
+msgstr "Rēķina Izrakstīšana, Piegādājot preci"
 
 #. module: base
 #: selection:base.language.install,lang:0
diff --git a/openerp/addons/base/i18n/mk.po b/openerp/addons/base/i18n/mk.po
index bc690ab40ca..3414ae7063c 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-07-05 04:44+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:41+0000\n"
+"X-Generator: Launchpad (build 15637)\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 8559c9084c7..c80aa9afb14 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-07-05 04:44+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:41+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -249,7 +249,7 @@ msgstr "Швецарь"
 #: code:addons/orm.py:4206
 #, python-format
 msgid "created."
-msgstr "үүсгэсэн."
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_tr
@@ -344,7 +344,7 @@ msgstr "Тайлан"
 #: field:res.partner,subname:0
 #: field:res.partner.address,name:0
 msgid "Contact Name"
-msgstr "Харьцах хүн"
+msgstr "Харилцагчийн нэр"
 
 #. module: base
 #: code:addons/base/module/wizard/base_export_language.py:56
@@ -2940,7 +2940,7 @@ msgstr "Менежер"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_custom
 msgid "Customization"
-msgstr "Өөрчлөн тохируулалт"
+msgstr "Өөриймшүүлэлт"
 
 #. module: base
 #: model:res.country,name:base.py
@@ -3867,7 +3867,7 @@ msgstr "Баазын бүтэц"
 #: model:ir.model,name:base.model_partner_massmail_wizard
 #: view:partner.massmail.wizard:0
 msgid "Mass Mailing"
-msgstr "Э-мэйл илгээх"
+msgstr "Масс Имэйл илгээх"
 
 #. module: base
 #: model:res.country,name:base.yt
@@ -7474,7 +7474,7 @@ msgstr "Цагийн Хуваарь"
 #. module: base
 #: field:res.partner,function:0
 msgid "function"
-msgstr "функц"
+msgstr "үүрэг"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_audit
@@ -7754,7 +7754,7 @@ msgstr "Хувилбар Ахиулах"
 #: field:res.partner,address:0
 #: view:res.partner.address:0
 msgid "Contacts"
-msgstr "Харьцах хүмүүс"
+msgstr "Харилцагч"
 
 #. module: base
 #: model:res.country,name:base.fo
@@ -8982,7 +8982,7 @@ msgstr "Том бүхэл тоо"
 #: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 msgid "Contact"
-msgstr "Харилцах хүн"
+msgstr "Харилцагч"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_at
@@ -10831,6 +10831,44 @@ msgid ""
 "    * Graph of stock value variation\n"
 "    "
 msgstr ""
+"\n"
+"Энэ модуль нь OpenERP-д үйлдвэрлэлийг менеж хийх үндсэн модуль юм.\n"
+"=======================================================================\n"
+"\n"
+"Онцлог:\n"
+"---------\n"
+"    * Хадгалуулах / Захиалуулах (мөр бүрээр)\n"
+"    * Олон түвшний жор, хязгааргүй\n"
+"    * Олон түвшний урсгал, хязгааргүй\n"
+"    * Шинжилгээний санхүүтэй уялдсан үйлдвэрлэлийн урсгал болон дамжлага\n"
+"    * Тогтол хугацааны тооцоолол / Яг Хугацаандааа модуль\n"
+"    * Олон-POS, Олон-Агуулах\n"
+"    * Эрэмбэлэх ялгаатай аргууд\n"
+"    * Өртөгийн арга бараагаар: Стандарт үнэ, Дундаж үнэ\n"
+"    * Бэрхшээл болон хэрэгцээний хялбар шинжилгээ\n"
+"    * Маш уян хатан\n"
+"    * Жоруудыг бүтцээр нь, завсрынхаар нь гэх мэт гүйцэд шинжилгээ, үзлэг\n"
+"\n"
+"Хадгалж болох бараа, үзүүлж болох үйлчилгээ зэрэгтэй бүрэн уялдаж дэмжиж "
+"ажилладаг. Үйлчилгээ нь програм хангамжийн бусад хэсэгтэй бүрэн уялддаг. "
+"Тухайлбал жор дотор дэд гэрээний үйлчилгээг оруулж тодорхойлж болох бөгөөд "
+"үйлдвэрлэлийн угсаргааны явцад үйлчилгээг худалдан авах захиалгыг автоматаар "
+"үүсгэдэг.\n"
+"\n"
+"Тайлангууд модулиар өгөгддөг:\n"
+"--------------------------------\n"
+"    * Жорын бүтэц, бүртэл хэсгийн тайлан\n"
+"    * Дамжлагын ачааллын урьдчилсан таамаглал\n"
+"    * Үйлдврэлэлийн захиалгын баримт хэвлэх\n"
+"    * Барааны урьдчилсан таамаг\n"
+"\n"
+"Модулийн Хянах Самбар:\n"
+"----------------------------------\n"
+"    * Дараагийн үйлдвэрлэлийн захиалгын жагсаалт\n"
+"    * Сондгой бэлтгэн нийлүүлэлтийн жагсаалт\n"
+"    * Дамжлагын ачааллыг график\n"
+"    * Барааны үнийн хазайлтын график\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_google_base_account
@@ -11199,6 +11237,33 @@ msgid ""
 "mail. \n"
 "    "
 msgstr ""
+"\n"
+"Ирж байгаа имэйлийг POP / IMAP серверүүдээс хүлээж авдаг.\n"
+"=============================================\n"
+"\n"
+"POP/IMAP имэйлийн параметрүүдийг тохируулаад энэ хаягт ирж байгаа "
+"имэйлүүдийг OpenERP-руу татаж авдаг. Бүх POP3/IMAP серверүүд дэмжигддэг. "
+"SSL/TLS серверүүд ч дэмжигдэнэ.\n"
+"\n"
+"Энэ нь имэйл оролцсон OpenERP-н маш олон ажлын урсгал дээр төрөл бүрийн "
+"баримтыг үүсгэж болно. Тухайлбал:\n"
+"\n"
+" * CRM Сэжим/Боломж\n"
+" * CRM Гомдол\n"
+" * Төслийн асуудал\n"
+" * Төслийн даалгавар\n"
+" * Хүний Нөөц Бүрдүүлэлт (Өргөдөл гаргагч)\n"
+" * гм.\n"
+"\n"
+"Өөрт хэрэг болох модулийг суулгаад баримтын төрлийг (Сэжим, Төслийн асуудал, "
+"гм) имэйл хаягуудад оноож өгнө. Эдгээр хаягт ирсэн имэйлүүд нь харгалзах "
+"баримтуудыг автоматаар үүсгэнэ. Эдгээрт шууд OpenERP дотроосоо хариулж болох "
+"бөгөөд хариу нь эргээд энэ баримт дээрээ ирж бүх харилцаа нь ярилцлага "
+"байдлаар бүгд нэг дор хөтлөгддөг.\n"
+"\n"
+"Бүр цаашилбал өөрийн тодорхойлсон үйдлийг (техник түвшинд бол: Серверийн "
+"Үйлдлүүд) ирж байгаа имэйл дээр ажиллуулж болно. \n"
+"    "
 
 #. module: base
 #: help:ir.actions.server,email:0
@@ -11890,6 +11955,38 @@ msgid ""
 "            "
 "fields_to_search.update(view_root.xpath(\"//field[@select=1]/@name"
 msgstr ""
+"%s-н цагалбар харагдацыг үүсгэхэд өгөгдөл хангалтгүй байна, date_stop эсвэл "
+"date_delay алга байна\" % (self._name)))\n"
+"\n"
+"        return view\n"
+"\n"
+"    def _get_default_search_view(self, cr, uid, context=None):\n"
+"        \"\n"
+"        :param cr: database cursor\n"
+"        :param int user: user id\n"
+"        :param dict context: connection context\n"
+"        :returns: an lxml document of the view\n"
+"        :rtype: etree._Element\n"
+"        \"\n"
+"        form_view = self.fields_view_get(cr, uid, False, 'form', "
+"context=context)\n"
+"        tree_view = self.fields_view_get(cr, uid, False, 'tree', "
+"context=context)\n"
+"\n"
+"        # TODO it seems _all_columns could be used instead of fields_get (no "
+"need for translated fields info)\n"
+"        fields = self.fields_get(cr, uid, context=context)\n"
+"        fields_to_search = set(\n"
+"            field for field, descriptor in fields.iteritems()\n"
+"            if descriptor.get('select'))\n"
+"\n"
+"        for view in (form_view, tree_view):\n"
+"            view_root = etree.fromstring(view['arch'])\n"
+"            # Only care about select=1 in xpath below, because select=2 is "
+"covered\n"
+"            # by the custom advanced search in clients\n"
+"            "
+"fields_to_search.update(view_root.xpath(\"//field[@select=1]/@name"
 
 #. module: base
 #: constraint:res.users:0
@@ -12472,6 +12569,8 @@ msgid ""
 "Checked if this is an OpenERP Publisher's Warranty contract (versus older "
 "contract types"
 msgstr ""
+"OpenERP-ийн нийтлэгчийн баталгааны гэрээ бол энэ нь тэмдэглэгдсэн байна "
+"(хуучин гэрээний төрөлүүдээс ялгаатай"
 
 #. module: base
 #: field:ir.model.fields,model:0
@@ -13620,7 +13719,7 @@ msgstr ""
 #. module: base
 #: field:res.groups,trans_implied_ids:0
 msgid "Transitively inherits"
-msgstr ""
+msgstr "Дамжиж давхар удамшдаг"
 
 #. module: base
 #: field:ir.default,ref_table:0
@@ -14090,6 +14189,38 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Энэ модуль нь state, date_start,date_stop буюу төлөв, эхлэх огноо, зогсох "
+"огноо гэсэн талбаруудийг үйлдвэрлэлийн захиалгын үйлдлийн мөрүүдэд нэмдэг "
+"(\"Ажлын төв\" хавтас дотор)\n"
+"============================================================================="
+"================================\n"
+"\n"
+"Төлөв: ноорог, батлагдсан, хийгдсэн, цуцалсан\n"
+"Үйлдвэрлэлийн цахиалгыг дуусгах, батлахад мөрүүдийн төлөв нь дагаж "
+"өөрчлөгддөг.\n"
+"\n"
+"Үүсгэгдэх меню:\n"
+"    Үйлдвэрлэл > Үйлдвэрлэл > Ажлын захиалгууд\n"
+"\n"
+"Үйлдвэрлэлийн захиалгын \"Ажлын төв\"-н мөрүүдийн харагдац.\n"
+"\n"
+"Үйлдвэрлэлийн захиалгын ажлын төв хавтаст дараах даруулуудыг нэмдэг:\n"
+"    * эхлэх (батлагдсан төлөвт оруулна), date_start буюу эхлэсэн огноог "
+"тааруулна\n"
+"    * хийгдсэн (хийгдсэн төлөвт оруулна), date_stop буюу зогссон огноог "
+"тааруулна\n"
+"    * ноороглох (ноорог төлөвт оруулна)\n"
+"    * цуцлах (төлөвийг цуцлагдсан төлөвтэй болгоно)\n"
+"\n"
+"Үйлдвэрлэлийн захиалга \"үйлдвэрлэхэд бэлэн\" болоход үйлдлүүд \n"
+"'батлагдсан' төлөвтэй болох ёстой. Үйлдвэрлэлийн захиалга хийгдсэн төлөвтэй "
+"болоход бүх үйлдлүүд хийгдсэн болох ёстой\n"
+"\n"
+"хугацаа талбар нь авсан хугацаа(stop date - start date).\n"
+"Иймээс онолын хугацаа, бодит хугацааг жиших боломжтой болно.\n"
+"\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_auction
@@ -14113,6 +14244,24 @@ msgid ""
 "    * Objects By Day (graph)\n"
 "    "
 msgstr ""
+"\n"
+"Энэ модуль нь зураач, дуудлага худалдааны бүтээл, худалдан авагч, худалдагч "
+"нарыг бүртгэж менеж хийдэг.\n"
+"============================================================================="
+"====\n"
+"\n"
+"Энэ нь дуудлага худалдааны үнэ хаялцах, зарагдсан барааны төлсөн "
+"төлөөгүйгээр ангилж хөтлөх, хүргэлтийн төлөв байдал гээд энэ бүгдийг бүгдийг "
+"хөтлөж менеж хийдэг.\n"
+"\n"
+"Дуудлага худалдааны хянах самбар нь:\n"
+"    * Сүүлийн обьектууд (жагсаалт)\n"
+"    * Сүүлийн урьдчилгаа (жагсаалт)\n"
+"    * Обьектуудын статистик (жагсаалт)\n"
+"    * Нийт дутуу төлбөр (график)\n"
+"    * Хамгийн бага/Төлөгдөөгүй/Хамгийн их (график)\n"
+"    * Обьектууд өдөрөөр (график)\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_base_crypt
@@ -14149,6 +14298,37 @@ msgid ""
 "\n"
 "                    "
 msgstr ""
+"\n"
+"Өгөгдлийн бааз дахь цэвэр текст нууц үгийг илүү нууцлаг hash бүхий нууц "
+"үгээр сольдог\n"
+"===============================================================\n"
+"Байгаа хэрэглэгчдийн хувьд base_crypt модулийг суулгамагц цэвэр текст нууц "
+"үгүүд илүү нууцлал сайтай шифрлэгдсэн нууц үгээр солигддог.\n"
+"\n"
+"Бүх нууц үгүүд шууд өгөгдлийн баазаас унших боломжгүй болж бүхд илүү "
+"нууцлалтай, шифрлэгдсэн, давстай шифрлэгдсэн,  cryptographic hash хийгдсэн "
+"болж солигддог.\n"
+"\n"
+"Энэ модулийг суулгасан дараа мартсан нууц үгийг лавлаж, асуух сэргээх "
+"боломжгүй болно. Зөвхөн шинэ нууц үгийг тохируулах боломжтой болно.\n"
+"\n"
+"Нууцлалын анхааруулга\n"
+"++++++++++++++++\n"
+"Энэ модулийг суулгаснаар нууцлалын бусад асуудлыг тоохгүй орхиж болохгүй. "
+"Учир нь XML-RPCS, HTTPS зэрэг нууцлалтай протоколь ашиглаж байгаа биш л бол "
+"нууц үгүүд нь сүлжээгээр цэвэр текст байдлаар дамжина. Мөн түүнчлэн нууц "
+"үгээс бусад өгөгдлийн баазад байгаа өгөгдлийг нууцладаггүй. Иймээс нууцлалыг "
+"сайжруулах асуудал нь системийн бүхэл хэсэгт систем админ өөрөө хийж хангах "
+"ёстой. Тухайлбал: өгөгдлийн баазын нөөцлөлтүүдийг нууцалж хамгаалах, "
+"системийн файлуудыг хамгаалах, алсын зайны shell хандалтыг хамгаалах, "
+"серверийн физик хаяг порт зэрэгийг хамгаалах бүх л арга хэмжээг авах ёстой.\n"
+"\n"
+"LDAP эрхийн хяналттай холбох\n"
+"+++++++++++++++++++++++++++++++++++\n"
+"Энэ модуль нь одоогоор ``user_ldap`` модультай нийцтэй биш бөгөөд хэрэв "
+"хоюуланг нь суулгавал ldap эрхийн хяналтыг тэр чигт нь идэвхгүй болгодог.\n"
+"\n"
+"                    "
 
 #. module: base
 #: field:ir.actions.act_window,view_id:0
@@ -14261,6 +14441,10 @@ msgid ""
 "queries regarding your account, please contact us.\n"
 "Thank you in advance.\n"
 msgstr ""
+"Бидний бүртгэлээс дараах төлбөрүүд нь хугацаа хэтэрсэн байдалтай байна. "
+"Хэрэв төлөгдсөн бол энэ мэдэгдлийг тоохгүй байж болно. Гэхдээ өөрийн данс, "
+"тооцоотой холбоотой аливаа асуулт байвал бидэнд хандана уу. Танд урьдчилан "
+"баярлалаа.\n"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_users_ldap
@@ -14293,7 +14477,7 @@ msgstr ""
 #. module: base
 #: help:ir.values,value:0
 msgid "Default value (pickled) or reference to an action"
-msgstr ""
+msgstr "Анхны утга (pickled - дарсан) эсвэл сурвалж үйлдэл"
 
 #. module: base
 #: sql_constraint:res.groups:0
@@ -14311,6 +14495,14 @@ msgid ""
 "you can modify in OpenOffice. Once you have modified it you can\n"
 "upload the report using the same wizard.\n"
 msgstr ""
+"\n"
+"Энэ модуль нь OpenERP-н OpenOffice залгаастай хамт хэрэглэгддэг.\n"
+"=========================================================\n"
+"\n"
+"Энэ модуль нь .sxw тайланг Импортлох/Экспортлох харилцах цонхыг нэмдэг "
+"бөгөөд ингэснээр тайланг OpenOffice-р засварлах боломжтой болдог. Засварлаж "
+"дуусаад адилхан харилцах цонхоор буцаагаад зассан хувилбарыг сервер ачаалж "
+"болно.\n"
 
 #. module: base
 #: view:ir.sequence:0
@@ -14492,6 +14684,8 @@ msgid ""
 "Here is what we got instead:\n"
 " %s"
 msgstr ""
+"Бидэнд оронд байгаа зүйл бол:\n"
+" %s"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_model_data
@@ -15017,11 +15211,12 @@ msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
 "format!"
 msgstr ""
+"Сонгох Сонголтын илэрхийлэл нь  [('key','Label'), ...] форматтай байх ёстой!"
 
 #. module: base
 #: view:ir.filters:0
 msgid "Current User"
-msgstr ""
+msgstr "Идэвхтэй Хэрэглэгч"
 
 #. module: base
 #: field:res.company,company_registry:0
@@ -15274,6 +15469,23 @@ msgid ""
 "using it, otherwise it may crash.\n"
 "    "
 msgstr ""
+"\n"
+"Энэ модулийн зорилго нь бусад модулийн чанарыг шалгах зориулалттай.\n"
+"================================================================\n"
+"\n"
+"Энэ нь OpenERP дахь модулиудын модулийн жагсаалт дээр ажиллах харилцах "
+"цонхыг үүсгэдэг.\n"
+"Энэ харилцах цонхоор модулиудыг OpenERP кодчилолын стандарт, хурдын оновчтой "
+"байдал зэрэг үзүүлэлтүүдээр үнэлэх боломжийг олгодог...\n"
+"\n"
+"Энэ модуль мөн та өөрийн чанарын шалгалтыг хийх framework-г өгдөг.\n"
+"Программстуудын хувьд илүү дэлгэрэнгүй танилцахын тулд base_module_quality\\"
+"README.txt файлыг унших хэрэгтэй.\n"
+"\n"
+"САНАМЖ: Энэ модуль нь модуль нь ZIP файл байдлаар ажиллаж чадахгүй учир "
+"хэрэглэхийн өмнө задлаж байж хэрэглэх хэрэгтэй. Тэгэхгүй бол модуль нурж "
+"гацдаг.\n"
+"    "
 
 #. module: base
 #: field:res.partner.bank,bank_name:0
@@ -15335,6 +15547,9 @@ msgid ""
 "are available. To add a new language, you can use the 'Load an Official "
 "Translation' wizard available from the 'Administration' menu."
 msgstr ""
+"Орчуулга байгаа бол хэрэглэгчийн график интерфейс хэрэглэгдэх анхны хэл. "
+"Шинэ хэл нэмэхдээ 'Албан ёсны орчуулга ачаалах' харилцах цонхыг 'Удирдлага' "
+"менюгээс сонгоно."
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_es
@@ -15900,7 +16115,7 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_partner_wizard_ean_check
 msgid "Ean Check"
-msgstr ""
+msgstr "Ean шалгалт"
 
 #. module: base
 #: view:res.partner:0
@@ -16701,7 +16916,7 @@ msgstr ""
 #. module: base
 #: view:res.partner.address:0
 msgid "Search Contact"
-msgstr "Хүн хайх"
+msgstr "Харилцагч хайх"
 
 #. module: base
 #: view:ir.attachment:0
@@ -16775,7 +16990,7 @@ msgstr "Хязгаар"
 #: help:workflow.transition,group_id:0
 msgid ""
 "The group that a user must have to be authorized to validate this transition."
-msgstr ""
+msgstr "Энэ шилжилтийг шалгах хэрэглэгчийн зөвшөөрөгдөх групп"
 
 #. module: base
 #: code:addons/orm.py:791
@@ -16890,6 +17105,40 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Имэйл үлгэрчлэл (Анхны байсан Power Email by Openlabs-ийн хялбаршуулсан "
+"хувилбар)\n"
+"============================================================================="
+"\n"
+"\n"
+"OpenERP-н аль ч баримт (борлуулалт, нэхэмжлэл гэх мэт)-д хэрэглэж болох "
+"имэйлийг зохиомжлох боломжийг олгодог. Зохиомжлохдоо илгээгч, хүлээн авагч, "
+"гарчиг, бие(биеийг HTML болон Text байдлаар) гэх бүх хэсгийг зохиомжлох "
+"боломжийг олгодог.Түүнчлэн имэйлдээ автоматаар хавсралт оруулах, хэвлэх, "
+"тайлан хавсаргах зэрэг боломжуудыг оруулж өгч болдог.\n"
+"\n"
+"Шилдэг хэрэглээний хувьд үлгэрүүд нь үүсгэхдээ холбогдох баримтуудын динамик "
+"аттрибутуудыг шууд авч үүсдэг байх явдал нь чухал. Жишээлбэл харилцагчийн "
+"улсын нэрийг имэйлдээ оруулах болон аюулгүйн үүднээс заавал тусгагдах анхны "
+"утгуудыг оруулах зэрэгээр хэрэглэж болно. Үлгэр болгон нь динамик утгуудыг "
+"оруулах туслагчтай байдаг.\n"
+"\n"
+"Түүнчлэн хэрэв сонголтыг зөвшөөрсөн бол холбогдох баримтын баруун гар талд "
+"имэйл үүсгэх туслагч гарч ирдэг. (ө.х. Нэхэмжлэлүүд).\n"
+"Энэ нь имэйлийг хялбараар илгээх боломжийг олгодог. Өөрөөр хэлбэл шууд бэлэн "
+"үлгэрээр динамик утгууд гүйцээгдсэн имэйлийг үүсгэж шаардлагатай бол "
+"өөрчлөлт хийгээд шууд илгээдэг. Түүнчлэн энэ боломж олон баримт дээр "
+"хэрэглэсэн тохиолдолд масс имэйл илгээх боломжтой байдаг.\n"
+"\n"
+"Эдгээр имэйл үлгэрүүд мөн нөгөөтэйгүүр маркетингийн компанит системийн гол "
+"зүрх болж байдаг.\n"
+"(``marketing_campaign`` модулийг харна уу), хэрэв томоохон компанит ажлыг "
+"OpenERP-д хэрэглэхээр бол хэрэглэж болно.\n"
+"\n"
+"Техникийн тэмдэглэл: Анхны  Power Email by Openlabs-н имэйл үлгэр хийдэг "
+"хэсэг нь хэрэглэгдэж үлдсэн.\n"
+"\n"
+"    "
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -17058,11 +17307,13 @@ msgid ""
 "Helps you handle your accounting needs, if you are not an accountant, we "
 "suggest you to install only the Invoicing."
 msgstr ""
+"Санхүүгийн боловсруулалтын хэрэгцээг хангахад тусалдаг, хэрэв та нягтлан бол "
+"зөвхөн нэхэмжлэлийг суулгахыг зөвлөе."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_plugin_thunderbird
 msgid "Thunderbird Plug-In"
-msgstr ""
+msgstr "Thunderbird залгаас"
 
 #. module: base
 #: model:ir.model,name:base.model_res_country
@@ -17094,6 +17345,9 @@ msgid ""
 "        OpenERP Web test suite.\n"
 "        "
 msgstr ""
+"\n"
+"        OpenERP вебийн тестийн иж бүрдэл.\n"
+"        "
 
 #. module: base
 #: view:ir.values:0
@@ -17118,7 +17372,7 @@ msgstr "Өнгө Өөрчлөх"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_15
 msgid "IT sector"
-msgstr ""
+msgstr "МТ салбар"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -17143,11 +17397,16 @@ msgid ""
 "1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
 "106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"Тусгаарлагчийн формат нь [,n] гэсэн хэлбэртэй байх ёстой. Энд 0 < n :Нэгжийн "
+"цифр нь.-1 -с эхлээд тусгаарлалтийг төгсгөнө. ө.х. [3,2,-1] нь 106500 гэсэн "
+"тоог 1,06,500 байдлаар илэрхийлнэ;[1,2,-1] нь 106,50,0 гэсэн байдлаар "
+"илэрхийлнэ;[3] нь 106,500 гэсэн байдлаар илэрхийлнэ. Өгөгдсөн ',' бүх "
+"тохиолдолд мянгатын тусгаарлагч байна"
 
 #. module: base
 #: field:ir.module.module,auto_install:0
 msgid "Automatic Installation"
-msgstr ""
+msgstr "Автомат Суулгалт"
 
 #. module: base
 #: model:res.country,name:base.jp
@@ -17158,7 +17417,7 @@ msgstr "Япон"
 #: code:addons/base/ir/ir_model.py:357
 #, python-format
 msgid "Can only rename one column at a time!"
-msgstr ""
+msgstr "Нэг удаад зөвхөн нэг баганын нэрийг өөрчилж чадна!"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -17199,6 +17458,33 @@ msgid ""
 "Leads.\n"
 "    "
 msgstr ""
+"\n"
+"Энэ модуль нь маркетингийн компанит ажлаар сэжимийг автоматжуулдаг (компанит "
+"ажил нь бүх төрлийн нөөц байж болно. Зөвхөн CRM сэжимээр хязгаарлагдахгүй).\n"
+"============================================================================="
+"============================================================\n"
+"\n"
+"Компанит ажил нь динамик бөгөөд олон суваг юм. Процесс нь дараах байдалтай:\n"
+"    * Маркетингийн компанит ажлыг ажлын ургсал шигээр зохиомжлох хэрэгтэй "
+"бөгөөд үүнд имэйл үлгэр, хэвлэх илгээх тайлангууд, өөриймшүүлсэн үйлдлүүд "
+"зэрэг зүйлс хамаарна.\n"
+"    * Компанит ажилд хэрэглэгдэх сегментүүдийг тодорхойлно. (ө.х зөвхөн "
+"тодорхой хэдэн улсаас сэжмийг авна гэх мэт.)\n"
+"    * Тестийн горимд компанит ажлыг симулаци хийж туршиж болно. Ингээд өшөө "
+"нарийвчлан тохируулж болно.\n"
+"    * Гар горимоор жинхэнэ компанит ажлыг эхлүүлж болно. Ингээд бүх үйлдэл "
+"гар шалгалтыг шаардах болно.\n"
+"    * Эцэст нь компанит ажлыг эхлүүлж бүх зүйлс бүрэн автомат хийгдэж "
+"байгааг статистикуудаар харж эхлэнэ.\n"
+"\n"
+"Компанит ажил явагдаж байх үед ч гэсэн сегментчлэл, ажлын урсгал зэрэгийг "
+"нарийвчлан тохируулах ажлыг үргэлжлүүлэн хийх боломжтйо.\n"
+"\n"
+"Санамж: Хэрэв танд туршилтын үзүүлэн өгөгдөл хэрэгтэй бол "
+"marketing_campaign_crm_demo модулийг суулгаж болно. Гэхдээ энэ нь мөн CRM "
+"модулийн туршилтын өгөгдөлтэй суулгадаг тул илүүж туршилтын өгөгдөл сэжимүүд "
+"үүсдэгийг анхаарах хэрэгтэй.\n"
+"    "
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
@@ -17277,7 +17563,7 @@ msgstr "Нөхцөл"
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
-msgstr ""
+msgstr "1-тэй тэнцэн ханштай валют руу хөрвөх тухайн валютын ханш."
 
 #. module: base
 #: field:ir.ui.view,name:0
@@ -17387,7 +17673,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_fetchmail_project_issue
 msgid "eMail Gateway for Project Issues"
-msgstr ""
+msgstr "Төслийн Асуудлуудын Имэйл үүд"
 
 #. module: base
 #: field:res.partner.bank,partner_id:0
@@ -17423,13 +17709,13 @@ msgstr "Дараагийн дугаарлалт нь энэ утгаар нэм
 #: code:addons/orm.py:341
 #, python-format
 msgid "Wrong ID for the browse record, got %r, expected an integer."
-msgstr ""
+msgstr "Browse хийж байгаа бичлэгийн буруу ID, %r-г авлаа, бүхэл байх ёстой."
 
 #. module: base
 #: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
-msgstr "Функц"
+msgstr "Үүрэг"
 
 #. module: base
 #: view:res.widget:0
@@ -17442,6 +17728,8 @@ msgid ""
 "Manage relations with prospects and customers using leads, opportunities, "
 "requests or issues."
 msgstr ""
+"Сэжим, боломж, хүсэлт, асуудал зэрэгийг ашиглана захиалагч, ирээдүйн "
+"захиалагчтай харилцааг менеж хийдэг."
 
 #. module: base
 #: selection:res.partner.address,type:0
@@ -17587,6 +17875,20 @@ msgid ""
 "    A + B + C -> D + E\n"
 "    "
 msgstr ""
+"\n"
+"Энэ модуль нь нэг үйлдвэрлэлийн захиалгаас хэд хэдэн бараа үүсгэх боломжийг "
+"олгодог.\n"
+"============================================================================="
+"\n"
+"\n"
+"Дэд бараануудыг жор дотор тохируулах боломжтой.\n"
+"\n"
+"Энэ модуль үгүйгээр:\n"
+"    A + B + C -> D\n"
+"\n"
+"Энэ модультайгаар:\n"
+"    A + B + C -> D + E\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.lk
@@ -17619,6 +17921,26 @@ msgid ""
 "module.\n"
 "    "
 msgstr ""
+"\n"
+"Энэ модуль нь ямар ч хөгжүүлэлтгүйгээр шинэ модуль үүсгэх боломжийг "
+"олгодог.\n"
+"======================================================================\n"
+"\n"
+"Энэ нь бүх үйлдлийг үйлдэл бичих үед бичиж аваад .ZIP модулийг үүсгэдэг. "
+"Иймээс та өөрийн модулийг шууд клиент хандалтаас үүсгэнэ.\n"
+"\n"
+"Энэ хувилбар нь бичлэг үүсгэх, бичлэг засах байдлаар ажилладаг. Энэ нь бүх "
+"виджетүүдийн хамаарлыг дахин тооцоолдог. (many2one, many2many, ...) Энэ нь "
+"мөн ажлын урсгал болон жишээ өгөгдөл, өгөгдөл шинэчлэх зэрэгийг дэмждэг.\n"
+"\n"
+"Энэ боломж нь хялбараар өөриймшүүлсэн бөгөөд ашиглах, дахин ашиглах "
+"боломжтой модулиудыг хялбараар үүсгэх боломжийг олгодог.\n"
+"\n"
+"Яаж хэрэглэх вэ:\n"
+"Удирдлага/Өөриймшүүлэлт/Модуль үүсгэх/Өөриймшүүлэлтийг модуль болгох "
+"экспортлох харилцах цонхыг хэрэглэнэ.\n"
+"Огноо цагийн нөхцөл, бичлэг хийх обьектуудыг сонгоод бичлэгийг хийж эхлэнэ.\n"
+"    "
 
 #. 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 298c6ce0676..1542c677529 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-07-05 04:44+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:41+0000\n"
+"X-Generator: Launchpad (build 15637)\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 71a8dee3e68..818bd5c4602 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-07-05 04:41+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:38+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -6141,7 +6141,7 @@ msgstr "Officiële vertaling laden"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_cancel
 msgid "Cancel Journal Entries"
-msgstr "Annuleer journaalpsoten"
+msgstr "Annuleer journaalposten"
 
 #. module: base
 #: view:ir.actions.server:0
diff --git a/openerp/addons/base/i18n/nl_BE.po b/openerp/addons/base/i18n/nl_BE.po
index 6165893d26d..cf2cc84f2fd 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-07-05 04:48+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:44+0000\n"
+"X-Generator: Launchpad (build 15637)\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 f67d9c46d85..b0e489d3b03 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-07-05 04:44+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:42+0000\n"
+"X-Generator: Launchpad (build 15637)\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 983990df5b3..b60b9b98d76 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-07-05 04:45+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:42+0000\n"
+"X-Generator: Launchpad (build 15637)\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 73c9f249850..97cbcce0eb6 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-07-05 04:47+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:44+0000\n"
+"X-Generator: Launchpad (build 15637)\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 6111d2ed4e8..f079b8bd10a 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-07-05 04:45+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:42+0000\n"
+"X-Generator: Launchpad (build 15637)\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 6cbed7a24fa..633734c1e67 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-07-05 04:45+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:42+0000\n"
+"X-Generator: Launchpad (build 15637)\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 71b3a748aa7..94ee24e819d 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-07-05 04:45+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:42+0000\n"
+"X-Generator: Launchpad (build 15637)\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 066ab3e47c0..f9eeb1456c2 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-07-05 04:46+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:43+0000\n"
+"X-Generator: Launchpad (build 15637)\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 69d4b2c36fc..b1f0478ed8a 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-07-05 04:39+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:36+0000\n"
+"X-Generator: Launchpad (build 15637)\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 a0ec7a1a497..e8c74060cc3 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-07-05 04:45+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:42+0000\n"
+"X-Generator: Launchpad (build 15637)\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 49af1e2bc1a..5c187aeec8b 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-07-05 04:48+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:46+0000\n"
+"X-Generator: Launchpad (build 15637)\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 a2b2f917674..2e9ff2e0539 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-07-05 04:46+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:43+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -893,7 +893,7 @@ msgstr "Albanien / Shqip"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_crm_config_opportunity
 msgid "Opportunities"
-msgstr "Opportunities"
+msgstr "Affärsmöjligheter"
 
 #. module: base
 #: model:ir.model,name:base.model_base_language_export
@@ -923,6 +923,8 @@ msgid ""
 "The module adds google contact in partner address and add google calendar "
 "events details in Meeting"
 msgstr ""
+"Modulen lägger till google-kontakter i företagsadresser och lägger till "
+"googlekalenderhändelser i möteskalendern"
 
 #. module: base
 #: view:res.users:0
@@ -1628,8 +1630,8 @@ msgid ""
 "Access all the fields related to the current object using expressions, i.e. "
 "object.partner_id.name "
 msgstr ""
-"represenrerar ett blanksteg. Skriver in ett blanksteg i motsvarande position "
-"i översättningen "
+"Tillgång till alla fält relaterade till aktuellt objekt via uttryck, "
+"exempelvis object.partner_id.name "
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -1989,7 +1991,7 @@ msgstr "7.  %H:%M:%S      ==> 18:25:20"
 #: view:res.partner.category:0
 #: field:res.partner.category,partner_ids:0
 msgid "Partners"
-msgstr "Partners"
+msgstr "Företag"
 
 #. module: base
 #: field:res.partner.category,parent_left:0
@@ -2348,7 +2350,7 @@ msgstr "aktiv"
 #, python-format
 msgid ""
 "Couldn't generate the next id because some partners have an alphabetic id !"
-msgstr "Kan inte skapa nästa id eftersom partnern har ett alfanumeriskt id."
+msgstr "Kan inte skapa nästa id eftersom företaget har ett alfanumeriskt id."
 
 #. module: base
 #: view:ir.attachment:0
@@ -2971,9 +2973,9 @@ msgid ""
 "partner records. You can create or delete countries to make sure the ones "
 "you are working on will be maintained."
 msgstr ""
-"Visa och hantera listan av alla länder som kan bli tilldelade dina partners "
-"uppgifter. Du kan skapa eller ta bort länder så att du är säker på att de "
-"som du jobbar på kommer att underhållas."
+"Visa och hantera listan av alla länder som kan bli tilldelade dina "
+"företagsuppgifter. Du kan skapa eller ta bort länder så att du är säker på "
+"att de som du jobbar på kommer att underhållas."
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_7
@@ -3242,7 +3244,7 @@ msgstr "Kalender"
 #. module: base
 #: field:res.partner.address,partner_id:0
 msgid "Partner Name"
-msgstr "Partnernamn"
+msgstr "Företagsnamn"
 
 #. module: base
 #: field:workflow.activity,signal_send:0
@@ -3842,9 +3844,9 @@ msgid ""
 "loading a new language it becomes available as default interface language "
 "for users and partners."
 msgstr ""
-"Den har wizarden hjälper dig med att lägga till ett nytt språk i ditt "
-"OpenERP system. Efter att språket laddats in blir det tillgängligt för "
-"användare och partners."
+"Den har guiden hjälper dig med att lägga till ett nytt språk i ditt OpenERP-"
+"system. Efter att språket laddats in blir det tillgängligt för användare och "
+"företag."
 
 #. module: base
 #: view:ir.model:0
@@ -3857,7 +3859,7 @@ msgid ""
 "Value Added Tax number. Check the box if the partner is subjected to the "
 "VAT. Used by the VAT legal statement."
 msgstr ""
-"Momsnummer. Markera denna om partnern skall ha moms. Används av "
+"Momsnummer. Markera denna om företaget skall debiteras moms. Används av "
 "momsrapporten."
 
 #. module: base
@@ -4265,7 +4267,7 @@ msgstr "Åtgärdsbeskriivning"
 #. module: base
 #: help:res.partner,customer:0
 msgid "Check this box if the partner is a customer."
-msgstr "Markera denna om partnern är en kund."
+msgstr "Markera denna om företaget är en kund."
 
 #. module: base
 #: help:ir.module.module,auto_install:0
@@ -4344,8 +4346,8 @@ msgid ""
 "If the selected language is loaded in the system, all documents related to "
 "this partner will be printed in this language. If not, it will be english."
 msgstr ""
-"Om det valda språket has installerats i systemet skriva alla dokumnet "
-"relaterade till partnern i detta språk. Annars används engelska."
+"Om det valda språket has installerats i systemet används detta språk för "
+"alla dokument till företaget. Annars används engelska."
 
 #. module: base
 #: report:ir.module.reference.graph:0
@@ -4503,6 +4505,19 @@ msgid ""
 "You can also use the geolocalization without using the GPS coordinates.\n"
 "    "
 msgstr ""
+"\n"
+"Denna modul används av OpenERP SA för att omdirigera kunder till sina "
+"företag, baserat på geolokalisering.\n"
+"============================================================================="
+"=======\n"
+"\n"
+"Du kan geolocalize dina affärsmöjligheter med hjälp av denna modul.\n"
+"\n"
+"Använd geolokalisering när du tilldelar affärsmöjligheter till företag.\n"
+"Bestäm GPS-koordinater enligt företagsadress .\n"
+"Det mest lämpliga företaget kan tilldelas.\n"
+"Du kan också använda geolokalisering utan att använda GPS-koordinater.\n"
+"    "
 
 #. module: base
 #: help:ir.actions.act_window,help:0
@@ -5262,6 +5277,13 @@ msgid ""
 "revenue\n"
 "reports, etc."
 msgstr ""
+"Generera dina fakturor från Utgifter, Tidrapporter ...\n"
+"Modul för att skapa fakturor baserade på kostnader (personal, utgifter, "
+"...).\n"
+"================================================== ========\n"
+"\n"
+"Du kan definiera prislistor i objektkonto, göra några teoretiska intäkts-\n"
+"rapporter etc."
 
 #. module: base
 #: field:ir.ui.menu,parent_id:0
@@ -5456,13 +5478,13 @@ msgid ""
 "The internal user that is in charge of communicating with this partner if "
 "any."
 msgstr ""
-"Den interna användare som hanterar kommunikationen med denna partner, om "
+"Den interna användare som hanterar kommunikationen med detta företag, om "
 "sådan finns."
 
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Parent Partner"
-msgstr "Överliggande partner"
+msgstr "Överliggande företag"
 
 #. module: base
 #: view:ir.module.module:0
@@ -5614,7 +5636,7 @@ msgstr ""
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_3
 msgid "Starter Partner"
-msgstr ""
+msgstr "Startföretag"
 
 #. module: base
 #: help:ir.model.fields,relation_field:0
@@ -6296,6 +6318,25 @@ msgid ""
 "an other object.\n"
 "    "
 msgstr ""
+"\n"
+"Den här modulen låter dig hantera dina kontakter\n"
+"=======================================\n"
+"\n"
+"Det låter dig definiera:\n"
+"* Kontakter utan samband med ett företag,\n"
+"* Kontaktuppgifter arbetar på flera adresser (eventuellt för olika "
+"företag),\n"
+"* Kontakter med eventuellt olika funktioner för varje  jobbadress\n"
+"\n"
+"Det ger också nya menyalternativ i\n"
+"Inköp / adressbok / kontakter\n"
+"Försäljning / adressbok / kontakter\n"
+"\n"
+"Uppmärksamma att denna modul omvandlar de befintliga adresserna till "
+"\"adresser + kontakter\". Det innebär att vissa områden adresserna kommer "
+"att saknas (som kontaktens namn), eftersom dessa är tänkta att definieras i "
+"ett annat objekt.\n"
+"    "
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_res_partner_event
@@ -6687,7 +6728,7 @@ msgstr "Botswana"
 #: model:ir.ui.menu,name:base.menu_partner_title_partner
 #: view:res.partner.title:0
 msgid "Partner Titles"
-msgstr "Partnertitlar"
+msgstr "Företagstitlar"
 
 #. module: base
 #: help:ir.actions.act_window,auto_refresh:0
@@ -6697,7 +6738,7 @@ msgstr "Lägg till autouppdatering till vyn."
 #. module: base
 #: help:res.partner,employee:0
 msgid "Check this box if the partner is an Employee."
-msgstr "Markera denna om partnern är en anställd."
+msgstr "Markera denna om företaget också är en anställd."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_profiling
@@ -7483,7 +7524,7 @@ msgstr ""
 #. module: base
 #: field:res.partner,title:0
 msgid "Partner Firm"
-msgstr ""
+msgstr "Företagsform"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_model_fields
@@ -7949,6 +7990,24 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Denna modul kan automatiskt skapa projektaktiviteter baserat på inkommande e-"
+"post\n"
+"===================================================================\n"
+"\n"
+"Tillåter dig att skapa uppgifter baserat på nya e-postmeddelanden som kommer "
+"till en viss brevlåda,\n"
+"likhet med vad CRM programmet har för kundämnen / affärsmöjligheter.\n"
+"Det finns två vanliga alternativ för att konfigurera brevlådeintegrationen:\n"
+"\n"
+"* Installera `` fetchmail `` modul och konfigurera en ny brevlåda, välj "
+"sedan\n"
+"`` Projektaktiviteter `` som mål för inkommande e-post.\n"
+"* Ställ in det manuellt på e-postservern baserat på \"post-gateway\" script\n"
+"ges i `` mail `` modul - och anslut den till `project.task` modell.\n"
+"\n"
+"\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_membership
@@ -9507,7 +9566,7 @@ msgstr "Användargränssnitt"
 #: field:res.partner,child_ids:0
 #: field:res.request,ref_partner_id:0
 msgid "Partner Ref."
-msgstr "Partnerref."
+msgstr "Företagsreferense"
 
 #. module: base
 #: field:ir.attachment,create_date:0
@@ -10863,8 +10922,8 @@ msgid ""
 "Manage the partner titles you want to have available in your system. The "
 "partner titles is the legal status of the company: Private Limited, SA, etc."
 msgstr ""
-"Hantera titlarna på systemets partner, som avspeglar deras legala status: "
-"AB, kommun, stiftelse etc."
+"Hantera systemets företagsformer, som avspeglar deras legala status: AB, "
+"kommun, stiftelse etc."
 
 #. module: base
 #: view:base.language.export:0
@@ -11608,7 +11667,7 @@ msgstr ""
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_2
 msgid "OpenERP Partners"
-msgstr "OpenERP Partners"
+msgstr "OpenERP-partner"
 
 #. module: base
 #: code:addons/base/module/module.py:293
@@ -12359,7 +12418,7 @@ msgstr "Guldpartner"
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
 msgid "Partner"
-msgstr "Partner"
+msgstr "Företag"
 
 #. module: base
 #: field:ir.model.fields,complete_name:0
@@ -12734,7 +12793,7 @@ msgstr "Villkor"
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_other_form
 msgid "Other Partners"
-msgstr "Övriga partners"
+msgstr "Övriga företag"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_currency_form
@@ -13066,7 +13125,7 @@ msgstr ""
 #. module: base
 #: view:res.partner.category:0
 msgid "Partner Category"
-msgstr "Partnerkategori"
+msgstr "Företagskategori"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -14300,7 +14359,7 @@ msgstr "Källa"
 #: help:res.partner.address,partner_id:0
 msgid "Keep empty for a private address, not related to partner."
 msgstr ""
-"Lämna blank om det är en privat adress som inte ska kopplas till en partner."
+"Lämna blank om det är en privatadress som inte ska kopplas till ett företag."
 
 #. module: base
 #: model:res.country,name:base.vu
@@ -14411,8 +14470,8 @@ msgid ""
 "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."
 msgstr ""
-"Markera den här rutan om partnern är en leverantör. Om den inte är markerar "
-"så kommer partnern inte visas när man väljer leverantör på en inköpsorder."
+"Markera den här rutan om företaget är en leverantör. Om den inte är markerar "
+"så kommer företaget inte visas när man väljer leverantör på en inköpsorder."
 
 #. module: base
 #: field:ir.actions.server,trigger_obj_id:0
@@ -14584,7 +14643,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_crm_config_lead
 msgid "Leads & Opportunities"
-msgstr "Leads & Opportunities"
+msgstr "Kundämnen och affärsmöjligheter"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -15090,6 +15149,10 @@ msgid ""
 "categories have a hierarchy structure: a partner belonging to a category "
 "also belong to his parent category."
 msgstr ""
+"Hantera företagskategorier för att bättre klassificera dem för spårning och "
+"analyssyften. Ett företag kan tillhöra flera kategorier och kategorier har "
+"en hierarkisk struktur: en företag som tillhör en kategori hör också till "
+"överordnade kategorin."
 
 #. module: base
 #: model:res.country,name:base.az
@@ -15194,6 +15257,10 @@ msgid ""
 "uncheck the 'Suppliers' filter button in order to search in all your "
 "partners, including customers and prospects."
 msgstr ""
+"Du kan komma åt all information om dina leverantörer från "
+"leverantörsformuläret: redovisningsdata, historik av e-post, möten, inköp "
+"etc. Du kan avmarkera  leverantörsfilterknappen för att söka i alla dina "
+"företag, däribland kunder och kundämnen."
 
 #. module: base
 #: model:res.country,name:base.rw
@@ -15626,7 +15693,7 @@ msgstr "Mobilnr"
 #: model:ir.ui.menu,name:base.menu_partner_category_form
 #: view:res.partner.category:0
 msgid "Partner Categories"
-msgstr "Partnerkategorier"
+msgstr "Företagskategorier"
 
 #. module: base
 #: view:base.module.upgrade:0
@@ -15769,7 +15836,7 @@ msgstr "Arbetsflödeinstanser"
 #: code:addons/base/res/res_partner.py:284
 #, python-format
 msgid "Partners: "
-msgstr "Partners "
+msgstr "Företag: "
 
 #. module: base
 #: field:res.partner.bank,name:0
diff --git a/openerp/addons/base/i18n/th.po b/openerp/addons/base/i18n/th.po
index 3e6b0a379cf..df20f7a2adc 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-07-05 04:46+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:43+0000\n"
+"X-Generator: Launchpad (build 15637)\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 78f0877d2a2..805035cf850 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-07-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15593)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:43+0000\n"
+"X-Generator: Launchpad (build 15637)\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 c1823796f8b..b6670894b5c 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-07-05 04:46+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:43+0000\n"
+"X-Generator: Launchpad (build 15637)\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 ba2f93242dd..79d5db6ef59 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-07-05 04:47+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:43+0000\n"
+"X-Generator: Launchpad (build 15637)\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 9ecaa19aeb9..4239bc2adf3 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-07-05 04:47+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:44+0000\n"
+"X-Generator: Launchpad (build 15637)\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 742c4aedd8a..0255aaf2f57 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-07-05 04:47+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:44+0000\n"
+"X-Generator: Launchpad (build 15637)\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 bc0591e9c93..ee0f43d8372 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-07-05 04:48+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:45+0000\n"
+"X-Generator: Launchpad (build 15637)\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 d86d8de9592..96313cd3e58 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-07-05 04:47+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:44+0000\n"
+"X-Generator: Launchpad (build 15637)\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 72f0f0a0faf..a4804f29e56 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-07-05 04:48+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:45+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh

From b8129fc2de94f4d469671cef00e712e682d118b0 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 19 Jul 2012 04:53:54 +0000
Subject: [PATCH 166/171] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120719044629-d54b2fz9zz2brmfa
bzr revid: launchpad_translations_on_behalf_of_openerp-20120719045354-dkjm64h7hz2zhqqg
---
 addons/crm_todo/i18n/en_GB.po   |   95 +++
 addons/event/i18n/mn.po         | 1263 +++++++++++++++++++++++++++++++
 addons/web/i18n/ja.po           |  834 ++++++++++----------
 addons/web_calendar/i18n/ja.po  |  138 ++--
 addons/web_dashboard/i18n/ja.po |   24 +-
 addons/web_diagram/i18n/ja.po   |   25 +-
 addons/web_gantt/i18n/ja.po     |   10 +-
 addons/web_graph/i18n/ja.po     |   40 +-
 addons/web_kanban/i18n/ja.po    |   28 +-
 addons/web_mobile/i18n/ja.po    |   14 +-
 addons/web_process/i18n/ja.po   |   24 +-
 11 files changed, 1937 insertions(+), 558 deletions(-)
 create mode 100644 addons/crm_todo/i18n/en_GB.po
 create mode 100644 addons/event/i18n/mn.po

diff --git a/addons/crm_todo/i18n/en_GB.po b/addons/crm_todo/i18n/en_GB.po
new file mode 100644
index 00000000000..d0d736b83ae
--- /dev/null
+++ b/addons/crm_todo/i18n/en_GB.po
@@ -0,0 +1,95 @@
+# English (United Kingdom) 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-18 16:31+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: English (United Kingdom) <en_GB@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-19 04:46+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
+
+#. module: crm_todo
+#: model:ir.model,name:crm_todo.model_project_task
+msgid "Task"
+msgstr "Task"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Timebox"
+msgstr "Timebox"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "For cancelling the task"
+msgstr "For cancelling the task"
+
+#. module: crm_todo
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr "Error ! Task end-date must be greater then task start-date"
+
+#. module: crm_todo
+#: model:ir.model,name:crm_todo.model_crm_lead
+msgid "crm.lead"
+msgstr "crm.lead"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Next"
+msgstr "Next"
+
+#. module: crm_todo
+#: model:ir.actions.act_window,name:crm_todo.crm_todo_action
+#: model:ir.ui.menu,name:crm_todo.menu_crm_todo
+msgid "My Tasks"
+msgstr "My Tasks"
+
+#. module: crm_todo
+#: view:crm.lead:0
+#: field:crm.lead,task_ids:0
+msgid "Tasks"
+msgstr "Tasks"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Done"
+msgstr "Done"
+
+#. module: crm_todo
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Error ! You cannot create recursive tasks."
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Cancel"
+msgstr "Cancel"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Extra Info"
+msgstr "Extra Info"
+
+#. module: crm_todo
+#: field:project.task,lead_id:0
+msgid "Lead / Opportunity"
+msgstr "Lead / Opportunity"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "For changing to done state"
+msgstr "For changing to done state"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Previous"
+msgstr "Previous"
diff --git a/addons/event/i18n/mn.po b/addons/event/i18n/mn.po
new file mode 100644
index 00000000000..8e47ece549f
--- /dev/null
+++ b/addons/event/i18n/mn.po
@@ -0,0 +1,1263 @@
+# 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 00:36+0000\n"
+"PO-Revision-Date: 2012-07-18 08:15+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-19 04:46+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
+
+#. module: event
+#: view:event.event:0
+msgid "Invoice Information"
+msgstr "Нэхэмжлэлийн мэдээлэл"
+
+#. module: event
+#: view:partner.event.registration:0
+msgid "Event Details"
+msgstr ""
+
+#. module: event
+#: field:event.event,main_speaker_id:0
+msgid "Main Speaker"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: view:report.event.registration:0
+msgid "Group By..."
+msgstr ""
+
+#. module: event
+#: field:event.event,register_min:0
+msgid "Minimum Registrations"
+msgstr ""
+
+#. module: event
+#: model:ir.model,name:event.model_event_confirm_registration
+msgid "Confirmation for Event Registration"
+msgstr ""
+
+#. module: event
+#: field:event.registration.badge,title:0
+msgid "Title"
+msgstr ""
+
+#. module: event
+#: field:event.event,mail_registr:0
+msgid "Registration Email"
+msgstr "Бүртгүүлсэн е-майл"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_event_confirm_registration
+msgid "Make Invoices"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+msgid "Registration Date"
+msgstr "Бүртгүүлсэн огноо"
+
+#. module: event
+#: view:partner.event.registration:0
+msgid "_Close"
+msgstr ""
+
+#. module: event
+#: model:event.event,name:event.event_0
+msgid "Concert of Bon Jovi"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Invoiced Registrations only"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "March"
+msgstr ""
+
+#. module: event
+#: field:event.event,mail_confirm:0
+msgid "Confirmation Email"
+msgstr "Батлагдсан е-майл"
+
+#. module: event
+#: field:event.registration,nb_register:0
+msgid "Quantity"
+msgstr ""
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:63
+#, python-format
+msgid "Registration doesn't have any partner to invoice."
+msgstr ""
+
+#. module: event
+#: field:event.event,company_id:0
+#: field:event.registration,company_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: event
+#: field:event.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: event
+#: help:event.event,pricelist_id:0
+msgid "Pricelist version for current event."
+msgstr ""
+
+#. module: event
+#: code:addons/event/wizard/partner_event_registration.py:88
+#: view:event.registration:0
+#: model:ir.actions.act_window,name:event.action_partner_event_registration
+#: model:ir.model,name:event.model_event_registration
+#: view:partner.event.registration:0
+#, python-format
+msgid "Event Registration"
+msgstr "Бүртгэгдсэн үйл ажиллагаа"
+
+#. module: event
+#: field:event.event,parent_id:0
+msgid "Parent Event"
+msgstr ""
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_make_invoices
+msgid "Make Invoice"
+msgstr ""
+
+#. module: event
+#: field:event.registration,price_subtotal:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Event on Registration"
+msgstr ""
+
+#. module: event
+#: help:event.event,reply_to:0
+msgid "The email address put in the 'Reply-To' of all emails sent by OpenERP"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Add Internal Note"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Confirmed events"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Event Beginning Date"
+msgstr ""
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_report_event_registration
+#: model:ir.model,name:event.model_report_event_registration
+#: model:ir.ui.menu,name:event.menu_report_event_registration
+#: view:report.event.registration:0
+msgid "Events Analysis"
+msgstr "Үйл ажиллагааны анализ"
+
+#. module: event
+#: field:event.registration,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: event
+#: model:ir.model,name:event.model_event_registration_badge
+msgid "event.registration.badge"
+msgstr ""
+
+#. module: event
+#: field:event.event,mail_auto_confirm:0
+msgid "Mail Auto Confirm"
+msgstr ""
+
+#. module: event
+#: model:product.template,name:event.event_product_1_product_template
+msgid "Ticket for Opera"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:125
+#: view:event.event:0
+#, python-format
+msgid "Confirm Event"
+msgstr ""
+
+#. module: event
+#: selection:event.event,state:0
+#: selection:event.registration,state:0
+#: selection:report.event.registration,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: event
+#: field:event.event,reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: event
+#: model:ir.actions.act_window,name:event.open_board_associations_manager
+#: model:ir.ui.menu,name:event.menu_board_associations_manager
+msgid "Event Dashboard"
+msgstr ""
+
+#. module: event
+#: model:event.event,name:event.event_1
+msgid "Opera of Verdi"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "July"
+msgstr ""
+
+#. module: event
+#: help:event.event,register_prospect:0
+msgid "Total of Prospect Registrations"
+msgstr ""
+
+#. module: event
+#: help:event.event,mail_auto_confirm:0
+msgid ""
+"Check this box if you want to use automatic confirmation emailing or "
+"reminder."
+msgstr ""
+
+#. module: event
+#: field:event.registration,ref:0
+msgid "Reference"
+msgstr ""
+
+#. module: event
+#: help:event.event,date_end:0
+#: help:partner.event.registration,end_date:0
+msgid "Closing Date of Event"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Emails"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:83
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: event
+#: selection:event.event,state:0
+#: selection:report.event.registration,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: event
+#: field:event.type,name:0
+msgid "Event type"
+msgstr ""
+
+#. module: event
+#: model:ir.model,name:event.model_event_type
+msgid " Event Type "
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: field:event.registration,event_id:0
+#: model:ir.model,name:event.model_event_event
+#: field:partner.event.registration,event_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,event_id:0
+#: view:res.partner:0
+msgid "Event"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+#: field:event.registration,badge_ids:0
+msgid "Badges"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: selection:event.event,state:0
+#: view:event.registration:0
+#: selection:event.registration,state:0
+#: selection:report.event.registration,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: event
+#: view:event.confirm.registration:0
+msgid "Registration Confirmation"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Events in New state"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Confirm"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: field:event.event,speaker_ids:0
+msgid "Other Speakers"
+msgstr ""
+
+#. module: event
+#: model:ir.model,name:event.model_event_make_invoice
+msgid "Event Make Invoice"
+msgstr ""
+
+#. module: event
+#: help:event.registration,nb_register:0
+msgid "Number of Registrations or Tickets"
+msgstr ""
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:50
+#: code:addons/event/wizard/event_make_invoice.py:54
+#: code:addons/event/wizard/event_make_invoice.py:58
+#: code:addons/event/wizard/event_make_invoice.py:62
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Send New Email"
+msgstr ""
+
+#. module: event
+#: help:event.event,register_min:0
+msgid "Provide Minimum Number of Registrations"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Location"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: view:report.event.registration:0
+msgid "New"
+msgstr ""
+
+#. module: event
+#: field:event.event,register_current:0
+#: view:report.event.registration:0
+msgid "Confirmed Registrations"
+msgstr ""
+
+#. module: event
+#: field:event.event,mail_auto_registr:0
+msgid "Mail Auto Register"
+msgstr ""
+
+#. module: event
+#: field:event.event,type:0
+#: field:partner.event.registration,event_type:0
+msgid "Type"
+msgstr ""
+
+#. module: event
+#: field:event.registration,email_from:0
+msgid "Email"
+msgstr ""
+
+#. module: event
+#: help:event.event,mail_confirm:0
+msgid ""
+"This email will be sent when the event gets confirmed or when someone "
+"subscribes to a confirmed event. This is also the email sent to remind "
+"someone about the event."
+msgstr ""
+
+#. module: event
+#: field:event.registration,tobe_invoiced:0
+msgid "To be Invoiced"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "My Sales Team(s)"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:398
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: event
+#: field:event.event,name:0
+#: field:event.registration,name:0
+msgid "Summary"
+msgstr ""
+
+#. module: event
+#: field:event.registration,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: view:res.partner:0
+msgid "Cancel Registration"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:399
+#, python-format
+msgid "Registered partner doesn't have an address to make the invoice."
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Events created in last month"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Events created in current year"
+msgstr ""
+
+#. module: event
+#: help:event.event,type:0
+msgid "Type of Event like Seminar, Exhibition, Conference, Training."
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Confirmed registrations"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Event Organization"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "History Information"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Dates"
+msgstr ""
+
+#. module: event
+#: view:event.confirm:0
+#: view:event.confirm.registration:0
+msgid "Confirm Anyway"
+msgstr ""
+
+#. module: event
+#: code:addons/event/wizard/event_confirm_registration.py:54
+#, python-format
+msgid "Warning: The Event '%s' has reached its Maximum Limit (%s)."
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: field:event.registration.badge,registration_id:0
+#: model:ir.actions.act_window,name:event.act_event_list_register_event
+msgid "Registration"
+msgstr ""
+
+#. module: event
+#: field:report.event.registration,nbevent:0
+msgid "Number Of Events"
+msgstr ""
+
+#. module: event
+#: help:event.event,main_speaker_id:0
+msgid "Speaker who will be giving speech at the event."
+msgstr ""
+
+#. module: event
+#: help:event.event,state:0
+msgid ""
+"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'."
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Cancel Event"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+msgid "Contact"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: field:event.registration,partner_id:0
+#: model:ir.model,name:event.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: event
+#: view:board.board:0
+#: model:ir.actions.act_window,name:event.act_event_reg
+#: view:report.event.registration:0
+msgid "Events Filling Status"
+msgstr ""
+
+#. module: event
+#: field:event.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Mailing"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Events States"
+msgstr ""
+
+#. module: event
+#: view:board.board:0
+#: field:event.event,register_prospect:0
+msgid "Unconfirmed Registrations"
+msgstr ""
+
+#. module: event
+#: field:event.registration,partner_invoice_id:0
+msgid "Partner Invoiced"
+msgstr ""
+
+#. module: event
+#: help:event.event,register_max:0
+msgid "Provide Maximum Number of Registrations"
+msgstr ""
+
+#. module: event
+#: field:event.registration,log_ids:0
+msgid "Logs"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: field:event.event,state:0
+#: view:event.registration:0
+#: field:event.registration,state:0
+#: view:report.event.registration:0
+#: field:report.event.registration,state:0
+msgid "State"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "September"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "December"
+msgstr ""
+
+#. module: event
+#: field:event.registration,event_product:0
+msgid "Invoice Name"
+msgstr ""
+
+#. module: event
+#: field:report.event.registration,draft_state:0
+msgid " # No of Draft Registrations"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+#: field:report.event.registration,month:0
+msgid "Month"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Event Done"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Registrations in unconfirmed state"
+msgstr ""
+
+#. module: event
+#: help:event.event,register_current:0
+msgid "Total of Open and Done Registrations"
+msgstr ""
+
+#. module: event
+#: field:event.confirm.registration,msg:0
+msgid "Message"
+msgstr ""
+
+#. module: event
+#: constraint:event.event:0
+msgid "Error ! You cannot create recursive event."
+msgstr ""
+
+#. module: event
+#: field:event.registration,ref2:0
+msgid "Reference 2"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:361
+#: view:report.event.registration:0
+#, python-format
+msgid "Invoiced"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:report.event.registration:0
+msgid "My Events"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Speakers"
+msgstr ""
+
+#. module: event
+#: view:event.make.invoice:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: event
+#: help:event.registration,email_cc:0
+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 ""
+
+#. module: event
+#: view:event.make.invoice:0
+msgid "Do you really want to create the invoice(s) ?"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Beginning Date"
+msgstr ""
+
+#. module: event
+#: field:event.registration,date_closed:0
+msgid "Closed"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Events which are in New state"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.action_event_view
+#: model:ir.ui.menu,name:event.menu_event_event
+#: model:ir.ui.menu,name:event.menu_event_event_assiciation
+#: view:res.partner:0
+msgid "Events"
+msgstr ""
+
+#. module: event
+#: field:partner.event.registration,nb_register:0
+msgid "Number of Registration"
+msgstr ""
+
+#. module: event
+#: field:event.event,child_ids:0
+msgid "Child Events"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "August"
+msgstr ""
+
+#. module: event
+#: field:res.partner,event_ids:0
+#: field:res.partner,event_registration_ids:0
+msgid "unknown"
+msgstr ""
+
+#. module: event
+#: help:event.event,product_id:0
+msgid ""
+"The invoices of this event registration will be created with this Product. "
+"Thus it allows you to set the default label and the accounting info you want "
+"by default on these invoices."
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "June"
+msgstr ""
+
+#. module: event
+#: model:product.template,name:event.event_product_0_product_template
+msgid "Ticket for Concert"
+msgstr ""
+
+#. module: event
+#: field:event.registration,write_date:0
+msgid "Write Date"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "My Registrations"
+msgstr ""
+
+#. module: event
+#: view:event.confirm:0
+msgid ""
+"Warning: This Event has not reached its Minimum Registration Limit. Are you "
+"sure you want to confirm it?"
+msgstr ""
+
+#. module: event
+#: field:event.registration,active:0
+msgid "Active"
+msgstr ""
+
+#. module: event
+#: field:event.registration,date:0
+msgid "Start Date"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: event
+#: field:partner.event.registration,start_date:0
+msgid "Start date"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "October"
+msgstr ""
+
+#. module: event
+#: field:event.event,language:0
+msgid "Language"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+#: field:event.registration,email_cc:0
+msgid "CC"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr ""
+
+#. module: event
+#: help:event.registration,email_from:0
+msgid "These people will receive email."
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Set To Draft"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:499
+#: view:event.event:0
+#: view:event.registration:0
+#: view:res.partner:0
+#, python-format
+msgid "Confirm Registration"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:report.event.registration:0
+#: view:res.partner:0
+msgid "Date"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Registration Email Body"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Confirmation Email Body"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Registrations in confirmed or done state"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+#: view:res.partner:0
+msgid "History"
+msgstr ""
+
+#. module: event
+#: field:event.event,address_id:0
+msgid "Location Address"
+msgstr ""
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_event_type
+#: model:ir.ui.menu,name:event.menu_event_type
+msgid "Types of Events"
+msgstr ""
+
+#. module: event
+#: field:event.registration,contact_id:0
+msgid "Partner Contact"
+msgstr ""
+
+#. module: event
+#: field:event.event,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:59
+#, python-format
+msgid "Event related doesn't have any product defined"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Auto Confirmation Email"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Misc"
+msgstr ""
+
+#. module: event
+#: constraint:event.event:0
+msgid "Error ! Closing Date cannot be set before Beginning Date."
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:446
+#: selection:event.event,state:0
+#: view:event.make.invoice:0
+#: selection:event.registration,state:0
+#: selection:report.event.registration,state:0
+#, python-format
+msgid "Done"
+msgstr ""
+
+#. module: event
+#: field:event.event,date_begin:0
+msgid "Beginning date"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+#: field:event.registration,invoice_id:0
+msgid "Invoice"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+#: field:report.event.registration,year:0
+msgid "Year"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:465
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#. module: event
+#: view:event.confirm:0
+#: view:event.confirm.registration:0
+#: view:event.make.invoice:0
+msgid "Close"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Event by Registration"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:436
+#, python-format
+msgid "Open"
+msgstr ""
+
+#. module: event
+#: field:event.event,user_id:0
+msgid "Responsible User"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:561
+#: code:addons/event/event.py:568
+#, python-format
+msgid "Auto Confirmation: [%s] %s"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: field:event.registration,user_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: event
+#: field:event.event,unit_price:0
+#: view:event.registration:0
+#: field:partner.event.registration,unit_price:0
+msgid "Registration Cost"
+msgstr ""
+
+#. module: event
+#: field:event.registration,unit_price:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+#: field:report.event.registration,speaker_id:0
+#: field:res.partner,speaker:0
+msgid "Speaker"
+msgstr ""
+
+#. module: event
+#: model:event.event,name:event.event_2
+msgid "Conference on ERP Buisness"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Reply"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Events created in current month"
+msgstr ""
+
+#. module: event
+#: help:event.event,mail_auto_registr:0
+msgid ""
+"Check this box if you want to use automatic emailing for new registration."
+msgstr ""
+
+#. module: event
+#: field:event.event,date_end:0
+#: field:partner.event.registration,end_date:0
+msgid "Closing date"
+msgstr ""
+
+#. module: event
+#: field:event.event,product_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: field:event.event,note:0
+#: view:event.registration:0
+#: field:event.registration,description:0
+msgid "Description"
+msgstr ""
+
+#. module: event
+#: field:report.event.registration,confirm_state:0
+msgid " # No of Confirmed Registrations"
+msgstr ""
+
+#. module: event
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "May"
+msgstr ""
+
+#. module: event
+#: view:res.partner:0
+msgid "Events Registration"
+msgstr ""
+
+#. module: event
+#: help:event.event,mail_registr:0
+msgid "This email will be sent when someone subscribes to the event."
+msgstr ""
+
+#. module: event
+#: model:product.template,name:event.event_product_2_product_template
+msgid "Ticket for Conference"
+msgstr ""
+
+#. module: event
+#: model:ir.ui.menu,name:event.menu_event_type_association
+msgid "Events Type"
+msgstr ""
+
+#. module: event
+#: field:event.registration.badge,address_id:0
+msgid "Address"
+msgstr ""
+
+#. module: event
+#: view:board.board:0
+#: model:ir.actions.act_window,name:event.act_event_view
+msgid "Next Events"
+msgstr ""
+
+#. module: event
+#: view:partner.event.registration:0
+msgid "_Subcribe"
+msgstr ""
+
+#. module: event
+#: model:ir.model,name:event.model_partner_event_registration
+msgid "  event Registration "
+msgstr ""
+
+#. module: event
+#: help:event.event,date_begin:0
+#: help:partner.event.registration,start_date:0
+msgid "Beginning Date of Event"
+msgstr ""
+
+#. module: event
+#: selection:event.registration,state:0
+msgid "Unconfirmed"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:565
+#, python-format
+msgid "Auto Registration: [%s] %s"
+msgstr ""
+
+#. module: event
+#: field:event.registration,date_deadline:0
+msgid "End Date"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "February"
+msgstr ""
+
+#. module: event
+#: view:board.board:0
+msgid "Association Dashboard"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: field:event.registration.badge,name:0
+msgid "Name"
+msgstr ""
+
+#. module: event
+#: field:event.event,section_id:0
+#: field:event.registration,section_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,section_id:0
+msgid "Sale Team"
+msgstr ""
+
+#. module: event
+#: field:event.event,country_id:0
+msgid "Country"
+msgstr ""
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:55
+#, python-format
+msgid "Registration is set as Cannot be invoiced"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:527
+#: view:event.event:0
+#: view:event.registration:0
+#: view:res.partner:0
+#, python-format
+msgid "Close Registration"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "April"
+msgstr ""
+
+#. module: event
+#: help:event.event,unit_price:0
+msgid ""
+"This will be the default price used as registration cost when invoicing this "
+"event. Note that you can specify a specific amount for each registration."
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Events which are in confirm state"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.type:0
+#: view:report.event.registration:0
+#: field:report.event.registration,type:0
+msgid "Event Type"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: field:event.event,registration_ids:0
+#: model:ir.actions.act_window,name:event.action_registration
+#: model:ir.ui.menu,name:event.menu_action_registration
+#: model:ir.ui.menu,name:event.menu_action_registration_association
+msgid "Registrations"
+msgstr ""
+
+#. module: event
+#: field:event.registration,id:0
+msgid "ID"
+msgstr ""
+
+#. module: event
+#: field:event.event,register_max:0
+#: field:report.event.registration,register_max:0
+msgid "Maximum Registrations"
+msgstr ""
+
+#. module: event
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: event
+#: field:report.event.registration,date:0
+msgid "Event Start Date"
+msgstr ""
+
+#. module: event
+#: view:partner.event.registration:0
+msgid "Event For Registration"
+msgstr ""
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:51
+#, python-format
+msgid "Invoice cannot be created if the registration is in %s state."
+msgstr ""
+
+#. module: event
+#: view:event.confirm:0
+#: model:ir.actions.act_window,name:event.action_event_confirm
+#: model:ir.model,name:event.model_event_confirm
+msgid "Event Confirmation"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Auto Registration Email"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+#: view:report.event.registration:0
+#: field:report.event.registration,total:0
+msgid "Total"
+msgstr ""
+
+#. module: event
+#: field:event.event,speaker_confirmed:0
+msgid "Speaker Confirmed"
+msgstr ""
+
+#. module: event
+#: model:ir.actions.act_window,help:event.action_event_view
+msgid ""
+"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."
+msgstr ""
diff --git a/addons/web/i18n/ja.po b/addons/web/i18n/ja.po
index 66f1f5d584b..c1339863a4d 100644
--- a/addons/web/i18n/ja.po
+++ b/addons/web/i18n/ja.po
@@ -8,179 +8,183 @@ 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-03-31 18:44+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
+"PO-Revision-Date: 2012-07-19 01:18+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:54+0000\n"
-"X-Generator: Launchpad (build 15531)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
+"X-Generator: Launchpad (build 15637)\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
+#: addons/web/static/src/js/chrome.js:176
+#: addons/web/static/src/js/chrome.js:202
+#: addons/web/static/src/js/chrome.js:380
+#: addons/web/static/src/js/view_form.js:457
+#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
-msgstr "正常"
+msgstr "OK"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:178
+#: addons/web/static/src/js/chrome.js:184
 msgid "Send OpenERP Enterprise Report"
 msgstr "OpenERPエンタープライズレポートを送る"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:192
+#: addons/web/static/src/js/chrome.js:198
 msgid "Dont send"
 msgstr "送らない"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:212
-#: addons/web/static/src/js/chrome.js:914
+#: addons/web/static/src/js/chrome.js:1119
 msgid "Client Error"
 msgstr "クライアントのエラー"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:253
+#: addons/web/static/src/js/chrome.js:260
 #, python-format
 msgid "Loading (%d)"
 msgstr "ロード中 (%d)"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:276
+#: addons/web/static/src/js/chrome.js:292
 msgid "Invalid database name"
 msgstr "無効なデータベース名"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:402
+#: addons/web/static/src/js/chrome.js:455
 msgid "Backed"
 msgstr "バックアップされました"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:402
+#: addons/web/static/src/js/chrome.js:456
 msgid "Database backed up successfully"
 msgstr "データベースは正常にバックアップされました"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:442
+#: addons/web/static/src/js/chrome.js:499
 msgid "Restored"
 msgstr "リストアされました"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:442
+#: addons/web/static/src/js/chrome.js:499
 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
+#: addons/web/static/src/js/chrome.js:783
+#: addons/web/static/src/xml/base.xml:226
+#: addons/web/static/src/xml/base.xml:1735
 msgid "Change Password"
 msgstr "パスワードの変更"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:809
-#: addons/web/static/src/xml/base.xml:326
+#: addons/web/static/src/js/chrome.js:759
+#: addons/web/static/src/xml/base.xml:356
 msgid "Preferences"
 msgstr "個人設定"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:812
+#: addons/web/static/src/js/chrome.js:763
 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
+#: addons/web/static/src/js/chrome.js:762
+#: addons/web/static/src/js/search.js:241
+#: addons/web/static/src/js/search.js:300
+#: addons/web/static/src/js/view_editor.js:95
+#: addons/web/static/src/js/view_editor.js:836
+#: addons/web/static/src/js/view_editor.js:962
+#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/xml/base.xml:743
+#: addons/web/static/src/xml/base.xml:1502
+#: addons/web/static/src/xml/base.xml:1512
+#: addons/web/static/src/xml/base.xml:1521
 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
+#: addons/web/static/src/js/chrome.js:764
+#: addons/web/static/src/js/view_editor.js:73
+#: addons/web/static/src/js/views.js:967 addons/web/static/src/xml/base.xml:742
+#: addons/web/static/src/xml/base.xml:1506
+#: addons/web/static/src/xml/base.xml:1520
 msgid "Save"
 msgstr "保存"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:839
+#: addons/web/static/src/js/chrome.js:680
+#: addons/web/static/src/xml/base.xml:359
 msgid "About"
 msgstr "について"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:856
+#: addons/web/static/src/js/chrome.js:1052
 msgid "OpenERP - Unsupported/Community Version"
 msgstr "OpenERP - サポート無し/コミュニティバージョン"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:619
 msgid "less than a minute ago"
-msgstr ""
+msgstr "数十秒前"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:620
 msgid "about a minute ago"
-msgstr ""
+msgstr "1分前"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:621
 #, python-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "%d分前"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:622
 msgid "about an hour ago"
-msgstr ""
+msgstr "1時間前"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:623
 #, python-format
 msgid "%d hours ago"
-msgstr ""
+msgstr "%d時間前"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:624
 msgid "a day ago"
-msgstr ""
+msgstr "1日前"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:625
 #, python-format
 msgid "%d days ago"
-msgstr ""
+msgstr "%d 日前"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:626
 msgid "about a month ago"
-msgstr ""
+msgstr "1ヶ月前"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:627
 #, python-format
 msgid "%d months ago"
-msgstr ""
+msgstr "%dヶ月前"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:628
 msgid "about a year ago"
-msgstr ""
+msgstr "1年前"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:629
 #, python-format
 msgid "%d years ago"
-msgstr ""
+msgstr "%d年前"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:6
@@ -191,10 +195,10 @@ msgstr "データのエクスポート"
 #: 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
+#: addons/web/static/src/js/view_editor.js:398
+#: addons/web/static/src/js/view_form.js:734
+#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "閉じる"
 
@@ -204,19 +208,19 @@ msgid "Export To File"
 msgstr "ファイルにエクスポート"
 
 #. openerp-web
-#: addons/web/static/src/js/data_export.js:125
+#: addons/web/static/src/js/data_export.js:126
 msgid "Please enter save field list name"
-msgstr "保管するフィールドリスト名を入れてください"
+msgstr "保管する項目リスト名を入れてください"
 
 #. openerp-web
-#: addons/web/static/src/js/data_export.js:360
+#: addons/web/static/src/js/data_export.js:362
 msgid "Please select fields to save export list..."
-msgstr "エクスポートリストに保管するフィールドを選んでください"
+msgstr "エクスポートリストに保存する項目を選んでください"
 
 #. openerp-web
-#: addons/web/static/src/js/data_export.js:373
+#: addons/web/static/src/js/data_export.js:375
 msgid "Please select fields to export..."
-msgstr "エクスポートするフィールドを選んでください"
+msgstr "エクスポートする項目を選んでください"
 
 #. openerp-web
 #: addons/web/static/src/js/data_import.js:34
@@ -238,93 +242,93 @@ msgstr "外部ID"
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
-msgstr ""
+msgstr "宛先項目の選択は1回のみです。幾つかの項目は複数回選択されます："
 
 #. openerp-web
 #: addons/web/static/src/js/data_import.js:383
 msgid "*Required Fields are not selected :"
-msgstr ""
+msgstr "* 必須項目が選択されていません："
 
 #. openerp-web
-#: addons/web/static/src/js/formats.js:141
+#: addons/web/static/src/js/formats.js:139
 #, python-format
 msgid "(%d records)"
-msgstr ""
+msgstr "（%d レコード）"
 
 #. openerp-web
-#: addons/web/static/src/js/formats.js:327
-#: addons/web/static/src/js/view_form.js:4301
+#: addons/web/static/src/js/formats.js:325
+#: addons/web/static/src/js/view_page.js:268
 msgid "Download"
 msgstr "ダウンロード"
 
 #. openerp-web
-#: addons/web/static/src/js/formats.js:332
+#: addons/web/static/src/js/formats.js:330
 #, python-format
 msgid "Download \"%s\""
-msgstr "ダウンロード \"%s\""
+msgstr "%s のダウンロード"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:798
+#: addons/web/static/src/js/search.js:437
 msgid "Invalid Search"
 msgstr "無効な検索"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:798
+#: addons/web/static/src/js/search.js:437
 msgid "triggered from search view"
 msgstr "検索ビューによって起動"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:839
+#: addons/web/static/src/js/search.js:528
 #, python-format
 msgid "Incorrect value for field %(fieldname)s: [%(value)s] is %(message)s"
-msgstr "フィールド  %(fieldname)s の正しくない値： [%(value)s] は %(message)s"
+msgstr "項目 %(fieldname)s の誤った値： [%(value)s] は %(message)s"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:948
 #, python-format
 msgid "Filter on: %s"
-msgstr ""
+msgstr "フィルタ：%s"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:999
 msgid "Filter"
-msgstr ""
+msgstr "フィルタ"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:1108
 #, python-format
 msgid "Group by: %s"
-msgstr ""
+msgstr "グループ：%s"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:1132
 msgid "GroupBy"
-msgstr ""
+msgstr "グループ化"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:1267
 #, python-format
 msgid "Search %(field)s for: %(value)s"
-msgstr ""
+msgstr "%(field)s を検索：%(value)s"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1301
+#: addons/web/static/src/js/search.js:869
 msgid "not a valid integer"
 msgstr "正しいトリガーではありません"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1315
+#: addons/web/static/src/js/search.js:883
 msgid "not a valid number"
 msgstr "正しい数値ではありません"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1398
-#: addons/web/static/src/xml/base.xml:840
+#: addons/web/static/src/js/search.js:962
+#: addons/web/static/src/xml/base.xml:973
 msgid "Yes"
 msgstr "はい"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1399
+#: addons/web/static/src/js/search.js:963
 msgid "No"
 msgstr "いいえ"
 
@@ -332,18 +336,17 @@ msgstr "いいえ"
 #: addons/web/static/src/js/search.js:1416
 #, python-format
 msgid "Search %(field)s at: %(value)s"
-msgstr ""
+msgstr "%(field)s の検索：%(value)s"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1622
-#: addons/web/static/src/xml/base.xml:1229
+#: addons/web/static/src/xml/base.xml:1286
 msgid "Filters"
 msgstr "フィルタ"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:1762
 msgid "Advanced"
-msgstr ""
+msgstr "高度"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:1853
@@ -352,77 +355,87 @@ msgid "%(field)s %(operator)s \"%(value)s\""
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1888
+#: addons/web/static/src/js/search.js:1341
 msgid "contains"
-msgstr "次を含む"
+msgstr "含む"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1889
+#: addons/web/static/src/js/search.js:1342
 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
+#: addons/web/static/src/js/search.js:1343
+#: addons/web/static/src/js/search.js:1359
+#: addons/web/static/src/js/search.js:1380
+#: addons/web/static/src/js/search.js:1401
+#: addons/web/static/src/js/search.js:1424
 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
+#: addons/web/static/src/js/search.js:1344
+#: addons/web/static/src/js/search.js:1360
+#: addons/web/static/src/js/search.js:1381
+#: addons/web/static/src/js/search.js:1402
+#: addons/web/static/src/js/search.js:1425
 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
+#: addons/web/static/src/js/search.js:1345
+#: addons/web/static/src/js/search.js:1361
+#: addons/web/static/src/js/search.js:1382
+#: addons/web/static/src/js/search.js:1403
+#: addons/web/static/src/js/search.js:1426
 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
+#: addons/web/static/src/js/search.js:1346
+#: addons/web/static/src/js/search.js:1362
+#: addons/web/static/src/js/search.js:1383
+#: addons/web/static/src/js/search.js:1404
+#: addons/web/static/src/js/search.js:1427
 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
+#: addons/web/static/src/js/search.js:1347
+#: addons/web/static/src/js/search.js:1363
+#: addons/web/static/src/js/search.js:1384
+#: addons/web/static/src/js/search.js:1405
+#: addons/web/static/src/js/search.js:1428
 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
+#: addons/web/static/src/js/search.js:1348
+#: addons/web/static/src/js/search.js:1364
+#: addons/web/static/src/js/search.js:1385
+#: addons/web/static/src/js/search.js:1406
+#: addons/web/static/src/js/search.js:1429
 msgid "less or equal than"
 msgstr "次より小さいか等しい"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1947
-#: addons/web/static/src/js/search.js:1973
+#: addons/web/static/src/js/search.js:1419
+#: addons/web/static/src/js/search.js:1444
 msgid "is"
 msgstr "が次である"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1974
+#: addons/web/static/src/js/search.js:1445
 msgid "is not"
 msgstr "は次ではない"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1988
+#: addons/web/static/src/js/search.js:1459
 msgid "is true"
 msgstr "は正しい"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1989
+#: addons/web/static/src/js/search.js:1460
 msgid "is false"
 msgstr "は正しくない"
 
@@ -435,195 +448,194 @@ msgstr "管理ビュー (%s)"
 #. 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
+#: addons/web/static/src/xml/base.xml:100
+#: addons/web/static/src/xml/base.xml:327
+#: addons/web/static/src/xml/base.xml:761
 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
+#: addons/web/static/src/xml/base.xml:483
+#: addons/web/static/src/xml/base.xml:760
 msgid "Edit"
 msgstr "編集"
 
 #. openerp-web
 #: addons/web/static/src/js/view_editor.js:48
-#: addons/web/static/src/xml/base.xml:1595
+#: addons/web/static/src/xml/base.xml:1653
 msgid "Remove"
 msgstr "削除"
 
 #. openerp-web
-#: addons/web/static/src/js/view_editor.js:72
+#: addons/web/static/src/js/view_editor.js:71
 #, python-format
 msgid "Create a view (%s)"
 msgstr "ビュー (%s) を作成"
 
 #. openerp-web
-#: addons/web/static/src/js/view_editor.js:169
+#: addons/web/static/src/js/view_editor.js:168
 msgid "Do you really want to remove this view?"
 msgstr "このビューを削除しますか？"
 
 #. openerp-web
-#: addons/web/static/src/js/view_editor.js:365
+#: addons/web/static/src/js/view_editor.js:364
 #, python-format
 msgid "View Editor %d - %s"
 msgstr "ビューエディタ %d - %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_editor.js:368
+#: addons/web/static/src/js/view_editor.js:367
 msgid "Inherited View"
 msgstr "継承ビュー"
 
 #. openerp-web
-#: addons/web/static/src/js/view_editor.js:372
+#: addons/web/static/src/js/view_editor.js:371
 msgid "Do you really wants to create an inherited view here?"
 msgstr "継承ビューを作成しますか？"
 
 #. openerp-web
-#: addons/web/static/src/js/view_editor.js:382
+#: addons/web/static/src/js/view_editor.js:381
 msgid "Preview"
 msgstr "プレビュー"
 
 #. openerp-web
-#: addons/web/static/src/js/view_editor.js:502
+#: addons/web/static/src/js/view_editor.js:501
 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
+#: addons/web/static/src/js/view_editor.js:815
+#: addons/web/static/src/js/view_editor.js:939
 msgid "Properties"
 msgstr "属性"
 
 #. openerp-web
-#: addons/web/static/src/js/view_editor.js:814
-#: addons/web/static/src/js/view_editor.js:940
+#: addons/web/static/src/js/view_editor.js:818
+#: addons/web/static/src/js/view_editor.js:942
 msgid "Update"
 msgstr "更新"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:43
+#: addons/web/static/src/js/view_form.js:16
+#: addons/web/static/src/js/view_form.js:210
 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
+#: addons/web/static/src/xml/base.xml:632
+#: addons/web/static/src/xml/base.xml:763
+#: addons/web/static/src/xml/base.xml:1714
 msgid "Delete"
 msgstr "削除"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:148
+#: addons/web/static/src/xml/base.xml:762
 msgid "Duplicate"
-msgstr "重複"
+msgstr "複製"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:149
-#: addons/web/static/src/js/view_form.js:885
+#: addons/web/static/src/js/view_form.js:133
+#: addons/web/static/src/js/view_form.js:728
 msgid "Set Default"
 msgstr "デフォルトに設定"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:643
+#: addons/web/static/src/js/view_page.js:59
 msgid "Do you really want to delete this record?"
 msgstr "このレコードを削除しますか？"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:657
+#: addons/web/static/src/js/view_form.js:508
 msgid ""
 "Warning, the record has been modified, your changes will be discarded."
-msgstr "警告，レコードは変更されて，あなたが行った変更は無視されます"
+msgstr "警告，レコードは変更されて，あなたが行った変更は無視されます。"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:892
+#: addons/web/static/src/js/view_form.js:735
 msgid "Save default"
-msgstr "デフォルトを保管"
+msgstr "デフォルトに保存"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1402
+#: addons/web/static/src/js/view_form.js:867
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr "ドメイン  %s に無効な演算  %s があります"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1410
+#: addons/web/static/src/js/view_form.js:875
 #, python-format
 msgid "Unknown field %s in domain %s"
-msgstr "ドメイン  %s に無効なフィールド  %s があります"
+msgstr "ドメイン  %s に無効な項目  %s があります"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1448
+#: addons/web/static/src/js/view_form.js:913
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr "ドメイン  %s に無効な演算  %s があります"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1657
+#: addons/web/static/src/js/view_form.js:1284
 msgid "Confirm"
 msgstr "確認"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2478
+#: addons/web/static/src/js/view_form.js:2193
 msgid "<em>   Search More...</em>"
-msgstr "<em>   もっと検索…</em>"
+msgstr "<em>   さらに検索…</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2488
+#: addons/web/static/src/js/view_form.js:2211
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   作成 \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2494
+#: addons/web/static/src/js/view_form.js:2217
 msgid "<em>   Create and Edit...</em>"
-msgstr "<em>   作成して編集…</em>"
+msgstr "<em>   作成＆編集…</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2527
+#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "検索: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2527
-#: addons/web/static/src/js/view_form.js:3210
+#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2738
 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
+#: addons/web/static/src/js/view_form.js:2040
+#: addons/web/static/src/js/view_form.js:2766
+#: addons/web/static/src/js/view_form.js:2991
 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
+#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/xml/base.xml:755
+#: addons/web/static/src/xml/base.xml:777
+#: addons/web/static/src/xml/base.xml:1652
 msgid "Add"
 msgstr "追加"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:3566
-#: addons/web/static/src/js/view_form.js:3684
+#: addons/web/static/src/js/view_form.js:2971
 msgid "Add: "
 msgstr "追加: "
 
 #. openerp-web
 #: addons/web/static/src/js/view_form.js:4230
 msgid "Save As..."
-msgstr ""
+msgstr "名前を付けて保存"
 
 #. openerp-web
 #: addons/web/static/src/js/view_form.js:4230
 msgid "The field is empty, there's nothing to save !"
-msgstr ""
+msgstr "項目は空です。何も保存するものはありません。"
 
 #. openerp-web
 #: addons/web/static/src/js/view_list.js:8
@@ -631,54 +643,52 @@ msgid "List"
 msgstr "リスト"
 
 #. openerp-web
-#: addons/web/static/src/js/view_list.js:338
+#: addons/web/static/src/js/view_list.js:277
 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
+#: addons/web/static/src/js/views.js:819
+#: addons/web/static/src/xml/base.xml:1742
 msgid "Import"
 msgstr "インポート"
 
 #. openerp-web
-#: addons/web/static/src/js/view_list.js:357
-#: addons/web/static/src/xml/base.xml:1554
+#: addons/web/static/src/js/views.js:822
+#: addons/web/static/src/xml/base.xml:1612
 msgid "Export"
 msgstr "エクスポート"
 
 #. openerp-web
-#: addons/web/static/src/js/view_list.js:436
+#: addons/web/static/src/js/view_list.js:374
 msgid "Group"
-msgstr ""
+msgstr "グループ"
 
 #. openerp-web
-#: addons/web/static/src/js/view_list.js:623
+#: addons/web/static/src/js/view_list.js:549
 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
+#: addons/web/static/src/js/views.js:925
 msgid "Warning"
 msgstr "注意"
 
 #. openerp-web
 #: addons/web/static/src/js/view_list.js:716
 msgid "You must select at least one record."
-msgstr ""
+msgstr "最低限1レコード選択して下さい。"
 
 #. openerp-web
-#: addons/web/static/src/js/view_list.js:1332
+#: addons/web/static/src/js/view_list.js:1243
 msgid "Undefined"
 msgstr "未定義"
 
 #. openerp-web
-#: addons/web/static/src/js/view_list.js:1428
+#: addons/web/static/src/js/view_list.js:1342
 #, python-format
 msgid "%(page)d/%(page_count)d"
-msgstr "%(page)d/%(page_count)d"
+msgstr "%(page)d / %(page_count)d"
 
 #. openerp-web
 #: addons/web/static/src/js/view_tree.js:11
@@ -686,336 +696,337 @@ msgid "Tree"
 msgstr "ツリー"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:566 addons/web/static/src/xml/base.xml:452
+#: addons/web/static/src/js/views.js:570 addons/web/static/src/xml/base.xml:480
 msgid "Fields View Get"
-msgstr "フィールドのビューを得る"
+msgstr "項目ビューの取得"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:574
+#: addons/web/static/src/js/views.js:578
 #, python-format
 msgid "View Log (%s)"
 msgstr "ビューのログ (%s)"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:604
+#: addons/web/static/src/js/views.js:605
 #, python-format
 msgid "Model %s fields"
-msgstr "モデル %s フィールド"
+msgstr "モデル %s 項目"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:614 addons/web/static/src/xml/base.xml:455
+#: addons/web/static/src/js/views.js:615 addons/web/static/src/xml/base.xml:482
 msgid "Manage Views"
 msgstr "ビューの管理"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:615
+#: addons/web/static/src/js/views.js:616
 msgid "Could not find current view declaration"
 msgstr "このビューの定義が見つかりません"
 
 #. openerp-web
 #: addons/web/static/src/js/views.js:716
 msgid "Print"
-msgstr ""
+msgstr "印刷"
 
 #. openerp-web
 #: addons/web/static/src/js/views.js:717
 msgid "Attachment"
-msgstr ""
+msgstr "添付"
 
 #. openerp-web
 #: addons/web/static/src/js/views.js:718 addons/web/static/src/xml/base.xml:276
 msgid "More"
-msgstr ""
+msgstr "さらに"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:726
+#: addons/web/static/src/js/views.js:810
 msgid "Translate"
 msgstr "翻訳"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:726
+#: addons/web/static/src/js/views.js:812
 msgid "Technical translation"
 msgstr "技術翻訳"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:820
+#: addons/web/static/src/js/views.js:924
 msgid "You must choose at least one record."
-msgstr "少なくとも１つのレコードを選んでください"
+msgstr "少なくとも１つのレコードを選んで下さい。"
 
 #. openerp-web
 #: addons/web/static/src/js/views.js:875
 msgid "Uploading..."
-msgstr ""
+msgstr "アップロード中..."
 
 #. openerp-web
 #: addons/web/static/src/js/views.js:885
 msgid "Do you really want to delete this attachment ?"
-msgstr ""
+msgstr "この添付を本当に削除しますか？"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:894
+#: addons/web/static/src/js/views.js:962
 msgid "Translations"
 msgstr "翻訳"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:9
+#: addons/web/static/src/xml/base.xml:52
 msgid "Loading..."
 msgstr "読込み中..."
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:48
+#: addons/web/static/src/xml/base.xml:251
 msgid ""
 "Your version of OpenERP is unsupported. Support & maintenance services are "
 "available here:"
-msgstr "このOpenERPはサポートされていあせん。サポート保守サービスはこちらまで："
+msgstr "このOpenERPのバージョンはサポートされていません。サポート保守サービスはこちらから："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:48
+#: addons/web/static/src/xml/base.xml:251
 msgid "OpenERP Entreprise"
 msgstr "OpenERPエンタープライズ"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:53
+#: addons/web/static/src/xml/base.xml:256
 msgid "OpenERP Enterprise Contract."
 msgstr "OpenERPエンタープライズ契約"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:54
+#: addons/web/static/src/xml/base.xml:257
 msgid "Your report will be sent to the OpenERP Enterprise team."
-msgstr "あなたのレポートをOpenERPエンタープライズチームに送ります"
+msgstr "あなたのレポートをOpenERPエンタープライズチームに送ります。"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:56
+#: addons/web/static/src/xml/base.xml:259
 msgid "Summary:"
-msgstr "要約:"
+msgstr "要約："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:60
+#: addons/web/static/src/xml/base.xml:263
 msgid "Description:"
-msgstr "説明:"
+msgstr "説明："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:64
+#: addons/web/static/src/xml/base.xml:267
 msgid "What you did:"
 msgstr "あなたが行ったこと："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:80
+#: addons/web/static/src/xml/base.xml:297
 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
+#: addons/web/static/src/xml/base.xml:116
+#: addons/web/static/src/xml/base.xml:150
+#: addons/web/static/src/xml/base.xml:301
 msgid "Database:"
 msgstr "データベース:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:89
+#: addons/web/static/src/xml/base.xml:306
 msgid "Username"
 msgstr "ユーザ名"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:91 addons/web/static/src/xml/base.xml:125
+#: addons/web/static/src/xml/base.xml:308
+#: addons/web/static/src/xml/base.xml:331
 msgid "Password"
 msgstr "パスワード"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:93
+#: addons/web/static/src/xml/base.xml:310
 msgid "Log in"
 msgstr "ログイン"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:97
+#: addons/web/static/src/xml/base.xml:314
 msgid "Manage Databases"
 msgstr "データベースの管理"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:98 addons/web/static/src/xml/base.xml:389
+#: addons/web/static/src/xml/base.xml:44 addons/web/static/src/xml/base.xml:315
 msgid "Powered by"
 msgstr "で動く"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:98 addons/web/static/src/xml/base.xml:334
+#: addons/web/static/src/xml/base.xml:44 addons/web/static/src/xml/base.xml:315
+#: addons/web/static/src/xml/base.xml:1819
 msgid "OpenERP"
 msgstr "OpenERP"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:122
-#: addons/web/static/src/xml/base.xml:189
+#: addons/web/static/src/xml/base.xml:132
+#: addons/web/static/src/xml/base.xml:328
 msgid "Drop"
-msgstr "破棄"
+msgstr "削除"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:123
-#: addons/web/static/src/xml/base.xml:215
+#: addons/web/static/src/xml/base.xml:166
+#: addons/web/static/src/xml/base.xml:329
 msgid "Backup"
 msgstr "バックアップ"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:124
-#: addons/web/static/src/xml/base.xml:237
+#: addons/web/static/src/xml/base.xml:195
+#: addons/web/static/src/xml/base.xml:330
 msgid "Restore"
 msgstr "リストア"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:126
+#: addons/web/static/src/xml/base.xml:332
 msgid "Back to Login"
 msgstr "ログインへ戻る"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:131
+#: addons/web/static/src/xml/base.xml:61
 msgid "CREATE DATABASE"
 msgstr "データベース作成"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:134
-#: addons/web/static/src/xml/base.xml:247
+#: addons/web/static/src/xml/base.xml:68 addons/web/static/src/xml/base.xml:211
 msgid "Master password:"
 msgstr "マスタパスワード："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:138
-#: addons/web/static/src/xml/base.xml:233
+#: addons/web/static/src/xml/base.xml:72 addons/web/static/src/xml/base.xml:191
 msgid "New database name:"
 msgstr "新しいデータベース名："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:142
+#: addons/web/static/src/xml/base.xml:77
 msgid "Load Demonstration data:"
 msgstr "デモ用のデータを読込み中："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:146
+#: addons/web/static/src/xml/base.xml:81
 msgid "Default language:"
 msgstr "デフォルトの言語:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:156
+#: addons/web/static/src/xml/base.xml:91
 msgid "Admin password:"
 msgstr "アドミン用パスワード："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:160
+#: addons/web/static/src/xml/base.xml:95
 msgid "Confirm password:"
 msgstr "パスワード確認"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:171
+#: addons/web/static/src/xml/base.xml:109
 msgid "DROP DATABASE"
-msgstr "データベースを破棄"
+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
+#: addons/web/static/src/xml/base.xml:128
+#: addons/web/static/src/xml/base.xml:162
+#: addons/web/static/src/xml/base.xml:187
 msgid "Master Password:"
 msgstr "マスタパスワード："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:197
+#: addons/web/static/src/xml/base.xml:143
 msgid "BACKUP DATABASE"
 msgstr "データベースをバックアップ"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:222
+#: addons/web/static/src/xml/base.xml:175
 msgid "RESTORE DATABASE"
 msgstr "データベースをリストア"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:225
+#: addons/web/static/src/xml/base.xml:182
 msgid "File:"
 msgstr "ファイル:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:244
+#: addons/web/static/src/xml/base.xml:204
 msgid "CHANGE MASTER PASSWORD"
 msgstr "マスタパスワードの変更"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:251
+#: addons/web/static/src/xml/base.xml:216
 msgid "New master password:"
 msgstr "新しいマスタパスワード："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:255
+#: addons/web/static/src/xml/base.xml:221
 msgid "Confirm new master password:"
 msgstr "新しいマスタパスワードの確認："
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:325
 msgid "About OpenERP"
-msgstr ""
+msgstr "OpenERPについて"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:327
 msgid "Log out"
-msgstr ""
+msgstr "ログアウト"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:333
 msgid "Activate the developer mode"
-msgstr ""
+msgstr "開発者モードを有効化"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:335
+#: addons/web/static/src/xml/base.xml:1820
 msgid "Version"
 msgstr "バージョン"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:336
+#: addons/web/static/src/xml/base.xml:1821
 msgid "Copyright © 2004-TODAY OpenERP SA. All Rights Reserved."
 msgstr "Copyright © 2004-TODAY OpenERP SA. All Rights Reserved."
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:337
+#: addons/web/static/src/xml/base.xml:1822
 msgid "OpenERP is a trademark of the"
 msgstr "OpenERPは商標です"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:338
+#: addons/web/static/src/xml/base.xml:1823
 msgid "OpenERP SA Company"
 msgstr "OpenERP SA Company"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:340
+#: addons/web/static/src/xml/base.xml:1825
 msgid "Licenced under the terms of"
 msgstr "ライセンスに準拠"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:341
+#: addons/web/static/src/xml/base.xml:1826
 msgid "GNU Affero General Public License"
 msgstr "GNU Affero General Public License"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:343
+#: addons/web/static/src/xml/base.xml:1828
 msgid "For more information visit"
 msgstr "もっと詳しい情報はこちらへ"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:344
+#: addons/web/static/src/xml/base.xml:1829
 msgid "OpenERP.com"
 msgstr "OpenERP.com"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:352
+#: addons/web/static/src/xml/base.xml:1720
 msgid "Old Password:"
 msgstr "古いパスワード"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:357
+#: addons/web/static/src/xml/base.xml:1725
 msgid "New Password:"
 msgstr "新しいパスワード："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:362
+#: addons/web/static/src/xml/base.xml:1730
 msgid "Confirm Password:"
 msgstr "パスワードの確認:"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:390
 msgid "Open"
-msgstr ""
+msgstr "開く"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:390
@@ -1023,85 +1034,84 @@ msgid "ERP"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:448
+#: addons/web/static/src/xml/base.xml:477
 msgid "Debug View#"
-msgstr "ビュー＃をデバッグ"
+msgstr "ビューをデバッグ"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:449
+#: addons/web/static/src/xml/base.xml:478
 msgid "View Log (perm_read)"
 msgstr "ログ (perm_read) のビュー"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:450
 msgid "Toggle Form Layout Outline"
-msgstr ""
+msgstr "トグル形式のレイアウトの概観"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:451
+#: addons/web/static/src/xml/base.xml:479
 msgid "View Fields"
-msgstr "フィールドのビュー"
+msgstr "項目のビュー"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:453
-#: addons/web/static/src/xml/base.xml:1242
+#: addons/web/static/src/xml/base.xml:1300
 msgid "Manage Filters"
 msgstr "フィルタの管理"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:456
+#: addons/web/static/src/xml/base.xml:483
 msgid "View"
 msgstr "ビュー"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:457
+#: addons/web/static/src/xml/base.xml:484
 msgid "Edit SearchView"
-msgstr "サーチビューを編集"
+msgstr "検索ビューの編集"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:458
+#: addons/web/static/src/xml/base.xml:485
 msgid "Edit Action"
-msgstr "アクションを編集"
+msgstr "アクションの編集"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:459
+#: addons/web/static/src/xml/base.xml:486
 msgid "Edit Workflow"
 msgstr "ワークフローを編集"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:464
+#: addons/web/static/src/xml/base.xml:491
 msgid "ID:"
-msgstr "ID:"
+msgstr "ID："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:467
+#: addons/web/static/src/xml/base.xml:494
 msgid "XML ID:"
 msgstr "XML ID："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:470
+#: addons/web/static/src/xml/base.xml:497
 msgid "Creation User:"
 msgstr "ユーザの作成："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:473
+#: addons/web/static/src/xml/base.xml:500
 msgid "Creation Date:"
 msgstr "日付の作成："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:476
+#: addons/web/static/src/xml/base.xml:503
 msgid "Latest Modification by:"
-msgstr "最近の修正は："
+msgstr "最終更新者："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:479
+#: addons/web/static/src/xml/base.xml:506
 msgid "Latest Modification Date:"
-msgstr "最近修正した日付："
+msgstr "最終更新日："
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:518
 msgid "Delete this attachment"
-msgstr ""
+msgstr "この添付の削除"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:523
@@ -1111,446 +1121,450 @@ msgstr ""
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:527
 msgid "Add..."
-msgstr ""
+msgstr "追加"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:622
 #: addons/web/static/src/xml/base.xml:687
 msgid "or"
-msgstr ""
+msgstr "または"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:687
 msgid "Discard"
-msgstr ""
+msgstr "破棄"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:704
+#: addons/web/static/src/xml/base.xml:806
 msgid "Default:"
 msgstr "デフォルト："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:721
+#: addons/web/static/src/xml/base.xml:823
 msgid "Condition:"
 msgstr "状態:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:740
+#: addons/web/static/src/xml/base.xml:842
 msgid "Only you"
 msgstr "あなただけ"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:747
+#: addons/web/static/src/xml/base.xml:849
 msgid "All users"
 msgstr "全てのユーザ"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:797
+#: addons/web/static/src/xml/base.xml:856
 msgid "Unhandled widget"
 msgstr "処理されないウィジェット"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:803
+#: addons/web/static/src/xml/base.xml:936
 msgid "(nolabel)"
-msgstr "(nolabel)"
+msgstr "（ラベルなし）"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:808
+#: addons/web/static/src/xml/base.xml:941
 msgid "Field:"
-msgstr "フィールド:"
+msgstr "項目："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:812
+#: addons/web/static/src/xml/base.xml:945
 msgid "Object:"
 msgstr "オブジェクト:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:816
+#: addons/web/static/src/xml/base.xml:949
 msgid "Type:"
-msgstr "タイプ:"
+msgstr "タイプ："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:820
+#: addons/web/static/src/xml/base.xml:953
 msgid "Widget:"
 msgstr "ウィジェット:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:824
+#: addons/web/static/src/xml/base.xml:957
 msgid "Size:"
 msgstr "サイズ:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:828
+#: addons/web/static/src/xml/base.xml:961
 msgid "Context:"
-msgstr "コンテキスト"
+msgstr "コンテキスト："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:832
+#: addons/web/static/src/xml/base.xml:965
 msgid "Domain:"
-msgstr "ドメイン:"
+msgstr "ドメイン："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:836
+#: addons/web/static/src/xml/base.xml:910
+#: addons/web/static/src/xml/base.xml:969
 msgid "Modifiers:"
-msgstr "修飾:"
+msgstr "修飾："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:840
+#: addons/web/static/src/xml/base.xml:973
 msgid "Change default:"
 msgstr "デフォルトの変更："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:844
+#: addons/web/static/src/xml/base.xml:977
 msgid "On change:"
 msgstr "変更："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:848
+#: addons/web/static/src/xml/base.xml:981
 msgid "Relation:"
 msgstr "関係:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:852
+#: addons/web/static/src/xml/base.xml:985
 msgid "Selection:"
 msgstr "選択:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:895
+#: addons/web/static/src/xml/base.xml:1040
 msgid "Open this resource"
 msgstr "このリソースを開く"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:922
+#: addons/web/static/src/xml/base.xml:1063
 msgid "Select date"
 msgstr "日付を選択"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:948
 msgid "Open Resource"
-msgstr ""
+msgstr "リソースを開く"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1026
-#: addons/web/static/src/xml/base.xml:1067
+#: addons/web/static/src/xml/base.xml:1162
+#: addons/web/static/src/xml/base.xml:1205
 msgid "Set Image"
-msgstr "イメージをセット"
+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
+#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/xml/base.xml:1170
+#: addons/web/static/src/xml/base.xml:1220
+#: addons/web/static/src/xml/base.xml:1222
+#: addons/web/static/src/xml/base.xml:1279
 msgid "Clear"
-msgstr "クリアー"
+msgstr "クリア"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1035
-#: addons/web/static/src/xml/base.xml:1092
+#: addons/web/static/src/xml/base.xml:1179
+#: addons/web/static/src/xml/base.xml:1230
 msgid "Uploading ..."
 msgstr "アップロード中…"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1066
 msgid "width: 83px;"
-msgstr ""
+msgstr "幅：83px；"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1069
-#: addons/web/static/src/xml/base.xml:1467
+#: addons/web/static/src/xml/base.xml:1207
+#: addons/web/static/src/xml/base.xml:1501
 msgid "Select"
 msgstr "選択"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1075
-#: addons/web/static/src/xml/base.xml:1077
+#: addons/web/static/src/xml/base.xml:1214
+#: addons/web/static/src/xml/base.xml:1216
 msgid "Save As"
 msgstr "名前を付けて保存"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1126
+#: addons/web/static/src/xml/base.xml:1245
 msgid "Button"
 msgstr "ボタン"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1129
+#: addons/web/static/src/xml/base.xml:1248
 msgid "(no string)"
-msgstr "（ストリングなし）"
+msgstr "（文字列なし）"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1136
+#: addons/web/static/src/xml/base.xml:1255
 msgid "Special:"
 msgstr "特別："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1141
+#: addons/web/static/src/xml/base.xml:1260
 msgid "Button Type:"
 msgstr "ボタンのタイプ："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1145
+#: addons/web/static/src/xml/base.xml:1264
 msgid "Method:"
-msgstr "メソッド:"
+msgstr "メソッド："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1149
+#: addons/web/static/src/xml/base.xml:1268
 msgid "Action ID:"
 msgstr "アクションID："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1159
+#: addons/web/static/src/xml/base.xml:542
 msgid "Field"
-msgstr "フィールド"
+msgstr "項目"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1205
 msgid "Advanced Search..."
-msgstr ""
+msgstr "高度な検索..."
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1230
+#: addons/web/static/src/xml/base.xml:1287
 msgid "-- Filters --"
 msgstr "--フィルタ--"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1239
+#: addons/web/static/src/xml/base.xml:1296
 msgid "-- Actions --"
 msgstr "--アクション--"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1240
+#: addons/web/static/src/xml/base.xml:1297
 msgid "Add Advanced Filter"
 msgstr "高度なフィルタを追加"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1241
+#: addons/web/static/src/xml/base.xml:1298
 msgid "Save Filter"
 msgstr "フィルタを保存"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1247
+#: addons/web/static/src/xml/base.xml:1305
 msgid "Filter Name:"
-msgstr "フィルタ名"
+msgstr "フィルタ名："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1249
+#: addons/web/static/src/xml/base.xml:1307
 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 ""
+msgstr "カスタムフィルタ"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1379
 msgid "Save current filter"
-msgstr ""
+msgstr "現在のフィルタを保存"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1381
 msgid "Filter name"
-msgstr ""
+msgstr "フィルタ名"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1383
 msgid "Share with all users"
-msgstr ""
+msgstr "全てのユーザと共有"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1392
+#: addons/web/static/src/js/search.js:298
+#: addons/web/static/src/xml/base.xml:1299
 msgid "Add to Dashboard"
 msgstr "ダッシュボードに追加"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1394
 msgid "Title of new Dashboard item"
-msgstr ""
+msgstr "新しいダッシュボード項目のタイトル"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1395
 msgid "save"
-msgstr ""
+msgstr "保存"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1399
 msgid "Select Dashboard to add this filter to"
-msgstr ""
+msgstr "このフィルタを加えるためのダッシュボードの選択"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1406
 msgid "Advanced Search"
-msgstr ""
+msgstr "高度な検索"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1411
 msgid "Add a condition"
-msgstr ""
+msgstr "条件の追加"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1412
 msgid "Apply"
-msgstr ""
+msgstr "適用"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1475
+#: addons/web/static/src/xml/base.xml:1509
 msgid "Save & New"
 msgstr "保存して新規"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1476
+#: addons/web/static/src/xml/base.xml:1510
 msgid "Save & Close"
 msgstr "保存して閉じる"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1559
+#: addons/web/static/src/xml/base.xml:1617
 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 ""
-"このウェザードは，検索条件に合った全てのデータをCSVファイルとしてエクスポートします。\n"
-"　　　　　　　　　　　　全てのデータあるいは変更したあと再インポートできるフィールドのみをエクスポートできます。"
+"このウィザードは，現在の検索条件に合致した全てのデータをCSVファイルとしてエクスポートします。\n"
+"　　　　　　　　　　　　全てのデータ，または変更後に再インポートした項目のみをエクスポートできます。"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1566
+#: addons/web/static/src/xml/base.xml:1624
 msgid "Export Type:"
 msgstr "エクスポートのタイプ："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1568
+#: addons/web/static/src/xml/base.xml:1626
 msgid "Import Compatible Export"
 msgstr "インポートと互換性があるエクスポート"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1569
+#: addons/web/static/src/xml/base.xml:1627
 msgid "Export all Data"
 msgstr "全てのデータをエクスポート"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1572
+#: addons/web/static/src/xml/base.xml:1630
 msgid "Export Formats"
 msgstr "エクスポートの形式"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1578
+#: addons/web/static/src/xml/base.xml:1636
 msgid "Available fields"
-msgstr "利用可能なフィールド"
+msgstr "利用可能な項目"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1580
+#: addons/web/static/src/xml/base.xml:1638
 msgid "Fields to export"
-msgstr "エクスポートするフィールド"
+msgstr "エクスポートする項目"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1582
+#: addons/web/static/src/xml/base.xml:1640
 msgid "Save fields list"
-msgstr "フィールドリストを保存"
+msgstr "項目リストを保存"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1596
+#: addons/web/static/src/xml/base.xml:1654
 msgid "Remove All"
 msgstr "全てを削除"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1607
+#: addons/web/static/src/xml/base.xml:1666
 msgid "Name"
 msgstr "名前"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1639
+#: addons/web/static/src/xml/base.xml:1699
 msgid "Save as:"
 msgstr "名前を付けて保存 :"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1645
+#: addons/web/static/src/xml/base.xml:1706
 msgid "Saved exports:"
-msgstr "保存されたエクスポート"
+msgstr "保存されたエクスポート："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1663
+#: addons/web/static/src/xml/base.xml:1748
 msgid "1. Import a .CSV file"
 msgstr "1. CVSファイルのインポート"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1664
+#: addons/web/static/src/xml/base.xml:1749
 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 ""
-"インポートするファイルのサンプルが必要ならば，インポートするCSVファイルを選択\n"
-"　　　　　　インポート互換のエクスポートツールを使ってください"
+"インポートするファイルのサンプルが必要ならば、インポートするCSVファイルを選択します。\n"
+"　　　　　　エクスポートツールでインポート互換オプションを使って下さい。"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1668
+#: addons/web/static/src/xml/base.xml:1753
 msgid "CSV File:"
-msgstr "CSVファイル"
+msgstr "CSVファイル："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1671
+#: addons/web/static/src/xml/base.xml:1756
 msgid "2. Check your file format"
-msgstr "2. ファイル形式をチェックしてください"
+msgstr "2. ファイル形式のチェック"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1674
+#: addons/web/static/src/xml/base.xml:1759
 msgid "Import Options"
 msgstr "インポートオプション"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1678
+#: addons/web/static/src/xml/base.xml:1763
 msgid "Does your file have titles?"
 msgstr "そのファイルはタイトルを持っていますか？"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1684
+#: addons/web/static/src/xml/base.xml:1769
 msgid "Separator:"
-msgstr "区切り文字:"
+msgstr "区切り文字："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1686
+#: addons/web/static/src/xml/base.xml:1771
 msgid "Delimiter:"
-msgstr "区切り文字:"
+msgstr "区切り文字："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1690
+#: addons/web/static/src/xml/base.xml:1775
 msgid "Encoding:"
-msgstr "エンコーディング:"
+msgstr "エンコード："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1693
+#: addons/web/static/src/xml/base.xml:1778
 msgid "UTF-8"
 msgstr "UTF-8"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1694
+#: addons/web/static/src/xml/base.xml:1779
 msgid "Latin 1"
 msgstr "ラテン1"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1697
+#: addons/web/static/src/xml/base.xml:1782
 msgid "Lines to skip"
 msgstr "スキップする行"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1697
+#: addons/web/static/src/xml/base.xml:1782
 msgid ""
 "For use if CSV files have titles on multiple lines, skips more than a single "
 "line during import"
-msgstr "CVSファイルが，複数行にタイトルを持っていたら，インポートの際に１行以上をスキップする"
+msgstr "CVSファイルが複数行であり、タイトルを持っていた場合、インポートの際に１行以上をスキップするために使用します"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1713
 msgid "--- Don't Import ---"
-msgstr ""
+msgstr "---インポートなし---"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1724
+#: addons/web/static/src/xml/base.xml:1809
 msgid "The import failed due to:"
 msgstr "次の理由でインポートに失敗しました："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1726
+#: addons/web/static/src/xml/base.xml:1811
 msgid "Here is a preview of the file we could not import:"
-msgstr "インポートできなかったファイルのポレビュー："
+msgstr "インポートできなかったファイルのプレビュー："
 
 #~ msgid "Filter Entry"
 #~ msgstr "フィルター項目"
diff --git a/addons/web_calendar/i18n/ja.po b/addons/web_calendar/i18n/ja.po
index 29425e178cb..00ea538f586 100644
--- a/addons/web_calendar/i18n/ja.po
+++ b/addons/web_calendar/i18n/ja.po
@@ -8,135 +8,135 @@ 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-22 02:18+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
+"PO-Revision-Date: 2012-07-19 01:27+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:55+0000\n"
-"X-Generator: Launchpad (build 15531)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. openerp-web
-#: addons/web_calendar/static/src/js/calendar.js:12
+#: addons/web_calendar/static/src/js/calendar.js:11
 msgid "Calendar"
 msgstr "カレンダー"
 
 #. openerp-web
-#: addons/web_calendar/static/src/js/calendar.js:73
+#: addons/web_calendar/static/src/js/calendar.js:70
 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 ""
+msgstr "フィルタ"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:144
-msgid "Save"
-msgstr ""
+msgid "Today"
+msgstr "本日"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:145
-msgid "Cancel"
-msgstr ""
+msgid "Day"
+msgstr "日"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:146
-msgid "Details"
-msgstr ""
+msgid "Week"
+msgstr "週"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:147
-msgid "Edit"
-msgstr ""
+msgid "Month"
+msgstr "月"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:148
-msgid "Delete"
-msgstr ""
+msgid "New event"
+msgstr "新規イベント"
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:149
+msgid "Save"
+msgstr "保存"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:150
-msgid "Event will be deleted permanently, are you sure?"
-msgstr ""
+msgid "Cancel"
+msgstr "キャンセル"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:151
-#: addons/web_calendar/static/src/js/calendar.js:164
-msgid "Description"
-msgstr ""
+msgid "Details"
+msgstr "詳細"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:152
-msgid "Time period"
-msgstr ""
+msgid "Edit"
+msgstr "編集"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:153
-msgid "Full day"
-msgstr ""
+msgid "Delete"
+msgstr "削除"
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:155
+msgid "Event will be deleted permanently, are you sure?"
+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 ""
+#: addons/web_calendar/static/src/js/calendar.js:169
+msgid "Description"
+msgstr "詳細"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:157
-msgid "Repeat event"
-msgstr ""
+msgid "Time period"
+msgstr "期間"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:158
-msgid "Disabled"
-msgstr ""
+msgid "Full day"
+msgstr "終日"
 
 #. openerp-web
-#: addons/web_calendar/static/src/js/calendar.js:159
-msgid "Enabled"
-msgstr ""
+#: addons/web_calendar/static/src/js/calendar.js:161
+msgid "Do you want to edit the whole set of repeated events?"
+msgstr "繰り返しイベントのセット全体を編集しますか？"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:162
-#: addons/web_calendar/static/src/js/calendar.js:170
-msgid "Agenda"
-msgstr ""
+msgid "Repeat event"
+msgstr "繰り返しイベント"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:163
-msgid "Date"
-msgstr ""
+msgid "Disabled"
+msgstr "無効"
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:164
+msgid "Enabled"
+msgstr "有効"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:167
-msgid "Year"
-msgstr ""
+#: addons/web_calendar/static/src/js/calendar.js:175
+msgid "Agenda"
+msgstr "議事"
 
 #. openerp-web
-#: addons/web_calendar/static/src/xml/web_calendar.xml:8
-#: addons/web_calendar/static/src/xml/web_calendar.xml:9
+#: addons/web_calendar/static/src/js/calendar.js:168
+msgid "Date"
+msgstr "日付"
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:172
+msgid "Year"
+msgstr "年"
+
+#. openerp-web
+#: addons/web_calendar/static/src/xml/web_calendar.xml:5
+#: addons/web_calendar/static/src/xml/web_calendar.xml:6
 msgid "&nbsp;"
 msgstr "&nbsp;"
 
diff --git a/addons/web_dashboard/i18n/ja.po b/addons/web_dashboard/i18n/ja.po
index 67544fd96c2..6b59633054b 100644
--- a/addons/web_dashboard/i18n/ja.po
+++ b/addons/web_dashboard/i18n/ja.po
@@ -8,29 +8,29 @@ 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-03-26 22:14+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
+"PO-Revision-Date: 2012-07-19 01:29+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:55+0000\n"
-"X-Generator: Launchpad (build 15531)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. openerp-web
-#: addons/web_dashboard/static/src/js/dashboard.js:61
+#: addons/web_dashboard/static/src/js/dashboard.js:60
 msgid "Edit Layout"
-msgstr "レイアウトを編集"
+msgstr "レイアウトの編集"
 
 #. openerp-web
-#: addons/web_dashboard/static/src/js/dashboard.js:107
+#: addons/web_dashboard/static/src/js/dashboard.js:106
 msgid "Are you sure you want to remove this item ?"
-msgstr "この項目を取り除きますか？"
+msgstr "この項目を削除しますか？"
 
 #. openerp-web
 #: addons/web_dashboard/static/src/xml/web_dashboard.xml:4
 msgid "Reset Layout.."
-msgstr "レイアウトをリセット"
+msgstr "レイアウトのリセット"
 
 #. openerp-web
 #: addons/web_dashboard/static/src/xml/web_dashboard.xml:6
@@ -40,12 +40,12 @@ msgstr "リセット"
 #. openerp-web
 #: addons/web_dashboard/static/src/xml/web_dashboard.xml:8
 msgid "Change Layout.."
-msgstr "レイアウトを変更…"
+msgstr "レイアウトの変更…"
 
 #. openerp-web
 #: addons/web_dashboard/static/src/xml/web_dashboard.xml:10
 msgid "Change Layout"
-msgstr "レイアウトを変更"
+msgstr "レイアウトの変更"
 
 #. openerp-web
 #: addons/web_dashboard/static/src/xml/web_dashboard.xml:27
@@ -60,7 +60,7 @@ msgstr "作成"
 #. openerp-web
 #: addons/web_dashboard/static/src/xml/web_dashboard.xml:39
 msgid "Choose dashboard layout"
-msgstr "ダッシュボードのレイアウトを選択"
+msgstr "ダッシュボードレイアウトの選択"
 
 #, python-format
 #~ msgid "Execute task \"%s\""
diff --git a/addons/web_diagram/i18n/ja.po b/addons/web_diagram/i18n/ja.po
index 73204874dca..bd1625fe9df 100644
--- a/addons/web_diagram/i18n/ja.po
+++ b/addons/web_diagram/i18n/ja.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-03-26 22:02+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
+"PO-Revision-Date: 2012-07-19 01:37+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:55+0000\n"
-"X-Generator: Launchpad (build 15531)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
@@ -25,7 +25,7 @@ msgstr "ダイアグラム"
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:165
 msgid "Are you sure?"
-msgstr ""
+msgstr "本当によろしいですか？"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:195
@@ -35,6 +35,10 @@ msgid ""
 "\n"
 "Are you sure ?"
 msgstr ""
+"このノードの削除は元に戻すことができません。\n"
+"また、接続している全ての取引を削除します。\n"
+"\n"
+"本当によろしいですか？"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:213
@@ -43,18 +47,21 @@ msgid ""
 "\n"
 "Are you sure ?"
 msgstr ""
+"この取引の削除は元に戻すことができません。\n"
+"\n"
+"本当によろしいですか？"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:224
 #: addons/web_diagram/static/src/js/diagram.js:257
 msgid "Activity"
-msgstr "アクティビティ"
+msgstr "活動"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:232
 #: addons/web_diagram/static/src/js/diagram.js:296
 msgid "Open: "
-msgstr "開く: "
+msgstr "開く： "
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:262
@@ -66,9 +73,9 @@ msgstr "作成："
 #: addons/web_diagram/static/src/js/diagram.js:289
 #: addons/web_diagram/static/src/js/diagram.js:308
 msgid "Transition"
-msgstr "変遷"
+msgstr "遷移"
 
 #. openerp-web
 #: addons/web_diagram/static/src/xml/base_diagram.xml:6
 msgid "New Node"
-msgstr "新しいノード"
+msgstr "新規ノード"
diff --git a/addons/web_gantt/i18n/ja.po b/addons/web_gantt/i18n/ja.po
index 8b141d2be75..d16a0e5452f 100644
--- a/addons/web_gantt/i18n/ja.po
+++ b/addons/web_gantt/i18n/ja.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-03-26 21:57+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
+"PO-Revision-Date: 2012-07-19 01:37+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:55+0000\n"
-"X-Generator: Launchpad (build 15531)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
@@ -25,4 +25,4 @@ msgstr "ガント"
 #. openerp-web
 #: addons/web_gantt/static/src/xml/web_gantt.xml:10
 msgid "Create"
-msgstr "作成する"
+msgstr "作成"
diff --git a/addons/web_graph/i18n/ja.po b/addons/web_graph/i18n/ja.po
index 8482120754c..7fa475e3bcb 100644
--- a/addons/web_graph/i18n/ja.po
+++ b/addons/web_graph/i18n/ja.po
@@ -8,91 +8,91 @@ 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-22 02:21+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
+"PO-Revision-Date: 2012-07-19 03: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:55+0000\n"
-"X-Generator: Launchpad (build 15531)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. openerp-web
-#: addons/web_graph/static/src/js/graph.js:22
+#: addons/web_graph/static/src/js/graph.js:19
 msgid "Graph"
 msgstr "グラフ"
 
 #. openerp-web
 #: addons/web_graph/static/src/xml/web_graph.xml:5
 msgid "Graph Options"
-msgstr ""
+msgstr "グラフオプション"
 
 #. openerp-web
 #: addons/web_graph/static/src/xml/web_graph.xml:7
 msgid "Graph Mode"
-msgstr ""
+msgstr "グラフモード"
 
 #. openerp-web
 #: addons/web_graph/static/src/xml/web_graph.xml:11
 msgid "Pie"
-msgstr ""
+msgstr "パイ"
 
 #. openerp-web
 #: addons/web_graph/static/src/xml/web_graph.xml:12
 msgid "Bars"
-msgstr ""
+msgstr "バー"
 
 #. openerp-web
 #: addons/web_graph/static/src/xml/web_graph.xml:14
 msgid "Lines"
-msgstr ""
+msgstr "ライン"
 
 #. openerp-web
 #: addons/web_graph/static/src/xml/web_graph.xml:15
 msgid "Areas"
-msgstr ""
+msgstr "エリア"
 
 #. openerp-web
 #: addons/web_graph/static/src/xml/web_graph.xml:18
 msgid "Radar"
-msgstr ""
+msgstr "レーダー"
 
 #. openerp-web
 #: addons/web_graph/static/src/xml/web_graph.xml:20
 msgid "Legend"
-msgstr ""
+msgstr "凡例"
 
 #. openerp-web
 #: addons/web_graph/static/src/xml/web_graph.xml:24
 msgid "Hidden"
-msgstr ""
+msgstr "非表示"
 
 #. openerp-web
 #: addons/web_graph/static/src/xml/web_graph.xml:25
 msgid "Inside"
-msgstr ""
+msgstr "内側"
 
 #. openerp-web
 #: addons/web_graph/static/src/xml/web_graph.xml:26
 msgid "Top"
-msgstr ""
+msgstr "上"
 
 #. openerp-web
 #: addons/web_graph/static/src/xml/web_graph.xml:28
 msgid "Actions"
-msgstr ""
+msgstr "アクション"
 
 #. openerp-web
 #: addons/web_graph/static/src/xml/web_graph.xml:32
 msgid "Switch Axis"
-msgstr ""
+msgstr "Axisに切替"
 
 #. openerp-web
 #: addons/web_graph/static/src/xml/web_graph.xml:33
 msgid "Show Data"
-msgstr ""
+msgstr "データの表示"
 
 #. openerp-web
 #: addons/web_graph/static/src/xml/web_graph.xml:34
 msgid "Download as PNG"
-msgstr ""
+msgstr "PNGとしてダウンロード"
diff --git a/addons/web_kanban/i18n/ja.po b/addons/web_kanban/i18n/ja.po
index 15e0ee4ca71..440a2e15fbd 100644
--- a/addons/web_kanban/i18n/ja.po
+++ b/addons/web_kanban/i18n/ja.po
@@ -8,59 +8,59 @@ 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-03-06 06:35+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
+"PO-Revision-Date: 2012-07-19 03:34+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:55+0000\n"
-"X-Generator: Launchpad (build 15531)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
 msgid "Kanban"
-msgstr "看板"
+msgstr "かんばん"
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:372
+#: addons/web_kanban/static/src/js/kanban.js:293
 msgid "Undefined"
 msgstr "未定義"
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:684
+#: addons/web_kanban/static/src/js/kanban.js:468
 msgid "Are you sure you want to delete this record ?"
 msgstr "このレコードを削除しますか？"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:839
 msgid "Create: "
-msgstr ""
+msgstr "作成： "
 
 #. openerp-web
-#: addons/web_kanban/static/src/xml/web_kanban.xml:53
+#: addons/web_kanban/static/src/xml/web_kanban.xml:41
 msgid "Show more... ("
-msgstr "もっと表示する…（"
+msgstr "さらに表示…（"
 
 #. openerp-web
-#: addons/web_kanban/static/src/xml/web_kanban.xml:53
+#: addons/web_kanban/static/src/xml/web_kanban.xml:41
 msgid "remaining)"
 msgstr "残り）"
 
 #. openerp-web
 #: addons/web_kanban/static/src/xml/web_kanban.xml:71
 msgid "Add"
-msgstr ""
+msgstr "追加"
 
 #. openerp-web
 #: addons/web_kanban/static/src/xml/web_kanban.xml:71
 msgid "or"
-msgstr ""
+msgstr "または"
 
 #. openerp-web
 #: addons/web_kanban/static/src/xml/web_kanban.xml:72
 msgid "Cancel"
-msgstr ""
+msgstr "キャンセル"
 
 #~ msgid "</tr><tr>"
 #~ msgstr "</tr><tr>"
diff --git a/addons/web_mobile/i18n/ja.po b/addons/web_mobile/i18n/ja.po
index 925b09df687..9be55cb112a 100644
--- a/addons/web_mobile/i18n/ja.po
+++ b/addons/web_mobile/i18n/ja.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-03-31 18:42+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
+"PO-Revision-Date: 2012-07-19 04:00+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:55+0000\n"
-"X-Generator: Launchpad (build 15531)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
@@ -25,7 +25,7 @@ msgstr "OpenERP"
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:22
 msgid "Database:"
-msgstr "データベース:"
+msgstr "データベース："
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:30
@@ -65,7 +65,7 @@ msgstr "お気に入り"
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:58
 msgid "Preference"
-msgstr "優先"
+msgstr "プリファレンス"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:123
@@ -75,7 +75,7 @@ msgstr "ログアウト"
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:132
 msgid "There are no records to show."
-msgstr "表示するレコードはありません"
+msgstr "表示するレコードはありません。"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:183
diff --git a/addons/web_process/i18n/ja.po b/addons/web_process/i18n/ja.po
index 3cda259f125..4cc24782acb 100644
--- a/addons/web_process/i18n/ja.po
+++ b/addons/web_process/i18n/ja.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-03-26 22:04+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
+"PO-Revision-Date: 2012-07-19 04:29+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:55+0000\n"
-"X-Generator: Launchpad (build 15531)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
@@ -30,7 +30,7 @@ msgstr "保存"
 #. openerp-web
 #: addons/web_process/static/src/xml/web_process.xml:6
 msgid "Process View"
-msgstr "プロセス一覧"
+msgstr "プロセスビュー"
 
 #. openerp-web
 #: addons/web_process/static/src/xml/web_process.xml:19
@@ -40,7 +40,7 @@ msgstr "ドキュメンテーション"
 #. openerp-web
 #: addons/web_process/static/src/xml/web_process.xml:19
 msgid "Read Documentation Online"
-msgstr "オンラインのドキュメンテーションを読んでください。"
+msgstr "オンラインのドキュメントを読んで下さい"
 
 #. openerp-web
 #: addons/web_process/static/src/xml/web_process.xml:25
@@ -55,12 +55,12 @@ msgstr "コミュニティの議論"
 #. openerp-web
 #: addons/web_process/static/src/xml/web_process.xml:31
 msgid "Books"
-msgstr "帳簿"
+msgstr "本"
 
 #. openerp-web
 #: addons/web_process/static/src/xml/web_process.xml:31
 msgid "Get the books"
-msgstr "帳簿を取る"
+msgstr "本を手に入れる"
 
 #. openerp-web
 #: addons/web_process/static/src/xml/web_process.xml:37
@@ -85,7 +85,7 @@ msgstr "注記"
 #. openerp-web
 #: addons/web_process/static/src/xml/web_process.xml:59
 msgid "Last modified by:"
-msgstr "最後に変更："
+msgstr "最終更新者："
 
 #. openerp-web
 #: addons/web_process/static/src/xml/web_process.xml:59
@@ -105,14 +105,14 @@ msgstr "関係："
 #. openerp-web
 #: addons/web_process/static/src/xml/web_process.xml:88
 msgid "Select Process"
-msgstr "プロセスを選んでください"
+msgstr "プロセスの選択"
 
 #. openerp-web
 #: addons/web_process/static/src/xml/web_process.xml:98
 msgid "Select"
-msgstr "選択する"
+msgstr "選択"
 
 #. openerp-web
 #: addons/web_process/static/src/xml/web_process.xml:109
 msgid "Edit Process"
-msgstr "プロセスを編集"
+msgstr "プロセスの編集"

From 92cb98fd73fcb064ae72ed489a6f3dafd236e43d Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 19 Jul 2012 11:08:13 +0530
Subject: [PATCH 167/171] [REVERT] account: analytical line view

bzr revid: hmo@tinyerp.com-20120719053813-y7vdq59yjw2svhen
---
 addons/account/project/project_view.xml | 30 +++++++++++++++----------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 8e2006b8d29..76aaaf7df6a 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -124,27 +124,33 @@
                     <group>
                         <group>
                             <field name="name"/>
-                            <field name="date"/>
-                            <label for="unit_amount"/>
-                                <group class="oe_inline">
-                                    <field name="unit_amount" nolabel="1"/>
-                                    <field name="product_uom_id" nolabel="1" />
-                                </group>
-                            <field name="amount"/>
-                        </group>
-                        <group>
                             <field name="account_id"/>
                             <field name="journal_id"/>
-                            <field name="product_id"/>
                         </group>
                         <group>
+                            <field name="date"/>
                             <field name="ref"/>
                             <field name="company_id" groups="base.group_multi_company"/>
                         </group>
-                        <group>
+                        <group string="Amount">
+                            <field name="amount"/>
+                            <label for="amount_currency"/>
+                            <div>
+                                <field name="amount_currency" class="oe_inline"/>
+                                <field name="currency_id" class="oe_inline"/>
+                            </div>
+                        </group>
+                        <group string="Product Information">
+                            <field name="product_id"/>
+                            <label for="unit_amount"/>
+                            <div>
+                                <field name="unit_amount" class="oe_inline"/>
+                                <field name="product_uom_id" class="oe_inline"/>
+                            </div>
+                        </group>
+                        <group string="General Accounting">
                             <field name="general_account_id"/>
                             <field name="move_id" readonly="1"/>
-                            <field name="amount_currency" class="oe_inline"/>
                         </group>
                     </group>
                 </form>

From 85aa1450c6a30ded29a68c58009084a4cb542c6c Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 19 Jul 2012 11:46:37 +0530
Subject: [PATCH 168/171] [FIX] put comment regarding TOFIX to set sequence
 into group element

bzr revid: hmo@tinyerp.com-20120719061637-p9j9ydzku61t8np1
---
 addons/crm_claim/crm_claim_view.xml            |  7 ++++---
 addons/event/res_partner_view.xml              | 12 ++++++------
 addons/marketing_campaign/res_partner_view.xml |  7 ++++---
 addons/project/res_partner_view.xml            |  7 ++++---
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 6317d53a1cc..f00b524a204 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -248,16 +248,17 @@
             </field>
         </record>
 
+        <!-- TOFIX: set sequence into group instead of fix group in base.view_parter_form -->
         <record id="base.view_crm_partner_info_History1" model="ir.ui.view">
             <field name="name">res.partner.crm.history.inherit1</field>
             <field name="model">res.partner</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//page[@name='History']" position="attributes">
+                <xpath expr="//page[@name='page_history']" position="attributes">
                     <attribute name="invisible">False</attribute>
                 </xpath>
-                <xpath expr="//group[@name='Claim']" position="attributes">
+                <xpath expr="//group[@name='grp_claim']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
             </field>
@@ -270,7 +271,7 @@
             <field name="priority">20</field>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//group[@name='Claim']" position="inside">
+                    <xpath expr="//group[@name='grp_claim']" position="inside">
                         <field name="claims_ids" colspan="4" nolabel="1">
                             <tree string="Partners Claim" editable="bottom">
                                 <field name="name"/>
diff --git a/addons/event/res_partner_view.xml b/addons/event/res_partner_view.xml
index 007feb5ec02..44a3d4613ec 100644
--- a/addons/event/res_partner_view.xml
+++ b/addons/event/res_partner_view.xml
@@ -3,7 +3,7 @@
     <data>
 
          <!--  Partners inherited form -->
-
+        <!-- TOFIX: set sequence into group instead of fix group in base.view_parter_form -->
         <record id="view_speaker_partner_info_form" model="ir.ui.view">
             <field name="name">res.partner.speaker.info.inherit</field>
             <field name="model">res.partner</field>
@@ -13,13 +13,13 @@
                 <field name="supplier" position="after">
                     <field name="speaker"/>
                 </field>
-                <xpath expr="//page[@name='History']" position="attributes">
+                <xpath expr="//page[@name='page_history']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
-                <xpath expr="//group[@name='Event']" position="attributes">
+                <xpath expr="//group[@name='grp_event']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
-                <xpath expr="//group[@name='Registration']" position="attributes">
+                <xpath expr="//group[@name='grp_registration']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
             </field>
@@ -30,7 +30,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <group name="Event" position="inside">
+                <group name="grp_event" position="inside">
                     <field name="event_ids" colspan="4" nolabel="1">
                         <tree string="Events">
                             <field name="name" string="Event"/>
@@ -38,7 +38,7 @@
                         </tree>
                     </field>
                    </group>
-                   <group name="Registration" position="inside">
+                   <group name="grp_registration" position="inside">
                     <field name="event_registration_ids" colspan="4" nolabel="1">
                         <tree string="Events Registration">
                             <field name="event_begin_date" string="Date"/>
diff --git a/addons/marketing_campaign/res_partner_view.xml b/addons/marketing_campaign/res_partner_view.xml
index b8ff13367d1..2b1b9dc09dd 100644
--- a/addons/marketing_campaign/res_partner_view.xml
+++ b/addons/marketing_campaign/res_partner_view.xml
@@ -3,16 +3,17 @@
     <data>
 
          <!--  Partners inherited form -->
+        <!-- TOFIX: set sequence into group instead of fix group in base.view_parter_form -->
         <record id="base.view_crm_partner_info_History2" model="ir.ui.view">
            <field name="name">res.partner.crm.history.inherit2</field>
            <field name="model">res.partner</field>
            <field name="type">form</field>
            <field name="inherit_id" ref="base.view_partner_form"/>
            <field name="arch" type="xml">
-                <xpath expr="//page[@name='History']" position="attributes">
+                <xpath expr="//page[@name='page_history']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
-                <xpath expr="//group[@name='Campaign']" position="attributes">
+                <xpath expr="//group[@name='grp_campaign']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
            </field>
@@ -23,7 +24,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                    <group name="Campaign" position="inside">
+                    <group name="grp_campaign" position="inside">
                             <field name="workitem_ids" colspan="4" nolabel="1"/>
                     </group>
             </field>
diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml
index 5d0544b78ef..3c2dde07376 100644
--- a/addons/project/res_partner_view.xml
+++ b/addons/project/res_partner_view.xml
@@ -3,16 +3,17 @@
     <data>
 
          <!--  Partners inherited form -->
+         <!-- TOFIX: set sequence into group instead of fix group in base.view_parter_form -->
          <record id="base.view_crm_partner_info_History" model="ir.ui.view">
             <field name="name">res.partner.crm.history.inherit1</field>
             <field name="model">res.partner</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//page[@name='History']" position="attributes">
+                <xpath expr="//page[@name='page_history']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
-                <xpath expr="//group[@name='Tasks']" position="attributes">
+                <xpath expr="//group[@name='grp_task']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
              </field>
@@ -23,7 +24,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                   <group name="Tasks" position="inside">
+                   <group name="grp_task" position="inside">
                     <field name="task_ids" colspan="4" nolabel="1">
                         <tree string="Tasks" editable="bottom">
                             <field name="name"/>

From 6dc3b762551150774842d6fc1f57d8421f010462 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 19 Jul 2012 10:19:14 +0200
Subject: [PATCH 169/171] [IMP] in dialog box 'Set Default', for many2one
 fields, show display_name instead of value (id)

bzr revid: rco@openerp.com-20120719081914-lchgb4k409fam1te
---
 addons/web/static/src/js/view_form.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 2e404a6bfdd..c430b013c40 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -865,6 +865,9 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
                             return option[0] === value;
                         })[1];
                     break;
+                case 'many2one':
+                    displayed = field.get_displayed();
+                    break;
                 }
 
                 return {
@@ -2781,6 +2784,9 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
         this._super(value_);
         this.inhibit_on_change = false;
     },
+    get_displayed: function() {
+        return this.display_value["" + this.get("value")];
+    },
     add_id: function(id) {
         this.display_value = {};
         this.set({value: id});

From 9e7bcb9c4068cd16a9b187692d90faafa40f9b49 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 19 Jul 2012 11:02:43 +0200
Subject: [PATCH 170/171] [IMP] sales/crm: usability, review of form views

bzr revid: qdp-launchpad@openerp.com-20120719090243-bdya6ozfklsi6v2k
---
 addons/account/partner_view.xml               |  2 +-
 addons/base_calendar/base_calendar.py         |  2 +-
 addons/crm/crm_meeting_view.xml               |  2 +
 addons/crm_claim/crm_claim_view.xml           | 26 ++------
 addons/event/res_partner_view.xml             | 64 ++++++++-----------
 addons/l10n_fr_rib/bank_view.xml              |  4 +-
 .../marketing_campaign/res_partner_view.xml   | 26 +++-----
 addons/membership/membership_view.xml         |  9 ++-
 addons/plugin_outlook/plugin_outlook.xml      |  2 +-
 .../plugin_thunderbird/plugin_thunderbird.xml |  3 +-
 addons/product/product_view.xml               |  7 +-
 addons/project/res_partner_view.xml           | 44 +++++--------
 addons/stock/stock_view.xml                   |  2 +-
 13 files changed, 79 insertions(+), 114 deletions(-)

diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 53f556b77c2..cd75daa6c07 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -115,7 +115,7 @@
                                 <group name="bank" string="Information About the Bank">
                                     <field name="bank" on_change="onchange_bank_id(bank)"/>
                                     <field name="bank_name"/>
-                                    <field name="bank_bic" placeholder="[Identifier code]"/>
+                                    <field name="bank_bic" placeholder="e.g. GEBABEBB"/>
                                 </group>
                             </group>
                         </form>
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 5aead3d086d..a9e5949a3ca 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1034,7 +1034,7 @@ class calendar_event(osv.osv):
              ('confidential', 'Public for Employees')], 'Privacy', states={'done': [('readonly', True)]}),
         'location': fields.char('Location', size=264, help="Location of Event", states={'done': [('readonly', True)]}),
         'show_as': fields.selection([('free', 'Free'), ('busy', 'Busy')], \
-                                                'Show Time As', states={'done': [('readonly', True)]}),
+                                                'Show Time as', states={'done': [('readonly', True)]}),
         'base_calendar_url': fields.char('Caldav URL', size=264),
         'state': fields.selection([('tentative', 'Tentative'),
                         ('cancelled', 'Cancelled'),
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 46cfb098166..0340b4f11a6 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+
     <!-- 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>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index f00b524a204..80e373160be 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -248,21 +248,6 @@
             </field>
         </record>
 
-        <!-- TOFIX: set sequence into group instead of fix group in base.view_parter_form -->
-        <record id="base.view_crm_partner_info_History1" model="ir.ui.view">
-            <field name="name">res.partner.crm.history.inherit1</field>
-            <field name="model">res.partner</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//page[@name='page_history']" position="attributes">
-                    <attribute name="invisible">False</attribute>
-                </xpath>
-                <xpath expr="//group[@name='grp_claim']" position="attributes">
-                   <attribute name="invisible">False</attribute>
-                </xpath>
-            </field>
-        </record>
         <record id="view_claim_partner_info_form1" model="ir.ui.view">
             <field name="name">res.partner.claim.info.form</field>
             <field name="model">res.partner</field>
@@ -270,15 +255,18 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="priority">20</field>
             <field name="arch" type="xml">
-                <data>
-                    <xpath expr="//group[@name='grp_claim']" position="inside">
+                <xpath expr="//page[@name='page_history']" position="attributes">
+                    <attribute name="invisible">False</attribute>
+                </xpath>
+                <xpath expr="//page[@name='page_history']" position="inside">
+                    <group name="grp_claim" string="Claim">
                         <field name="claims_ids" colspan="4" nolabel="1">
                             <tree string="Partners Claim" editable="bottom">
                                 <field name="name"/>
                             </tree>
                         </field>
-                    </xpath>
-                </data>
+                    </group>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/event/res_partner_view.xml b/addons/event/res_partner_view.xml
index 44a3d4613ec..c8760c0b07f 100644
--- a/addons/event/res_partner_view.xml
+++ b/addons/event/res_partner_view.xml
@@ -3,9 +3,9 @@
     <data>
 
          <!--  Partners inherited form -->
-        <!-- TOFIX: set sequence into group instead of fix group in base.view_parter_form -->
-        <record id="view_speaker_partner_info_form" model="ir.ui.view">
-            <field name="name">res.partner.speaker.info.inherit</field>
+
+       <record id="view_event_partner_info_form" model="ir.ui.view">
+            <field name="name">res.partner.event.info.inherit</field>
             <field name="model">res.partner</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
@@ -14,43 +14,31 @@
                     <field name="speaker"/>
                 </field>
                 <xpath expr="//page[@name='page_history']" position="attributes">
-                   <attribute name="invisible">False</attribute>
+                    <attribute name="invisible">False</attribute>
                 </xpath>
-                <xpath expr="//group[@name='grp_event']" position="attributes">
-                   <attribute name="invisible">False</attribute>
+                <xpath expr="//page[@name='page_history']" position="inside">
+                    <group name="grp_event" string="Event">
+                        <field name="event_ids" colspan="4" nolabel="1">
+                            <tree string="Events">
+                                <field name="name" string="Event"/>
+                                <field name="main_speaker_id"/>
+                            </tree>
+                        </field>
+                    </group>
+                    <group name="grp_registration" string="Registration">
+                        <field name="event_registration_ids" colspan="4" nolabel="1">
+                            <tree string="Events Registration">
+                                <field name="event_begin_date" string="Date"/>
+                                <field name="event_id" />
+                                <field name="nb_register"/>
+                                <field name="state"/>
+                                <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                                <button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
+                                <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                            </tree>
+                        </field>
+                    </group>
                 </xpath>
-                <xpath expr="//group[@name='grp_registration']" position="attributes">
-                   <attribute name="invisible">False</attribute>
-                </xpath>
-            </field>
-       </record>
-       <record id="view_event_partner_info_form" model="ir.ui.view">
-            <field name="name">res.partner.event.info.inherit</field>
-            <field name="model">res.partner</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-                <group name="grp_event" position="inside">
-                    <field name="event_ids" colspan="4" nolabel="1">
-                        <tree string="Events">
-                            <field name="name" string="Event"/>
-                            <field name="main_speaker_id"/>
-                        </tree>
-                    </field>
-                   </group>
-                   <group name="grp_registration" position="inside">
-                    <field name="event_registration_ids" colspan="4" nolabel="1">
-                        <tree string="Events Registration">
-                            <field name="event_begin_date" string="Date"/>
-                            <field name="event_id" />
-                            <field name="nb_register"/>
-                            <field name="state"/>
-                            <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
-                            <button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
-                            <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                        </tree>
-                    </field>
-               </group>
             </field>
        </record>
 
diff --git a/addons/l10n_fr_rib/bank_view.xml b/addons/l10n_fr_rib/bank_view.xml
index 38c51df58e0..627c2eacf04 100644
--- a/addons/l10n_fr_rib/bank_view.xml
+++ b/addons/l10n_fr_rib/bank_view.xml
@@ -9,7 +9,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//page[@string='Accounting']/field[@name='bank_ids']/form/field[@name='acc_number']" position="before">
+                    <xpath expr="//field[@name='bank_ids']/form/field[@name='acc_number']" position="before">
                         <newline />
                         <field name="bank_code" />
                         <field name="office" />
@@ -17,7 +17,7 @@
                         <field name="key" />
                         <newline />
                     </xpath>
-                    <xpath expr="//page[@string='Accounting']/field[@name='bank_ids']/tree/field[@name='acc_number']" position="after">
+                    <xpath expr="//field[@name='bank_ids']/tree/field[@name='acc_number']" position="after">
                         <field name="rib_acc_number"/>
                     </xpath>
                 </data>
diff --git a/addons/marketing_campaign/res_partner_view.xml b/addons/marketing_campaign/res_partner_view.xml
index 2b1b9dc09dd..ee619f041e8 100644
--- a/addons/marketing_campaign/res_partner_view.xml
+++ b/addons/marketing_campaign/res_partner_view.xml
@@ -2,31 +2,21 @@
 <openerp>
     <data>
 
-         <!--  Partners inherited form -->
-        <!-- TOFIX: set sequence into group instead of fix group in base.view_parter_form -->
-        <record id="base.view_crm_partner_info_History2" model="ir.ui.view">
-           <field name="name">res.partner.crm.history.inherit2</field>
-           <field name="model">res.partner</field>
-           <field name="type">form</field>
-           <field name="inherit_id" ref="base.view_partner_form"/>
-           <field name="arch" type="xml">
-                <xpath expr="//page[@name='page_history']" position="attributes">
-                   <attribute name="invisible">False</attribute>
-                </xpath>
-                <xpath expr="//group[@name='grp_campaign']" position="attributes">
-                   <attribute name="invisible">False</attribute>
-                </xpath>
-           </field>
-          </record>    
+         <!--  Partners inherited form -->  
         <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>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                    <group name="grp_campaign" position="inside">
-                            <field name="workitem_ids" colspan="4" nolabel="1"/>
+                <xpath expr="//page[@name='page_history']" position="attributes">
+                   <attribute name="invisible">False</attribute>
+                </xpath>
+                <xpath expr="//page[@name='page_history']" position="inside">
+                    <group name="grp_campaign" string="Campaign">
+                        <field name="workitem_ids" colspan="4" nolabel="1"/>
                     </group>
+                </xpath>
             </field>
        </record>
    </data>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 71d9bca3a71..9c566a69bde 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -242,10 +242,13 @@
                 <notebook position="inside">
                     <page string="Membership">
                         <group>
-                            <group col="3">
+                            <group>
                                 <field name="free_member"/>
-                                <button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" attrs="{'readonly':[('free_member','=',True)]}" class="oe_inline oe_right"/>
-                                <field name="membership_state" class="oe_inline"/>
+                                <label for="membership_state"/>
+                                <div>
+                                    <field name="membership_state" class="oe_inline"/>
+                                    <button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" attrs="{'readonly':[('free_member','=',True)]}" class="oe_inline oe_right"/>
+                                </div>
                             </group>
                             <group>
                                 <field name="associate_member" attrs="{'readonly':[('membership_state','!=', 'none')]}"/>
diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index 052b49c5294..04e5dca32de 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -27,7 +27,7 @@
                     </xpath>
                     <separator string="title" position="attributes">
                         <attribute name="string"></attribute>
-                      </separator>
+                    </separator>
                 </data>
             </field>
         </record>
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index 8433824c268..1adb4fa5eda 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -33,8 +33,7 @@
                     </xpath>
                     <separator string="title" position="attributes">
                         <attribute name="string"></attribute>
-                      </separator>
-
+                    </separator>
                 </data>
             </field>
         </record>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 7610222d166..4fe51dc67f6 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -313,9 +313,14 @@
             <field name="arch" type="xml">
                 <form string="Product Categories" version="7.0">
                     <sheet>
+                        <div class="oe_title">
+                            <label for="name" class="oe_edit_only"/>
+                            <h1>
+                                <field name="name"/>
+                            </h1>
+                        </div>
                         <group>
                             <group>
-                                <field name="name"/>
                                 <field name="parent_id"/>
                             </group>
                             <group>
diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml
index 3c2dde07376..09170c43434 100644
--- a/addons/project/res_partner_view.xml
+++ b/addons/project/res_partner_view.xml
@@ -3,39 +3,29 @@
     <data>
 
          <!--  Partners inherited form -->
-         <!-- TOFIX: set sequence into group instead of fix group in base.view_parter_form -->
-         <record id="base.view_crm_partner_info_History" model="ir.ui.view">
-            <field name="name">res.partner.crm.history.inherit1</field>
-            <field name="model">res.partner</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//page[@name='page_history']" position="attributes">
-                   <attribute name="invisible">False</attribute>
-                </xpath>
-                <xpath expr="//group[@name='grp_task']" position="attributes">
-                   <attribute name="invisible">False</attribute>
-                </xpath>
-             </field>
-          </record>
         <record id="view_task_partner_info_form" model="ir.ui.view">
             <field name="name">res.partner.task.info.inherit</field>
             <field name="model">res.partner</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                   <group name="grp_task" position="inside">
-                    <field name="task_ids" colspan="4" nolabel="1">
-                        <tree string="Tasks" editable="bottom">
-                            <field name="name"/>
-                            <field name="user_id"/>
-                            <field name="date_deadline"/>
-                            <field name="state" invisible="1"/>
-                            <button name="do_open" states="pending,draft,done,cancelled" string="Start Task" type="object" icon="gtk-media-play" help="For changing to open state" invisible="context.get('set_visible',False)"/>
-                            <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
-                        </tree>
-                    </field>
-                  </group>
+                <xpath expr="//page[@name='page_history']" position="attributes">
+                    <attribute name="invisible">False</attribute>
+                </xpath>
+                <xpath expr="//page[@name='page_history']" position="inside">
+                    <group name="grp_task" string="Tasks">
+                        <field name="task_ids" colspan="4" nolabel="1">
+                            <tree string="Tasks" editable="bottom">
+                                <field name="name"/>
+                                <field name="user_id"/>
+                                <field name="date_deadline"/>
+                                <field name="state" invisible="1"/>
+                                <button name="do_open" states="pending,draft,done,cancelled" string="Start Task" type="object" icon="gtk-media-play" help="For changing to open state" invisible="context.get('set_visible',False)"/>
+                                <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
+                            </tree>
+                        </field>
+                      </group>
+                </xpath>
             </field>
        </record>
        
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 668c48e1bf6..053f0e1765a 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -874,7 +874,7 @@
                             </group>
                         </page>
                         <page string="Notes">
-                            <field name="note" placeholder="Add an internal note"/>
+                            <field name="note" placeholder="Add an internal note..."/>
                         </page>
                     </notebook>
                 </sheet>

From e1d6ecb015ce1db604eedc93048995ed74022664 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 19 Jul 2012 11:34:14 +0200
Subject: [PATCH 171/171] [IMP] sale, sale_margin: better name for <group> tag

bzr revid: qdp-launchpad@openerp.com-20120719093414-eqsw86hkj8qunxir
---
 addons/sale/sale_view.xml               | 2 +-
 addons/sale_margin/sale_margin_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 1c41951d438..f7ab8fd748e 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -262,7 +262,7 @@
                                 <field name="amount_tax"/>
                                 <field name="amount_total" class="oe_subtotal_footer_separator"/>
                             </group>
-                            <group name="sale_delivery">
+                            <group name="sale_margin_grp">
                             </group>
                             <div class="oe_clear">
                                 <label for="note"/>
diff --git a/addons/sale_margin/sale_margin_view.xml b/addons/sale_margin/sale_margin_view.xml
index faac570e500..30c2a0dea14 100644
--- a/addons/sale_margin/sale_margin_view.xml
+++ b/addons/sale_margin/sale_margin_view.xml
@@ -8,7 +8,7 @@
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//group[@name='sale_delivery']" position="inside">
+            <xpath expr="//group[@name='sale_margin_grp']" position="inside">
                 <group>
                     <label for="margin"/>
                     <div>