From 2cd8c0bf8c287e343cc57564cad9fc34f10bdf0b Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Tue, 9 Oct 2012 10:48:20 +0530
Subject: [PATCH 01/65] [IMP] whether instead of wheter

bzr revid: shp@tinyerp.com-20121009051820-2kllcfgd985opk0t
---
 addons/product/product_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 8c19aee026f..defffa5162e 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -321,7 +321,7 @@
               <p class="oe_view_nocontent_create">
                 Click to define a new product.
               </p><p>
-                You must define a product for everything you purchase, wheter
+                You must define a product for everything you purchase, whether
                 it's a physical product, a consumable or services you buy to
                 subcontractants.
               </p><p>

From 18e59b63527c5a8185c481da8ab991f6a840f89b Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Tue, 9 Oct 2012 11:11:05 +0530
Subject: [PATCH 02/65] [IMP] massively instead of massicely

bzr revid: shp@tinyerp.com-20121009054105-5q25k6dq4b2wbhjk
---
 addons/crm/crm_phonecall_menu.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index c359aa461e7..30303d4205c 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -123,7 +123,7 @@
             OpenERP allows you to easily define all the calls to be done
             by your sales team and follow up based on their summary.
           </p><p>  
-            You can use the import feature to massicely import a new list of
+            You can use the import feature to massively import a new list of
             prospects to qualify.
           </p>
         </field>

From 97329f23bf87421d89ec7dfafed4c9f47164d8e9 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Tue, 9 Oct 2012 11:20:44 +0530
Subject: [PATCH 03/65] [ADD] add oe_highlight class to save button.

bzr revid: nco@tinyerp.com-20121009055044-2g8qj43otkx4euht
---
 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 78579fc66df..f09866b76ab 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -214,7 +214,7 @@
                     </group>
                     <footer>
                         <button name="preference_change_password" type="object" string="Change password"/>
-                        <button name="preference_save" type="object" string="Save"/>
+                        <button name="preference_save" type="object" class="oe_highlight" string="Save"/>
                         or
                         <button name="preference_cancel" string="Cancel" special="cancel" class="oe_link"/>
                     </footer>

From d9a27d19024333de53ca5d435e9c0fb5c6f2b9b9 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Tue, 9 Oct 2012 11:22:23 +0530
Subject: [PATCH 04/65] [REMOVE] remove change password button.

bzr revid: nco@tinyerp.com-20121009055223-vflb9wxzo3nvw310
---
 openerp/addons/base/res/res_users.py       | 7 -------
 openerp/addons/base/res/res_users_view.xml | 1 -
 2 files changed, 8 deletions(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 8bd5c3a0179..59c60b23dfd 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -488,13 +488,6 @@ class res_users(osv.osv):
             'tag': 'reload',
         }
 
-    def preference_change_password(self, cr, uid, ids, context=None):
-        return {
-            'type': 'ir.actions.client',
-            'tag': 'change_password',
-            'target': 'new',
-        }
-
     def has_group(self, cr, uid, group_ext_id):
         """Checks whether user belongs to given group.
 
diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index f09866b76ab..7c4988bd1f0 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -213,7 +213,6 @@
                         <field name="signature" readonly="0"/>
                     </group>
                     <footer>
-                        <button name="preference_change_password" type="object" string="Change password"/>
                         <button name="preference_save" type="object" class="oe_highlight" string="Save"/>
                         or
                         <button name="preference_cancel" string="Cancel" special="cancel" class="oe_link"/>

From b5f0bc1257a0b782ebe212f1d32625c50f6a9926 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Tue, 9 Oct 2012 11:46:40 +0530
Subject: [PATCH 05/65] [IMP] remove second blank option in laguage selection
 in prefrences.

bzr revid: nco@tinyerp.com-20121009061640-dpf3q4m5ubdr5sch
---
 openerp/addons/base/res/res_partner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index c5c95276b16..0c0e3398f88 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -157,7 +157,7 @@ def _lang_get(self, cr, uid, context=None):
     lang_pool = self.pool.get('res.lang')
     ids = lang_pool.search(cr, uid, [], context=context)
     res = lang_pool.read(cr, uid, ids, ['code', 'name'], context)
-    return [(r['code'], r['name']) for r in res] + [('','')]
+    return [(r['code'], r['name']) for r in res]
 
 POSTAL_ADDRESS_FIELDS = ('street', 'street2', 'zip', 'city', 'state_id', 'country_id')
 ADDRESS_FIELDS = POSTAL_ADDRESS_FIELDS + ('email', 'phone', 'fax', 'mobile', 'website', 'ref', 'lang')

From 7edf7aa42071d658d4f960493819f54ee57281be Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Tue, 9 Oct 2012 12:08:14 +0530
Subject: [PATCH 06/65] [IMP] hide label when click in 'based on' except 'other
 pricelist' and improve 'Other Pricelist'

bzr revid: shp@tinyerp.com-20121009063814-qm2kh936zfssojck
---
 addons/product/pricelist.py       | 2 +-
 addons/product/pricelist_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 3bc6e6d6814..f5c69c7acf7 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -410,7 +410,7 @@ class product_pricelist_item(osv.osv):
         'min_quantity': fields.integer('Min. Quantity', required=True, help="The rule only applies if the partner buys/sells equal to or more than this quantity."),
         'sequence': fields.integer('Sequence', required=True, help="Gives the order in which the pricelist items will be checked. The evaluation gives highest priority to lowest sequence and stops as soon as a matching item is found."),
         'base': fields.selection(_price_field_get, 'Based on', required=True, size=-1, help="The mode for computing the price for this rule."),
-        'base_pricelist_id': fields.many2one('product.pricelist', 'If Other Pricelist'),
+        'base_pricelist_id': fields.many2one('product.pricelist', 'Other Pricelist'),
 
         'price_surcharge': fields.float('Price Surcharge',
             digits_compute= dp.get_precision('Product Price'), help='Specify the fixed amount to add or substract(if negative) to the amount calculated with the discount.'),
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 01cb4dc54eb..a1b996b891b 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -92,7 +92,7 @@
                     </group>
                     <group col="4" string="Price Computation">
                         <field name="base"/>
-                        <field name="base_pricelist_id" attrs="{'required': [('base','=', -1)], 'readonly': [('base','!=', -1)]}"/>
+                        <field name="base_pricelist_id" attrs="{'invisible':[('base', '!=', -1)],'required': [('base','=', -1)], 'readonly': [('base','!=', -1)]}"/>
                     </group>
                     <group col="6" colspan="5">
                         <label string="New Price ="/>

From 917ae0ee8548a8749421b858dc267dd78def7cd8 Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Tue, 9 Oct 2012 12:32:38 +0530
Subject: [PATCH 07/65] [IMP] opportunity to the right of contact

bzr revid: shp@tinyerp.com-20121009070238-vyuen9nb8551p2ph
---
 addons/crm/crm_phonecall_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index c610913febf..f1308556779 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -140,12 +140,12 @@
                         <field name="duration" widget="float_time"/>
                         <field name="section_id" colspan="1" widget="selection"/>
                         <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
+                        <field name="opportunity_id"/>
                         <field name="email_from" invisible="1"/> <!--not needed because of the chatter, thus invisible, but must be in the view as it's returned by onchange_partner_id()-->
                         <field name="categ_id" widget="selection"
                             domain="[('object_id.model', '=', 'crm.phonecall')]"/>
                         <field name="partner_mobile"/>
                         <field name="priority"/>
-                        <field name="opportunity_id"/>
                     </group>
                     <field name="description" placeholder="Description..."/>
                 </sheet>

From 439e737cefa6e56c7f790af7e16b80b7858fc3e5 Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Tue, 9 Oct 2012 15:33:40 +0530
Subject: [PATCH 08/65] [IMP] Units of Measure Category should not be visible

bzr revid: shp@tinyerp.com-20121009100340-8g5ux8g58f53ufmp
---
 addons/product/product_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 8c19aee026f..2d0e61c3364 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -527,7 +527,7 @@
               </p>
             </field>
         </record>
-        <menuitem action="product_uom_categ_form_action" id="menu_product_uom_categ_form_action" parent="base.menu_base_config" sequence="25" groups="base.group_no_one"/>
+        <menuitem action="product_uom_categ_form_action" id="menu_product_uom_categ_form_action" parent="base.menu_base_config" sequence="25" groups="product.group_uom"/>
 
         <record id="product_ul_form_view" model="ir.ui.view">
             <field name="name">product.ul.form.view</field>

From 2ac0273835c537f650f7bb7541d0baf99f2b730b Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Tue, 9 Oct 2012 17:19:52 +0530
Subject: [PATCH 09/65] [IMP] Packaging field

bzr revid: shp@tinyerp.com-20121009114952-2jlsxqi9popw12ny
---
 addons/sale_stock/sale_stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_stock/sale_stock_view.xml b/addons/sale_stock/sale_stock_view.xml
index 8962c21dc6e..c128bb9c565 100644
--- a/addons/sale_stock/sale_stock_view.xml
+++ b/addons/sale_stock/sale_stock_view.xml
@@ -92,7 +92,7 @@
                             groups="sale.group_mrp_properties"/>
                    </xpath>
                    <xpath expr="//page[@string='Order Lines']/field[@name='order_line']/form[@string='Sales Order Lines']/group/group/field[@name='tax_id']" position="before">
-                       <field name="product_packaging" context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}" on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)" domain="[('product_id','=',product_id)]" groups="product.group_stock_packaging" colspan="3"/>
+                       <field name="product_packaging" context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}" on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)" domain="[('product_id','=',product_id)]" groups="product.group_stock_packaging"  />
                    </xpath>
                    <xpath expr="//page[@string='Order Lines']/field[@name='order_line']/form[@string='Sales Order Lines']/div/field[@name='invoice_lines']" position="after">
                        <label for="move_ids"/>

From e16bd157d9bbe332aefd807a044949c451169cb6 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Tue, 9 Oct 2012 18:39:43 +0530
Subject: [PATCH 10/65] [IMP] improve help.

bzr revid: nco@tinyerp.com-20121009130943-n4ru1qa5fdo1b84r
---
 addons/portal_sale/portal_sale_view.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/portal_sale/portal_sale_view.xml b/addons/portal_sale/portal_sale_view.xml
index 5786fbc52ad..6b25d87b791 100644
--- a/addons/portal_sale/portal_sale_view.xml
+++ b/addons/portal_sale/portal_sale_view.xml
@@ -13,7 +13,7 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="context">{"search_default_draft":1}</field>
             <field name="search_view_id" ref="sale.view_sales_order_filter"/>
-            <field name="help">You dont have any quotation.</field>
+            <field name="help">You don't have any quotation.</field>
         </record>
 
         <record id="action_order_form" model="ir.actions.act_window">
@@ -23,7 +23,7 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="search_view_id" ref="sale.view_sales_order_filter"/>
             <field name="context">{"search_default_sales":1}</field>
-            <field name="help">You dont have any sale order.</field>
+            <field name="help">You don't have any sale order.</field>
         </record>
 
         <record id="action_picking_tree" model="ir.actions.act_window">
@@ -34,7 +34,7 @@
             <field name="domain">[('type','=','out')]</field>
             <field name="context">{'default_type': 'out', 'contact_display': 'partner_address'}</field>
             <field name="search_view_id" ref="stock.view_picking_out_search"/>
-            <field name="help">You dont have any delivery order.</field>
+            <field name="help">You don't have any delivery order.</field>
         </record>
 
         <record id="product_normal_action" model="ir.actions.act_window">
@@ -55,7 +55,7 @@
             <field name="domain">[('type','=','out_invoice')]</field>
             <field name="context">{'default_type':'out_invoice', 'type':'out_invoice', 'journal_type': 'sale'}</field>
             <field name="search_view_id" ref="account.view_account_invoice_filter"/>
-            <field name="help">You dont have any invoice.</field>
+            <field name="help">You don't have any invoice.</field>
         </record>
 
         <record id="action_vendor_receipt" model="ir.actions.act_window">
@@ -65,7 +65,7 @@
             <field name="context">{'type':'receipt'}</field>
             <field name="search_view_id" ref="account_voucher.view_voucher_filter_customer_pay"/>
             <field name="target">current</field>
-            <field name="help">You dont have any payment.</field>
+            <field name="help">You don't have any payment.</field>
         </record>
 
         <menuitem name="Quotations" id="portal_quotations" parent="portal.portal_orders"

From d87786fd413ece1edd68df29b933c842c17124aa Mon Sep 17 00:00:00 2001
From: "Jalpesh Patel (OpenERP)" <pja@tinyerp.com>
Date: Wed, 10 Oct 2012 14:20:29 +0530
Subject: [PATCH 11/65] [IMP] user's form view  remove link to open User's
 Projects

bzr revid: pja@tinyerp.com-20121010085029-n78m51b40nnzr7qd
---
 addons/project/project_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 686ae08ee73..8fe64dcf300 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -787,7 +787,6 @@
         <menuitem action="open_task_type_form" name="Task Stages" id="menu_task_types_view" parent="base.menu_project_config_project" sequence="2"/>
         <menuitem action="open_view_project_all" id="menu_projects" name="Projects" parent="menu_project_management" sequence="1"/>
 
-        <act_window context="{'search_default_user_id': active_id, 'default_user_id': active_id}" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>
 
          <record id="task_company" model="ir.ui.view">
             <field name="name">res.company.task.config</field>

From 8bbd857198955fd968b141cb35d360f64eb43b81 Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Wed, 10 Oct 2012 17:03:23 +0530
Subject: [PATCH 12/65] [IMP] move type field in sale module and improve
 default state in crm_claim

bzr revid: shp@tinyerp.com-20121010113323-wpxt81u5p3hmwl6w
---
 addons/crm_claim/crm_claim.py         | 3 ++-
 addons/crm_claim/crm_claim_view.xml   | 3 +--
 addons/sale/sale.py                   | 2 ++
 addons/sale/sale_view.xml             | 2 +-
 addons/sale_stock/sale_stock.py       | 2 --
 addons/sale_stock/sale_stock_view.xml | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index cbf3ec9f13a..5110a670583 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -123,7 +123,8 @@ class crm_claim(base_stage, osv.osv):
         'date': fields.datetime.now,
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.case', context=c),
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
-        'active': lambda *a: 1
+        'active': lambda *a: 1,
+        'stage_id':lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c)
     }
 
     def stage_find(self, cr, uid, cases, section_id, domain=[], order='sequence', context=None):
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 9643a56bfe2..93e07f95eef 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -118,8 +118,7 @@
                         <button name="case_cancel" string="Cancel" type="object" 
                                 states="draft,open,pending"/>
                     </span>
-                    <field name="stage_id" widget="statusbar"
-                            on_change="onchange_stage_id(stage_id)"/>
+                    <field name="stage_id" widget="statusbar"/>
                 </header>
                 <sheet string="Claims">
                     <group>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index ed7a2835425..69e180f7276 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -710,6 +710,8 @@ class sale_order_line(osv.osv):
         'invoice_lines': fields.many2many('account.invoice.line', 'sale_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),
         'invoiced': fields.boolean('Invoiced', readonly=True),
         'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Product Price'), readonly=True, states={'draft': [('readonly', False)]}),
+        'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True, readonly=True, states={'draft': [('readonly', False)]},
+         help="If 'on order', it triggers a procurement when the sale order is confirmed to create a task, purchase order or manufacturing order linked to this sale order line."),
         'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Account')),
         'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes', readonly=True, states={'draft': [('readonly', False)]}),
         'address_allotment_id': fields.many2one('res.partner', 'Allotment Partner'),
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 5505a6a88b5..300c51e330d 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -224,8 +224,8 @@
                                         </group>
                                         <group>
                                             <field name="tax_id" widget="many2many_tags" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
+                                            <field name="type"/>
                                             <field name="th_weight"/>
-
                                             <!-- we should put a config wizard for these two fields -->
                                             <field name="address_allotment_id"/>
                                         </group>
diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py
index ce6894318c4..5f614a18b7f 100644
--- a/addons/sale_stock/sale_stock.py
+++ b/addons/sale_stock/sale_stock.py
@@ -490,8 +490,6 @@ class sale_order_line(osv.osv):
     _columns = { 
         'delay': fields.float('Delivery Lead Time', required=True, help="Number of days between the order confirmation the shipping of the products to the customer", readonly=True, states={'draft': [('readonly', False)]}),
         'procurement_id': fields.many2one('procurement.order', 'Procurement'),
-        'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True, readonly=True, states={'draft': [('readonly', False)]},
-            help="If 'on order', it triggers a procurement when the sale order is confirmed to create a task, purchase order or manufacturing order linked to this sale order line."),
         'property_ids': fields.many2many('mrp.property', 'sale_order_line_property_rel', 'order_id', 'property_id', 'Properties', readonly=True, states={'draft': [('readonly', False)]}),
         'product_packaging': fields.many2one('product.packaging', 'Packaging'),
         'move_ids': fields.one2many('stock.move', 'sale_line_id', 'Inventory Moves', readonly=True),
diff --git a/addons/sale_stock/sale_stock_view.xml b/addons/sale_stock/sale_stock_view.xml
index c128bb9c565..46e777d0a5c 100644
--- a/addons/sale_stock/sale_stock_view.xml
+++ b/addons/sale_stock/sale_stock_view.xml
@@ -80,12 +80,12 @@
                            </tree>
                        </field>
                    </field>
-                   <xpath expr="//page[@string='Order Lines']/field[@name='order_line']/form[@string='Sales Order Lines']/group/group/field[@name='th_weight']" position="before">                   
+                   <xpath expr="//page[@string='Order Lines']/field[@name='order_line']/form[@string='Sales Order Lines']/group/group/field[@name='type']" position="before">                   
                        <label for="delay"/>
                        <div>
                            <field name="delay" class="oe_inline"/> days
                        </div>
-                       <field name="type"/>
+                       
                    </xpath>
                    <xpath expr="//page[@string='Order Lines']/field[@name='order_line']/form[@string='Sales Order Lines']/group/group/field[@name='address_allotment_id']" position="after">
                        <field name="property_ids" widget="many2many_tags"

From 4c8e5b39a81bc031fa6f79777500a65020c19329 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Thu, 11 Oct 2012 11:34:42 +0530
Subject: [PATCH 13/65] [FIX] make lang field required true to select atleast
 language.

bzr revid: nco@tinyerp.com-20121011060442-rqe3shhavag7qo5s
---
 openerp/addons/base/res/res_partner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 0c0e3398f88..3287c12184b 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -189,7 +189,7 @@ class res_partner(osv.osv, format_address):
         'parent_id': fields.many2one('res.partner', 'Company'),
         'child_ids': fields.one2many('res.partner', 'parent_id', 'Contacts'),
         'ref': fields.char('Reference', size=64, select=1),
-        'lang': fields.selection(_lang_get, 'Language',
+        'lang': fields.selection(_lang_get, 'Language', required=True,
             help="If the selected language is loaded in the system, all documents related to this contact will be printed in this language. If not, it will be English."),
         'tz': fields.selection(_tz_get,  'Timezone', size=64,
             help="The partner's timezone, used to output proper date and time values inside printed reports. "

From ac999ede8a60097341bab7b8c5ed8babd1d97d4b Mon Sep 17 00:00:00 2001
From: "Jalpesh Patel (OpenERP)" <pja@tinyerp.com>
Date: Thu, 11 Oct 2012 15:11:07 +0530
Subject: [PATCH 14/65] [IMP] forgot to add a supplier first add to suppier
 after add an item

bzr revid: pja@tinyerp.com-20121011094107-smwclaybgo7uenyo
---
 addons/purchase/purchase.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index c0516d09de3..d1fa271b1b1 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -875,7 +875,12 @@ class purchase_order_line(osv.osv):
         """
         if context is None:
             context = {}
