From b92702c9aa4c86a1a79e3db6abad515682c5ae0b Mon Sep 17 00:00:00 2001
From: pso <pso@tinyerp.com>
Date: Mon, 1 Nov 2010 15:26:38 +0530
Subject: [PATCH 01/16] [FIX] hr_timesheet_sheet: Fixed overlapping error of
 timesheet

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

bzr revid: pso@tinyerp.com-20101101095638-2wsfuilu01almz6l
---
 .../hr_timesheet_sheet/hr_timesheet_sheet_demo.xml   | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
index a4b4b434da6..daaa55fc6a1 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-        <record id="sheet0" model="hr_timesheet_sheet.sheet">
-            <field name="name">Sheet 0</field>
+        
+        <record id="sheet1" model="hr_timesheet_sheet.sheet">
+            <field name="name">Sheet 1</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="employee_id" ref="hr.employee1" />
             <field eval="time.strftime('%Y-%m-01', time.localtime(time.mktime(time.localtime()[0:2] + (0,)*7)-1))" name="date_from"/>
@@ -10,12 +11,5 @@
             <field eval="time.strftime('%Y-%m-%d', time.localtime(time.mktime(time.localtime()[0:2] + (0,)*7)-1))" name="date_to"/>
         </record>
 
-        <record id="sheet1" model="hr_timesheet_sheet.sheet">
-            <field name="name">Sheet 1</field>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="employee_id" ref="hr.employee1" />
-            <field eval="time.strftime('%Y-%m-%d')" name="date_current"/>
-        </record>
-
     </data>
 </openerp>

From a36a5cd576a6a73616d2e9e8b1314c9be8aecfa4 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Tue, 2 Nov 2010 10:29:54 +0100
Subject: [PATCH 02/16] [IMP] base, res_lang: very small usability improvement
 in form view (colspan=4 on a separator)

bzr revid: qdp-launchpad@tinyerp.com-20101102092954-hk20xruzgnn8m7q4
---
 bin/addons/base/res/res_lang_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/res/res_lang_view.xml b/bin/addons/base/res/res_lang_view.xml
index cbe5fb388ba..839915a56a5 100644
--- a/bin/addons/base/res/res_lang_view.xml
+++ b/bin/addons/base/res/res_lang_view.xml
@@ -76,7 +76,7 @@
                     </group>
                     <newline/>
                     <group colspan="4" col="4">
-	                    <separator string="Examples"/>
+	                    <separator string="Examples" colspan="4"/>
 	                    <newline/>
 	                    <label align="0.0" string="1.  %%c              ==> Fri Dec  5 18:25:20 2008"/>
 		                <label align="0.0" string="2.  %%a ,%%A         ==> Fri, Friday"/>

From ab38d5247df3e1fc7e3959f5fc188dc4fe8e25dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= <>
Date: Tue, 2 Nov 2010 15:03:37 +0530
Subject: [PATCH 03/16] [FIX] Account: user can't validate the invoice of an
 other company; patch included

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

bzr revid: mra@mra-laptop-20101102093337-0diiqe2wmapc68i2
---
 addons/account/account_move_line.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index ffea12170a2..efa6c5be341 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -1101,6 +1101,9 @@ class account_move_line(osv.osv):
         journal_obj = self.pool.get('account.journal')
         if context is None:
             context = {}
+        company_id = self.pool.get('account.move').read(cr, uid, vals['move_id'], ['company_id']).get('company_id', False)
+        if company_id:
+            vals['company_id'] = company_id[0]
         self._check_date(cr, uid, vals, context, check)
         if ('account_id' in vals) and not account_obj.read(cr, uid, vals['account_id'], ['active'])['active']:
             raise osv.except_osv(_('Bad account!'), _('You can not use an inactive account!'))

