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 1/8] [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 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 2/8] [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 3/8] [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 4/8] [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 5/8] [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 6/8] [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 7/8] [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 8/8] [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>