-
+        
+        # - check for the presence of partner_id and pricelist_id
+        if not pricelist_id:
+            raise osv.except_osv(_('No Pricelist !'), _('Select a price list for a supplier in the purchase form to choose a product.'))
+        if not partner_id:
+            raise osv.except_osv(_('No Partner!'), _('Select a partner in purchase order to choose a product.'))
         res = {'value': {'price_unit': price_unit or 0.0, 'name': name or '', 'product_uom' : uom_id or False}}
         if not product_id:
             return res
@@ -888,11 +893,7 @@ class purchase_order_line(osv.osv):
         account_fiscal_position = self.pool.get('account.fiscal.position')
         account_tax = self.pool.get('account.tax')
 
-        # - check for the presence of partner_id and pricelist_id
-        if not pricelist_id:
-            raise osv.except_osv(_('No Pricelist !'), _('Select a price list for a supplier in the purchase form to choose a product.'))
-        if not partner_id:
-            raise osv.except_osv(_('No Partner!'), _('Select a partner in purchase order to choose a product.'))
+        
 
         # - determine name and notes based on product in partner lang.
         lang = res_partner.browse(cr, uid, partner_id).lang

From 03c5b849b98ea2cff447c70adf31b037735f4a68 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 11 Oct 2012 15:51:10 +0530
Subject: [PATCH 15/65] [FIX]exchange date and name field

bzr revid: kbh@tinyerp.com-20121011102110-n1cpyknr15i0jvfh
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 03c0ee2440b..5894afe7d67 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -416,8 +416,8 @@
                             <field name="description" attrs="{'readonly':[('state','=','done')]}" placeholder="Add a Description..."/>
                             <field name="work_ids" groups="project.group_tasks_work_on_tasks">
                                 <tree string="Task Work" editable="top">
-                                    <field name="date"/>
                                     <field name="name"/>
+                                    <field name="date"/>
                                     <field name="user_id"/>
                                     <field name="hours" widget="float_time" sum="Spent Hours"/>
                                 </tree>

From 2fb54ef0076ddf7abfceda4da68859b1a01a33f2 Mon Sep 17 00:00:00 2001
From: "RGA(OpenERP)" <>
Date: Thu, 11 Oct 2012 18:34:00 +0530
Subject: [PATCH 16/65] [FIX] pager of Menu Items list view

bzr revid: rgaopenerp-20121011130400-jys06hqc8wmdsu75
---
 addons/mail/mail_group_menu.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/mail/mail_group_menu.py b/addons/mail/mail_group_menu.py
index 707ece6a180..a29ee2519d5 100644
--- a/addons/mail/mail_group_menu.py
+++ b/addons/mail/mail_group_menu.py
@@ -41,7 +41,7 @@ class ir_ui_menu(osv.osv):
         """ Override to take off menu entries (mail.group) the user is not
             following. Access are done using SUPERUSER_ID to avoid access
             rights issues for an internal back-end algorithm. """
-        ids = super(ir_ui_menu, self).search(cr, uid, args, offset=0, limit=None, order=order, context=context, count=False)
+        ids = super(ir_ui_menu, self).search(cr, uid, args, offset=offset, limit=limit, order=order, context=context, count=False)
         partner_id = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
         follower_obj = self.pool.get('mail.followers')
         for menu in self.browse(cr, uid, ids, context=context):
@@ -52,4 +52,6 @@ class ir_ui_menu(osv.osv):
                     ], context=context)
                 if not sub_ids:
                     ids.remove(menu.id)
+        if count:
+            return len(ids)
         return ids

From 935314ea267ac23a9d30a2b02646a610dcda09ff Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Fri, 12 Oct 2012 10:46:40 +0530
Subject: [PATCH 17/65] [IMP] move type of defaults in sale. and  increase the
 priority of the product tree view defined in hr_epense.

bzr revid: shp@tinyerp.com-20121012051640-4i0eyltyuvpq57vc
---
 addons/hr_expense/hr_expense_view.xml | 1 +
 addons/sale/res_partner_view.xml      | 1 +
 addons/sale/sale.py                   | 1 +
 addons/sale_stock/sale_stock.py       | 1 -
 4 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 44853cee4f0..eeb9ec89075 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -194,6 +194,7 @@
         <record id="view_product_hr_expense_form" model="ir.ui.view">
             <field name="name">product.product.expense.form</field>
             <field name="model">product.product</field>
+            <field eval="8" name="priority"/>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <field name="purchase_ok" position="before">
diff --git a/addons/sale/res_partner_view.xml b/addons/sale/res_partner_view.xml
index cd0536bd05b..46feb3a16fe 100644
--- a/addons/sale/res_partner_view.xml
+++ b/addons/sale/res_partner_view.xml
@@ -75,6 +75,7 @@
                 </xpath>
             </field>
         </record>
+        
 
 
     </data>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 8e3c9f993f1..509c471988e 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -746,6 +746,7 @@ class sale_order_line(osv.osv):
         'sequence': 10,
         'invoiced': 0,
         'state': 'draft',
+        'type': 'make_to_stock',
         'price_unit': 0.0,
     }
 
diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py
index 5f614a18b7f..9611c97ac60 100644
--- a/addons/sale_stock/sale_stock.py
+++ b/addons/sale_stock/sale_stock.py
@@ -497,7 +497,6 @@ class sale_order_line(osv.osv):
     }
     _defaults = {
         'delay': 0.0,
-        'type': 'make_to_stock',
         'product_packaging': False,
     }
 

From 17f1e6a12c6b11c91b6be8e9fceabe7ce3b70952 Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Fri, 12 Oct 2012 10:59:27 +0530
Subject: [PATCH 18/65] [IMP] default value for Planned Date field

bzr revid: shp@tinyerp.com-20121012052927-y7njhusx5emlxf4j
---
 addons/crm/wizard/crm_phonecall_to_phonecall.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/wizard/crm_phonecall_to_phonecall.py b/addons/crm/wizard/crm_phonecall_to_phonecall.py
index d68591ab0b7..2cdfb0387e6 100644
--- a/addons/crm/wizard/crm_phonecall_to_phonecall.py
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall.py
@@ -87,7 +87,7 @@ class crm_phonecall2phonecall(osv.osv_memory):
             if 'user_id' in fields:
                 res.update({'user_id': phonecall.user_id and phonecall.user_id.id or False})
             if 'date' in fields:
-                res.update({'date': phonecall.date})
+                res.update({'date': False})
             if 'section_id' in fields:
                 res.update({'section_id': phonecall.section_id and phonecall.section_id.id or False})
             if 'categ_id' in fields:

From bf3dd9918d1610b2e056351f800b570cc324de44 Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Fri, 12 Oct 2012 11:30:36 +0530
Subject: [PATCH 19/65] [IMP] partner tree view when group by company

bzr revid: shp@tinyerp.com-20121012060036-n91al0zj4qq0pt4p
---
 addons/crm/crm_phonecall_view.xml |  4 ++--
 addons/sale/res_partner_view.xml  | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index f1308556779..38010238f75 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -70,11 +70,11 @@
                 <field name="date"/>
                 <field name="name"/>
                 <field name="partner_id"/>
+                <field name="opportunity_id" />
                 <field name="partner_phone"/>
                 <field name="user_id"/>
                 <field name="categ_id" invisible="1"/>
                 <field name="create_date" invisible="1"/>
-                <field name="opportunity_id" invisible="1"/>
                 <button string="Convert to Opportunity"
                     name="%(phonecall2opportunity_act)d"
                     states="open,pending"
@@ -140,12 +140,12 @@
                         <field name="duration" widget="float_time"/>
                         <field name="section_id" colspan="1" widget="selection"/>
                         <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-                        <field name="opportunity_id"/>
                         <field name="email_from" invisible="1"/> <!--not needed because of the chatter, thus invisible, but must be in the view as it's returned by onchange_partner_id()-->
                         <field name="categ_id" widget="selection"
                             domain="[('object_id.model', '=', 'crm.phonecall')]"/>
                         <field name="partner_mobile"/>
                         <field name="priority"/>
+                        <field name="opportunity_id"/>
                     </group>
                     <field name="description" placeholder="Description..."/>
                 </sheet>
diff --git a/addons/sale/res_partner_view.xml b/addons/sale/res_partner_view.xml
index 46feb3a16fe..4bcead634bd 100644
--- a/addons/sale/res_partner_view.xml
+++ b/addons/sale/res_partner_view.xml
@@ -76,6 +76,16 @@
             </field>
         </record>
         
+    <record id="view_tree_partner_id" model="ir.ui.view">
+        <field name="name">- Add partner on tree</field>
+        <field name="model">res.partner</field>
+        <field name="inherit_id" ref="base.view_partner_tree"/>
+        <field name="arch" type="xml">
+            <field name="country_id" position="after">
+                <field name="parent_id" invisible="1"/>
+            </field>
+        </field>
+    </record>
 
 
     </data>

From 4e088306d1df4e181aa22ab14746ce6a485538ae Mon Sep 17 00:00:00 2001
From: "Jalpesh Patel (OpenERP)" <pja@tinyerp.com>
Date: Fri, 12 Oct 2012 11:58:46 +0530
Subject: [PATCH 20/65] [IMP]interchange sequence of buttons in Purchase order
 form like: [Receive Products] [Receive Invoice]

bzr revid: pja@tinyerp.com-20121012062846-27zef8nxmwiaz5wz
---
 addons/purchase/purchase.py       | 6 +++---
 addons/purchase/purchase_view.xml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index d1fa271b1b1..2cabe6e8559 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -114,7 +114,7 @@ class purchase_order(osv.osv):
             if state=='done':
                 res[oid][0] += nbr or 0.0
                 res[oid][1] += nbr or 0.0
-            else:
+            else:L878
                 res[oid][1] += nbr or 0.0
         for r in res:
             if not res[r][1]:
@@ -877,10 +877,10 @@ class purchase_order_line(osv.osv):
             context = {}
         
         # - check for the presence of partner_id and pricelist_id
-        if not pricelist_id:
-            raise osv.except_osv(_('No Pricelist !'), _('Select a price list for a supplier in the purchase form to choose a product.'))
         if not partner_id:
             raise osv.except_osv(_('No Partner!'), _('Select a partner in purchase order to choose a product.'))
+        if not pricelist_id:
+            raise osv.except_osv(_('No Pricelist !'), _('Select a price list for a supplier in the purchase form to choose a product.'))
         res = {'value': {'price_unit': price_unit or 0.0, 'name': name or '', 'product_uom' : uom_id or False}}
         if not product_id:
             return res
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 446c17578cb..85dde22e3e2 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -205,8 +205,8 @@
                     <button name="picking_ok" states="except_picking" string="Manually Corrected"/>
                     <button name="invoice_ok" states="except_invoice" string="Manually Corrected"/>
                     <button name="purchase_approve" states="confirmed" string="Approve Order" class="oe_highlight" groups="purchase.group_purchase_manager"/>
-                    <button name="view_invoice" string="Receive Invoice" type="object" attrs="{'invisible': ['|', ('invoice_method','=','picking'), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}" class="oe_highlight"/>
                     <button name="view_picking" string="Receive Products" type="object" attrs="{'invisible': ['|', ('shipped','=',True), ('state','!=', 'approved')]}" class="oe_highlight"/>
+                    <button name="view_invoice" string="Receive Invoice" type="object" attrs="{'invisible': ['|', ('invoice_method','=','picking'), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}" class="oe_highlight"/>
                     <button name="action_cancel_draft" states="cancel,sent,confirmed" string="Set to Draft" type="object" />
                     <button name="purchase_cancel" states="draft,confirmed,sent" string="Cancel"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,sent,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue"}' readonly="1"/>

From 7c3b223618e5ac5d9fe3d3b9fe1162621f2e7802 Mon Sep 17 00:00:00 2001
From: "Jalpesh Patel (OpenERP)" <pja@tinyerp.com>
Date: Fri, 12 Oct 2012 12:09:25 +0530
Subject: [PATCH 21/65] [IMP] remove unnecessary code

bzr revid: pja@tinyerp.com-20121012063925-eerqul5b3rl83ds0
---
 addons/purchase/purchase.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 2cabe6e8559..a98a5f926bd 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -114,7 +114,7 @@ class purchase_order(osv.osv):
             if state=='done':
                 res[oid][0] += nbr or 0.0
                 res[oid][1] += nbr or 0.0
-            else:L878
+            else:
                 res[oid][1] += nbr or 0.0
         for r in res:
             if not res[r][1]:

From 63c072bb11000b8f1b46bee7ed9e09da8669ac48 Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Fri, 12 Oct 2012 12:10:42 +0530
Subject: [PATCH 22/65] [IMP]  reference of sale order which is in done state

bzr revid: shp@tinyerp.com-20121012064042-8l255iecqqs68rx9
---
 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 37c1f5a98c8..45e08e72be0 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -483,7 +483,7 @@
                     </header>
                     <sheet>
                     <label for="order_id" class="oe_edit_only"/>
-                    <h1><field name="order_id"/></h1>
+                    <h1><field name="order_id" domain="[('state','!=','done')]"/></h1>
                     <label for="order_partner_id" class="oe_edit_only"/>
                     <h2><field name="order_partner_id"/></h2>
                     <group>

From 35d3027fdf3b4762f8665ffba7e0153682128bc5 Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Fri, 12 Oct 2012 12:25:33 +0530
Subject: [PATCH 23/65] [IMP] Order Lines to Invoice create new you can not
 select product there

bzr revid: shp@tinyerp.com-20121012065533-mvmorbar8675k5uk
---
 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 45e08e72be0..f3a7ecc2ce3 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -488,7 +488,7 @@
                     <h2><field name="order_partner_id"/></h2>
                     <group>
                         <group>
-                            <field name="product_id" readonly="1"/>
+                            <field name="product_id"/>
                             <label for="product_uom_qty"/>
                             <div>
                                 <field name="product_uom_qty" readonly="1" class="oe_inline"/>

From 022a7c5de064d65272a45c3b79c9c51e2ce6fedc Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Fri, 12 Oct 2012 12:58:25 +0530
Subject: [PATCH 24/65] [IMP] move schedule meeting and convert to opportunity
 to the right of contact

bzr revid: shp@tinyerp.com-20121012072825-oplxmiuqnrszygfz
---
 addons/crm/crm_phonecall_view.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 38010238f75..16f7eab65d3 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -70,11 +70,6 @@
                 <field name="date"/>
                 <field name="name"/>
                 <field name="partner_id"/>
-                <field name="opportunity_id" />
-                <field name="partner_phone"/>
-                <field name="user_id"/>
-                <field name="categ_id" invisible="1"/>
-                <field name="create_date" invisible="1"/>
                 <button string="Convert to Opportunity"
                     name="%(phonecall2opportunity_act)d"
                     states="open,pending"
@@ -83,6 +78,11 @@
                 <button string="Meeting"
                     states="open,pending" icon="gtk-redo"
                      name="action_make_meeting" type="object"/>
+                <field name="partner_phone"/>
+                <field name="user_id"/>
+                <field name="categ_id" invisible="1"/>
+                <field name="create_date" invisible="1"/>
+                <field name="opportunity_id" invisible="1"/>
                 <field name="state"/>
                 <button name="case_open" string="Confirm" type="object"
                         states="draft,pending" icon="gtk-go-forward"/>

From 86676cf1c92035fcb0031e9831bf04c51e14acdb Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 12 Oct 2012 13:55:25 +0530
Subject: [PATCH 25/65] [IMP]project_timesheet:added method for setting default
 product.

bzr revid: kbh@tinyerp.com-20121012082525-y600x8lv0xteej6a
---
 addons/project_timesheet/project_timesheet.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 12fac7802c6..2154f6d89dd 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -284,6 +284,19 @@ class account_analytic_line(osv.osv):
            raise osv.except_osv(_('Invalid Analytic Account !'), _('You cannot select a Analytic Account which is in Close or Cancelled state.'))
        return res
 
+   def _default_product(self, cr, uid, context=None):
+        proxy = self.pool.get('hr.employee')
+        record_ids = proxy.search(cr, uid, [('user_id', '=', uid)], context=context)
+        print "record_ids",record_ids
+        employee = proxy.browse(cr, uid, record_ids[0], context=context)
+        if employee.product_id:
+            return employee.product_id.id
+        return False
+
+   _defaults = {
+        'product_id': _default_product,
+        }
+
 account_analytic_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From fce8bb9c29d18f758d15eb5301e2f79f75c469fe Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 12 Oct 2012 14:09:06 +0530
Subject: [PATCH 26/65] [IMP]project_timesheet:added method for setting default
 product uom.

bzr revid: kbh@tinyerp.com-20121012083906-3ab8ephqoc09dx7z
---
 addons/project_timesheet/project_timesheet.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 2154f6d89dd..3e72a7e7522 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -293,8 +293,18 @@ class account_analytic_line(osv.osv):
             return employee.product_id.id
         return False
 
+   def _default_product_uom(self, cr, uid, context=None):
+        proxy = self.pool.get('hr.employee')
+        record_ids = proxy.search(cr, uid, [('user_id', '=', uid)], context=context)
+        print "record_ids",record_ids
+        employee = proxy.browse(cr, uid, record_ids[0], context=context)
+        if employee.product_id and employee.product_id.uom_id:
+            return employee.product_id.uom_id.id
+        return False
+
    _defaults = {
         'product_id': _default_product,
+        'product_uom_id': _default_product_uom,
         }
 
 account_analytic_line()

From 06ae4d8913a7df3ab9f549707a1c0f59e0ff3f78 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Fri, 12 Oct 2012 14:35:27 +0530
Subject: [PATCH 27/65] [IMP]project_timesheet:added method for setting default
 type of invoicing

bzr revid: kbh@tinyerp.com-20121012090527-zn9ngz25ylbio2nx
---
 addons/project_timesheet/project_timesheet.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 3e72a7e7522..724944d9994 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -302,9 +302,18 @@ class account_analytic_line(osv.osv):
             return employee.product_id.uom_id.id
         return False
 
+   def _default_invoice(self, cr, uid, context=None):
+        proxy = self.pool.get('hr_timesheet_invoice.factor')
+        record_ids = proxy.search(cr, uid, [('customer_name', '=', '100%')], context=context)
+        invoice = proxy.browse(cr, uid, record_ids[0], context=context)
+        if invoice:
+            return invoice.id
+        return False
+
    _defaults = {
         'product_id': _default_product,
         'product_uom_id': _default_product_uom,
+        'to_invoice': _default_invoice
         }
 
 account_analytic_line()

From b39b0139bf92ee2715231bc17d40cccd3a111202 Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Fri, 12 Oct 2012 14:44:29 +0530
Subject: [PATCH 28/65] [IMP] remove menu event and event anaylasis

bzr revid: shp@tinyerp.com-20121012091429-02i5f9v3szb4rm3i
---
 addons/base_calendar/base_calendar_view.xml | 30 ---------------------
 1 file changed, 30 deletions(-)

diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index d5dc75df873..3cdef34e165 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -97,25 +97,11 @@
                </search>
             </field>
         </record>
-        <record id="action_view_attendee_form" model="ir.actions.act_window">
-             <field name="name">Event Invitations</field>
-             <field name="type">ir.actions.act_window</field>
-             <field name="res_model">calendar.attendee</field>
-             <field name="view_type">form</field>
-             <field name="view_mode">tree,form</field>
-             <field name="view_id" ref="base_calendar.base_calendar_attendee_tree_view"/>
-             <field name="context">{'default_sent_by_uid': uid}</field>
-         </record>
 
         <!-- Calendar's menu -->
         <menuitem id="base.menu_calendar_configuration" name="Calendar"
             parent="base.menu_base_config" sequence="50" groups="base.group_no_one"/>
 
-        <!-- Invitation menu -->
-         <menuitem id="menu_attendee_invitations"
-            parent="base.menu_calendar_configuration"
-            sequence="10" action="action_view_attendee_form"/>
-
         <!-- Alarm form view -->
         <record id="res_alarm_form_view" model="ir.ui.view">
             <field name="name">res.alarm.form</field>