From 4f1ddce0fb8afff4f8d128dcfbd352acdbbadfe2 Mon Sep 17 00:00:00 2001
From: pso <pso@tinyerp.com>
Date: Tue, 2 Nov 2010 15:44:27 +0530
Subject: [PATCH 04/16] [FIX] hr_timesheet_sheet: Fixed overlapping error of
 timesheet

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

bzr revid: pso@tinyerp.com-20101102101427-gpjgxlj6fuo8q3pf
---
 addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
index daaa55fc6a1..3ffa2cf0d1a 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
@@ -6,9 +6,7 @@
             <field name="name">Sheet 1</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="employee_id" ref="hr.employee1" />
-            <field eval="time.strftime('%Y-%m-01', time.localtime(time.mktime(time.localtime()[0:2] + (0,)*7)-1))" name="date_from"/>
-            <field eval="time.strftime('%Y-%m-15', time.localtime(time.mktime(time.localtime()[0:2] + (0,)*7)-1))" name="date_current"/>
-            <field eval="time.strftime('%Y-%m-%d', time.localtime(time.mktime(time.localtime()[0:2] + (0,)*7)-1))" name="date_to"/>
+            <field eval="time.strftime('%Y-%m-%d')" name="date_current"/>
         </record>
 
     </data>

From d366367ff2a62c6684f43d883f7e3432c2fc5dcc Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 2 Nov 2010 16:25:42 +0530
Subject: [PATCH 05/16] [FIX] Account: account move line create method

bzr revid: mra@mra-laptop-20101102105542-041r1uivh0u60958
---
 addons/account/account_move_line.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index efa6c5be341..62cfa7cbd6f 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -1101,9 +1101,10 @@ class account_move_line(osv.osv):
         journal_obj = self.pool.get('account.journal')
         if context is None:
             context = {}
-        company_id = self.pool.get('account.move').read(cr, uid, vals['move_id'], ['company_id']).get('company_id', False)
-        if company_id:
-            vals['company_id'] = company_id[0]
+        if vals.get('move_id', False):
+            company_id = self.pool.get('account.move').read(cr, uid, vals['move_id'], ['company_id']).get('company_id', False)
+            if company_id:
+                vals['company_id'] = company_id[0]
         self._check_date(cr, uid, vals, context, check)
         if ('account_id' in vals) and not account_obj.read(cr, uid, vals['account_id'], ['active'])['active']:
             raise osv.except_osv(_('Bad account!'), _('You can not use an inactive account!'))

From fa454743f4b398b79cc450019aa8ac96ab1e0048 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 2 Nov 2010 16:41:12 +0530
Subject: [PATCH 06/16] [REF]

bzr revid: mra@mra-laptop-20101102111112-5ik1xz0m6mw96saa
---
 addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index c780951d07e..04cdc7231e5 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -20,12 +20,12 @@
 ##############################################################################
 
 import time
-import netsvc
-
-from osv import fields, osv
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
+
+from osv import fields, osv
 from tools.translate import _
+import netsvc
 
 class one2many_mod2(fields.one2many):
     def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):

From 73f259cfacda2b75a6ad570b0f5664f77a636314 Mon Sep 17 00:00:00 2001
From: pso <pso@tinyerp.com>
Date: Tue, 2 Nov 2010 19:20:24 +0530
Subject: [PATCH 07/16] [FIX] hr_timesheet: Improved timesheet report (solved
 confusion between user and employee)

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

bzr revid: pso@tinyerp.com-20101102135024-jiqodh1tkynyxgsh
---
 addons/hr_timesheet/report/user_timesheet.py  | 16 +++++++++-------
 addons/hr_timesheet/report/users_timesheet.py |  9 +++------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/addons/hr_timesheet/report/user_timesheet.py b/addons/hr_timesheet/report/user_timesheet.py
index 93c425af995..404876b029d 100644
--- a/addons/hr_timesheet/report/user_timesheet.py
+++ b/addons/hr_timesheet/report/user_timesheet.py
@@ -44,6 +44,12 @@ class report_custom(report_rml):
 
     def create_xml(self, cr, uid, ids, data, context):
 