@@ -381,21 +367,5 @@
             </field>
         </record>
 
-
-        <!-- Event action -->
-        <record id="action_view_event" model="ir.actions.act_window">
-                <field name="name">Events</field>
-                <field name="type">ir.actions.act_window</field>
-                <field name="res_model">calendar.event</field>
-                <field name="view_type">form</field>
-                <field name="view_mode">calendar,tree,form</field>
-                <field name="search_view_id" ref="view_calendar_event_filter"/>
-            </record>
-
-        <!-- Event menu -->
-        <menuitem id="menu_events"
-                name="Events" parent="base.menu_calendar_configuration"
-                sequence="15" action="action_view_event"/>
-
      </data>
  </openerp>

From bf6343c5afd1d0e30488cd1d16f3cc0f9c807083 Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Fri, 12 Oct 2012 18:28:42 +0530
Subject: [PATCH 29/65] [IMP] whether instead of wether

bzr revid: shp@tinyerp.com-20121012125842-xpd7548qpale0xfv
---
 addons/product/product_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index a3017022476..6860b6221de 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -219,7 +219,7 @@
                 Click to define a new product.
               </p><p>
                 You must define a product for everything you buy or sell,
-                wether it's a physical product, a consumable or service.
+                whether it's a physical product, a consumable or service.
               </p>
             </field>
         </record>

From 349d07cf503cfd546188497f616e49c1e9a5648a Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Fri, 12 Oct 2012 18:35:32 +0530
Subject: [PATCH 30/65] [ADD] set bounce effect in sale_view.

bzr revid: nco@tinyerp.com-20121012130532-0188vov115ztewbc
---
 addons/sale/sale_view.xml | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 2ba00a7f0ae..d6a4a2dee14 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -147,23 +147,21 @@
             <field name="arch" type="xml">
                 <form string="Sales Order" version="7.0">
                     <header>
-                        <span groups="base.group_user">
-                            <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice"/>
-                            <button name="invoice_corrected" states="invoice_except" string="Ignore Exception"/>
-                            <button name="action_quotation_send" string="Send by Mail" type="object" states="draft" class="oe_highlight"/>
-                            <button name="action_quotation_send" string="Send by Mail" type="object" states="sent"/>
-                            <button name="print_quotation" string="Print" type="object" states="draft" class="oe_highlight"/>
-                            <button name="print_quotation" string="Print" type="object" states="sent"/>
-                            <button name="action_button_confirm" states="draft" string="Confirm" type="object"/>
-                            <button name="action_button_confirm" states="sent" string="Confirm" class="oe_highlight" type="object"/>
+                            <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" groups="base.group_user"/>
+                            <button name="invoice_corrected" states="invoice_except" string="Ignore Exception" groups="base.group_user"/>
+                            <button name="action_quotation_send" string="Send by Mail" type="object" states="draft" class="oe_highlight" groups="base.group_user"/>
+                            <button name="action_quotation_send" string="Send by Mail" type="object" states="sent" groups="base.group_user"/>
+                            <button name="print_quotation" string="Print" type="object" states="draft" class="oe_highlight" groups="base.group_user"/>
+                            <button name="print_quotation" string="Print" type="object" states="sent" groups="base.group_user"/>
+                            <button name="action_button_confirm" states="draft" string="Confirm" type="object" groups="base.group_user"/>
+                            <button name="action_button_confirm" states="sent" string="Confirm" class="oe_highlight" type="object" groups="base.group_user"/>
                             <button name="action_view_invoice" string="View Invoice" type="object" class="oe_highlight"
-                              attrs="{'invisible': [('invoice_exists', '=', False)]}"/>
+                              attrs="{'invisible': [('invoice_exists', '=', False)]}" groups="base.group_user"/>
                             <button name="%(action_view_sale_advance_payment_inv)d" string="Create Invoice"
-                                type="action" states="manual" class="oe_highlight"/>
-                            <button name="cancel" states="draft,sent" string="Cancel"/>
-                            <button name="action_cancel" states="manual,progress" string="Cancel" type="object"/>
-                            <button name="invoice_cancel" states="invoice_except" string="Cancel"/>
-                        </span>
+                                type="action" states="manual" class="oe_highlight" groups="base.group_user"/>
+                            <button name="cancel" states="draft,sent" string="Cancel" groups="base.group_user"/>
+                            <button name="action_cancel" states="manual,progress" string="Cancel" type="object" groups="base.group_user"/>
+                            <button name="invoice_cancel" states="invoice_except" string="Cancel" groups="base.group_user"/>
                         <field name="state" widget="statusbar" statusbar_visible="draft,sent,invoiced,done" statusbar_colors='{"invoice_except":"red","waiting_date":"blue"}'/>
                 </header>
                 <sheet>

From c919ff5bc723ab2e439e286194ac35e0c40ba55c Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Fri, 12 Oct 2012 18:46:17 +0530
Subject: [PATCH 31/65] [ADD] set group on button for bounce effect in
 account/account_invoice_view.xml

bzr revid: nco@tinyerp.com-20121012131617-duj0h40tfj0wxi5k
---
 addons/account/account_invoice_view.xml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 8516fcd96ae..9a54a8bf5b6 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -143,13 +143,11 @@
             <field name="arch" type="xml">
                 <form string="Supplier Invoice" version="7.0">
                 <header>
-                    <span groups="base.group_user">
-                        <button name="invoice_open" states="draft,proforma2" string="Validate" class="oe_highlight"/>
-                        <button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid' />
-                        <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
-                        <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
-                        <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
-                    </span>
+                        <button name="invoice_open" states="draft,proforma2" string="Validate" class="oe_highlight" groups="base.group_user"/>
+                        <button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid' groups="base.group_user"/>
+                        <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one,base.group_user"/>
+                        <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" groups="base.group_user"/>
+                        <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice,base.group_user" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                 </header>
                 <sheet string="Supplier Invoice">

From 627a858d3e7347c5eea1d4c77065425742cadbc1 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Fri, 12 Oct 2012 18:51:46 +0530
Subject: [PATCH 32/65] [ADD] set bouce effect by setting group on buttons in
 account/account_invoice_view.xml.

bzr revid: nco@tinyerp.com-20121012132146-tb7taa2cqtzs744n
---
 addons/account/account_invoice_view.xml | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 9a54a8bf5b6..14c05c960f2 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -289,20 +289,18 @@
             <field name="arch" type="xml">
                 <form string="Invoice" version="7.0">
                 <header>
-                    <span groups="base.group_user">
-                        <button name="action_invoice_sent" type="object" string="Send by Email" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}" class="oe_highlight"/>
-                        <button name="invoice_print" string="Print Invoice" type="object" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}" class="oe_highlight"/>
-                        <button name="action_invoice_sent" type="object" string="Send by Email" attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}"/>
-                        <button name="invoice_print" string="Print Invoice" type="object" attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}"/>
-                        <button name="invoice_open" states="draft" string="Validate" class="oe_highlight"/>
-                        <button name="invoice_open" states="proforma2" string="Validate"/>
-                        <button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices"/>
-                        <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='open,proforma2,paid'/>
-                        <button name="invoice_cancel" states="draft,proforma2,open" string="Cancel" groups="base.group_no_one"/>
-                        <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object"/>
-                        <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
+                        <button name="action_invoice_sent" type="object" string="Send by Email" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}" class="oe_highlight" groups="base.group_user"/>
+                        <button name="invoice_print" string="Print Invoice" type="object" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}" class="oe_highlight" groups="base.group_user"/>
+                        <button name="action_invoice_sent" type="object" string="Send by Email" attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}" groups="base.group_user"/>
+                        <button name="invoice_print" string="Print Invoice" type="object" attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}" groups="base.group_user"/>
+                        <button name="invoice_open" states="draft" string="Validate" class="oe_highlight" groups="base.group_user"/>
+                        <button name="invoice_open" states="proforma2" string="Validate" groups="base.group_user"/>
+                        <button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices,base.group_user"/>
+                        <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='open,proforma2,paid' groups="base.group_user"/>
+                        <button name="invoice_cancel" states="draft,proforma2,open" string="Cancel" groups="base.group_no_one,base.group_user"/>
+                        <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" groups="base.group_user"/>
+                        <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice,base.group_user" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
                         <!--button name="%(account_invoices)d" string="Print Invoice" type="action" states="open,paid,proforma,sale,proforma2"/-->
-                    </span>
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                 </header>
                 <sheet string="Invoice">

From 2aa4aa88d02004748d7f4b21187bc3e1233e528c Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Fri, 12 Oct 2012 18:55:03 +0530
Subject: [PATCH 33/65] [ADD] set bouce effect by stting groups on button in
 crm_claim_view.xml.

bzr revid: nco@tinyerp.com-20121012132503-71wv670r91k429m8
---
 addons/crm_claim/crm_claim_view.xml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 9643a56bfe2..4a56604101f 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -102,22 +102,20 @@
             <field name="arch" type="xml">
                 <form string="Claim" version="7.0">
                 <header>
-                    <span groups="base.group_user">
                         <button name="case_open" string="Open" type="object" class="oe_highlight"
-                                states="draft,pending" />
+                                states="draft,pending" groups="base.group_user"/>
                         <button name="case_close" string="Done" type="object" class="oe_highlight"
-                                states="open,pending"/>
+                                states="open,pending" groups="base.group_user"/>
                         <button name="case_refuse" string="Refuse" type="object" class="oe_highlight"
-                                states="draft,open,pending"/>
-                        <button name="stage_previous" string="Previous Stage" type="object"
+                                states="draft,open,pending" groups="base.group_user"/>
+                        <button name="stage_previous" string="Previous Stage" type="object" groups="base.group_user" 
                                 states="open,pending" icon="gtk-go-back" attrs="{'invisible': [('stage_id','=', False)]}"/>
-                        <button name="stage_next" string="Next Stage" type="object"
+                        <button name="stage_next" string="Next Stage" type="object" groups="base.group_user"
                                 states="open,pending" icon="gtk-go-forward" attrs="{'invisible': [('stage_id','=', False)]}"/>
-                        <button name="case_reset" string="Reset to Draft" type="object" 
+                        <button name="case_reset" string="Reset to Draft" type="object" groups="base.group_user"
                                 states="cancel,done"/>
-                        <button name="case_cancel" string="Cancel" type="object" 
+                        <button name="case_cancel" string="Cancel" type="object"  groups="base.group_user"
                                 states="draft,open,pending"/>
-                    </span>
                     <field name="stage_id" widget="statusbar"
                             on_change="onchange_stage_id(stage_id)"/>
                 </header>

From 199db0e73f181e820d4feec21316fd49e97b472d Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Fri, 12 Oct 2012 18:56:23 +0530
Subject: [PATCH 34/65] [ADD] set bouce effect by stting groups on button in
 event/event_view.xml.

bzr revid: nco@tinyerp.com-20121012132623-j4ae12wq3un36xzj
---
 addons/event/event_view.xml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index ecd40e05531..3e0f08d2933 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -100,12 +100,10 @@
             <field name="arch" type="xml">
                 <form string="Events" version="7.0">
                     <header>
-                        <span groups="base.group_user">
-                            <button string="Confirm Event" name="button_confirm" states="draft" type="object" class="oe_highlight"/>
-                            <button string="Event Ended" name="button_done" states="confirm" type="object" class="oe_highlight"/>
-                            <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" />
-                            <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object"/>
-                        </span>
+                            <button string="Confirm Event" name="button_confirm" states="draft" type="object" class="oe_highlight" groups="base.group_user"/>
+                            <button string="Event Ended" name="button_done" states="confirm" type="object" class="oe_highlight" groups="base.group_user"/>
+                            <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" groups="base.group_user"/>
+                            <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" groups="base.group_user"/>
                         <field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
                     </header>
                     <sheet>

From a5317308f1fdadc34d35eeb026d35bb24808fd82 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Fri, 12 Oct 2012 18:57:33 +0530
Subject: [PATCH 35/65] [ADD] set bouce effect by stting groups on button in 
 project/project_view.xml.

bzr revid: nco@tinyerp.com-20121012132733-o0gfo1c33r2kzvs2
---
 addons/project/project_view.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 4c6d3b6ac09..2ed67192723 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -377,7 +377,6 @@
             <field name="arch" type="xml">
                 <form string="Project" version="7.0">
                     <header>
-                        <span groups="base.group_user">
                             <!--
                             <button name="do_open" string="Start Task" type="object"
                                     states="draft,pending" class="oe_highlight"/>
@@ -385,12 +384,11 @@
                                     states="cancel,done"/>
                             -->
                             <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
-                                    states="cancelled,done" context="{'button_reactivate':True}"/>
+                                    states="cancelled,done" context="{'button_reactivate':True}" groups="base.group_user"/>
                             <button name="action_close" string="Done" type="object"
-                                    states="draft,open,pending"/>
+                                    states="draft,open,pending" groups="base.group_user"/>
                             <button name="do_cancel" string="Cancel" type="object"
-                                    states="draft,open,pending"/>
-                        </span>
+                                    states="draft,open,pending" groups="base.group_user"/>
                         <field name="stage_id" widget="statusbar" clickable="True"/>
                     </header>
                     <sheet string="Task">

From 35a32439619f31ee0d0b049cc0813a40372c8e06 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Fri, 12 Oct 2012 18:58:32 +0530
Subject: [PATCH 36/65] [ADD] set bouce effect by stting groups on button in
 project_issue/project_issue_view.xml.

bzr revid: nco@tinyerp.com-20121012132832-xfg4ut4s4axx6jsf
---
 addons/project_issue/project_issue_view.xml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 4cd9e2c19ff..1fb18fbddef 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -95,14 +95,12 @@
             <field name="arch" type="xml">
                 <form string="Issue" version="7.0">
                 <header>
-                    <span groups="base.group_user">
-                        <button name="case_close" string="Done" type="object"
-                                states="open"/>
+                        <button name="case_close" string="Done" type="object" 
+                                states="open" groups="base.group_user"/>
                          <button name="case_close" string="Done" type="object"
-                                states="draft,pending"/>
+                                states="draft,pending" groups="base.group_user"/>
                         <button name="case_cancel" string="Cancel" type="object"
-                                states="draft,open,pending"/>
-                    </span>
+                                states="draft,open,pending" groups="base.group_user"/>
                     <field name="stage_id" widget="statusbar" clickable="True"/>
                 </header>
                 <sheet string="Issue">

From d9acefcc64f82f786ebb2d579c53453b2cd4f6f6 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Fri, 12 Oct 2012 18:59:43 +0530
Subject: [PATCH 37/65] [ADD] set bouce effect by stting groups on button in
 sale/sale_view.xml.

bzr revid: nco@tinyerp.com-20121012132943-rxh97832ahwlunq6
---
 addons/sale/sale_view.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index d6a4a2dee14..6b8a6ec7c78 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -472,11 +472,9 @@
             <field name="arch" type="xml">
                 <form string="Sales Order Lines" version="7.0">
                     <header>
-                        <span groups="base.group_user">
-                            <button name="button_cancel" string="Cancel" type="object" states="confirmed,exception"/>
-                            <button name="%(action_view_sale_order_line_make_invoice)d" string="Create Invoice" type="action" attrs="{'invisible': ['|',('invoiced', '=', 1), ('state', 'not in', ('confirmed', 'draft'))]}" class="oe_highlight"/>
-                            <button name="button_done" string="Done" type="object"  attrs="{'invisible': ['|',('invoiced', '=', 0), ('state', 'not in', ('confirmed', 'exception'))]}" class="oe_highlight"/>
-                        </span>
+                            <button name="button_cancel" string="Cancel" type="object" states="confirmed,exception" groups="base.group_user"/>
+                            <button name="%(action_view_sale_order_line_make_invoice)d" string="Create Invoice" type="action" attrs="{'invisible': ['|',('invoiced', '=', 1), ('state', 'not in', ('confirmed', 'draft'))]}" class="oe_highlight" groups="base.group_user"/>
+                            <button name="button_done" string="Done" type="object"  attrs="{'invisible': ['|',('invoiced', '=', 0), ('state', 'not in', ('confirmed', 'exception'))]}" class="oe_highlight" groups="base.group_user"/>
                         <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
                     </header>
                     <sheet>

From cb78b0386dc5fd3a87c3ad73e52c5c4abcc18c06 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Fri, 12 Oct 2012 19:01:17 +0530
Subject: [PATCH 38/65] [ADD] set bouce effect by stting groups on button in
 stock/stock_view.xml.

bzr revid: nco@tinyerp.com-20121012133117-5kncg7qd2ga4e91n
---
 addons/stock/stock_view.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 329425148c5..377704ea69e 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -747,14 +747,14 @@
                 <form string="Internal Picking List" version="7.0">
                 <header>
                     <span groups="base.group_user">
-                        <button name="draft_force_assign" states="draft" string="Confirm" type="object" class="oe_highlight"/>
-                        <button name="draft_validate" states="draft" string="Confirm &amp; Transfer" type="object" class="oe_highlight"/>
+                        <button name="draft_force_assign" states="draft" string="Confirm" type="object" class="oe_highlight" groups="base.group_user"/>
+                        <button name="draft_validate" states="draft" string="Confirm &amp; Transfer" type="object" class="oe_highlight" groups="base.group_user"/>
                         <!-- <button name="action_assign" states="confirmed" string="Check Availability" type="object"/> -->
-                        <button name="force_assign" states="confirmed" string="Force Availability" type="object" class="oe_highlight"/>
-                        <button name="action_process" states="assigned" string="Confirm &amp; Transfer" groups="stock.group_stock_user" type="object" class="oe_highlight"/>
-                        <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice/Refund"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" class="oe_highlight"/>
-                        <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action"/>
-                        <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel"/>
+                        <button name="force_assign" states="confirmed" string="Force Availability" type="object" class="oe_highlight" groups="base.group_user"/>
+                        <button name="action_process" states="assigned" string="Confirm &amp; Transfer" groups="stock.group_stock_user,base.group_user" type="object" class="oe_highlight"/>
+                        <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice/Refund"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" class="oe_highlight" groups="base.group_user"/>
+                        <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action" groups="base.group_user"/>
+                        <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" groups="base.group_user"/>
                     </span>
                     <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                 </header>

From a7773f3f3a947aac73c0c9b64cd9683b3d324a9a Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Fri, 12 Oct 2012 19:02:31 +0530
Subject: [PATCH 39/65] [ADD] set bouce effect by stting groups on button in
 stock/stock_view.xml.

bzr revid: nco@tinyerp.com-20121012133231-1kujlao4bm1jgvle
---
 addons/stock/stock_view.xml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 377704ea69e..0976efb3c62 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -746,7 +746,6 @@
             <field name="arch" type="xml">
                 <form string="Internal Picking List" version="7.0">
                 <header>
-                    <span groups="base.group_user">
                         <button name="draft_force_assign" states="draft" string="Confirm" type="object" class="oe_highlight" groups="base.group_user"/>
                         <button name="draft_validate" states="draft" string="Confirm &amp; Transfer" type="object" class="oe_highlight" groups="base.group_user"/>
                         <!-- <button name="action_assign" states="confirmed" string="Check Availability" type="object"/> -->
@@ -755,7 +754,6 @@
                         <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice/Refund"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" class="oe_highlight" groups="base.group_user"/>
                         <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action" groups="base.group_user"/>
                         <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" groups="base.group_user"/>
-                    </span>
                     <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                 </header>
                 <sheet>
@@ -1282,11 +1280,9 @@
             <field name="arch" type="xml">
             <form string="Stock Moves" version="7.0">
                 <header>
-                    <span groups="base.group_user">
-                        <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
-                        <button name="action_confirm" states="draft" string="Confirm" type="object"/>
-                        <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"/>
-                    </span>
+                        <button name="force_assign" states="confirmed" string="Force Availability" type="object" groups="base.group_user"/>
+                        <button name="action_confirm" states="draft" string="Confirm" type="object" groups="base.group_user"/>
+                        <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" groups="base.group_user"/>
                         <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done"/>
                 </header>
                 <group>

From 689b19ca1dde2e97143a02cf8d2ddb21467f411b Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Sun, 14 Oct 2012 13:15:10 +0530
Subject: [PATCH 40/65] [FIX]: Change typo whether

bzr revid: atp@tinyerp.com-20121014074510-hs4qtwefs5gpwqw9
---
 addons/product/product_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 6860b6221de..9d690cd4a5c 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -236,7 +236,7 @@
               <p class="oe_view_nocontent_create">
                 Click to define a new product.
               </p><p>
-                You must define a product for everything you sell, wether it's
+                You must define a product for everything you sell, whether it's
                 a physical product, a consumable or a service you offer to
                 customers.
               </p><p>

From b5317c514ce79d80cd6910a29109a1dca25f2660 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Sun, 14 Oct 2012 14:31:33 +0530
Subject: [PATCH 41/65] [REM]: Remove calendar invitaiton view and menu.

bzr revid: atp@tinyerp.com-20121014090133-i50ibni56y7jf3b6
---
 addons/base_calendar/base_calendar_view.xml | 335 --------------------
 addons/crm/__openerp__.py                   |   1 -
 addons/crm/crm_meeting_view.xml             |  12 -
 addons/crm/crm_phonecall_view.xml           |   6 +-
 4 files changed, 3 insertions(+), 351 deletions(-)

diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index d5dc75df873..a9cfa179480 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -1,120 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <!-- Attendee form view -->
-        <record id="base_calendar_attendee_form_view" model="ir.ui.view">
-            <field name="name">calendar.attendee.form</field>
-            <field name="model">calendar.attendee</field>
-            <field name="arch" type="xml">
-                <form string="Invitation details" version="7.0">
-                    <header>
-                        <button name="do_tentative" states="needs-action,declined,accepted" string="Uncertain" type="object" class="oe_highlight"/>
-                        <button name="do_accept" string="Accept" states="needs-action,tentative,declined" type="object" class="oe_highlight"/>
-                        <button name="do_decline" string="Decline" states="needs-action,tentative,accepted" type="object" class="oe_highlight"/>
-                        <field name="state" widget="statusbar"
-                            statusbar_visible="tentative,needs-action,accepted" statusbar_colors='{"proforma":"blue"}'/>
-                    </header>
-                    <sheet>
-
-                        <div class="oe_title">
-                            <label for="email" string="Invitation To" class="oe_edit_only"/>
-                            <h1>
-                                <field name="email" class="oe_inline"/>
-                                (<field name="language" class="oe_inline"/>)
-                            </h1>
-
-                            <h2>
-                                From <field name="event_date" class="oe_inline"/>
-                                to <field name="event_end_date" class="oe_inline"/>
-                            </h2>
-                        </div>
-                        <group>
-                            <group>
-                                <field name="sent_by_uid" string="Invitation From"/>
-                                <field name="user_id" string="Invited User"/>
-                                <field name="partner_id" string="Contact"/>
-                            </group>
-                            <group>
-                                <field name="cutype" string="Invitation Type"/>
-                                <field name="role" string="Role"/>
-                                <field name="rsvp"/>
-                                <field name="ref" readonly="1"/>
-                            </group>
-                        </group>
-                        <group>
-                            <group string="Delegated From">
-                                <field name="parent_ids" readonly="1" nolabel="1"/>
-                            </group>
-                            <group string="Delegated To" >
-                                <field name="child_ids" readonly="1" nolabel="1"/>
-                            </group>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-        <!-- Attendee tree view -->
-        <record id="base_calendar_attendee_tree_view" model="ir.ui.view">
-            <field name="name">calendar.attendee.tree</field>
-            <field name="model">calendar.attendee</field>
-            <field name="arch" type="xml">
-                <tree string="Invitation details">
-                    <field name="sent_by_uid" string="Invitation From"/>
-                    <field name="role" string="My Role"/>
-                    <field name="user_id" invisible="1"/>
-                    <field name="partner_id" invisible="1"/>
-                    <field name="cutype" string="Invitation Type"/>
-                    <field name="state"/>
-                    <field name="rsvp" string="Required to Join"/>
-                </tree>
-            </field>
-        </record>
-
-        <!-- Attendee search view -->
-        <record id="base_calendar_attendee_search_view" model="ir.ui.view">
-            <field name="name">calendar.attendee.search</field>
-            <field name="model">calendar.attendee</field>
-            <field name="arch" type="xml">
-                <search string="Search Invitations">
-                    <field name="email" string="Email"/>
-                    <field name="event_date"/>
-                    <filter icon="terp-gtk-jump-to-ltr" name="toreview" string="To Review" domain="[('state','=', 'needs-action')]" help="Invitations To Review"/>
-                    <filter icon="terp-check" string="Accepted" domain="[('state','=', 'accepted')]" help="Accepted Invitations"/>
-                    <filter icon="terp-dialog-close" string="Declined" domain="[('state','=', 'declined')]" help="Declined Invitations"/>
-                    <filter icon="gtk-sort-descending" string="Delegated" domain="[('state','=', 'delegated')]" help="Delegated Invitations"/>
-                    <field name="user_id" string="Responsible"/>
-                    <field name="cutype" string="Invitation type"/>
-                    <group expand="0" string="Group By...">
-                        <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Contact" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Type" icon="terp-stock_symbol-selection" help="Invitation Type" domain="[]" context="{'group_by':'cutype'}"/>
-                        <filter string="Role" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'role'}"/>
-                        <filter string="Required Reply" icon="terp-mail-replied" domain="[]" context="{'group_by':'rsvp'}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" help="Invitation Type"
-                            domain="[]" context="{'group_by':'state'}"/>
-                    </group>
-               </search>
-            </field>
-        </record>
-        <record id="action_view_attendee_form" model="ir.actions.act_window">
-             <field name="name">Event Invitations</field>
-             <field name="type">ir.actions.act_window</field>
-             <field name="res_model">calendar.attendee</field>
-             <field name="view_type">form</field>
-             <field name="view_mode">tree,form</field>
-             <field name="view_id" ref="base_calendar.base_calendar_attendee_tree_view"/>
-             <field name="context">{'default_sent_by_uid': uid}</field>
-         </record>
 
         <!-- Calendar's menu -->
         <menuitem id="base.menu_calendar_configuration" name="Calendar"
             parent="base.menu_base_config" sequence="50" groups="base.group_no_one"/>
 
-        <!-- Invitation menu -->
-         <menuitem id="menu_attendee_invitations"
-            parent="base.menu_calendar_configuration"
-            sequence="10" action="action_view_attendee_form"/>
 
         <!-- Alarm form view -->
         <record id="res_alarm_form_view" model="ir.ui.view">
@@ -171,231 +62,5 @@
             action="base_calendar.action_res_alarm_view"
             parent="base.menu_calendar_configuration" sequence="5"/>
 
-        <!-- Event form view -->
-        <record model="ir.ui.view" id="event_form_view">
-            <field name="name">Event Form</field>
-            <field name="model">calendar.event</field>
-            <field name="arch" type="xml">
-                <form string="Events" version="7.0">
-                <header>
-                    <button name="do_confirm" string="Confirm" states="tentative,cancelled" type="object" class="oe_highlight"/>
-                    <button name="do_tentative" states="confirmed,cancelled" string="Uncertain" type="object" class="oe_highlight"/>
-                    <button name="do_cancel" string="Cancel" states="tentative,confirmed" type="object"/>
-                    <field name="state" widget="statusbar"
-                        statusbar_visible="tentative,confirmed" statusbar_colors='{"proforma":"blue"}'/>
-                </header>
-                <sheet>
-                    <group col="6">
-                        <field name="name" string="Summary"
-                            colspan="4" required="1"/>
-                        <field name="allday" colspan="2" on_change="onchange_dates(date,False,False,allday)"/>
-                        <newline/>
-                        <field name="date" string="Start Date" required="1"
-                            on_change="onchange_dates(date,duration,False,allday)"/>
-                        <field name="duration" widget="float_time"
-                            on_change="onchange_dates(date,duration,False,allday)" attrs="{'invisible': [('allday', '=', True)]}"/>
-                        <field name="date_deadline" string="End Date" required="1"
-                            on_change="onchange_dates(date,False,date_deadline)"/>
-                        <field name="location"/>
-                        <field name="alarm_id" string="Reminder"
-                            widget="selection"/>
-                        <group colspan="2" col="4" attrs="{'readonly': [('state','=','done')]}">
-                           <field name="recurrency"/>
-                        </group>
-                    </group>
-                    <notebook>
-                    <page string="Event">
-                        <group col="6" colspan="4">
-                             <separator colspan="6" string="Visibility"/>
-                             <field name="user_id" string="Responsible User"/>
-                             <field name="show_as" string="Show Time as"/>
-                             <field name="class" string="Privacy"/>
-                             <field name="recurrent_id" invisible="1"/>
-                             <field name="recurrent_uid" invisible="1"/>
-                        </group>
-                        <separator string="Description"/>
-                        <field name="description"/>
-                    </page>
-                    <page string="Invitation Detail">
-                        <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"/>
-                                <field name="role" width="200"/>
-                                <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"/>
-                            </tree>
-                            <form string="Invitation details" version="7.0">
-                                <notebook colspan="4">
-                                    <page string="Details">
-                                        <group col="4">
-                                            <field name="email"/>
-                                            <field name="rsvp"/>
-                                            <field name="cutype"/>
-                                            <field name="role"/>
-                                        </group>
-                                        <group col="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"/>
-                                        </group>
-                                    </page>
-                                    </notebook>
-                                </form>
-                            </field>
-                        </page>
-                    <page string="Recurrency Option" attrs="{'invisible': [('recurrency','=',False)]}">
-                        <group col="4" colspan="4" name="rrule">
-                            <group col="4" colspan="4">
-                                <field name="rrule_type" string="Recurrency period"
-                                   attrs="{'readonly':[('recurrent_uid','!=',False)]}"/>
-                                <field name="interval"/>
-                                <separator string="End of Recurrence" colspan="4"/>
-                                <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')] }"/>
-                                <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'), ('rrule_type','!=','monthly')]}"/>
-                                </group>
-                                <group col="3" colspan="1"
-                                    attrs="{'invisible' : ['|', ('select1','=','date'), ('rrule_type','!=','monthly')]}">
-                                    <field name="byday" string="The"
-                                        attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')]}"/>
-                                    <field name="week_list" nolabel="1"
-                                        attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')]}"/>
-                                </group>
-                            </group>
-                        </group>
-
-                    </page>
-                    </notebook>
-                </sheet>
-                </form>
-            </field>
-        </record>
-
-        <!-- Event list view -->
-        <record model="ir.ui.view" id="event_tree_view">
-            <field name="name">Event Tree</field>
-            <field name="model">calendar.event</field>
-            <field name="arch" type="xml">
-                <tree string="Events">
-                    <field name="name" string="Subject"/>
-                    <field name="date" string="Event Date"/>
-                    <field name="location"/>
-                    <field name="show_as"/>
-                    <field name="class" string="Privacy"/>
-                    <field name="user_id" invisible="1"/>
-                    <field name="state" invisible="1"/>
-                </tree>
-            </field>
-        </record>
-
-        <!-- Event calendar view -->
-        <record model="ir.ui.view" id="event_calendar_view">
-            <field name="name">Events Calendar</field>
-            <field name="model">calendar.event</field>
-            <field name="priority" eval="2"/>
-            <field name="arch" type="xml">
-                <calendar string="Events" date_start="date" color="show_as" date_delay="duration">
-                    <field name="name"/>
-                    <field name="class"/>
-                    <field name="show_as"/>
-                </calendar>
-            </field>
-        </record>
-
-        <!-- Event search view -->
-        <record id="view_calendar_event_filter" model="ir.ui.view">
-            <field name="name">Calendar Events Search</field>
-            <field name="model">calendar.event</field>
-            <field name="arch" type="xml">
-                <search string="Search Events">
-                    <field name="name" filter_domain="['|',('name','ilike',self),('location','ilike',self)]" string="Event"/>
-                    <field name="show_as"/>
-                    <field name="class" string="Privacy"/>
-                    <filter icon="terp-go-today" string="My Events" domain="[('user_id','=',uid)]" help="My Events"/>
-                    <separator/>
-                    <filter icon="terp-check" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Events"/>
-                    <field name="user_id"/>
-                    <group expand="0" string="Group By...">
-                        <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Availability" icon="terp-camera_test" domain="[]" context="{'group_by':'show_as'}"/>
-                        <filter string="Privacy" icon="terp-locked" domain="[]" context="{'group_by':'class'}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-
-        <!-- Event action -->
-        <record id="action_view_event" model="ir.actions.act_window">
-                <field name="name">Events</field>
-                <field name="type">ir.actions.act_window</field>
-                <field name="res_model">calendar.event</field>
-                <field name="view_type">form</field>
-                <field name="view_mode">calendar,tree,form</field>
-                <field name="search_view_id" ref="view_calendar_event_filter"/>
-            </record>
-
-        <!-- Event menu -->
-        <menuitem id="menu_events"
-                name="Events" parent="base.menu_calendar_configuration"
-                sequence="15" action="action_view_event"/>
-
      </data>
  </openerp>
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index dd36aa19041..caa21ad2d9c 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -85,7 +85,6 @@ Dashboard for CRM will include:
         'crm_lead_view.xml',
         'crm_lead_menu.xml',
 
-        'crm_meeting_view.xml',
         'crm_meeting_menu.xml',
         'crm_meeting_shortcut_data.xml',
 
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 068f7cfbf64..14710cf8f37 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -2,17 +2,5 @@
 <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>
-            <field name="inherit_id" ref="base_calendar.base_calendar_attendee_form_view"/>
-            <field name="arch" type="xml">
-                <field name="ref" position="after">
-                    <field name="categ_id" string="Event Type"/>
-                </field>
-            </field>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 16f7eab65d3..e70d67a55dd 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -70,14 +70,14 @@
                 <field name="date"/>
                 <field name="name"/>
                 <field name="partner_id"/>
+                <button string="Meeting"
+                    states="open,pending" icon="gtk-redo"
+                     name="action_make_meeting" type="object"/>
                 <button string="Convert to Opportunity"
                     name="%(phonecall2opportunity_act)d"
                     states="open,pending"
                     icon="gtk-index"
                     type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}"/>
-                <button string="Meeting"
-                    states="open,pending" icon="gtk-redo"
-                     name="action_make_meeting" type="object"/>
                 <field name="partner_phone"/>
                 <field name="user_id"/>
                 <field name="categ_id" invisible="1"/>

From eb1aca64ed214e97915c398d83c080a074e29b96 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 15 Oct 2012 10:42:37 +0530
Subject: [PATCH 42/65] [FIX]: Add event view TO FIX YAML error

bzr revid: atp@tinyerp.com-20121015051237-sl5toatsg71nfzaw
---
 addons/base_calendar/base_calendar_view.xml | 226 ++++++++++++++++++++
 1 file changed, 226 insertions(+)

diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 742ac7d8806..72f3e1dee83 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -61,6 +61,232 @@
             groups="base.group_no_one"
             action="base_calendar.action_res_alarm_view"
             parent="base.menu_calendar_configuration" sequence="5"/>
+            
+        <!-- Event form view -->
+        <record model="ir.ui.view" id="event_form_view">
+            <field name="name">Event Form</field>
+            <field name="model">calendar.event</field>
+            <field name="arch" type="xml">
+                <form string="Events" version="7.0">
+                <header>
+                    <button name="do_confirm" string="Confirm" states="tentative,cancelled" type="object" class="oe_highlight"/>
+                    <button name="do_tentative" states="confirmed,cancelled" string="Uncertain" type="object" class="oe_highlight"/>
+                    <button name="do_cancel" string="Cancel" states="tentative,confirmed" type="object"/>
+                    <field name="state" widget="statusbar"
+                        statusbar_visible="tentative,confirmed" statusbar_colors='{"proforma":"blue"}'/>
+                </header>
+                <sheet>
+                    <group col="6">
+                        <field name="name" string="Summary"
+                            colspan="4" required="1"/>
+                        <field name="allday" colspan="2" on_change="onchange_dates(date,False,False,allday)"/>
+                        <newline/>
+                        <field name="date" string="Start Date" required="1"
+                            on_change="onchange_dates(date,duration,False,allday)"/>
+                        <field name="duration" widget="float_time"
+                            on_change="onchange_dates(date,duration,False,allday)" attrs="{'invisible': [('allday', '=', True)]}"/>
+                        <field name="date_deadline" string="End Date" required="1"
+                            on_change="onchange_dates(date,False,date_deadline)"/>
+                        <field name="location"/>
+                        <field name="alarm_id" string="Reminder"
+                            widget="selection"/>
+                        <group colspan="2" col="4" attrs="{'readonly': [('state','=','done')]}">
+                           <field name="recurrency"/>
+                        </group>
+                    </group>
+                    <notebook>
+                    <page string="Event">
+                        <group col="6" colspan="4">
+                             <separator colspan="6" string="Visibility"/>
+                             <field name="user_id" string="Responsible User"/>
+                             <field name="show_as" string="Show Time as"/>
+                             <field name="class" string="Privacy"/>
+                             <field name="recurrent_id" invisible="1"/>
+                             <field name="recurrent_uid" invisible="1"/>
+                        </group>
+                        <separator string="Description"/>
+                        <field name="description"/>
+                    </page>
+                    <page string="Invitation Detail">
+                        <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"/>
+                                <field name="role" width="200"/>
+                                <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"/>
+                            </tree>
+                            <form string="Invitation details" version="7.0">
+                                <notebook colspan="4">
+                                    <page string="Details">
+                                        <group col="4">
+                                            <field name="email"/>
+                                            <field name="rsvp"/>
+                                            <field name="cutype"/>
+                                            <field name="role"/>
+                                        </group>
+                                        <group col="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"/>
+                                        </group>
+                                    </page>
+                                    </notebook>
+                                </form>
+                            </field>
+                        </page>
+                    <page string="Recurrency Option" attrs="{'invisible': [('recurrency','=',False)]}">
+                        <group col="4" colspan="4" name="rrule">
+                            <group col="4" colspan="4">
+                                <field name="rrule_type" string="Recurrency period"
+                                   attrs="{'readonly':[('recurrent_uid','!=',False)]}"/>
+                                <field name="interval"/>
+                                <separator string="End of Recurrence" colspan="4"/>
+                                <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')] }"/>
+                                <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'), ('rrule_type','!=','monthly')]}"/>
+                                </group>
+                                <group col="3" colspan="1"
+                                    attrs="{'invisible' : ['|', ('select1','=','date'), ('rrule_type','!=','monthly')]}">
+                                    <field name="byday" string="The"
+                                        attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')]}"/>
+                                    <field name="week_list" nolabel="1"
+                                        attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')]}"/>
+                                </group>
+                            </group>
+                        </group>
+
+                    </page>
+                    </notebook>
+                </sheet>
+                </form>
+            </field>
+        </record>
+
+        <!-- Event list view -->
+        <record model="ir.ui.view" id="event_tree_view">
+            <field name="name">Event Tree</field>
+            <field name="model">calendar.event</field>
+            <field name="arch" type="xml">
+                <tree string="Events">
+                    <field name="name" string="Subject"/>
+                    <field name="date" string="Event Date"/>
+                    <field name="location"/>
+                    <field name="show_as"/>
+                    <field name="class" string="Privacy"/>
+                    <field name="user_id" invisible="1"/>
+                    <field name="state" invisible="1"/>
+                </tree>
+            </field>
+        </record>
+
+        <!-- Event calendar view -->
+        <record model="ir.ui.view" id="event_calendar_view">
+            <field name="name">Events Calendar</field>
+            <field name="model">calendar.event</field>
+            <field name="priority" eval="2"/>
+            <field name="arch" type="xml">
+                <calendar string="Events" date_start="date" color="show_as" date_delay="duration">
+                    <field name="name"/>
+                    <field name="class"/>
+                    <field name="show_as"/>
+                </calendar>
+            </field>
+        </record>
+
+        <!-- Event search view -->
+        <record id="view_calendar_event_filter" model="ir.ui.view">
+            <field name="name">Calendar Events Search</field>
+            <field name="model">calendar.event</field>
+            <field name="arch" type="xml">
+                <search string="Search Events">
+                    <field name="name" filter_domain="['|',('name','ilike',self),('location','ilike',self)]" string="Event"/>
+                    <field name="show_as"/>
+                    <field name="class" string="Privacy"/>
+                    <filter icon="terp-go-today" string="My Events" domain="[('user_id','=',uid)]" help="My Events"/>
+                    <separator/>
+                    <filter icon="terp-check" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Events"/>
+                    <field name="user_id"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Availability" icon="terp-camera_test" domain="[]" context="{'group_by':'show_as'}"/>
+                        <filter string="Privacy" icon="terp-locked" domain="[]" context="{'group_by':'class'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+
+        <!-- Event action -->
+        <record id="action_view_event" model="ir.actions.act_window">
+                <field name="name">Events</field>
+                <field name="type">ir.actions.act_window</field>
+                <field name="res_model">calendar.event</field>
+                <field name="view_type">form</field>
+                <field name="view_mode">calendar,tree,form</field>
+                <field name="search_view_id" ref="view_calendar_event_filter"/>
+            </record>
+
+        <!-- Event menu -->
+        <menuitem id="menu_events"
+                name="Events" parent="base.menu_calendar_configuration"
+                sequence="15" action="action_view_event"/>
 
      </data>
  </openerp>