+        # Get the user id from the selected employee record
+        emp_id = data['form']['employee_id']
+        emp_obj = pooler.get_pool(cr.dbname).get('hr.employee')
+        user_id = emp_obj.browse(cr, uid, emp_id).user_id.id
+        empl_name = emp_obj.browse(cr, uid, emp_id).name
+ 
         # Computing the dates (start of month: som, and end of month: eom)
         som = datetime.date(data['form']['year'], data['form']['month'], 1)
         eom = som + datetime.timedelta(lengthmonth(som.year, som.month))
@@ -63,7 +69,7 @@ class report_custom(report_rml):
             "and product_uom_id = unit.id "\
             "and line.user_id=%s and line.date >= %s and line.date < %s "
             "order by line.date",
-            (uid, som.strftime('%Y-%m-%d'), eom.strftime('%Y-%m-%d')))
+            (user_id, som.strftime('%Y-%m-%d'), eom.strftime('%Y-%m-%d')))
 
         # Sum attendence by account, then by day
         accounts = {}
@@ -84,7 +90,7 @@ class report_custom(report_rml):
         <date>%s</date>
         <company>%s</company>
         </header>
-        ''' %  (str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")),pooler.get_pool(cr.dbname).get('res.users').browse(cr,uid,uid).company_id.name)
+        ''' %  (str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")),pooler.get_pool(cr.dbname).get('res.users').browse(cr,uid,user_id).company_id.name)
 
         account_xml = []
         for account, telems in accounts.iteritems():
@@ -96,10 +102,6 @@ class report_custom(report_rml):
             account_xml.append('\n'.join([xml % (day, amount) for day, amount in telems.iteritems()]))
             account_xml.append('</account>')
 
-        # Computing the employee
-        cr.execute("select name from res_users where id=%s", (str(uid)))
-        emp = cr.fetchone()[0]
-
         # Computing the xml
         xml = '''<?xml version="1.0" encoding="UTF-8" ?>
         <report>
@@ -107,7 +109,7 @@ class report_custom(report_rml):
         <employee>%s</employee>
         %s
         </report>
-        ''' % (header_xml,toxml(emp), '\n'.join(date_xml) + '\n'.join(account_xml))
+        ''' % (header_xml,toxml(empl_name), '\n'.join(date_xml) + '\n'.join(account_xml))
         return xml
 
 report_custom('report.hr.analytical.timesheet', 'hr.employee', '', 'addons/hr_timesheet/report/user_timesheet.xsl')
diff --git a/addons/hr_timesheet/report/users_timesheet.py b/addons/hr_timesheet/report/users_timesheet.py
index 5a52e9ce9c8..f7f78d72fd7 100644
--- a/addons/hr_timesheet/report/users_timesheet.py
+++ b/addons/hr_timesheet/report/users_timesheet.py
@@ -33,7 +33,7 @@ def lengthmonth(year, month):
         return 29
     return [0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month]
 
-def emp_create_xml(cr, id, som, eom):
+def emp_create_xml(cr, id, som, eom, emp):
     # Computing the attendence by analytical account
     cr.execute(
         "select line.date, (unit_amount * unit.factor) as amount "\
@@ -58,10 +58,6 @@ def emp_create_xml(cr, id, som, eom):
     '''
     time_xml = ([xml % (day, amount) for day, amount in month.iteritems()])
 
-    # Computing the employee
-    cr.execute("select name from resource_resource where id=%s", (id,))
-    emp = cr.fetchone()[0]
-
     # Computing the xml
     xml = '''
     <employee id="%d" name="%s">
@@ -94,8 +90,9 @@ class report_custom(report_rml):
         emp_obj = pooler.get_pool(cr.dbname).get('hr.employee')        
         for id in data['form']['employee_ids']:
             user = emp_obj.browse(cr, uid, id).user_id.id
+            empl_name = emp_obj.browse(cr, uid, id).name
             if user:
-                emp_xml += emp_create_xml(cr, id, som, eom)
+                emp_xml += emp_create_xml(cr, user, som, eom, empl_name)
         # Computing the xml
         #Without this, report don't show non-ascii characters (TO CHECK)
         date_xml = '\n'.join(date_xml)

From 748b48ede8814a2d50706ef8b7c27e4304e0fa46 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Tue, 2 Nov 2010 19:23:19 +0530
Subject: [PATCH 08/16] [REF] CRM: Replace sales manager dashboard to sales
 dashboard

bzr revid: ara@tinyerp.com-20101102135319-iv0d1tzbwdiu8glb
---
 addons/crm/board_crm_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index 79dadadbcd0..ee9a78109c8 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -159,5 +159,6 @@
             sequence="1"
             id="menu_board_crm" icon="terp-graph"
             groups="base.group_sale_salesman"/>
+        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" action="open_board_crm"/>
     </data>
 </openerp>

From b70095df947faf43b4e5d207cab35f1b25e139ff Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Tue, 2 Nov 2010 19:48:07 +0530
Subject: [PATCH 09/16] [FIX] filters : Size of model name corrected to 64,same
 as model name

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

bzr revid: jvo@tinyerp.com-20101102141807-o8szqi6fn9q1pfms
---
 bin/addons/base/ir/ir_filters.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/ir/ir_filters.py b/bin/addons/base/ir/ir_filters.py
index 541dbdb60c6..0146b8dd85b 100644
--- a/bin/addons/base/ir/ir_filters.py
+++ b/bin/addons/base/ir/ir_filters.py
@@ -60,7 +60,7 @@ class ir_filters(osv.osv):
         'user_id':fields.many2one('res.users', 'User', help='False means for every user'),
         'domain': fields.text('Domain Value', required=True),
         'context': fields.text('Context Value', required=True),
-        'model_id': fields.selection(_list_all_models, 'Object', required=True),
+        'model_id': fields.selection(_list_all_models, 'Object', size=64, required=True),
     }
 
 ir_filters()

From dcaef8c77ce21098439c144ea82749941a05fdf5 Mon Sep 17 00:00:00 2001
From: Niels Huylebroeck <niels@bubbles-it.be>
Date: Tue, 2 Nov 2010 16:35:07 +0100
Subject: [PATCH 10/16] [FIX] Fetchmail module was using domain 'type' on
 mailgate.message, real name was 'server_type'

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

bzr revid: niels@bubbles-it.be-20101102153507-xy0yp3vouif0holl
---
 addons/fetchmail/fetchmail_view.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 1d0cf21be08..11a988b7093 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -71,8 +71,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_email_server_tree"/>
-            <field name="context">{'type':'pop'}</field>
-            <field name="domain">[('type','=','pop')]</field>
+            <field name="context">{'server_type':'pop'}</field>
+            <field name="domain">[('server_type','=','pop')]</field>
         </record>
 
         <menuitem 
@@ -93,8 +93,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_email_server_tree"/>
-            <field name="context">{'type':'imap'}</field>
-            <field name="domain">[('type','=','imap')]</field>
+            <field name="context">{'server_type':'imap'}</field>
+            <field name="domain">[('server_type','=','imap')]</field>
         </record>
         
         <menuitem 
@@ -128,8 +128,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="mailgate_message_tree_view"/>
-            <field name="context">{'type':'imap'}</field>
-            <field name="domain">[('type','=','imap')]</field>
+            <field name="context">{'server_type':'imap'}</field>
+            <field name="domain">[('server_type','=','imap')]</field>
         </record>
         
         <menuitem 
@@ -143,8 +143,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="mailgate_message_tree_view"/>
-            <field name="context">{'type':'pop'}</field>
-            <field name="domain">[('type','=','pop')]</field>
+            <field name="context">{'server_type':'pop'}</field>
+            <field name="domain">[('server_type','=','pop')]</field>
         </record>
         
         <menuitem 

From b1c4debf3868996d919282020a02612dd5c22b68 Mon Sep 17 00:00:00 2001
From: Niels Huylebroeck <niels@bubbles-it.be>
Date: Tue, 2 Nov 2010 16:53:51 +0100
Subject: [PATCH 11/16] [REV] Reverted some changes to actions for servers
 (there the field IS 'type')

bzr revid: niels@bubbles-it.be-20101102155351-byhpbklwf7t3ep12
---
 addons/fetchmail/fetchmail_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 11a988b7093..7f751f7c5a2 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -71,8 +71,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_email_server_tree"/>
-            <field name="context">{'server_type':'pop'}</field>
-            <field name="domain">[('server_type','=','pop')]</field>
+            <field name="context">{'type':'pop'}</field>
+            <field name="domain">[('type','=','pop')]</field>
         </record>
 
         <menuitem 
@@ -93,8 +93,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_email_server_tree"/>
-            <field name="context">{'server_type':'imap'}</field>
-            <field name="domain">[('server_type','=','imap')]</field>
+            <field name="context">{'type':'imap'}</field>
+            <field name="domain">[('type','=','imap')]</field>
         </record>
         
         <menuitem 

From 4ee9a77fd9fd0a17afe4852c65ef73c3069921fd Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 2 Nov 2010 17:58:07 +0100
Subject: [PATCH 12/16] [IMP] reindent html_view demo/example

bzr revid: xmo@openerp.com-20101102165807-t907zgsih9edxnj5
---
 addons/html_view/html_view.xml | 76 +++++++++++++++++-----------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/addons/html_view/html_view.xml b/addons/html_view/html_view.xml
index 7babda37c46..a279b408300 100644
--- a/addons/html_view/html_view.xml
+++ b/addons/html_view/html_view.xml
@@ -1,41 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data>
-		<record id="html_view_form" model="ir.ui.view">
-            <field name="name">htmlform</field>
-            <field name="model">html.view</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Html Example">
-                    <html>
-						<h2>This is Test Html Page </h2>
-						<table>
-					    <tr>
-					        <td>
-					            Name :
-					        </td>
-					        <td>
-					            <field name="name"/>
-					        </td>
-					        <td>
-					            Company :
-					        </td>
-					        <td>
-					            <field name="comp_id"/>
-					        </td>
-					    </tr>
-					</table>						
-						<field name="bank_ids"/>
-					</html>
-                </form>
-            </field>
-        </record>
-        <record id="action_html_view_form" model="ir.actions.act_window">
-            <field name="name">Html Test</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">html.view</field>
-            <field name="view_type">form</field>
-        </record>
-        <menuitem action="action_html_view_form" id="html_form" parent="base.menu_address_book" sequence="40"/>
-	</data>
+  <data>
+    <record id="html_view_form" model="ir.ui.view">
+      <field name="name">htmlform</field>
+      <field name="model">html.view</field>
+      <field name="type">form</field>
+      <field name="arch" type="xml">
+        <form string="Html Example">
+          <html>
+            <h2>This is Test Html Page </h2>
+            <table>
+              <tr>
+                <td>
+                  Name :
+                </td>
+                <td>
+                  <field name="name"/>
+                </td>
+                <td>
+                  Company :
+                </td>
+                <td>
+                  <field name="comp_id"/>
+                </td>
+              </tr>
+            </table>
+            <field name="bank_ids"/>
+          </html>
+        </form>
+      </field>
+    </record>
+    <record id="action_html_view_form" model="ir.actions.act_window">
+      <field name="name">Html Test</field>
+      <field name="type">ir.actions.act_window</field>
+      <field name="res_model">html.view</field>
+      <field name="view_type">form</field>
+    </record>
+    <menuitem action="action_html_view_form" id="html_form" parent="base.menu_address_book" sequence="40"/>
+  </data>
 </openerp>
\ No newline at end of file

From 5f1f000193e83139f559ef1b84f7a1b7093852a6 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 2 Nov 2010 17:58:27 +0100
Subject: [PATCH 13/16] [IMP] pad: update_xml -> data in module descriptor

bzr revid: xmo@openerp.com-20101102165827-ghyy19b83emwpc2i
---
 addons/pad/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/pad/__openerp__.py b/addons/pad/__openerp__.py
index 4b5e3ca959e..01d2e3f0c1c 100644
--- a/addons/pad/__openerp__.py
+++ b/addons/pad/__openerp__.py
@@ -11,7 +11,7 @@ company customize which Pad installation should be used to link to new pads
     'author': 'OpenERP SA',
     'website': 'http://openerp.com',
     'depends': ['base'],
-    'update_xml': [
+    'data': [
         'company_pad.xml'
     ],
     'installable': True,

From 199387f4c6ac4b8f45974104acb7984471964ccc Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Tue, 2 Nov 2010 18:05:10 +0100
Subject: [PATCH 14/16] [FIX] account, generation form chart template: fixed
 the selection of default taxes for sale and purchase + small usability fixes

bzr revid: qdp-launchpad@tinyerp.com-20101102170510-1n340469gxnflvl0
---
 addons/account/account.py       | 16 ++++++++--------
 addons/account/account_view.xml |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 7cce45ad006..45474178977 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2533,8 +2533,8 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Bank Accounts', required=True),
         'code_digits':fields.integer('# of Digits', required=True, help="No. of Digits to use for account code"),
         'seq_journal':fields.boolean('Separated Journal Sequences', help="Check this box if you want to use a different sequence for each created journal. Otherwise, all will use the same sequence."),
-        "sale_tax": fields.many2one("account.tax.template", "Sale Tax"),
-        "purchase_tax": fields.many2one("account.tax.template", "Purchase Tax"),
+        "sale_tax": fields.many2one("account.tax.template", "Default Sale Tax"),
+        "purchase_tax": fields.many2one("account.tax.template", "Default Purchase Tax"),
     }
     def onchange_chart_template_id(self, cr, uid, ids, chart_template_id=False, context=None):
         res = {}
@@ -2542,12 +2542,12 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         res['value']["sale_tax"] = False
         res['value']["purchase_tax"] = False
         if chart_template_id:
-            ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id"
-                                          , "=", chart_template_id)], order="sequence")
-            if len(ids) > 0:
-                id=ids[0]
-                res['value']["sale_tax"] = id
-                res['value']["purchase_tax"] = id
+            sale_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id"
+                                          , "=", chart_template_id), ('type_tax_use', 'in', ('sale','all'))], order="sequence")
+            purchase_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id"
+                                          , "=", chart_template_id), ('type_tax_use', 'in', ('purchase','all'))], order="sequence")
+            res['value']["sale_tax"] = sale_tax_ids and sale_tax_ids[0] or False
+            res['value']["purchase_tax"] = purchase_tax_ids and purchase_tax_ids[0] or False
         return res
 
     def _get_chart(self, cr, uid, context={}):
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index a829e4b2955..320d5b1089e 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2419,8 +2419,8 @@
                     <field name ="code_digits" groups="base.group_extended"/>
                     <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)"/>
                     <field name ="seq_journal" groups="base.group_extended"/>
-                  <field name="sale_tax" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False)]"/>
-                  <field name="purchase_tax" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False)]"/>
+                  <field name="sale_tax" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
+                  <field name="purchase_tax" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/>
                     <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list">
                         <form string="Bank Information">
                             <field name="acc_name"/>
@@ -2467,7 +2467,7 @@ action = self.pool.get('res.config').next(cr, uid, [], context)
             <field name="name">New Company Financial Setting</field>
             <field eval="1" name="sequence"/>
             <field name="parent_id" ref="account.menu_finance_accounting"/>
-            <field name="icon">STOCK_JUSTIFY_FILL</field>
+            <field name="icon">STOCK_EXECUTE</field>
             <field name="action" ref="ir_actions_server_action_wizard_multi_chart"/>
         </record>
 

From a11edd028ede4d8792d0be48863efcb009263f48 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Tue, 2 Nov 2010 18:07:13 +0100
Subject: [PATCH 15/16] [IMP] purchase: usability changes

bzr revid: qdp-launchpad@tinyerp.com-20101102170713-r8sji2zac7638nt7
---
 addons/purchase/purchase.py       |  4 ++--
 addons/purchase/purchase_view.xml | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 3145979d7b0..5291df7d258 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -297,10 +297,10 @@ class purchase_order(osv.osv):
                     managers.append(manager.id)
             for manager_id in managers:
                 request.create(cr, uid,{
-                       'name' : "Purchase amount over the limit",
+                       'name' : _("Purchase amount over the limit"),
                        'act_from' : uid,
                        'act_to' : manager_id,
-                       'body': 'Somebody has just confirmed a purchase with an amount over the defined limit',
+                       'body': _('Somebody has just confirmed a purchase with an amount over the defined limit'),
                        'ref_partner_id': po.partner_id.id,
                        'ref_doc1': 'purchase.order,%d' % (po.id,),
                 })
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 18317f2cff1..fbb05024c29 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -41,7 +41,7 @@
             parent="base.menu_purchase_root" sequence="4"/>
       <menuitem action="stock.action_picking_tree4" id="menu_action_picking_tree4" parent="menu_procurement_management_inventory"
             name="Incoming Shipments" sequence="9"
-      groups="base.group_extended"/>
+            groups="base.group_extended"/>
       <menuitem action="stock.action_reception_picking_move" id="menu_action_picking_tree_in_move"
             parent="menu_procurement_management_inventory" sequence="11"/>
 
@@ -147,8 +147,7 @@
                                 <button name="purchase_confirm" states="draft" string="Convert to Purchase Order" icon="gtk-go-forward"/>
                                 <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" icon="gtk-ok"/>
                                 <button name="purchase_approve" states="confirmed" string="Approved by Supplier" icon="gtk-go-forward"/>
-								<button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
-
+                                <button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
                             </group>
                         </page>
                         <page string="Delivery &amp; Invoices" groups="base.group_extended">
@@ -199,7 +198,7 @@
                 </group>
                 <newline/>
                   <group expand="0" string="Group By..." colspan="4" col="10" groups="base.group_extended">
-                    <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                    <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                      <separator orientation="vertical"/>
                     <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
@@ -377,10 +376,11 @@
                         </group> 
                         <newline/>
                         <group expand="0" string="Group By...">
+                        <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by' : 'partner_id'}" />
+                        <separator orientation="vertical"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by' : 'product_id'}" />
-                        <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by' : 'partner_id'}" />
                         <filter icon="terp-gtk-jump-to-rtl" string="Order Reference" domain="[]" context="{'group_by' :'order_id'}"/>
-                         <separator orientation="vertical"/>
+                        <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" />
                         </group>
                </search>

From f234d42a0361fb423234c87a241150ee67c1abab Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Wed, 3 Nov 2010 10:03:31 +0530
Subject: [PATCH 16/16] [FIX] Sale: sale.shop isn't multicompany

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

bzr revid: mra@mra-laptop-20101103043331-f4gcu2sb9exefwtf
---
 addons/sale/security/sale_security.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index 209870711f2..5d422a3b879 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -49,5 +49,12 @@
         <field name="groups" eval="[(4, ref('base.group_sale_salesman'))]"/>
     </record>
 
+    <record model="ir.rule" id="sale_order_line_comp_rule">
+        <field name="name">Sale Shop multi-company</field>
+        <field name="model_id" ref="model_sale_shop"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
+
 </data>
-</openerp>
+</openerp>
\ No newline at end of file