From 7ca9a1294a30c3691478ca0c1b68111df406810c Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Mon, 15 Oct 2012 12:50:14 +0530
Subject: [PATCH 43/65] [IMP]project_timesheet:implemented method for setting
 default values.

bzr revid: kbh@tinyerp.com-20121015072014-st4aavfgw4pve3ad
---
 addons/project_timesheet/project_timesheet.py | 53 ++++++++-----------
 1 file changed, 21 insertions(+), 32 deletions(-)

diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 724944d9994..bc3e764491c 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -272,6 +272,27 @@ res_partner()
 class account_analytic_line(osv.osv):
    _inherit = "account.analytic.line"
 
+   def _default_account_id(self, cr, uid, context=None):
+        proxy = self.pool.get('account.analytic.account')
+        record_ids = proxy.search(cr, uid, [('user_id', '=', uid)], context=context)
+        employee = proxy.browse(cr, uid, record_ids[0], context=context)
+        if employee:
+            return employee.id
+        return False
+
+   def _default_product(self, cr, uid, context=None):
+        proxy = self.pool.get('hr.employee')
+        record_ids = proxy.search(cr, uid, [('user_id', '=', uid)], context=context)
+        employee = proxy.browse(cr, uid, record_ids[0], context=context)
+        if employee.product_id:
+            return employee.product_id.id
+        return False
+
+   _defaults = {
+        'product_id': _default_product,
+        'account_id': _default_account_id
+        }
+
    def on_change_account_id(self, cr, uid, ids, account_id):
        res = {}
        if not account_id:
@@ -284,38 +305,6 @@ class account_analytic_line(osv.osv):
            raise osv.except_osv(_('Invalid Analytic Account !'), _('You cannot select a Analytic Account which is in Close or Cancelled state.'))
        return res
 
-   def _default_product(self, cr, uid, context=None):
-        proxy = self.pool.get('hr.employee')
-        record_ids = proxy.search(cr, uid, [('user_id', '=', uid)], context=context)
-        print "record_ids",record_ids
-        employee = proxy.browse(cr, uid, record_ids[0], context=context)
-        if employee.product_id:
-            return employee.product_id.id
-        return False
-
-   def _default_product_uom(self, cr, uid, context=None):
-        proxy = self.pool.get('hr.employee')
-        record_ids = proxy.search(cr, uid, [('user_id', '=', uid)], context=context)
-        print "record_ids",record_ids
-        employee = proxy.browse(cr, uid, record_ids[0], context=context)
-        if employee.product_id and employee.product_id.uom_id:
-            return employee.product_id.uom_id.id
-        return False
-
-   def _default_invoice(self, cr, uid, context=None):
-        proxy = self.pool.get('hr_timesheet_invoice.factor')
-        record_ids = proxy.search(cr, uid, [('customer_name', '=', '100%')], context=context)
-        invoice = proxy.browse(cr, uid, record_ids[0], context=context)
-        if invoice:
-            return invoice.id
-        return False
-
-   _defaults = {
-        'product_id': _default_product,
-        'product_uom_id': _default_product_uom,
-        'to_invoice': _default_invoice
-        }
-
 account_analytic_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From a35b5a7f02c0aa4a81e3ee9001ff89dada91fd7b Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Mon, 15 Oct 2012 15:10:57 +0530
Subject: [PATCH 44/65] [ADD]added on_change on field

bzr revid: kbh@tinyerp.com-20121015094057-n4l3xei6o417dh1o
---
 addons/account/project/project_view.xml             | 2 +-
 addons/project_timesheet/project_timesheet_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 70db95425b1..3d2b300f009 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -141,7 +141,7 @@
                             </div>
                         </group>
                         <group string="Product Information">
-                            <field name="product_id"/>
+                            <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)"/>
                             <label for="unit_amount"/>
                             <div>
                                 <field name="unit_amount" class="oe_inline"/>
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index c7d6ab15ab4..a4e2a38a3cc 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -71,7 +71,7 @@
             <field name="inherit_id" ref="account.view_account_analytic_line_tree"/>
             <field name="arch" type="xml">
                 <field name="account_id"  position="replace">
-                    <field name="account_id" string="Analytic account/project"/>
+                    <field name="account_id" string="Analytic account/project" on_change="on_change_account_id(account_id)"/>
                 </field>
             </field>
         </record>

From df6a4055d3f8e8cf47ba28446f36850a5624189c Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Mon, 15 Oct 2012 15:39:44 +0530
Subject: [PATCH 45/65] [FIX]Link to doc dessappear on process view

lp bug: https://launchpad.net/bugs/1062904 fixed

bzr revid: vja@tinyerp.com-20121015100944-w8wo8wti6our5wye
---
 addons/process/static/src/js/process.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/process/static/src/js/process.js b/addons/process/static/src/js/process.js
index c214dbb0fdf..c2ec4486507 100644
--- a/addons/process/static/src/js/process.js
+++ b/addons/process/static/src/js/process.js
@@ -176,6 +176,12 @@ instance.web.ViewManager.include({
                 var notes = new_notes.substring(0,60) +'..';
             }
             r.text(nodes.x+60, nodes.y+30, (notes || new_notes)).attr({"title":nodes.notes,"cursor": "default"});
+            var DOC_URL = "http://doc.openerp.com/v6.1/index.php";
+            r['image']('/web/static/src/img/icons/gtk-info.png', nodes.x, nodes.y+75, 16, 16)
+              .attr({"cursor": "pointer", "title": "Help"})
+              .click(function() {
+                   window.open(nodes.url || DOC_URL + "?model=" + nodes.model);
+              });
             if(nodes.menu) {
                  r['image']('/web/static/src/img/icons/gtk-jump-to.png', nodes.x+100, nodes.y+75, 16, 16)
                     .attr({"cursor": "pointer", "title": nodes.menu.name})

From b34aad01eb6e30479d250e7bf53ee90d3f79854d Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Mon, 15 Oct 2012 15:40:49 +0530
Subject: [PATCH 46/65] [FIX]project_timesheet:if condition for record

bzr revid: kbh@tinyerp.com-20121015101049-vj69950ccpmvwa24
---
 addons/project_timesheet/project_timesheet.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index bc3e764491c..55a4d036e5a 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -275,17 +275,19 @@ class account_analytic_line(osv.osv):
    def _default_account_id(self, cr, uid, context=None):
         proxy = self.pool.get('account.analytic.account')
         record_ids = proxy.search(cr, uid, [('user_id', '=', uid)], context=context)
-        employee = proxy.browse(cr, uid, record_ids[0], context=context)
-        if employee:
-            return employee.id
+        if record_ids:
+            employee = proxy.browse(cr, uid, record_ids[0], context=context)
+            if employee:
+                return employee.id
         return False
 
    def _default_product(self, cr, uid, context=None):
         proxy = self.pool.get('hr.employee')
         record_ids = proxy.search(cr, uid, [('user_id', '=', uid)], context=context)
-        employee = proxy.browse(cr, uid, record_ids[0], context=context)
-        if employee.product_id:
-            return employee.product_id.id
+        if record_ids:
+            employee = proxy.browse(cr, uid, record_ids[0], context=context)
+            if employee.product_id:
+                return employee.product_id.id
         return False
 
    _defaults = {

From 04c6f1bba297cb1b44e4f151dfab0f64b5551d3c Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 15 Oct 2012 16:35:21 +0530
Subject: [PATCH 47/65] [FIX]: Add oe_left to remove white space in interview
 request problem

bzr revid: atp@tinyerp.com-20121015110521-8o4dzipa0d34lyqu
---
 addons/hr_evaluation/hr_evaluation_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index fb9d287ea77..7164e7d9415 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -283,7 +283,7 @@
                 <form string="Interview Appraisal" version="7.0">
                     <header>
                         <button string="Cancel" name="survey_req_cancel" type="object"
-                            states="draft,waiting_answer"/>
+                            states="draft,waiting_answer" class="oe_left"/>
                         <button string="Print Survey" name="action_print_survey"  type="object"
                             states="draft" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}"
                             attrs="{'readonly':[('survey_id','=',False)]}" class="oe_highlight"/>

From c76e6341a1e63e0c48ecf51b0b81e76b755201a2 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 15 Oct 2012 18:41:45 +0530
Subject: [PATCH 48/65] [FIX]: Set higher priority to hr expense product tree
 view

bzr revid: atp@tinyerp.com-20121015131145-qkyowlkl2uu4d3p5
---
 addons/hr_expense/hr_expense_installer_view.xml | 2 +-
 addons/hr_expense/hr_expense_view.xml           | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/hr_expense/hr_expense_installer_view.xml b/addons/hr_expense/hr_expense_installer_view.xml
index 03a461a84c5..bc17e9d2cbe 100644
--- a/addons/hr_expense/hr_expense_installer_view.xml
+++ b/addons/hr_expense/hr_expense_installer_view.xml
@@ -10,7 +10,7 @@
         <record id="product_expense_installer_tree_view" model="ir.ui.view">
             <field name="name">product.product.tree</field>
             <field name="model">product.product</field>
-            <field eval="7" name="priority"/>
+            <field eval="8" name="priority"/>
             <field name="arch" type="xml">
                 <tree editable="bottom" string="Products">
                     <field name="name"/>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index df28a5a4342..76393d9e030 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -194,7 +194,6 @@
         <record id="view_product_hr_expense_form" model="ir.ui.view">
             <field name="name">product.product.expense.form</field>
             <field name="model">product.product</field>
-            <field eval="8" name="priority"/>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <div name="options" position="inside">

From ad60fcc961b654d55bb1e3f52db1d9cf4833a2ad Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Tue, 16 Oct 2012 14:23:22 +0530
Subject: [PATCH 49/65] [FIX]project:exchange fields in view

bzr revid: kbh@tinyerp.com-20121016085322-tylf2rfppejtjupi
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index b9579c08681..fb575b02365 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -418,8 +418,8 @@
                                 <tree string="Task Work" editable="top">
                                     <field name="name"/>
                                     <field name="date"/>
-                                    <field name="user_id"/>
                                     <field name="hours" widget="float_time" sum="Spent Hours"/>
+                                    <field name="user_id"/>
                                 </tree>
                             </field>
                             <group>

From 0cc4712a2ec5e289e2121341fdc8d37286fc3e7f Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Tue, 16 Oct 2012 14:45:51 +0530
Subject: [PATCH 50/65] [FIX]project:exchange time spent field in view

bzr revid: kbh@tinyerp.com-20121016091551-p0rtdw071uasg3qm
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index fb575b02365..f6280f43e53 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -417,8 +417,8 @@
                             <field name="work_ids" groups="project.group_tasks_work_on_tasks">
                                 <tree string="Task Work" editable="top">
                                     <field name="name"/>
-                                    <field name="date"/>
                                     <field name="hours" widget="float_time" sum="Spent Hours"/>
+                                    <field name="date"/>
                                     <field name="user_id"/>
                                 </tree>
                             </field>

From f78b41c2ba4d26a89082e82e5585de548dcca4b5 Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Wed, 17 Oct 2012 18:30:47 +0530
Subject: [PATCH 51/65] [IMP] Right click on header logo open dialog box to
 resize logo.

bzr revid: bth@tinyerp.com-20121017130047-xw1j2jw9eje8wn8p
---
 addons/web/static/src/js/chrome.js | 10 +++++++++-
 addons/web/static/src/xml/base.xml | 19 +++++++++++++++++--
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 67e36678040..bfcb7639a26 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -983,7 +983,15 @@ instance.web.WebClient = instance.web.Client.extend({
     start: function() {
         var self = this;
         return $.when(this._super()).pipe(function() {
-            self.$el.on('click', '.oe_logo', function() {
+            self.$el.on('contextmenu','.oe_logo',function(e) {
+                instance.web.dialog($(QWeb.render('Resolution')),{
+                    title: "OpenERP Resolution" });
+                    $('.resolution a').click(function() {
+                        self.$el.find('.oe_logo').css('width', $(this).text()+"px");
+                        self.$el.find('.oe_logo img').css('width', $(this).text()+"px");
+                    })
+            })
+            self.$el.on('click', '.oe_logo', function(e) {
                 self.action_manager.do_action('home');
             });
             if (jQuery.param !== undefined && jQuery.deparam(jQuery.param.querystring()).kitten !== undefined) {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index a09897862f6..956d5164729 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -10,6 +10,21 @@
         Loading...
     </div>
 </t>
+<t t-name="Resolution">
+<div class="resolution">
+    <label style="font-size:20px;font-weight:bold;">Resolution:</label>
+    <table width="100%" >
+        <tr>
+            <td valign="middle"><a class="whiteres"  href="#">100</a>px</td>
+            <td valign="middle"><a class="whiteres"  href="#" >200</a>px</td>
+        </tr>
+        <tr>
+            <td valign="middle"><a class="whiteres"  href="#">250</a>px</td>
+            <td valign="middle"><a class="whiteres"  href="#" >300</a>px</td>
+        </tr>
+    </table>
+</div>
+</t>
 <t t-name="Notification">
     <div class="oe_notification" t-translation="off">
         <div id="oe_notification_default">
@@ -404,7 +419,7 @@
         </tr>
         <tr>
             <td class="oe_leftbar" valign="top">
-                <a class="oe_logo" href="#"><img t-att-src='_s + "/web/static/src/img/logo.png"'/></a>
+                <a class="oe_logo" href="#"><img onContextMenu="return false;" t-att-src='_s + "/web/static/src/img/logo.png"'/></a>
                 <div class="oe_secondary_menus_container"/>
                 <div class="oe_footer">
                     Powered by <a href="http://www.openerp.com" target="_blank"><span>OpenERP</span></a>
@@ -1090,7 +1105,7 @@
         <div class="oe_form_field_image_controls oe_edit_only">
             <t t-call="HiddenInputFile">
                 <t t-set="fileupload_id" t-value="widget.fileupload_id"/>
-                Edit 
+                Edit
             </t>
             <div class="oe_form_binary_progress" style="display: none">
                 <img t-att-src='_s + "/web/static/src/img/throbber.gif"' width="16" height="16"/>

From 40e1cbda37f2821cc6479d7bae46ccd39b07edaf Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Wed, 17 Oct 2012 18:55:33 +0530
Subject: [PATCH 52/65] [IMP] Improve code.

bzr revid: bth@tinyerp.com-20121017132533-s4wxx3vvn1g3tdaf
---
 addons/web/static/src/css/base.css |  7 +++++++
 addons/web/static/src/js/chrome.js | 12 +++++++----
 addons/web/static/src/xml/base.xml | 32 ++++++++++++++++++------------
 3 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index c8f1567bee9..9b7524363fa 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2913,3 +2913,10 @@ div.ui-widget-overlay {
   -webkit-border-radius: 3px;
   border-radius: 3px;
 }
+.resolution table {
+    width: 100%;
+    line-height: 20px;
+}
+.resolution table td {
+    valign: middle;
+}
\ No newline at end of file
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index bfcb7639a26..ce871af68c3 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -986,10 +986,14 @@ instance.web.WebClient = instance.web.Client.extend({
             self.$el.on('contextmenu','.oe_logo',function(e) {
                 instance.web.dialog($(QWeb.render('Resolution')),{
                     title: "OpenERP Resolution" });
-                    $('.resolution a').click(function() {
-                        self.$el.find('.oe_logo').css('width', $(this).text()+"px");
-                        self.$el.find('.oe_logo img').css('width', $(this).text()+"px");
-                    })
+                $('.resolution a').click(function() {
+                    if ($(this).text() == "Original") {
+                        self.$el.find('.oe_logo').css('width', "220px");
+                        self.$el.find('.oe_logo img').css('width', "157px");
+                    }
+                    self.$el.find('.oe_logo').css('width', $(this).text()+"px");
+                    self.$el.find('.oe_logo img').css('width', $(this).text()+"px");
+                })
             })
             self.$el.on('click', '.oe_logo', function(e) {
                 self.action_manager.do_action('home');
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 956d5164729..90dc55cb29a 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -11,19 +11,25 @@
     </div>
 </t>
 <t t-name="Resolution">
-<div class="resolution">
-    <label style="font-size:20px;font-weight:bold;">Resolution:</label>
-    <table width="100%" >
-        <tr>
-            <td valign="middle"><a class="whiteres"  href="#">100</a>px</td>
-            <td valign="middle"><a class="whiteres"  href="#" >200</a>px</td>
-        </tr>
-        <tr>
-            <td valign="middle"><a class="whiteres"  href="#">250</a>px</td>
-            <td valign="middle"><a class="whiteres"  href="#" >300</a>px</td>
-        </tr>
-    </table>
-</div>
+    <div class="resolution">
+        <table>
+            <tr>
+                <td colspan="2"><label>Resolution:</label></td>
+            </tr>
+            <tr>
+                <td><a>100</a>px</td>
+                <td><a>200</a>px</td>
+            </tr>
+            <tr>
+                <td><a>250</a>px</td>
+                <td><a>300</a>px</td>
+            </tr>
+            <tr>
+                <td></td>
+                <td style="float:right;"><a>Original</a></td>
+            </tr>
+        </table>
+    </div>
 </t>
 <t t-name="Notification">
     <div class="oe_notification" t-translation="off">

From 988cb0df1a0a1bdc8666a30d3a47209c6b805f1c Mon Sep 17 00:00:00 2001
From: "Jalpesh Patel (OpenERP)" <pja@tinyerp.com>
Date: Thu, 18 Oct 2012 12:40:57 +0530
Subject: [PATCH 53/65] [IMP] onchange_product_id method code

bzr revid: pja@tinyerp.com-20121018071057-y6zzeth9b1b6unxx
---
 addons/purchase/purchase.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index d93aa823b3e..db6ed8b80be 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -875,12 +875,7 @@ class purchase_order_line(osv.osv):
         """
         if context is None:
             context = {}
-        
-        # - check for the presence of partner_id and pricelist_id
-        if not partner_id:
-            raise osv.except_osv(_('No Partner!'), _('Select a partner in purchase order to choose a product.'))
-        if not pricelist_id:
-            raise osv.except_osv(_('No Pricelist !'), _('Select a price list for a supplier in the purchase form to choose a product.'))
+
         res = {'value': {'price_unit': price_unit or 0.0, 'name': name or '', 'product_uom' : uom_id or False}}
         if not product_id:
             return res
@@ -893,7 +888,11 @@ class purchase_order_line(osv.osv):
         account_fiscal_position = self.pool.get('account.fiscal.position')
         account_tax = self.pool.get('account.tax')
 
-        
+        # - check for the presence of partner_id and pricelist_id
+        if not pricelist_id:
+            raise osv.except_osv(_('No Pricelist !'), _('Select a price list for a supplier in the purchase form to choose a product.'))
+        if not partner_id:
+            raise osv.except_osv(_('No Partner!'), _('Select a partner in purchase order to choose a product.'))
 
         # - determine name and notes based on product in partner lang.
         lang = res_partner.browse(cr, uid, partner_id).lang

From 24257069e6cc73211eb573df32409d53c73cb8e1 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 18 Oct 2012 12:45:37 +0530
Subject: [PATCH 54/65] [REM]: Remove partner_view for parent_id and remove
 hr_expense product inherited view.

bzr revid: atp@tinyerp.com-20121018071537-92qq6lfuo14y7j8e
---
 .../hr_expense/hr_expense_installer_view.xml  | 28 -------------------
 addons/sale/res_partner_view.xml              | 12 --------
 2 files changed, 40 deletions(-)

diff --git a/addons/hr_expense/hr_expense_installer_view.xml b/addons/hr_expense/hr_expense_installer_view.xml
index bc17e9d2cbe..94f15a58940 100644
--- a/addons/hr_expense/hr_expense_installer_view.xml
+++ b/addons/hr_expense/hr_expense_installer_view.xml
@@ -6,32 +6,4 @@
           <field name="state">open</field>
       </record>
   </data>
-  <data>
-        <record id="product_expense_installer_tree_view" model="ir.ui.view">
-            <field name="name">product.product.tree</field>
-            <field name="model">product.product</field>
-            <field eval="8" name="priority"/>
-            <field name="arch" type="xml">
-                <tree editable="bottom" string="Products">
-                    <field name="name"/>
-                    <field name="standard_price"/>
-                    <field name="list_price"/>
-                    <field name="uom_id" string="Unit of Measure"/>
-                </tree>
-            </field>
-        </record> 
- 
-        <record model="ir.actions.act_window" id="product_normal_form_view_installer">
-           <field name="name">Review Your Expenses Products</field>
-           <field name="type">ir.actions.act_window</field>
-           <field name="res_model">product.product</field>
-           <field name="view_type">form</field>
-           <field name="view_mode">tree,form</field>
-           <field name="context" eval="'{\'default_type\':\'service\',\'default_procure_method\':\'make_to_stock\',\'default_supply_method\':\'buy\',\'default_purchase_ok\':True, \'default_sale_ok\':False, \'default_hr_expense_ok\':True,\'default_categ_id\': ' + str(ref('cat_expense')) +'}'"/>
-           <field name="domain">[('hr_expense_ok','=',True)]</field>
-           <field name="view_id" ref="product_expense_installer_tree_view"/>
-           <field name="help">Define one product for each expense type allowed for an employee (travel by car, hostel, restaurant, etc). If you reimburse the employees at a fixed rate, set a cost and a unit of measure on the product. If you reimburse based on real costs, set the cost at 0.00. The user will set the real price when recording his expense sheet.</field>
-       </record>
-
-    </data>
 </openerp>
diff --git a/addons/sale/res_partner_view.xml b/addons/sale/res_partner_view.xml
index 4bcead634bd..58d337350ba 100644
--- a/addons/sale/res_partner_view.xml
+++ b/addons/sale/res_partner_view.xml
@@ -75,18 +75,6 @@
                 </xpath>
             </field>
         </record>
-        
-    <record id="view_tree_partner_id" model="ir.ui.view">
-        <field name="name">- Add partner on tree</field>
-        <field name="model">res.partner</field>
-        <field name="inherit_id" ref="base.view_partner_tree"/>
-        <field name="arch" type="xml">
-            <field name="country_id" position="after">
-                <field name="parent_id" invisible="1"/>
-            </field>
-        </field>
-    </record>
-
 
     </data>
 </openerp>

From decc05e68eb1b57c2f02b5a005a3d28fd367c5fa Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Thu, 18 Oct 2012 12:48:40 +0530
Subject: [PATCH 55/65] [IMP] Set height & width for logo and improve code.

bzr revid: bth@tinyerp.com-20121018071840-mzl3286v0twl088n
---
 addons/web/static/src/js/chrome.js | 10 ++++------
 addons/web/static/src/xml/base.xml | 10 +++++-----
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index ce871af68c3..a039433f09b 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -987,12 +987,10 @@ instance.web.WebClient = instance.web.Client.extend({
                 instance.web.dialog($(QWeb.render('Resolution')),{
                     title: "OpenERP Resolution" });
                 $('.resolution a').click(function() {
-                    if ($(this).text() == "Original") {
-                        self.$el.find('.oe_logo').css('width', "220px");
-                        self.$el.find('.oe_logo img').css('width', "157px");
-                    }
-                    self.$el.find('.oe_logo').css('width', $(this).text()+"px");
-                    self.$el.find('.oe_logo img').css('width', $(this).text()+"px");
+                    self.$el.find('.oe_logo').css('width', $(this).attr('awidth')+"px");
+                    self.$el.find('.oe_logo').css('height', $(this).attr('aheight')+"px");
+                    self.$el.find('.oe_logo img').css('width', $(this).attr('imgw')+"px");
+                    self.$el.find('.oe_logo img').css('height', $(this).attr('imgh')+"px");
                 })
             })
             self.$el.on('click', '.oe_logo', function(e) {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 90dc55cb29a..99437d8d66f 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -17,16 +17,16 @@
                 <td colspan="2"><label>Resolution:</label></td>
             </tr>
             <tr>
-                <td><a>100</a>px</td>
-                <td><a>200</a>px</td>
+                <td><a awidth="150" aheight="60" imgw="100" imgh="30">150 x 60</a></td>
+                <td><a awidth="250" aheight="90" imgw="200" imgh="60">250 x 90</a></td>
             </tr>
             <tr>
-                <td><a>250</a>px</td>
-                <td><a>300</a>px</td>
+                <td><a awidth="290" aheight="90" imgw="225" imgh="60">290 x 90</a></td>
+                <td><a awidth="320" aheight="100" imgw="257" imgh="70">320 x 100</a></td>
             </tr>
             <tr>
                 <td></td>
-                <td style="float:right;"><a>Original</a></td>
+                <td style="float:right;"><a awidth="220" aheight="70" imgw="157" imgh="40">Original</a></td>
             </tr>
         </table>
     </div>

From 6c491aa26c70b54ab72ab1df58b1b11d4b3048c1 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 18 Oct 2012 12:57:19 +0530
Subject: [PATCH 56/65] [FIX]: Fix parent_id problem when group by company in
 partner tree view

bzr revid: atp@tinyerp.com-20121018072719-xb5kjnnrvrjnhexo
---
 openerp/addons/base/res/res_partner_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 81d9c00f120..963262556be 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -85,6 +85,7 @@
                     <field name="is_company" invisible="1"/>
                     <field name="country" invisible="1"/>
                     <field name="country_id" invisible="1"/>
+                    <field name="parent_id" invisible="1"/>
                 </tree>
             </field>
         </record>

From 540c9cdaf1fba4c4253686112971f32c14703f98 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 18 Oct 2012 14:20:22 +0530
Subject: [PATCH 57/65] [FIX]: Fix portal message_follower_ids domain problem

bzr revid: atp@tinyerp.com-20121018085022-2a2424mmoz6r2bat
---
 addons/portal_sale/security/portal_security.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/portal_sale/security/portal_security.xml b/addons/portal_sale/security/portal_security.xml
index d27317d0305..c4bf6131ba1 100644
--- a/addons/portal_sale/security/portal_security.xml
+++ b/addons/portal_sale/security/portal_security.xml
@@ -6,42 +6,42 @@
         <record id="portal_sale_order_user_rule" model="ir.rule">
             <field name="name">Portal Personal Quotations/Sales Orders</field>
             <field name="model_id" ref="sale.model_sale_order"/>
-            <field name="domain_force">[('message_follower_ids','in',user.partner_id.id)]</field>
+            <field name="domain_force">[('message_follower_ids','in',[user.partner_id.id])]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>
 
         <record id="portal_stock_picking_user_rule" model="ir.rule">
             <field name="name">Portal Personal Delivery Orders</field>
             <field name="model_id" ref="stock.model_stock_picking"/>
-            <field name="domain_force">[('message_follower_ids','in',user.partner_id.id)]</field>
+            <field name="domain_force">[('message_follower_ids','in',[user.partner_id.id])]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>
 
         <record id="portal_stock_picking_user_rule" model="ir.rule">
             <field name="name">Portal Personal Delivery Orders Out</field>
             <field name="model_id" ref="stock.model_stock_picking_out"/>
-            <field name="domain_force">[('message_follower_ids','in',user.partner_id.id)]</field>
+            <field name="domain_force">[('message_follower_ids','in',[user.partner_id.id])]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>
 
         <record id="portal_account_invoice_user_rule" model="ir.rule">
             <field name="name">Portal Personal Account Invoices</field>
             <field name="model_id" ref="account.model_account_invoice"/>
-            <field name="domain_force">[('message_follower_ids','in',user.partner_id.id)]</field>
+            <field name="domain_force">[('message_follower_ids','in',[user.partner_id.id])]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>
 
         <record id="portal_personal_payment" model="ir.rule">
             <field name="name">Portal Personal Payments</field>
             <field name="model_id" ref="account_voucher.model_account_voucher"/>
-            <field name="domain_force">[('message_follower_ids','in',user.partner_id.id)]</field>
+            <field name="domain_force">[('message_follower_ids','in',[user.partner_id.id])]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>
 
         <record id="portal_personal_contact" model="ir.rule">
             <field name="name">Portal Personal Contacts</field>
             <field name="model_id" ref="base.model_res_partner"/>
-            <field name="domain_force">[('message_follower_ids','in',user.partner_id.id)]</field>
+            <field name="domain_force">[('message_follower_ids','in',[user.partner_id.id])]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>
 

From 19e722424e0fd44a7d073501eccd868ca520192b Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 18 Oct 2012 14:44:46 +0530
Subject: [PATCH 58/65] [FIX]: Fix message_followers_ids problem

bzr revid: atp@tinyerp.com-20121018091446-dwskge1p8bzbi9f3
---
 addons/portal_claim/security/portal_security.xml         | 2 +-
 addons/portal_project/security/portal_security.xml       | 2 +-
 addons/portal_project_issue/security/portal_security.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/portal_claim/security/portal_security.xml b/addons/portal_claim/security/portal_security.xml
index a88c8ce7835..e177b07eab9 100644
--- a/addons/portal_claim/security/portal_security.xml
+++ b/addons/portal_claim/security/portal_security.xml
@@ -5,7 +5,7 @@
         <record id="portal_stock_picking_user_rule" model="ir.rule">
             <field name="name">Portal Personal Claims</field>
             <field ref="crm_claim.model_crm_claim" name="model_id"/>
-            <field name="domain_force">[('message_follower_ids','in',user.partner_id.id)]</field>
+            <field name="domain_force">[('message_follower_ids','in', [user.partner_id.id])]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>
 
diff --git a/addons/portal_project/security/portal_security.xml b/addons/portal_project/security/portal_security.xml
index 316fb1b4a15..1247d25365a 100644
--- a/addons/portal_project/security/portal_security.xml
+++ b/addons/portal_project/security/portal_security.xml
@@ -5,7 +5,7 @@
         <record id="portal_task_rule" model="ir.rule">
             <field name="name">Portal Personal Task</field>
             <field ref="project.model_project_task" name="model_id"/>
-            <field name="domain_force">[('message_follower_ids','in',user.partner_id.id)]</field>
+            <field name="domain_force">[('message_follower_ids','in', [user.partner_id.id])]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>
 
diff --git a/addons/portal_project_issue/security/portal_security.xml b/addons/portal_project_issue/security/portal_security.xml
index d58e160051b..9527f1f9628 100644
--- a/addons/portal_project_issue/security/portal_security.xml
+++ b/addons/portal_project_issue/security/portal_security.xml
@@ -5,7 +5,7 @@
         <record id="portal_issue_rule" model="ir.rule">
             <field name="name">Portal Personal Issues</field>
             <field ref="project_issue.model_project_issue" name="model_id"/>
-            <field name="domain_force">[('message_follower_ids','in',user.partner_id.id)]</field>
+            <field name="domain_force">[('message_follower_ids','in', [user.partner_id.id])]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>
 

From 419f31928cdd562fec4c45e5e65bf4c9dd1cfb75 Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Thu, 18 Oct 2012 17:56:20 +0530
Subject: [PATCH 59/65] [Fix]display in a form what are the keyboard shortcuts
 defined in screen when hold ALT key

bzr revid: vja@tinyerp.com-20121018122620-7angnmxvaig2l8ac
---
 addons/web/static/src/css/base.css    |  34 +++----
 addons/web/static/src/js/view_form.js | 136 ++++++++------------------
 addons/web/static/src/xml/base.xml    |  15 ++-
 3 files changed, 61 insertions(+), 124 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index e4b8885b1a1..5dc5f7d8cbf 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -25,6 +25,7 @@
     display: none !important;
   }
 }
+
 .openerp.openerp_webclient_container {
   height: 100%;
   position: relative;
@@ -473,6 +474,11 @@
   max-width: 180px;
   max-height: 180px;
 }
+.openerp .oe_view_manager_current .accessactive{
+   text-decoration:underline;
+   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
+   font-weight:bold;
+}
 .openerp .oe_button.oe_link {
   border: none;
   padding: 0;
@@ -2561,12 +2567,6 @@
 .openerp .oe_list.oe_list_editable td.oe_list_record_delete {
   position: absolute;
 }
-.openerp .oe_list.oe_list_editable.oe_editing .oe_edition .oe_list_field_cell:not(.oe_readonly) {
-  color: transparent;
-}
-.openerp .oe_list.oe_list_editable.oe_editing .oe_edition .oe_list_field_cell:not(.oe_readonly) * {
-  visibility: hidden;
-}
 .openerp .oe_list.oe_list_editable.oe_editing .oe_m2o_drop_down_button {
   top: 5px;
 }
@@ -2585,10 +2585,10 @@
 }
 .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_float input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_view_integer input {
   text-align: right;
-  width: 100% !important;
+  width: 100%;
 }
 .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_datetime > span, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_date > span {
-  width: 100% !important;
+  width: 100%;
 }
 .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_datetime input.oe_datepicker_master, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_date input.oe_datepicker_master {
   width: 100% !important;
@@ -2597,9 +2597,6 @@
   min-width: 0 !important;
   max-width: none !important;
 }
-.openerp .oe_list_group_name {
-  white-space: nowrap;
-}
 .openerp .oe_form .oe_form_field_many2many > .oe_list .oe_list_pager_single_page {
   display: none;
 }
@@ -2659,17 +2656,14 @@
   background: #eeeeee;
   vertical-align: top;
 }
+.openerp .oe_list_content > thead th {
+  position: relative;
+}
 .openerp .oe_list_content td, .openerp .oe_list_content th {
   padding: 3px 6px;
   line-height: 18px;
 }
-.openerp .oe_list_content th.oe_sortable, .openerp .oe_list_content th.oe_sortable div {
-  cursor: pointer;
-}
-.openerp .oe_list_content th.oe_sortable div {
-  position: relative;
-}
-.openerp .oe_list_content th.oe_sortable div:after {
+.openerp .oe_list_content th:after {
   position: absolute;
   right: 6px;
   content: "";
@@ -2679,12 +2673,12 @@
   border-color: black transparent;
   visibility: hidden;
 }
-.openerp .oe_list_content th.sortup div:after {
+.openerp .oe_list_content th.sortup:after {
   visibility: visible;
   filter: alpha(opacity=60);
   opacity: 0.6;
 }
-.openerp .oe_list_content th.sortdown div:after {
+.openerp .oe_list_content th.sortdown:after {
   border-bottom: none;
   border-left: 4px solid transparent;
   border-right: 4px solid transparent;
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index bc171ef1d6e..f43a4f10da2 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -125,9 +125,9 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             self.check_actual_mode();
             self.on("change:actual_mode", self, self.init_pager);
             self.init_pager();
+            self.widgetAccesskey();
         });
         self.on("load_record", self, self.load_record);
-        this.on('view_loaded', self, self.load_form);
         instance.web.bus.on('clear_uncommitted_changes', this, function(e) {
             if (!this.can_be_discarded()) {
                 e.preventDefault();
@@ -144,13 +144,13 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         }
         this._super();
     },
-    load_form: function(data) {
+    on_loaded: function(data) {
         var self = this;
         if (!data) {
             throw new Error("No data provided.");
         }
         if (this.arch) {
-            throw "Form view does not support multiple calls to load_form";
+            throw "Form view does not support multiple calls to on_loaded";
         }
         this.fields_order = [];
         this.fields_view = data;
@@ -214,9 +214,19 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
                 e.stopPropagation();
             }
          });
-        this.trigger('form_view_loaded', data);
+
         return $.when();
     },
+    widgetAccesskey:function(){
+        $(document).keydown(function(e){
+            if(e.keyCode === $.ui.keyCode.ALT) {
+                $("[accesskey] span").addClass('accessactive');
+            }
+            e.stopPropagation();
+        }).keyup(function(e){
+                $("[accesskey] span").removeClass('accessactive');
+        });
+    },
     widgetFocused: function() {
         // Clear click flag if used to focus a widget
         this.__clicked_inside = false;
@@ -2153,20 +2163,6 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.w
             self.do_action(r);
         });
     },
-
-    set_dimensions: function (height, width) {
-        // remove width css property
-        this.$el.css('width', '');
-        // extract style (without width)
-        var old_style = this.$el.attr('style');
-        // jQuery doesn't understand/use !important
-        var style = 'width:' + width + 'px !important;';
-        if (old_style) {
-            style += old_style
-        }
-        this.$el.attr('style', style);
-        this.$el.css('minHeight', height);
-    }
 });
 
 /**
@@ -2545,13 +2541,6 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(instance.we
     focus: function($el) {
         this.$textarea.focus();
     },
-    set_dimensions: function (height, width) {
-        this._super();
-        this.$textarea.css({
-            width: width,
-            minHeight: height
-        });
-    },
 });
 
 /**
@@ -3172,9 +3161,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
         return ! this.get("value");
     },
     focus: function () {
-        if (!this.get('effective_readonly')) {
-            this.$input.focus();
-        }
+        this.$input.focus();
     },
     _quick_create: function() {
         this.no_ed = true;
@@ -3351,23 +3338,6 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
                     controller.on('edit:before', self, function (e) {
                         e.cancel = true;
                     });
-                    var has_handle = _(controller.columns).find(function (column) {
-                        if (!column instanceof instance.web.list.Handle) {
-                            return false;
-                        }
-                        column.modifiers.tree_invisible = true;
-                        column.invisible = '1';
-                        // remove from visibles
-                        controller.visible_columns.splice(
-                            controller.visible_columns.indexOf(column),
-                            1);
-                        return true;
-                    });
-                    if (has_handle) {
-                        // recompute aggregates
-                        controller.aggregate_columns =
-                            _(controller.visible_columns).invoke('to_aggregate');
-                    }
                 }
             } else if (view_type === "form") {
                 if (self.get("effective_readonly")) {
@@ -3603,7 +3573,6 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
     _template: 'One2Many.listview',
     init: function (parent, dataset, view_id, options) {
         this._super(parent, dataset, view_id, _.extend(options || {}, {
-            GroupsType: instance.web.form.One2ManyGroups,
             ListType: instance.web.form.One2ManyList
         }));
         this.on('edit:before', this, this.proxy('_before_edit'));
@@ -3784,13 +3753,6 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
         });
     }
 });
-instance.web.form.One2ManyGroups = instance.web.ListView.Groups.extend({
-    setup_resequence_rows: function () {
-        if (!this.view.o2m.get('effective_readonly')) {
-            this._super.apply(this, arguments);
-        }
-    }
-});
 instance.web.form.One2ManyList = instance.web.ListView.List.extend({
     pad_table_to: function (count) {
         if (!this.view.is_action_enabled('create')) {
@@ -3851,7 +3813,7 @@ instance.web.form.One2ManyList = instance.web.ListView.List.extend({
 
 instance.web.form.One2ManyFormView = instance.web.FormView.extend({
     form_template: 'One2Many.formview',
-    load_form: function(data) {
+    on_loaded: function(data) {
         this._super(data);
         var self = this;
         this.$buttons.find('button.oe_form_button_create').click(function() {
@@ -4061,7 +4023,7 @@ instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend({
         }
         this.list_view.m2m_field = this;
         var loaded = $.Deferred();
-        this.list_view.on("list_view_loaded", self, function() {
+        this.list_view.on_loaded.add_last(function() {
             self.initial_is_loaded.resolve();
             loaded.resolve();
         });
@@ -4106,17 +4068,13 @@ instance.web.form.Many2ManyListView = instance.web.ListView.extend(/** @lends in
         );
         var self = this;
         pop.on("elements_selected", self, function(element_ids) {
-            var reload = false;
-            _(element_ids).each(function (id) {
-                if(! _.detect(self.dataset.ids, function(x) {return x == id;})) {
-                    self.dataset.set_ids(self.dataset.ids.concat([id]));
+            _.each(element_ids, function(one_id) {
+                if(! _.detect(self.dataset.ids, function(x) {return x == one_id;})) {
+                    self.dataset.set_ids([].concat(self.dataset.ids, [one_id]));
                     self.m2m_field.dataset_changed();
-                    reload = true;
+                    self.reload_content();
                 }
             });
-            if (reload) {
-                self.reload_content();
-            }
         });
     },
     do_activate_record: function(index, id) {
@@ -4185,7 +4143,7 @@ instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend(
         }
         this.kanban_view.m2m = this;
         var loaded = $.Deferred();
-        this.kanban_view.on("kanban_view_loaded",self,function() {
+        this.kanban_view.on_loaded.add_last(function() {
             self.initial_is_loaded.resolve();
             loaded.resolve();
         });
@@ -4409,7 +4367,7 @@ instance.web.form.AbstractFormPopup = instance.web.Widget.extend({
             this.view_form.set_embedded_view(this.options.alternative_form_view);
         }
         this.view_form.appendTo(this.$el.find(".oe_popup_form"));
-        this.view_form.on("form_view_loaded", self, function() {
+        this.view_form.on_loaded.add_last(function() {
             var multi_select = self.row_id === null && ! self.options.disable_multiple_selection;
             self.$buttonpane.html(QWeb.render("AbstractFormPopup.buttons", {
                 multi_select: multi_select,
@@ -4520,7 +4478,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend
         }
         this.searchview = new instance.web.SearchView(this,
                 this.dataset, false,  search_defaults);
-        this.searchview.on('search_data', self, function(domains, contexts, groupbys) {
+        this.searchview.on_search.add(function(domains, contexts, groupbys) {
             if (self.initial_ids) {
                 self.do_search(domains.concat([[["id", "in", self.initial_ids]], self.domain]),
                     contexts, groupbys);
@@ -4529,7 +4487,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend
                 self.do_search(domains.concat([self.domain]), contexts.concat(self.context), groupbys);
             }
         });
-        this.searchview.on("search_view_loaded", self, function() {
+        this.searchview.on_loaded.add_last(function () {
             self.view_list = new instance.web.form.SelectCreateListView(self,
                     self.dataset, false,
                     _.extend({'deletable': false,
@@ -4546,7 +4504,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend
             }).pipe(function() {
                 self.searchview.do_search();
             });
-            self.view_list.on("list_view_loaded", self, function() {
+            self.view_list.on_loaded.add_last(function() {
                 self.$buttonpane.html(QWeb.render("SelectCreatePopup.search.buttons", {widget:self}));
                 var $cbutton = self.$buttonpane.find(".oe_selectcreatepopup-search-close");
                 $cbutton.click(function() {
@@ -4559,7 +4517,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend
                 });
             });
         });
-        this.searchview.appendTo($(".oe_popup_search", self.$el));
+        this.searchview.appendTo($(".oe_popup_list", self.$el));
     },
     do_search: function(domains, contexts, groupbys) {
         var self = this;
@@ -4695,19 +4653,14 @@ instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(instance.
         var self = this;
         this._super(field_manager, node);
         this.binary_value = false;
-        this.useFileAPI = !!window.FileReader;
-        if (!this.useFileAPI) {
-            this.fileupload_id = _.uniqueId('oe_fileupload');
-            $(window).on(this.fileupload_id, function() {
-                var args = [].slice.call(arguments).slice(1);
-                self.on_file_uploaded.apply(self, args);
-            });
-        }
+        this.fileupload_id = _.uniqueId('oe_fileupload');
+        $(window).on(this.fileupload_id, function() {
+            var args = [].slice.call(arguments).slice(1);
+            self.on_file_uploaded.apply(self, args);
+        });
     },
     stop: function() {
-        if (!this.useFileAPI) {
-            $(window).off(this.fileupload_id);
-        }
+        $(window).off(this.fileupload_id);
         this._super.apply(this, arguments);
     },
     initialize_content: function() {
@@ -4725,22 +4678,13 @@ instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(instance.
         return size.toFixed(2) + ' ' + units[i];
     },
     on_file_change: function(e) {
-        var self = this;
-        var file_node = e.target;
-        if ((this.useFileAPI && file_node.files.length) || (!this.useFileAPI && $(file_node).val() !== '')) {
-            if (this.useFileAPI) {
-                var file = file_node.files[0];
-                var filereader = new FileReader();
-                filereader.readAsDataURL(file);
-                filereader.onloadend = function(upload) {
-                    var data = upload.target.result;
-                    data = data.split(',')[1];
-                    self.on_file_uploaded(file.size, file.name, file.type, data);
-                };
-            } else {
-                this.$el.find('form.oe_form_binary_form input[name=session_id]').val(this.session.session_id);
-                this.$el.find('form.oe_form_binary_form').submit();
-            }
+        // TODO: on modern browsers, we could directly read the file locally on client ready to be used on image cropper
+        // http://www.html5rocks.com/tutorials/file/dndfiles/
+        // http://deepliquid.com/projects/Jcrop/demos.php?demo=handler
+
+        if ($(e.target).val() !== '') {
+            this.$el.find('form.oe_form_binary_form input[name=session_id]').val(this.session.session_id);
+            this.$el.find('form.oe_form_binary_form').submit();
             this.$el.find('.oe_form_binary_progress').show();
             this.$el.find('.oe_form_binary').hide();
         }
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 899bd614f76..b543b31e75e 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -631,9 +631,9 @@
             </th>
             <t t-foreach="columns" t-as="column">
                 <th t-if="!column.meta and column.invisible !== '1'" t-att-data-id="column.id"
-                    t-attf-class="oe_list_header_#{column.widget or column.type} #{((options.sortable and column.tag !== 'button') ? 'oe_sortable' : null)}"><div>
+                    t-attf-class="oe_list_header_#{column.widget or column.type} #{((options.sortable and column.tag !== 'button') ? 'oe_sortable' : null)}">
                     <t t-if="column.tag !== 'button'"><t t-esc="column.string"/></t>
-                </div></th>
+                </th>
             </t>
             <th t-if="options.deletable" class="oe_list_record_delete" width="13px"/>
         </tr>
@@ -730,15 +730,15 @@
         <span class="oe_form_buttons_view">
             <!-- required for the bounce effect on button -->
             <div t-if="widget.is_action_enabled('edit')" style="display: inline-block;">
-                <button type="button" class="oe_button oe_form_button_edit" accesskey="E">Edit</button>
+                <button type="button" class="oe_button oe_form_button_edit" accesskey="E"><span>E</span>dit</button>
             </div>
             <button t-if="widget.is_action_enabled('create')"
-                type="button" class="oe_button oe_form_button_create" accesskey="C">Create</button>
+                type="button" class="oe_button oe_form_button_create" accesskey="C"><span>C</span>reate</button>
         </span>
         <span class="oe_form_buttons_edit">
-            <button type="button" class="oe_button oe_form_button_save oe_highlight" accesskey="S">Save</button>
+            <button type="button" class="oe_button oe_form_button_save oe_highlight" accesskey="S"><span>S</span>ave</button>
             <span class="oe_fade">or</span>
-            <a href="#" class="oe_bold oe_form_button_cancel" accesskey="D">Discard</a>
+            <a href="#" class="oe_bold oe_form_button_cancel" accesskey="D"><span>D</span>iscard</a>
         </span>
     </t>
 </div>
@@ -1297,8 +1297,7 @@
 
 <div t-name="SearchView.InputView"
      class="oe_searchview_input"
-     contenteditable="true"
-     tabindex="0"/>
+     contenteditable="true"/>
 <!-- tabindex: makes div focusable -->
 <div t-name="SearchView.FacetView"
      class="oe_tag oe_tag_dark oe_searchview_facet"

From c429019b5c56ce1a835f0854834fb935e6cb6407 Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Mon, 22 Oct 2012 11:45:53 +0530
Subject: [PATCH 60/65] [IMP] Click on openerp element then close resolution
 dialog.

bzr revid: bth@tinyerp.com-20121022061553-icx3zjy0n678bemm
---
 addons/web/static/src/js/chrome.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index a039433f09b..41039749528 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -986,6 +986,10 @@ instance.web.WebClient = instance.web.Client.extend({
             self.$el.on('contextmenu','.oe_logo',function(e) {
                 instance.web.dialog($(QWeb.render('Resolution')),{
                     title: "OpenERP Resolution" });
+
+                $(self.$el).click(function(){
+                    $('.resolution').dialog('close');
+                })
                 $('.resolution a').click(function() {
                     self.$el.find('.oe_logo').css('width', $(this).attr('awidth')+"px");
                     self.$el.find('.oe_logo').css('height', $(this).attr('aheight')+"px");

From 17ce4c93b70b7e07059e306f57600dd2464d628f Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Mon, 22 Oct 2012 18:52:17 +0530
Subject: [PATCH 61/65] [IMP] css changes with sass.

bzr revid: bth@tinyerp.com-20121022132217-13oz992sx88ouumn
---
 addons/web/static/src/css/base.css  | 9 +++++----
 addons/web/static/src/css/base.sass | 5 +++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 4dad3505d4b..b7952810c37 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2925,10 +2925,11 @@ div.ui-widget-overlay {
   -webkit-border-radius: 3px;
   border-radius: 3px;
 }
+
 .resolution table {
-    width: 100%;
-    line-height: 20px;
+  width: 100%;
+  line-height: 20px;
 }
 .resolution table td {
-    valign: middle;
-}
\ No newline at end of file
+  valign: middle;
+}
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index a128fcec24b..f1176b3de40 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2313,5 +2313,10 @@ div.ui-widget-overlay
 .ui-corner-all
     @include radius(3px)
 
+.resolution table
+    width: 100%
+    line-height: 20px
+    td
+        valign: middle
 // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"
 // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker:

From 9121cb71b66c10b4cc15974417102efe065cbf3d Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Mon, 22 Oct 2012 18:59:25 +0530
Subject: [PATCH 62/65] [FIX]CSS changes with SASS

bzr revid: vja@tinyerp.com-20121022132925-pijuxtt5z2icgrtj
---
 addons/web/static/src/css/base.sass | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index a128fcec24b..871d23d084e 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -431,6 +431,10 @@ $sheet-max-width: 860px
     .oe_image_medium > img
         max-width: 180px
         max-height: 180px
+    .oe_view_manager_current .accessactive
+        text-decoration: underline
+        text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2)
+        font-weight: bold
     .oe_button.oe_link
         @include reset()
         img

From 40c3a1d748cb5cd27518e6881a83f7d38eb47380 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 23 Oct 2012 03:03:03 +0200
Subject: [PATCH 63/65] [FIX] process model link to doc.openerp.com

bzr revid: al@openerp.com-20121023010303-u0opl3aluqtogqeb
---
 addons/process/static/src/js/process.js   | 3 +--
 addons/process/static/src/xml/process.xml | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/process/static/src/js/process.js b/addons/process/static/src/js/process.js
index c2ec4486507..2405f6d2aa5 100644
--- a/addons/process/static/src/js/process.js
+++ b/addons/process/static/src/js/process.js
@@ -176,11 +176,10 @@ instance.web.ViewManager.include({
                 var notes = new_notes.substring(0,60) +'..';
             }
             r.text(nodes.x+60, nodes.y+30, (notes || new_notes)).attr({"title":nodes.notes,"cursor": "default"});
-            var DOC_URL = "http://doc.openerp.com/v6.1/index.php";
             r['image']('/web/static/src/img/icons/gtk-info.png', nodes.x, nodes.y+75, 16, 16)
               .attr({"cursor": "pointer", "title": "Help"})
               .click(function() {
-                   window.open(nodes.url || DOC_URL + "?model=" + nodes.model);
+                   window.open(nodes.url || "http://doc.openerp.com/v6.1/index.php?model=" + nodes.model);
               });
             if(nodes.menu) {
                  r['image']('/web/static/src/img/icons/gtk-jump-to.png', nodes.x+100, nodes.y+75, 16, 16)
diff --git a/addons/process/static/src/xml/process.xml b/addons/process/static/src/xml/process.xml
index b1a39aa6ce8..d6229b686f3 100644
--- a/addons/process/static/src/xml/process.xml
+++ b/addons/process/static/src/xml/process.xml
@@ -16,7 +16,7 @@
                    <div class="oe_view_manager_header" style="padding: 8px;">
                        <div class="oe_header_row">
                             <h2 class="oe_view_title">
-                                <span class="oe_view_title_text oe_breadcrumb_title"><t t-esc="action.name"/> (<t t-esc="action.res_model"/>)</span>
+                                <span class="oe_view_title_text oe_breadcrumb_title"><t t-esc="action.name"/> (<a t-attf-href="http://doc.openerp.com/v6.1/index.php?model=#{action.res_model}"><t t-esc="action.res_model"/></a>)</span>
                             </h2>
                        </div>
                     </div>
@@ -25,7 +25,7 @@
         </tr>
         <tr>
             <td style="padding-left:10px;">
-                <p><t t-esc="process_help"/></p>
+                <p><t t-raw="process_help"/></p>
             </td>
         </tr>
         <tr>

From c55438e695d03854ebf1b82aa0d6b33b3dc278f0 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 23 Oct 2012 05:05:46 +0000
Subject: [PATCH 64/65] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20121023044839-5p7b9e93zpxmpfpv
bzr revid: launchpad_translations_on_behalf_of_openerp-20121023050546-in29ajkb3zkyg3za
---
 addons/account_cancel/i18n/es_MX.po  |   39 +-
 addons/anonymization/i18n/mn.po      |    4 +-
 addons/hr/i18n/lt.po                 |   29 +-
 addons/hr_timesheet_sheet/i18n/mk.po | 1031 ++++++++++++++++++++++++++
 addons/l10n_mx/i18n/es_MX.po         |   73 +-
 addons/sale/i18n/lt.po               |   30 +-
 addons/web/i18n/it.po                |   28 +-
 7 files changed, 1139 insertions(+), 95 deletions(-)
 create mode 100644 addons/hr_timesheet_sheet/i18n/mk.po

diff --git a/addons/account_cancel/i18n/es_MX.po b/addons/account_cancel/i18n/es_MX.po
index c3029cd8d53..c176d3a8f45 100644
--- a/addons/account_cancel/i18n/es_MX.po
+++ b/addons/account_cancel/i18n/es_MX.po
@@ -1,38 +1,23 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# Spanish (Mexico) 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>, 2010.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-11-23 09:43+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
-"Language-Team: Spanish <es@li.org>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-10-22 17:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:48+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2012-10-23 04:48+0000\n"
+"X-Generator: Launchpad (build 16179)\n"
 
 #. module: account_cancel
-#: model:ir.module.module,description:account_cancel.module_meta_information
-msgid ""
-"\n"
-"    Module adds 'Allow cancelling entries' field on form view of account "
-"journal. If set to true it allows user to cancel entries & invoices.\n"
-"    "
-msgstr ""
-"\n"
-"    Este módulo añade el campo 'Permitir la cancelación de asientos' en la "
-"vista de formulario de los diarios contables. Si está marcado, permite a los "
-"usuarios cancelar los asientos y las facturas.\n"
-"    "
-
-#. module: account_cancel
-#: model:ir.module.module,shortdesc:account_cancel.module_meta_information
-msgid "Account Cancel"
-msgstr "Cancelar asientos/facturas"
+#: view:account.invoice:0
+msgid "Cancel"
+msgstr "Cancelar"
diff --git a/addons/anonymization/i18n/mn.po b/addons/anonymization/i18n/mn.po
index cd54ad8ef6c..3ba97872c3c 100644
--- a/addons/anonymization/i18n/mn.po
+++ b/addons/anonymization/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-22 04:40+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-10-23 04:48+0000\n"
+"X-Generator: Launchpad (build 16179)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/hr/i18n/lt.po b/addons/hr/i18n/lt.po
index f50c071b739..831a1fe29d5 100644
--- a/addons/hr/i18n/lt.po
+++ b/addons/hr/i18n/lt.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-10-21 21:20+0000\n"
-"Last-Translator: mchip <mifchip@gmail.com>\n"
+"PO-Revision-Date: 2012-10-22 07:48+0000\n"
+"Last-Translator: nanothole <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-22 04:40+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-10-23 04:48+0000\n"
+"X-Generator: Launchpad (build 16179)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -56,7 +56,7 @@ msgstr ""
 #. module: hr
 #: model:ir.actions.act_window,name:hr.view_department_form_installer
 msgid "Create Your Departments"
-msgstr ""
+msgstr "Sukurkite padalinius"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.action_hr_job
@@ -77,12 +77,12 @@ msgstr "Padalinys"
 #. module: hr
 #: view:hr.job:0
 msgid "Mark as Old"
-msgstr ""
+msgstr "Pažymeti kaip sena"
 
 #. module: hr
 #: view:hr.job:0
 msgid "Jobs"
-msgstr ""
+msgstr "Darbai"
 
 #. module: hr
 #: view:hr.job:0
@@ -185,12 +185,12 @@ msgstr ""
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
 msgid "Attendance"
-msgstr ""
+msgstr "Lankomumas"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Social IDs"
-msgstr ""
+msgstr "SODRA Nr."
 
 #. module: hr
 #: field:hr.employee,work_phone:0
@@ -227,7 +227,7 @@ msgstr "Darbuotojas"
 #. module: hr
 #: model:process.node,note:hr.process_node_employeecontact0
 msgid "Other information"
-msgstr ""
+msgstr "Kita informacija"
 
 #. module: hr
 #: field:hr.employee,work_email:0
@@ -237,7 +237,7 @@ msgstr "Darbo el. paštas"
 #. module: hr
 #: field:hr.employee,birthday:0
 msgid "Date of Birth"
-msgstr ""
+msgstr "Gimimo data"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_reporting
@@ -253,7 +253,7 @@ msgstr ""
 #. module: hr
 #: view:hr.employee:0 field:hr.employee,job_id:0 view:hr.job:0
 msgid "Job"
-msgstr ""
+msgstr "Darbas"
 
 #. module: hr
 #: field:hr.department,member_ids:0
@@ -268,7 +268,7 @@ msgstr "Nustatymai"
 #. module: hr
 #: view:hr.employee:0 field:hr.employee,category_ids:0
 msgid "Categories"
-msgstr ""
+msgstr "Kategorijos"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
@@ -799,3 +799,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Objekto pavadinimas turi prasidėti su x_ ir jame negali būti specialiųjų "
 #~ "ženklų!"
+
+#~ msgid "Work E-mail"
+#~ msgstr "Darbinis el. paštas"
diff --git a/addons/hr_timesheet_sheet/i18n/mk.po b/addons/hr_timesheet_sheet/i18n/mk.po
new file mode 100644
index 00000000000..23a08ee255d
--- /dev/null
+++ b/addons/hr_timesheet_sheet/i18n/mk.po
@@ -0,0 +1,1031 @@
+# Macedonian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-10-22 12:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian <mk@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-10-23 04:48+0000\n"
+"X-Generator: Launchpad (build 16179)\n"
+
+#. module: hr_timesheet_sheet
+#: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
+#: field:hr_timesheet_sheet.sheet.account,sheet_id:0
+#: field:hr_timesheet_sheet.sheet.day,sheet_id:0
+msgid "Sheet"
+msgstr "Лист"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr "Сервис"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
+#, python-format
+msgid "No employee defined for your user !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
+msgstr "Групирај По..."
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_attendance:0
+#: field:hr_timesheet_sheet.sheet,total_attendance_day:0
+msgid "Total Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,department_id:0 view:timesheet.report:0
+#: field:timesheet.report,department_id:0
+msgid "Department"
+msgstr "Сектор"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid "Timesheet in current year"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Today"
+msgstr "Денес"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:274
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "March"
+msgstr "Март"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid "Timesheet of last month"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,company_id:0
+#: field:hr_timesheet_sheet.sheet,company_id:0 view:timesheet.report:0
+#: field:timesheet.report,company_id:0
+msgid "Company"
+msgstr "Фирма"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:hr_timesheet_sheet.sheet:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_report
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_timesheet_report
+#: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
+#: view:timesheet.report:0
+msgid "Timesheet"
+msgstr "Работни Часови"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Set to Draft"
+msgstr "Сетирај на Драфт"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,date_to:0 field:timesheet.report,date_to:0
+msgid "Date to"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid "Group by day of date"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:615
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
+msgid "Validate"
+msgstr "Потврди"
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+msgid "Approved"
+msgstr "Одобрено"
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state_attendance:0
+msgid "Present"
+msgstr "Присутен"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:263
+#, python-format
+msgid ""
+"In order to create a timesheet for this employee, you must assign the "
+"employee to an analytic journal!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
+msgid "Refuse"
+msgstr "Одбиј"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:619
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:639
+#, python-format
+msgid ""
+"You cannot enter an attendance date outside the current timesheet dates!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
+msgid ""
+"My Timesheet opens your timesheet so that you can book your activities into "
+"the system. From the same form, you can register your attendances (Sign "
+"In/Out) and describe the working hours made on the different projects. At "
+"the end of the period defined in the company, the timesheet is confirmed by "
+"the user and can be validated by his manager. If required, as defined on the "
+"project, you can generate the invoices based on the timesheet."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet.day:0
+msgid "Total Difference"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "My Departments Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
+msgid "Timesheet by Day"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet.account,name:0
+msgid "Project / Analytic Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:274
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,account_id:0
+#: view:timesheet.report:0 field:timesheet.report,account_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
+msgid "Date from"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+msgid " Month "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+#: view:res.company:0
+msgid "Timesheets"
+msgstr "Работни часови"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0 selection:timesheet.report,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
+#: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
+msgid "Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_draftconfirmtimesheet0
+msgid "Confirm"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,timesheet_ids:0
+msgid "Timesheet lines"
+msgstr "Редови на работни часови"
+
+#. module: hr_timesheet_sheet
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,state:0 view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
+msgid "New"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:241
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:246
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:248
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:250
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:257
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:259
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:261
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:263
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:318
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:548
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:615
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:646
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet.account,total:0
+msgid "Total Time"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet
+msgid "Timesheet Lines"
+msgstr "Редови на работни часови"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Hours"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid "Group by month of date"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:455
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:457
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Daily"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 field:timesheet.report,quantity:0
+msgid "#Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+#: view:hr_timesheet_sheet.sheet.day:0
+#: field:hr_timesheet_sheet.sheet.day,total_timesheet:0
+msgid "Total Timesheet"
+msgstr "Вкупно работни часови"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Sign In"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Go to:"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:248
+#, python-format
+msgid ""
+"In order to create a timesheet for this employee, you must link the employee "
+"to a product, like 'Consultant'!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:241
+#, python-format
+msgid "You cannot duplicate a timesheet!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,month:0
+#: selection:res.company,timesheet_range:0 view:timesheet.report:0
+#: field:timesheet.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 field:timesheet.report,total_diff:0
+msgid "#Total Diff"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "In Draft"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:261
+#, python-format
+msgid ""
+"In order to create a timesheet for this employee, you must link the employee "
+"to a product!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+msgid "Waiting Approval"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid ""
+"The timesheet line represents the time spent by the employee on a specific "
+"service provided."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid "You must select a Current date which is in the timesheet dates !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,name:0
+msgid "Note"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+msgid ""
+"This report performs analysis on timesheets created by your human resources "
+"in the system. It allows you to have a full overview of  entries done by "
+"your employees. You can group them by specific selection criteria thanks to "
+"the search tool."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 selection:timesheet.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:res.company,timesheet_range:0
+msgid "Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,state_attendance:0
+msgid "Current Status"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:646
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0 view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
+msgid "Timesheet by Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0 field:hr_timesheet_sheet.sheet.day,name:0
+msgid "Date"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:548
+#, python-format
+msgid "You can not modify an entry in a confirmed timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:259
+#, python-format
+msgid ""
+"You cannot have 2 timesheets that overlaps!\n"
+"You should use the menu 'My Timesheet' to avoid this problem."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid ""
+"Check your timesheets for a specific period. You can also encode time spent "
+"on a project (i.e. an analytic account) thus generating costs in the "
+"analytic account concerned."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:237
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain an equal number of "
+"sign ins and sign outs!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Summary"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid ""
+"You cannot have 2 timesheets that overlaps !\n"
+"Please use the menu 'My Current Timesheet' to avoid this problem."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Unvalidated Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:457
+#, python-format
+msgid "You cannot delete a timesheet which have attendance entries!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:455
+#, python-format
+msgid "You cannot delete a timesheet which is already confirmed!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,general_account_id:0
+#: view:timesheet.report:0 field:timesheet.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_range:0
+msgid "Periodicity on which you validate your timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet.account:0
+msgid "Search Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_max_difference:0
+msgid ""
+"Allowed difference in hours between the sign in/out and the timesheet "
+"computation for one sheet. Set this to 0 if you do not want any control."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0 field:hr_timesheet_sheet.sheet,period_ids:0
+#: view:hr_timesheet_sheet.sheet.day:0
+msgid "Period"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,day:0
+#: selection:res.company,timesheet_range:0 view:timesheet.report:0
+#: field:timesheet.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
+msgid "My Current Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 selection:timesheet.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid "Timesheet in current month"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet.account:0
+msgid "Timesheet by Accounts"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:51
+#, python-format
+msgid "Open Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid "Group by year of date"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:hr_timesheet_sheet.sheet,state:0
+msgid ""
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"timesheet.                 \n"
+"* The 'Confirmed' state is used for to confirm the timesheet by user.        "
+"         \n"
+"* The 'Done' state is used when users timesheet is accepted by his/her "
+"senior."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
+msgid "Timesheet Analysis"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Confirmed Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,product_id:0
+#: view:timesheet.report:0 field:timesheet.report,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,attendances_ids:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_attendance
+msgid "Attendances"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,name:0 field:timesheet.report,name:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Sign Out"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet.day:0
+msgid "Total Attendances"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_difference:0
+#: field:hr_timesheet_sheet.sheet,total_difference_day:0
+#: field:hr_timesheet_sheet.sheet.day,total_difference:0
+msgid "Difference"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state_attendance:0
+msgid "Absent"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
+msgid "Invoice rate"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:619
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:639
+#, python-format
+msgid "UserError"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:250
+#, python-format
+msgid ""
+"In order to create a timesheet for this employee, you must assign the "
+"employee to an analytic journal, like 'Timesheet'!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:318
+#, python-format
+msgid "You cannot sign in/sign out from an other date than today"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Submit to Manager"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,account_ids:0
+msgid "Analytic accounts"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:246
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:257
+#, python-format
+msgid ""
+"In order to create a timesheet for this employee, you must assign it to a "
+"user!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,date_current:0
+#: field:timesheet.report,date_current:0
+msgid "Current date"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,year:0
+#: view:timesheet.report:0 field:timesheet.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0 selection:hr_timesheet_sheet.sheet,state:0
+msgid "Open"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet.account:0
+msgid "Total"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#~ msgid "My Timesheet"
+#~ msgstr "Мои работни часови"
diff --git a/addons/l10n_mx/i18n/es_MX.po b/addons/l10n_mx/i18n/es_MX.po
index e9822e23498..eec525b5f53 100644
--- a/addons/l10n_mx/i18n/es_MX.po
+++ b/addons/l10n_mx/i18n/es_MX.po
@@ -1,28 +1,41 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# Spanish (Mexico) 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>, 2011.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-07 06:07+0000\n"
-"PO-Revision-Date: 2011-02-15 15:37+0000\n"
+"POT-Creation-Date: 2011-12-23 09:56+0000\n"
+"PO-Revision-Date: 2012-10-22 22:58+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish <es@li.org>\n"
+"Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2012-10-23 04:48+0000\n"
+"X-Generator: Launchpad (build 16179)\n"
 
 #. module: l10n_mx
-#: model:ir.module.module,description:l10n_mx.module_meta_information
-msgid ""
-"This is the module to manage the accounting chart for Mexico in Open ERP."
-msgstr ""
-"Este es el módulo para gestionar el plan contable para Méjico en Open ERP."
+#: model:account.account.type,name:l10n_mx.account_type_receivable
+msgid "Receivable"
+msgstr "Por cobrar"
+
+#. module: l10n_mx
+#: model:account.account.type,name:l10n_mx.account_type_equity
+msgid "Equity"
+msgstr "Capital"
+
+#. module: l10n_mx
+#: model:account.account.type,name:l10n_mx.account_type_tax
+msgid "Tax"
+msgstr "Impuesto"
+
+#. module: l10n_mx
+#: model:account.account.type,name:l10n_mx.account_type_cash
+msgid "Cash"
+msgstr "Efectivo"
 
 #. module: l10n_mx
 #: model:ir.actions.todo,note:l10n_mx.config_call_account_template_mx_chart
@@ -35,16 +48,28 @@ msgid ""
 "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
 "Chart of Accounts from a Chart Template."
 msgstr ""
-"Generar Plan Contable a partir de una plantilla de Plan. Se le preguntará "
-"por el nombre de la compañía, la plantilla de plan contable a seguir, el no. "
-"de dígitos para generar el código de sus cuentas y la cuenta bancaria, la "
-"divisa para crear Diarios. Por lo tanto, la copia exacta de la plantilla de "
-"plan contable será generada.\n"
-"Este es el mismo asistente que se ejecuta desde Gestión "
-"Financiera/Configuración/Contabilidad Financiera/Contabilidad "
-"Financiera/Generar Plan Contable a partir de una Plantilla de Plan."
 
 #. module: l10n_mx
-#: model:ir.module.module,shortdesc:l10n_mx.module_meta_information
-msgid "Mexico - Chart of Account"
-msgstr "Méjico - Plan Contable"
+#: model:account.account.type,name:l10n_mx.account_type_payable
+msgid "Payable"
+msgstr "A pagar"
+
+#. module: l10n_mx
+#: model:account.account.type,name:l10n_mx.account_type_asset
+msgid "Asset"
+msgstr "Activo"
+
+#. module: l10n_mx
+#: model:account.account.type,name:l10n_mx.account_type_income
+msgid "Income"
+msgstr "Ingreso"
+
+#. module: l10n_mx
+#: model:account.account.type,name:l10n_mx.account_type_expense
+msgid "Expense"
+msgstr "Gasto"
+
+#. module: l10n_mx
+#: model:account.account.type,name:l10n_mx.account_type_view
+msgid "View"
+msgstr "Vista"
diff --git a/addons/sale/i18n/lt.po b/addons/sale/i18n/lt.po
index 46158f9bbde..bf590d7ca7f 100644
--- a/addons/sale/i18n/lt.po
+++ b/addons/sale/i18n/lt.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-09-20 07:29+0000\n"
-"PO-Revision-Date: 2010-12-14 21:49+0000\n"
-"Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
+"PO-Revision-Date: 2012-10-22 17:52+0000\n"
+"Last-Translator: ignas <ignassladkevicius@yahoo.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-19 05:12+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-10-23 04:48+0000\n"
+"X-Generator: Launchpad (build 16179)\n"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:215
@@ -160,14 +160,14 @@ msgstr ""
 #. module: sale
 #: field:sale.order,date_confirm:0
 msgid "Confirmation Date"
-msgstr ""
+msgstr "Patvirtinimo data"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 #: view:sale.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupuoti pagal..."
 
 #. module: sale
 #: view:sale.order.line:0
@@ -322,7 +322,7 @@ msgstr ""
 #. module: sale
 #: help:sale.order,amount_total:0
 msgid "The total amount."
-msgstr ""
+msgstr "Bendra suma."
 
 #. module: sale
 #: view:sale.report:0
@@ -652,7 +652,7 @@ msgstr ""
 #: view:board.board:0
 #: model:ir.actions.act_window,name:sale.action_turnover_by_month
 msgid "Monthly Turnover"
-msgstr ""
+msgstr "Mėnesinė apyvarta"
 
 #. module: sale
 #: view:sale.report:0
@@ -716,7 +716,7 @@ msgstr "Bendra kaina"
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree
 msgid "Old Quotations"
-msgstr ""
+msgstr "Seni pasiūlymai"
 
 #. module: sale
 #: help:sale.config.settings,module_sale_journal:0
@@ -816,7 +816,7 @@ msgstr "Iš viso :"
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
-msgstr ""
+msgstr "Mano pardavimai"
 
 #. module: sale
 #: code:addons/sale/sale.py:253
@@ -1233,7 +1233,7 @@ msgstr "Grupuoti sąskaitas faktūras"
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
-msgstr ""
+msgstr "Mokesčiai"
 
 #. module: sale
 #: view:sale.order:0
@@ -1252,7 +1252,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Rugpjūtis"
 
 #. module: sale
 #: view:sale.order:0
@@ -1282,7 +1282,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Birželis"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
@@ -1559,7 +1559,7 @@ msgstr ""
 #: view:sale.report:0
 #: field:sale.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Diena"
 
 #. module: sale
 #: view:sale.order:0
@@ -1830,7 +1830,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Other Information"
-msgstr ""
+msgstr "Kita informacija"
 
 #. module: sale
 #: view:res.partner:0
diff --git a/addons/web/i18n/it.po b/addons/web/i18n/it.po
index cd25e1fb9d6..7df8f4c27bb 100644
--- a/addons/web/i18n/it.po
+++ b/addons/web/i18n/it.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-02-16 21:49+0000\n"
-"Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
+"PO-Revision-Date: 2012-10-22 14:36+0000\n"
+"Last-Translator: Marius Marolla <mariusmarolla@areablu.net>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-21 05:02+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
+"X-Launchpad-Export-Date: 2012-10-23 05:05+0000\n"
+"X-Generator: Launchpad (build 16179)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
@@ -129,56 +129,56 @@ msgstr "OpenERP - Unsupported/Community Version"
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:619
 msgid "less than a minute ago"
-msgstr ""
+msgstr "meno di un minuto fa"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:620
 msgid "about a minute ago"
-msgstr ""
+msgstr "circa un minuto fa"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:621
 #, python-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "%d minuti fa"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:622
 msgid "about an hour ago"
-msgstr ""
+msgstr "circa un'ora fa"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:623
 #, python-format
 msgid "%d hours ago"
-msgstr ""
+msgstr "%d ore fa"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:624
 msgid "a day ago"
-msgstr ""
+msgstr "un giorno fa"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:625
 #, python-format
 msgid "%d days ago"
-msgstr ""
+msgstr "%d giorni fa"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:626
 msgid "about a month ago"
-msgstr ""
+msgstr "circa un mese fa"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:627
 #, python-format
 msgid "%d months ago"
-msgstr ""
+msgstr "%d mesi fa"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:628
 msgid "about a year ago"
-msgstr ""
+msgstr "circa un anno fa"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:629

From 1ac38618d629c5af391909eca4a725ffcc992f1c Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Tue, 23 Oct 2012 14:59:45 +0530
Subject: [PATCH 65/65] [FIX]Improve code

bzr revid: vja@tinyerp.com-20121023092945-4krp469jm3u5kzcy
---
 addons/web/static/src/css/base.css    | 4 ++++
 addons/web/static/src/css/base.sass   | 2 +-
 addons/web/static/src/js/view_form.js | 4 ++--
 addons/web/static/src/xml/base.xml    | 8 ++++----
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 9384a3ed8f6..eb70b150d76 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -394,6 +394,10 @@
   .openerp .oe_image_medium > img {
     max-width: 180px;
     max-height: 180px; }
+  .openerp .oe_view_manager_current .accessactive:first-letter{
+   text-decoration:underline;
+   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
+   font-weight:bold; }
   .openerp .oe_button.oe_link {
     border: none;
     padding: 0;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 0beaaf901cc..70a9898022c 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -434,7 +434,7 @@ $sheet-max-width: 860px
     .oe_image_medium > img
         max-width: 180px
         max-height: 180px
-    .oe_view_manager_current .accessactive
+    .oe_view_manager_current .accessactive:first-letter
         text-decoration: underline
         text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2)
         font-weight: bold
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 61cf6c8f02e..4c74b55206c 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -220,11 +220,11 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
     widgetAccesskey:function(){
         $(document).keydown(function(e){
             if(e.keyCode === $.ui.keyCode.ALT) {
-                $("[accesskey] span").addClass('accessactive');
+                $("[accesskey]").addClass('accessactive');
             }
             e.stopPropagation();
         }).keyup(function(e){
-                $("[accesskey] span").removeClass('accessactive');
+                $("[accesskey]").removeClass('accessactive');
         });
     },
     widgetFocused: function() {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 11f04e93d8b..caba50416ad 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -751,15 +751,15 @@
         <span class="oe_form_buttons_view">
             <!-- required for the bounce effect on button -->
             <div t-if="widget.is_action_enabled('edit')" style="display: inline-block;">
-                <button type="button" class="oe_button oe_form_button_edit" accesskey="E"><span>E</span>dit</button>
+                <button type="button" class="oe_button oe_form_button_edit" accesskey="E">Edit</button>
             </div>
             <button t-if="widget.is_action_enabled('create')"
-                type="button" class="oe_button oe_form_button_create" accesskey="C"><span>C</span>reate</button>
+                type="button" class="oe_button oe_form_button_create" accesskey="C">Create</button>
         </span>
         <span class="oe_form_buttons_edit">
-            <button type="button" class="oe_button oe_form_button_save oe_highlight" accesskey="S"><span>S</span>ave</button>
+            <button type="button" class="oe_button oe_form_button_save oe_highlight" accesskey="S">Save</button>
             <span class="oe_fade">or</span>
-            <a href="#" class="oe_bold oe_form_button_cancel" accesskey="D"><span>D</span>iscard</a>
+            <a href="#" class="oe_bold oe_form_button_cancel" accesskey="D">Discard</a>
         </span>
     </t>
 </div>