From b2c4dd6b8717aadc383e9727fefbf98af5643025 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 7 Sep 2010 13:21:01 +0530
Subject: [PATCH 01/61] [MOD/IMP]res_user : Usability Improvement

bzr revid: dbr@tinyerp.com-20100907075101-ki0rwisnslqjqd93
---
 bin/addons/base/base_update.xml | 14 ++++++++------
 bin/addons/base/res/res_user.py |  4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 7639418f825..02ea1c58e5c 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -114,16 +114,18 @@
                     <newline/>
                     <notebook colspan="4">
                         <page string="User">
-                            <field name="address_id" select="1"/>
-                            <field name="user_email" widget="email"/>
                             <field name="company_id" required="1"
                                 context="{'user_id': self, 'user_preference': 1}"
                                 on_change="on_change_company_id(company_id)"
                                 groups="base.group_multi_company"
-                                />
+                                />                        
+                            <field name="address_id" select="1"/>
+                            <field name="user_email" widget="email"/>
+                            <field name="context_lang"/>   
+                            <field domain="[('usage','=','menu')]" name="menu_id" required="True"/>                                                    
                             <field name="action_id" required="True"/>
-                            <field domain="[('usage','=','menu')]" name="menu_id" required="True"/>
-                            <field name="context_lang"/>
+
+
                             <field name="context_tz"/>
                             <field name="view" readonly="0"/>
                             <field name="menu_tips" colspan="2"/>
@@ -141,7 +143,7 @@
                             <field colspan="4" nolabel="1" name="roles_id"/>
                         </page>
                         <page string="Companies">
-                            <field colspan="4" nolabel="1" name="company_ids" select="1"/>
+                            <field colspan="4" nolabel="1" name="company_ids" select="1" widget="selection"/>
                         </page>
                     </notebook>
                 </form>
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index d8645a83cc0..db76c333730 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -240,10 +240,10 @@ class users(osv.osv):
                  " aren't configured, it won't be possible to email new "
                  "users."),
         'signature': fields.text('Signature', size=64),
-        'address_id': fields.many2one('res.partner.address', 'Address'),
+        'address_id': fields.many2one('res.partner.address', 'Company Address'),
         'active': fields.boolean('Active'),
         'action_id': fields.many2one('ir.actions.actions', 'Home Action'),
-        'menu_id': fields.many2one('ir.actions.actions', 'Menu Action'),
+        'menu_id': fields.many2one('ir.actions.actions', 'Menu Action',help="Always Display Tips"),
         'groups_id': fields.many2many('res.groups', 'res_groups_users_rel', 'uid', 'gid', 'Groups'),
         'roles_id': fields.many2many('res.roles', 'res_roles_users_rel', 'uid', 'rid', 'Roles'),
 

From 1e5bd3dc4c5dfde324ed559b01ffdc89d2367c63 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 8 Sep 2010 11:35:34 +0530
Subject: [PATCH 02/61] [IMP] res_user view improved

bzr revid: vir@tinyerp.com-20100908060534-pod7b4b10lxd193n
---
 bin/addons/base/base_update.xml | 2 +-
 bin/addons/base/res/res_user.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 02ea1c58e5c..8e12c123b42 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -143,7 +143,7 @@
                             <field colspan="4" nolabel="1" name="roles_id"/>
                         </page>
                         <page string="Companies">
-                            <field colspan="4" nolabel="1" name="company_ids" select="1" widget="selection"/>
+                            <field colspan="4" nolabel="1" name="company_ids" select="1"/>
                         </page>
                     </notebook>
                 </form>
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index db76c333730..9203d76dacc 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -243,7 +243,7 @@ class users(osv.osv):
         'address_id': fields.many2one('res.partner.address', 'Company Address'),
         'active': fields.boolean('Active'),
         'action_id': fields.many2one('ir.actions.actions', 'Home Action'),
-        'menu_id': fields.many2one('ir.actions.actions', 'Menu Action',help="Always Display Tips"),
+        'menu_id': fields.many2one('ir.actions.actions', 'Menu Action'),
         'groups_id': fields.many2many('res.groups', 'res_groups_users_rel', 'uid', 'gid', 'Groups'),
         'roles_id': fields.many2many('res.roles', 'res_roles_users_rel', 'uid', 'rid', 'Roles'),
 
@@ -264,7 +264,7 @@ class users(osv.osv):
                                 selection=[('simple','Simplified'),('extended','Extended')],
                                 string='Interface', help="Choose between the simplified interface and the extended one"),
         'user_email': fields.function(_email_get, method=True, fnct_inv=_email_set, string='Email', type="char", size=240),
-        'menu_tips': fields.boolean('Menu Tips', help="Check out this box if you want to display tips on each menu action"),
+        'menu_tips': fields.boolean('Menu Tips', help="Check out this box if you want to always display tips on each menu action"),
 
     }
 

From f8590fbfd6d0492e871535198e908f6db7d155e2 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Sat, 11 Sep 2010 11:55:08 +0530
Subject: [PATCH 03/61] [IMP] Improved the viwe of User Preferences

bzr revid: vir@tinyerp.com-20100911062508-9ze77rhm45veup5o
---
 bin/addons/base/base_update.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 8e12c123b42..50f923d1b20 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -82,16 +82,15 @@
                                     context="{'user_id': self, 'user_preference': 1}" groups="base.group_multi_company"/>
                             <field name="view" readonly="0"/>
                             <label string="" colspan="2"/>
-                            <field name="menu_tips" colspan="2" readonly="0"/>
                             <newline/>
-                            <separator colspan="4" string="Preferences"/>
                         </page>
                          <page string="Preferences">
-                            <field name="password" password="True" readonly="0" colspan="4"/>
+                            <field name="password" password="True" readonly="0" />
+                            <field name="context_lang" completion="1" readonly="0"/>
                             <label string="" colspan="1"/>
                             <label colspan="3" string="You must logout and login again after changing your password."/>
-                            <field name="context_lang" completion="1" readonly="0"/>
                             <field name="context_tz" completion="1" readonly="0"/>
+                            <field name="menu_tips" colspan="2" readonly="0"/>
                             <separator string="Email &amp; Signature" colspan="4"/>
                             <group colspan="4"><field name="user_email" widget="email"/></group>
                             <field colspan="4" name="signature" readonly="0" nolabel="1"/>

From a02c514038afe4bc48211338bd642fd8a35b47d2 Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Mon, 20 Sep 2010 13:09:37 +0530
Subject: [PATCH 04/61] [REM] mrp_repair: Shortcuts removed from wizard
 buttons.

bzr revid: uco@tinyerp.com-20100920073937-er2gv772cm2m9oyr
---
 addons/mrp_repair/wizard/mrp_repair_cancel_view.xml       | 4 ++--
 addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
index 811551aedbf..e307580be7b 100644
--- a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
@@ -14,8 +14,8 @@
 				    <newline/>
 				    <group col="2" colspan="4">
                 		<button icon="gtk-stop" special="cancel"
-                			string="_No" />
-                		<button name="cancel_repair" string="_Yes"
+                			string="No" />
+                		<button name="cancel_repair" string="Yes"
                 			colspan="1" type="object" icon="gtk-ok" />
                 	</group>
                 </form>
diff --git a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
index 62edf984b20..982ee5d4bc0 100644
--- a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
@@ -15,8 +15,8 @@
                     <newline/>  
                     <group col="2" colspan="4">                        
                 		<button icon="gtk-stop" special="cancel"
-                			string="_Cancel" />
-                		<button name="make_invoices" string="Create _Invoice"
+                			string="Cancel" />
+                		<button name="make_invoices" string="Create Invoice"
                 			colspan="1" type="object" icon="terp-dolar" />
                 	</group>
                 </form>

From 95d4cfd7f529ff6d869c150bdd137bfeaa3f5fea Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Mon, 20 Sep 2010 14:38:26 +0530
Subject: [PATCH 05/61] [IMP] point_of_sale: Report improved.

bzr revid: uco@tinyerp.com-20100920090826-r7hoy19n9ne7njqs
---
 addons/point_of_sale/report/pos_receipt.rml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/report/pos_receipt.rml b/addons/point_of_sale/report/pos_receipt.rml
index e722687f094..46a19714234 100644
--- a/addons/point_of_sale/report/pos_receipt.rml
+++ b/addons/point_of_sale/report/pos_receipt.rml
@@ -104,7 +104,7 @@
         <para style="terp_default_Centre_9">E-mail : [[ address and address.email ]]</para>
         <para style="terp_default_Centre_9">Shop : [[ o.shop_id.name ]]</para>
         <para style="terp_default_Centre_9">Vendeur : [[ o.user_salesman_id.name ]]</para>
-        <para style="terp_default_Centre_9">Date : [[ formatLang(o.date_order,date = True) ]]</para>
+        <para style="terp_default_Centre_9">Date : [[ formatLang(o.date_order,date_time = True) ]]</para>
         <para style="P4">
             <font color="white"> </font>
         </para>

From 8ba31fc711e01b9ae48ad6b3fe26b34ea1bd8d4a Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Mon, 20 Sep 2010 14:54:10 +0530
Subject: [PATCH 06/61] [FIX] mrp_repair: Repair order Quotation/Order report
 error corrected.

bzr revid: uco@tinyerp.com-20100920092410-v6othao2y8tofyn3
---
 addons/mrp_repair/report/order.py  |  2 +-
 addons/mrp_repair/report/order.rml | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/mrp_repair/report/order.py b/addons/mrp_repair/report/order.py
index 298e1f237ff..9ed63548e18 100644
--- a/addons/mrp_repair/report/order.py
+++ b/addons/mrp_repair/report/order.py
@@ -48,7 +48,7 @@ class order(report_sxw.rml_parse):
             res_partner_address = pooler.get_pool(self.cr.dbname).get('res.partner.address')
             addresses = res_partner.address_get(self.cr, self.uid, [partner.id], [type])
             adr_id = addresses and addresses[type] or False
-            return adr_id and res_partner_address.read(self.cr, self.uid, [adr_id])[0] or False
+            return adr_id and res_partner_address.read(self.cr, self.uid, [adr_id])[0] or {}
 
 report_sxw.report_sxw('report.repair.order','mrp.repair','addons/mrp_repair/report/order.rml',parser=order)
 
diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml
index c71abb614cf..b3c1855260b 100644
--- a/addons/mrp_repair/report/order.rml
+++ b/addons/mrp_repair/report/order.rml
@@ -175,7 +175,7 @@
           <para style="P3">
             <font color="white"> </font>
           </para>
-          <para style="P13">Invoice address</para>
+          <para style="P13">Invoice address :</para>
           <para style="P3">[[ o.partner_id and o.partner_id.property_payment_term.name ]]</para>
           <para style="P3">[[ o.partner_invoice_id.street ]]</para>
           <para style="P3">[[ o.partner_invoice_id.street2 or removeParentNode('para') ]]</para>
@@ -189,12 +189,12 @@
           </para>
         </td>
         <td>
-          <para style="P3">[[ o.partner_id.name ]]</para>
-          <para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default')['street'] ]]</para>
-          <para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default')['street2'] or removeParentNode('para') ]]</para>
-          <para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default')['zip'] ]][[ o.partner_id and adr_get(o.partner_id, 'default')['city'] ]]</para>
-          <para style="P3">[[ (o.partner_id and adr_get(o.partner_id, 'default')['state_id'] and adr_get(o.partner_id, 'default')['state_id'][1]) or removeParentNode('para') ]]</para>
-          <para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default')['country_id'] and adr_get(o.partner_id, 'default')['country_id'][1] ]]</para>
+          <para style="P3">[[ o.partner_id.name or removeParentNode('para') ]]</para>
+          <para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default').get('street','') or removeParentNode('para') ]]</para>
+          <para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default').get('street2','') or removeParentNode('para') ]]</para>
+          <para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default').get('zip','') or removeParentNode('para') ]][[ o.partner_id and adr_get(o.partner_id, 'default').get('city','') or removeParentNode('para') ]]</para>
+          <para style="P3">[[ (o.partner_id and adr_get(o.partner_id, 'default').get('state_id','') and adr_get(o.partner_id, 'default').get('state_id',[])[1]) or removeParentNode('para') ]]</para>
+          <para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default').get('country_id','') and adr_get(o.partner_id, 'default').get('country_id',[])[1] or removeParentNode('para') ]]</para>
           <para style="P3">
             <font color="white"> </font>
           </para>

From 787b398e4e8bc3b786d85fae608beef85b28f6a0 Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Tue, 21 Sep 2010 12:21:06 +0530
Subject: [PATCH 07/61] [IMP] auction: View improvements. Tooltips corrected.

bzr revid: uco@tinyerp.com-20100921065106-7nk61eaduimku3dq
---
 addons/auction/auction.py       |  41 ++++++------
 addons/auction/auction_view.xml | 109 ++++++++++++++++++--------------
 2 files changed, 84 insertions(+), 66 deletions(-)

diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index 5ea2441e6fd..cd468d56d8a 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -37,7 +37,8 @@ class auction_artists(osv.osv):
     _columns = {
         'name': fields.char('Artist/Author Name', size=64, required=True),
         'pseudo': fields.char('Pseudo', size=64),
-        'birth_death_dates':fields.char('Birth / Death dates', size=64),
+        'birth_date':fields.date('Birth date'),
+        'death_date':fields.date('Death date'),
         'biography': fields.text('Biography'),
     }
 auction_artists()
@@ -72,14 +73,14 @@ class auction_dates(osv.osv):
 
     _columns = {
         'name': fields.char('Auction Name', size=64, required=True),
-        'expo1': fields.date('First Exposition Day', required=True, help="Beginning Exposition Date For Auction"),
-        'expo2': fields.date('Last Exposition Day', required=True, help="Last Exposition Date For Auction"),
-        'auction1': fields.date('First Auction Day', required=True, help="Start Date Of Auction"),
-        'auction2': fields.date('Last Auction Day', required=True, help="End Date Of Auction"),
-        'journal_id': fields.many2one('account.journal', 'Buyer Journal', required=True, help="Account Journal For Buyer"),
-        'journal_seller_id': fields.many2one('account.journal', 'Seller Journal', required=True, help="Account Journal For Seller"),
-        'buyer_costs': fields.many2many('account.tax', 'auction_buyer_taxes_rel', 'auction_id', 'tax_id', 'Buyer Costs', help="Account Tax For Buyer"),
-        'seller_costs': fields.many2many('account.tax', 'auction_seller_taxes_rel', 'auction_id', 'tax_id', 'Seller Costs', help="Account Tax For Seller"),
+        'expo1': fields.date('First Exposition Day', required=True, help="Beginning exposition date for auction"),
+        'expo2': fields.date('Last Exposition Day', required=True, help="Last exposition date for auction"),
+        'auction1': fields.date('First Auction Day', required=True, help="Start date of auction"),
+        'auction2': fields.date('Last Auction Day', required=True, help="End date of auction"),
+        'journal_id': fields.many2one('account.journal', 'Buyer Journal', required=True, help="Account journal for buyer"),
+        'journal_seller_id': fields.many2one('account.journal', 'Seller Journal', required=True, help="Account journal for seller"),
+        'buyer_costs': fields.many2many('account.tax', 'auction_buyer_taxes_rel', 'auction_id', 'tax_id', 'Buyer Costs', help="Account tax for buyer"),
+        'seller_costs': fields.many2many('account.tax', 'auction_seller_taxes_rel', 'auction_id', 'tax_id', 'Seller Costs', help="Account tax for seller"),
         'acc_income': fields.many2one('account.account', 'Income Account', required=True),
         'acc_expense': fields.many2one('account.account', 'Expense Account', required=True),
         'adj_total': fields.function(_adjudication_get, method=True, string='Total Adjudication', store=True),
@@ -355,15 +356,15 @@ class auction_lots(osv.osv):
 
     _columns = {
         'bid_lines':fields.one2many('auction.bid_line', 'lot_id', 'Bids'),
-        'auction_id': fields.many2one('auction.dates', 'Auction', select=1, help="Auction For Object"),
-        'bord_vnd_id': fields.many2one('auction.deposit', 'Depositer Inventory', required=True, help="Provide Deposit Information: seller, Withdrawned Method, Object, Deposit Costs"),
-        'name': fields.char('Title', size=64, required=True, help='Auction Object Name'),
+        'auction_id': fields.many2one('auction.dates', 'Auction', select=1, help="Auction for object"),
+        'bord_vnd_id': fields.many2one('auction.deposit', 'Depositer Inventory', required=True, help="Provide deposit information: seller, Withdrawned Method, Object, Deposit Costs"),
+        'name': fields.char('Title', size=64, required=True, help='Auction object name'),
         'name2': fields.char('Short Description (2)', size=64),
         'lot_type': fields.selection(_type_get, 'Object category', size=64),
-        'author_right': fields.many2one('account.tax', 'Author rights', help="Account Tax For Author Commission"),
+        'author_right': fields.many2one('account.tax', 'Author rights', help="Account tax for author commission"),
         'lot_est1': fields.float('Minimum Estimation', help="Minimum Estimate Price"),
         'lot_est2': fields.float('Maximum Estimation', help="Maximum Estimate Price"),
-        'lot_num': fields.integer('List Number', required=True, select=1, help="List Number In Depositer Inventory"),
+        'lot_num': fields.integer('List Number', required=True, select=1, help="List number in depositer inventory"),
         'create_uid': fields.many2one('res.users', 'Created by', readonly=True),
         'history_ids':fields.one2many('auction.lot.history', 'lot_id', 'Auction history'),
         'lot_local':fields.char('Location', size=64, help="Auction Location"),
@@ -380,15 +381,15 @@ class auction_lots(osv.osv):
         'ach_login': fields.char('Buyer Username', size=64),
         'ach_uid': fields.many2one('res.partner', 'Buyer'),
         'seller_id': fields.related('bord_vnd_id','partner_id', type='many2one', relation='res.partner', string='Seller', readonly=True),
-        'ach_emp': fields.boolean('Taken Away', readonly=True, help="When state is Taken Away, This field is Marked as True"),
-        'is_ok': fields.boolean('Buyer\'s payment', help="When Buyer Pay For Bank statement', This field is Marked"),
+        'ach_emp': fields.boolean('Taken Away', readonly=True, help="When state is Taken Away, this field is marked as True"),
+        'is_ok': fields.boolean('Buyer\'s payment', help="When buyer pay for bank statement', this field is marked"),
         'ach_inv_id': fields.many2one('account.invoice', 'Buyer Invoice', readonly=True, states={'draft':[('readonly', False)]}),
         'sel_inv_id': fields.many2one('account.invoice', 'Seller Invoice', readonly=True, states={'draft':[('readonly', False)]}),
         'vnd_lim': fields.float('Seller limit'),
         'vnd_lim_net': fields.boolean('Net limit ?', readonly=True),
         'image': fields.binary('Image', help="Object Image"),
-        'paid_vnd':fields.function(_getprice, string='Seller Paid', method=True, type='boolean', store=True, multi="paid_vnd", help="When state of Seller Invoice is 'Paid', This field is selected as True."),
-        'paid_ach':fields.function(_getprice, string='Buyer Invoice Reconciled', method=True, type='boolean', store=True, multi="paid_ach", help="When state of Buyer Invoice is 'Paid', This field is selected as True."),
+        'paid_vnd':fields.function(_getprice, string='Seller Paid', method=True, type='boolean', store=True, multi="paid_vnd", help="When state of Seller Invoice is 'Paid', this field is selected as True."),
+        'paid_ach':fields.function(_getprice, string='Buyer Invoice Reconciled', method=True, type='boolean', store=True, multi="paid_ach", help="When state of Buyer Invoice is 'Paid', this field is selected as True."),
         'state': fields.selection((
             ('draft', 'Draft'),
             ('unsold', 'Unsold'),
@@ -404,7 +405,7 @@ class auction_lots(osv.osv):
         'gross_revenue':fields.function(_getprice, method=True, string='Gross revenue', store=True, multi="gross_revenue", help="Buyer Price - Seller Price"),
         'gross_margin':fields.function(_getprice, method=True, string='Gross Margin (%)', store=True, multi="gross_margin", help="(Gross Revenue*100.0)/ Object Price"),
         'costs':fields.function(_getprice, method=True, string='Indirect costs', store=True, multi="costs", help="Deposit cost"),
-        'statement_id': fields.many2many('account.bank.statement.line', 'auction_statement_line_rel', 'auction_id', 'statement', 'Payment', help="Bank statement Line For Given Buyer"),
+        'statement_id': fields.many2many('account.bank.statement.line', 'auction_statement_line_rel', 'auction_id', 'statement', 'Payment', help="Bank statement line for given buyer"),
         'net_revenue':fields.function(_getprice, method=True, string='Net revenue', store=True, multi="net_revenue", help="Buyer Price - Seller Price - Indirect Cost"),
         'net_margin':fields.function(_getprice, method=True, string='Net Margin (%)', store=True, multi="net_margin", help="(Net Revenue * 100)/ Object Price"),
     }
@@ -761,7 +762,7 @@ class auction_bid(osv.osv):
     _order = 'id desc'
     _columns = {
         'partner_id': fields.many2one('res.partner', 'Buyer Name', required=True),
-        'contact_tel':fields.char('Contact', size=64),
+        'contact_tel':fields.char('Contact Number', size=64),
         'name': fields.char('Bid ID', size=64, required=True),
         'auction_id': fields.many2one('auction.dates', 'Auction Date', required=True),
         'bid_lines': fields.one2many('auction.bid_line', 'bid_id', 'Bid'),
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index f91f77429ca..c01efdb1f5f 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
 <data>
-    <menuitem name="Auction Management" id="auction_menu_root" icon="terp-purchase" sequence="26" groups="base.group_system"/>
+    <menuitem name="Auction" id="auction_menu_root" icon="terp-purchase" sequence="26" groups="base.group_system"/>
     <menuitem name="Configuration" parent="auction_menu_root" id="auction_config_menu" sequence="7"/>
     <menuitem name="Tools Bar Codes" id="auction_outils_menu" parent="auction_menu_root" sequence="5" />
     <menuitem name="Deliveries Management" action="action_auction_taken" id="menu_wizard_emporte" parent="auction_outils_menu"/>
@@ -14,9 +14,10 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Artists">
-            <field name="name"/>
-                <field name="birth_death_dates"/>
-                <field name="biography"/>
+	            <field name="name"/>
+	            <field name="birth_date"/>
+	            <field name="death_date"/>
+	            <field name="biography"/>
             </tree>
         </field>
     </record>
@@ -26,12 +27,16 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Artists">
-                <field colspan="4" name="name" select="1"/>
-                <field colspan="4" name="pseudo" select="1"/>
-                    <newline/>
-                <field colspan="4" name="birth_death_dates"/>
-                    <newline/>
-                <field colspan="4" name="biography"/>
+                <separator string="Author/Artist" colspan="4"/>
+                <group colspan="4" col="6">
+	                <field name="name" colspan="4" string="Name"/>
+	                <newline/>
+	                <field name="pseudo"/>
+	                <field name="birth_date"/>
+	                <field name="death_date"/>
+                </group>
+                <separator string="Biography" colspan="4"/>
+                <field name="biography" nolabel="1" colspan="4"/>
             </form>
         </field>
     </record>
@@ -105,27 +110,39 @@
                 <field name="name" colspan="2" select="1"/>
                 <notebook colspan="4">
                     <page string="Auction Dates">
-                        <separator string="Exposition Dates" colspan="4"/>
-                        <field name="expo1"/>
-                        <field name="expo2"/>
-                        <separator string="Auction Dates" colspan="4"/>
-                        <field name="auction1" select="1"/>
-                        <field name="auction2" select="1"/>
+                        <group colspan="4" col="4">
+                            <group colspan="2" col="2">
+		                        <separator string="Exposition Dates" colspan="4"/>
+		                        <field name="expo1"/>
+		                        <field name="expo2"/>
+		                    </group>
+		                    <group colspan="2" col="2">
+				                <separator string="Auction Dates" colspan="4"/>
+		                        <field name="auction1" select="1"/>
+		                        <field name="auction2" select="1"/>
+		                    </group>
+                        </group>
                         <separator string="" colspan="4"/>
                         <field name="state"/>
                         <button name="close" states="draft" string="Create Invoices" type="object" colspan="2" icon="gtk-yes"/>
                     </page>
                     <page string="Accounting" >
-                        <separator string="Accounting" colspan="4"/>
-                        <field name="acc_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                        <field name="acc_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                        <separator string="Analytic" colspan="4"/>
-                        <field name="journal_id"/>
-                        <field name="journal_seller_id"/>
-                        <field name="account_analytic_id" groups="base.group_extended"/>
+                        <group colspan="4" col="4">
+                            <group colspan="2" col="2">
+		                        <separator string="Accounting" colspan="4"/>
+		                        <field name="acc_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+		                        <field name="acc_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+	                        </group>
+	                        <group colspan="2" col="2">
+		                        <separator string="Analytic" colspan="4"/>
+		                        <field name="journal_id"/>
+		                        <field name="journal_seller_id"/>
+		                        <field name="account_analytic_id" groups="base.group_extended"/>
+		                    </group>
+                        </group>
                     </page>
                     <page string="Commissions">
-                        <group col="4" colspan="4">
+                        <group col="4" colspan="4" expand="1">
                             <group col="2" colspan="4">
                                <separator string="Buyer Commissions" colspan="4"/>
                                 <field name="buyer_costs" domain="[('parent_id','=',False),('domain','=','auction'),('type_tax_use','&lt;&gt;','sale')]" nolabel="1" colspan="4"/>
@@ -332,13 +349,10 @@
                             </form>
                         </field>
                     </page>
-                    <page string="Note">
-                        <field name="obj_desc" colspan="4" nolabel="1"/>
-                    </page>
                     <page string="History" groups="base.group_extended">
                             <group colspan="2" col="2">
                                 <field name="statement_id" domain="[('state','=','draft')]" colspan="4" nolabel="1"
-                                    widget="one2many_list">
+                                    height="575" width="285" widget="one2many_list">
                                     <tree string="Buyer's Payment History">
                                         <field name="statement_id"/>
                                         <field name="amount"/>
@@ -352,14 +366,12 @@
                                         <field name="account_id"/>
                                         <field name="type"/>
                                         <field name="statement_id"/>
-                                        <field name="reconcile_id"/>
                                         <field name="amount"/>
-                                        <field name="reconcile_amount"/>
                                     </form>
                                 </field>
                             </group>
                             <group colspan="2" col="2">
-                               <field name="history_ids" colspan="4" readonly="1" nolabel="1">
+                               <field name="history_ids" colspan="4" readonly="1" nolabel="1" height="575">
                                   <tree string="History">
                                      <field name="name"/>
                                      <field name="lot_id"/>
@@ -369,6 +381,9 @@
                                </field>
                             </group>
                     </page>
+                    <page string="Notes">
+                        <field name="obj_desc" colspan="4" nolabel="1"/>
+                    </page>
                 </notebook>
            </form>
         </field>
@@ -450,8 +465,7 @@
         src_model="auction.lots"
         id="act_auction_lot_open_bid"/>
 
-    <menuitem name="Objects" parent="auction_menu_root" id="auction_objects_menu" sequence="2"/>
-    <menuitem name="Objects" action="action_all_objects" parent="auction_objects_menu" id="auction_all_objects_menu"/>
+    <menuitem name="Objects" action="action_all_objects" parent="auction_date_menu" id="auction_all_objects_menu"/>
 
     <record model="ir.ui.view" id="view_deposit_border_form">
         <field name="name">auction.deposit.form</field>
@@ -459,14 +473,15 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Deposit Border Form">
-               <field name="name" select="1"/>
-               <field name="date_dep" select="1"/>
-               <field name="partner_id" select="1"/>
-               <field name="method"/>
-               <newline/>
-               <field name="tax_id" domain="[('domain','=','auction'),('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
-               <field name="transfer"/>
-               <newline/>
+                <group colspan="4" col="6">
+	               <field name="name" string="Reference"/>
+	               <field name="date_dep"/>
+	               <field name="partner_id"/>
+	               <newline/>
+	               <field name="method"/>
+	               <field name="tax_id" domain="[('domain','=','auction'),('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
+	               <field name="transfer"/>
+	            </group>
                <notebook colspan="4">
                 <page string="General Information">
                  <field name="lot_id" colspan="4" mode="tree,graph" nolabel="1">
@@ -640,11 +655,13 @@
         <field name="model">auction.bid</field>
         <field name="arch" type="xml">
             <form string="Bids">
-                <field name="name" select="1"/>
-                 <field name="auction_id" select="1"/>
-                <newline/>
-                <field name="partner_id" select="1" on_change="onchange_contact(partner_id)"/>
-                <field  name="contact_tel"/>
+                <group colspan="4" col="6">
+	                <field name="name"/>
+	                <field name="auction_id"/>
+	                <field name="contact_tel"/>
+	                <newline/>
+	                <field name="partner_id" on_change="onchange_contact(partner_id)" colspan="4"/>
+                </group>
                 <field name="bid_lines" colspan="4" nolabel="1">
                     <tree string="Bids Lines" editable="bottom">
                         <field name="lot_id" domain="[('auction_id','=',parent.auction_id)]"/>

From ab0d9433c4b5a4323de387c2642dc3a48c3501b5 Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Tue, 21 Sep 2010 17:44:29 +0530
Subject: [PATCH 08/61] [ADD] auction: Added two fields to maintain invoice
 history of seller and buyer.

bzr revid: uco@tinyerp.com-20100921121429-r76je2pfwumyuib0
---
 addons/auction/auction.py       | 27 +++++++++++++++++++++++
 addons/auction/auction_view.xml | 39 ++++++++++++++++++++++++++++++++-
 2 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index cd468d56d8a..4fb99a2efbf 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -70,6 +70,31 @@ class auction_dates(osv.osv):
         reads = self.read(cr, uid, ids, ['name', 'auction1'], context)
         name = [(r['id'], '['+r['auction1']+'] '+ r['name']) for r in reads]
         return name
+    
+    def _get_buyer_invoice(self, cr, uid, ids, name, arg, context={}):
+        lots_obj = self.pool.get('auction.lots')
+        result = {}
+        for data in self.browse(cr, uid, ids):
+            inv_ids = []
+            lots_ids = lots_obj.search(cr, uid, [('auction_id','=',data.id),('ach_inv_id','!=',False)])
+            for lot in lots_obj.browse(cr, uid, lots_ids):
+                if lot.ach_inv_id:
+                    inv_ids.append(lot.ach_inv_id.id)
+            result[data.id] = inv_ids
+        return result
+    
+    def _get_seller_invoice(self, cr, uid, ids, name, arg, context={}):
+        lots_obj = self.pool.get('auction.lots')
+        lots_ids = lots_obj.search(cr, uid, [('auction_id','in',ids)])
+        result = {}
+        for data in self.browse(cr, uid, ids):
+            inv_ids = []
+            lots_ids = lots_obj.search(cr, uid, [('auction_id','=',data.id),('sel_inv_id','!=',False)])
+            for lot in lots_obj.browse(cr, uid, lots_ids):
+                if lot.sel_inv_id:
+                    inv_ids.append(lot.sel_inv_id.id)
+            result[data.id] = inv_ids
+        return result
 
     _columns = {
         'name': fields.char('Auction Name', size=64, required=True),
@@ -87,6 +112,8 @@ class auction_dates(osv.osv):
         'state': fields.selection((('draft', 'Draft'), ('closed', 'Closed')), 'State', select=1, readonly=True,
                                   help='When auction starts the state is \'Draft\'.\n At the end of auction, the state becomes \'Closed\'.'),
         'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True),
+        'buyer_invoice_history': fields.function(_get_buyer_invoice, relation='account.invoice', method=True, string="Buyer Invoice", type='many2many'),
+        'seller_invoice_history': fields.function(_get_seller_invoice, relation='account.invoice', method=True, string="Seller Invoice", type='many2many'),
     }
 
     _defaults = {
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index c01efdb1f5f..1ec39f8c0f0 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -17,7 +17,6 @@
 	            <field name="name"/>
 	            <field name="birth_date"/>
 	            <field name="death_date"/>
-	            <field name="biography"/>
             </tree>
         </field>
     </record>
@@ -153,6 +152,44 @@
                              </group>
                         </group>
                     </page>
+                    <page string="History">
+                        <group colspan="4" col="4">
+                            <group colspan="2" col="2">
+                                <separator string="Buyer Invoices" colspan="2"/>
+                                <field name="buyer_invoice_history" nolabel="1" widget="one2many_list"
+                                        height="400">
+                                    <tree colors="blue:state in ('draft');black:state in ('proforma','proforma2','open');gray:state in ('cancel')" string="Invoice">
+					                    <field name="date_invoice"/>
+					                    <field name="number"/>
+					                    <field name="partner_id" groups="base.group_user"/>
+					                    <field name="name"/>
+					                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+					                    <field name="user_id"/>
+					                    <field name="date_due"/>
+					                    <field name="origin"/>
+                                        <field name="state"/>
+                                    </tree>
+                                </field>
+                            </group>
+                            <group colspan="2" col="2">
+                                <separator string="Seller Invoices" colspan="2"/>
+                                <field name="seller_invoice_history" nolabel="1" widget="one2many_list"
+                                        height="400">
+                                    <tree colors="blue:state in ('draft');black:state in ('proforma','proforma2','open');gray:state in ('cancel')" string="Invoice">
+                                        <field name="date_invoice"/>
+                                        <field name="number"/>
+                                        <field name="partner_id" groups="base.group_user"/>
+                                        <field name="name"/>
+                                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                        <field name="user_id"/>
+                                        <field name="date_due"/>
+                                        <field name="origin"/>
+                                        <field name="state"/>
+                                    </tree>
+                                </field>
+                            </group>
+                        </group>
+                    </page>
                 </notebook>
             </form>
         </field>

From 91e5b3a0583bc0583cd14df175229899a2bb4c70 Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Tue, 21 Sep 2010 17:47:11 +0530
Subject: [PATCH 09/61] [REF] auction: Field name changed according to new
 changes.

bzr revid: uco@tinyerp.com-20100921121711-3tvhrcxbys9avm3b
---
 addons/auction/auction_demo.xml   | 6 ++++--
 addons/auction/report/artists.xml | 3 ++-
 addons/auction/test/auction.yml   | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/addons/auction/auction_demo.xml b/addons/auction/auction_demo.xml
index a26e5355cde..94ee1ec98a2 100644
--- a/addons/auction/auction_demo.xml
+++ b/addons/auction/auction_demo.xml
@@ -144,12 +144,14 @@
 
     <record model="auction.artists" id="auction_art_1">
         <field name="name">Philippe Lavilier</field>
-        <field name="birth_death_dates">1345-1450</field>
+        <field name="birth_date">1345-08-10</field>
+        <field name="death_date">1450-10-21</field>
     </record>
 
     <record model="auction.artists" id="auction_art_2">
         <field name="name">POREAU OSWALD</field>
-        <field name="birth_death_dates">1877-1955</field>
+        <field name="birth_date">1877-03-12</field>
+        <field name="death_date">1955-09-11</field>
     </record>
 
         <!-- demo data for the account tax code-->
diff --git a/addons/auction/report/artists.xml b/addons/auction/report/artists.xml
index 0c63f338051..360930f9f0c 100644
--- a/addons/auction/report/artists.xml
+++ b/addons/auction/report/artists.xml
@@ -3,7 +3,8 @@
 <artists>
 	<artist type="fields" name="name,id">
 		<name type="field" name="name"></name>
-		<birth_death_dates type="field" name="birth_death_dates"></birth_death_dates>
+		<birth_date type="field" name="birth_date"></birth_date>
+		<death_date type="field" name="death_date"></death_date>
 		<biography type="field" name="biography"></biography>
 	</artist>
 </artists>
diff --git a/addons/auction/test/auction.yml b/addons/auction/test/auction.yml
index 6d07f5fc0a5..8ef1e72ede3 100644
--- a/addons/auction/test/auction.yml
+++ b/addons/auction/test/auction.yml
@@ -21,7 +21,8 @@
   I create a new artist for an object. 
 - 
   !record {model: auction.artists, id: auction_artists_vincentvangogh0}:
-    birth_death_dates: 1853-1900
+    birth_date: "1853-03-30"
+    death_date: "1890-07-29"
     name: Vincent van Gogh
  
 - 

From 3b0db681ab6008dbd2e0d2a78a9a3d1fbeb00695 Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Tue, 21 Sep 2010 17:48:57 +0530
Subject: [PATCH 10/61] [IMP] auction: View improvements. Wizard improved.

bzr revid: uco@tinyerp.com-20100921121857-000n5w01kep9spym
---
 addons/auction/wizard/auction_lots_make_invoice_view.xml | 3 ++-
 addons/auction/wizard/auction_pay_buy_view.xml           | 3 ++-
 addons/auction/wizard/auction_taken.py                   | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/auction/wizard/auction_lots_make_invoice_view.xml b/addons/auction/wizard/auction_lots_make_invoice_view.xml
index ddd82ac3cda..56903865e5f 100644
--- a/addons/auction/wizard/auction_lots_make_invoice_view.xml
+++ b/addons/auction/wizard/auction_lots_make_invoice_view.xml
@@ -15,7 +15,8 @@
                 		 <label string="(Keep empty for automatic number)" colspan="2"/>
                     </group>
                     <separator string="" colspan="4"/>
-                    <group colspan="4" col="6">
+                    <group colspan="2" col="2"/>
+                    <group colspan="2" col="2">
                     	<button icon="gtk-close" special="cancel" string="Close"/>
                     	<button icon="gtk-yes" string="Create invoices" name="makeInvoices" type="object"/>
                    </group>
diff --git a/addons/auction/wizard/auction_pay_buy_view.xml b/addons/auction/wizard/auction_pay_buy_view.xml
index d4ba91cad84..f7059d1374e 100644
--- a/addons/auction/wizard/auction_pay_buy_view.xml
+++ b/addons/auction/wizard/auction_pay_buy_view.xml
@@ -30,7 +30,8 @@
                     <field name="statement_id3"  domain="[('state','=','draft')]"/>
                   </group>
                   <separator string="" colspan="4" />
-                  <group colspan="4" col="6">
+                  <group colspan="2" col="2"/>
+                  <group colspan="2" col="2">
                    	<button icon="gtk-close" special="cancel" string="Close"/>
                    	<button icon="gtk-yes"  string="Pay" name="pay_and_reconcile" type="object"/>
                   </group>
diff --git a/addons/auction/wizard/auction_taken.py b/addons/auction/wizard/auction_taken.py
index 6beadc6a312..7db905cd576 100644
--- a/addons/auction/wizard/auction_taken.py
+++ b/addons/auction/wizard/auction_taken.py
@@ -53,7 +53,7 @@ class auction_taken(osv.osv_memory):
           lot_obj = self.pool.get('auction.lots')
           for current in self.browse(cr, uid, ids, context):
               for lot in current.lot_ids:
-                  lot_obj.write(cr, uid, lot.id, {'state':'taken_away'})
+                  lot_obj.write(cr, uid, lot.id, {'state':'taken_away', 'ach_emp': True})
               return {'lot_ids': []}
 
 auction_taken()

From 8af368159be801f5ee24d8be8fdcad7025688cae Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 21 Sep 2010 16:04:57 +0200
Subject: [PATCH 11/61] [IMP] addons.init: avoid spurious warnings during
 validation of -i / -u server parameters Includes revert of revision 2111.5.24
 rvo@tinyerp.co.in-20100503134414-ma87k4htpifi00tz

bzr revid: odo@openerp.com-20100921140457-cwhl843wz86nfmm8
---
 bin/addons/__init__.py | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index cc3bdc2ce7b..3e062563dd5 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -757,16 +757,19 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, **kwargs):
 
     return has_updates
 
+def _check_module_names(cr, module_names):
+    mod_names = set(module_names)
+    if 'base' in mod_names:
+        # ignore dummy 'all' module
+        mod_names.remove('all')
+    cr.execute("SELECT count(id) AS count FROM ir_module_module WHERE name in %s", (tuple(mod_names),))
+    if cr.dictfetchone()['count'] != len(mod_names):
+        # find out what module name(s) are incorrect:
+        cr.execute("SELECT name FROM ir_module_module")
+        incorrect_names = mod_names.difference([x['name'] for x in cr.dictfetchall()])
+        logging.getLogger('init').warning('invalid module names, ignored: %s', ", ".join(incorrect_names))
+
 def load_modules(db, force_demo=False, status=None, update_module=False):
-
-    def check_module_name(cr, mods, state):
-        for mod in mods:
-            id = modobj.search(cr, 1, ['&', ('state', '=', state), ('name', '=', mod)])
-            if id:
-                getattr(modobj, states[state])(cr, 1, id)
-            elif mod != 'all':
-                logger.notifyChannel('init', netsvc.LOG_WARNING, 'module %s: invalid module name!' % (mod))
-
     if not status:
         status = {}
     cr = db.cursor()
@@ -795,16 +798,23 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
 
         if update_module:
             modobj = pool.get('ir.module.module')
-            states = {'installed': 'button_upgrade', 'uninstalled': 'button_install'}
             logger.notifyChannel('init', netsvc.LOG_INFO, 'updating modules list')
             if ('base' in tools.config['init']) or ('base' in tools.config['update']):
                 modobj.update_list(cr, 1)
 
+            _check_module_names(cr, itertools.chain(tools.config['init'].keys(), tools.config['update'].keys()))
+
             mods = [k for k in tools.config['init'] if tools.config['init'][k]]
-            check_module_name(cr, mods, 'uninstalled')
+            if mods:
+                ids = modobj.search(cr, 1, ['&', ('state', '=', 'uninstalled'), ('name', 'in', mods)])
+                if ids:
+                    modobj.button_install(cr, 1, ids)
 
             mods = [k for k in tools.config['update'] if tools.config['update'][k]]
-            check_module_name(cr, mods, 'installed')
+            if mods:
+                ids = modobj.search(cr, 1, ['&', ('state', '=', 'installed'), ('name', 'in', mods)])
+                if ids:
+                    modobj.button_upgrade(cr, 1, ids)
 
             cr.execute("update ir_module_module set state=%s where name=%s", ('installed', 'base'))
 

From d34059a6222ba7d4ca687a56f90e7833eacfcbbd Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Tue, 21 Sep 2010 19:38:11 +0530
Subject: [PATCH 12/61] [FIX] mrp_repair: Report error corrected in better way.

bzr revid: uco@tinyerp.com-20100921140811-8g1e4y70zqlp9b80
---
 addons/mrp_repair/mrp_repair.py    | 11 +++++++++++
 addons/mrp_repair/report/order.py  |  9 ---------
 addons/mrp_repair/report/order.rml | 10 +++++-----
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index ddcd2ccb501..146fbb32f03 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -93,12 +93,23 @@ class mrp_repair(osv.osv):
             cur = repair.pricelist_id.currency_id
             res[id] = cur_obj.round(cr, uid, cur, untax.get(id, 0.0) + tax.get(id, 0.0))
         return res
+    
+    def _get_default_address(self, cr, uid, ids, field_name, arg, context):
+        res = {}
+        partner_obj = self.pool.get('res.partner')
+        for data in self.browse(cr, uid, ids):
+            adr_id = False
+            if data.partner_id:
+                adr_id = partner_obj.address_get(cr, uid, [data.partner_id.id], ['default'])['default']
+            res[data.id] = adr_id
+        return res
 
     _columns = {
         'name': fields.char('Repair Reference',size=24, required=True),
         'product_id': fields.many2one('product.product', string='Product to Repair', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'partner_id' : fields.many2one('res.partner', 'Partner', select=True, help='This field allow you to choose the parner that will be invoiced and delivered'),
         'address_id': fields.many2one('res.partner.address', 'Delivery Address', domain="[('partner_id','=',partner_id)]"),
+        'default_address_id': fields.function(_get_default_address, method=True, type="many2one", relation="res.partner.address"),
         'prodlot_id': fields.many2one('stock.production.lot', 'Lot Number', select=True, domain="[('product_id','=',product_id)]"),
         'state': fields.selection([
             ('draft','Quotation'),
diff --git a/addons/mrp_repair/report/order.py b/addons/mrp_repair/report/order.py
index 9ed63548e18..3257ba3df7a 100644
--- a/addons/mrp_repair/report/order.py
+++ b/addons/mrp_repair/report/order.py
@@ -30,10 +30,8 @@ class order(report_sxw.rml_parse):
         self.localcontext.update({
             'time': time,
             'total': self.total,
-            'adr_get' : self._adr_get
         })
 
-
     def total(self, repair):
         total = 0.0
         for operation in repair.operations:
@@ -43,13 +41,6 @@ class order(report_sxw.rml_parse):
         total = total + repair.amount_tax
         return total
 
-    def _adr_get(self, partner, type):
-            res_partner = pooler.get_pool(self.cr.dbname).get('res.partner')
-            res_partner_address = pooler.get_pool(self.cr.dbname).get('res.partner.address')
-            addresses = res_partner.address_get(self.cr, self.uid, [partner.id], [type])
-            adr_id = addresses and addresses[type] or False
-            return adr_id and res_partner_address.read(self.cr, self.uid, [adr_id])[0] or {}
-
 report_sxw.report_sxw('report.repair.order','mrp.repair','addons/mrp_repair/report/order.rml',parser=order)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml
index b3c1855260b..149a2650bfd 100644
--- a/addons/mrp_repair/report/order.rml
+++ b/addons/mrp_repair/report/order.rml
@@ -190,11 +190,11 @@
         </td>
         <td>
           <para style="P3">[[ o.partner_id.name or removeParentNode('para') ]]</para>
-          <para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default').get('street','') or removeParentNode('para') ]]</para>
-          <para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default').get('street2','') or removeParentNode('para') ]]</para>
-          <para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default').get('zip','') or removeParentNode('para') ]][[ o.partner_id and adr_get(o.partner_id, 'default').get('city','') or removeParentNode('para') ]]</para>
-          <para style="P3">[[ (o.partner_id and adr_get(o.partner_id, 'default').get('state_id','') and adr_get(o.partner_id, 'default').get('state_id',[])[1]) or removeParentNode('para') ]]</para>
-          <para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default').get('country_id','') and adr_get(o.partner_id, 'default').get('country_id',[])[1] or removeParentNode('para') ]]</para>
+          <para style="P3">[[ o.default_address_id and o.default_address_id.street or removeParentNode('para') ]]</para>
+          <para style="P3">[[ o.default_address_id and o.default_address_id.street2 or removeParentNode('para') ]]</para>
+          <para style="P3">[[ o.default_address_id and o.default_address_id.zip or removeParentNode('para') ]][[ o.default_address_id and o.default_address_id.city or removeParentNode('para') ]]</para>
+          <para style="P3">[[ o.default_address_id and o.default_address_id.state_id and o.default_address_id.state_id.name or removeParentNode('para') ]]</para>
+          <para style="P3">[[ o.default_address_id and o.default_address_id.country_id and o.default_address_id.country_id.name or removeParentNode('para') ]]</para>
           <para style="P3">
             <font color="white"> </font>
           </para>

From 0b314fd3dd6da4ca55993293d350825d55bd9b86 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 21 Sep 2010 16:25:25 +0200
Subject: [PATCH 13/61] [IMP] addons.init: handle properly empty update/init
 module spec

bzr revid: odo@openerp.com-20100921142525-2vjy7njophpl77bf
---
 bin/addons/__init__.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index 3e062563dd5..297cf73c6f4 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -762,12 +762,13 @@ def _check_module_names(cr, module_names):
     if 'base' in mod_names:
         # ignore dummy 'all' module
         mod_names.remove('all')
-    cr.execute("SELECT count(id) AS count FROM ir_module_module WHERE name in %s", (tuple(mod_names),))
-    if cr.dictfetchone()['count'] != len(mod_names):
-        # find out what module name(s) are incorrect:
-        cr.execute("SELECT name FROM ir_module_module")
-        incorrect_names = mod_names.difference([x['name'] for x in cr.dictfetchall()])
-        logging.getLogger('init').warning('invalid module names, ignored: %s', ", ".join(incorrect_names))
+    if mod_names:
+        cr.execute("SELECT count(id) AS count FROM ir_module_module WHERE name in %s", (tuple(mod_names),))
+        if cr.dictfetchone()['count'] != len(mod_names):
+            # find out what module name(s) are incorrect:
+            cr.execute("SELECT name FROM ir_module_module")
+            incorrect_names = mod_names.difference([x['name'] for x in cr.dictfetchall()])
+            logging.getLogger('init').warning('invalid module names, ignored: %s', ", ".join(incorrect_names))
 
 def load_modules(db, force_demo=False, status=None, update_module=False):
     if not status:

From bbc9eba7a0824dafb05832518a4fa3a9117b8b1f Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 21 Sep 2010 17:34:23 +0200
Subject: [PATCH 14/61] [IMP] netsvc.Agent: Agent.runner thread should be
 marked daemon to be terminated at server exit (harmlessly) Also set a thread
 name for the runner thread.

bzr revid: odo@openerp.com-20100921153423-053knurknw34qj1r
---
 bin/netsvc.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bin/netsvc.py b/bin/netsvc.py
index d29aebd92b5..ce9b35d2a5b 100644
--- a/bin/netsvc.py
+++ b/bin/netsvc.py
@@ -352,7 +352,12 @@ class Agent(object):
                 time.sleep(1)
             time.sleep(60)
 
-threading.Thread(target=Agent.runner).start()
+agent_runner = threading.Thread(target=Agent.runner, name="netsvc.Agent.runner")
+# the agent runner is a typical daemon thread, that will never quit and must be
+# terminated when the main process exits - with no consequence (the processing
+# threads it spawns are not marked daemon)
+agent_runner.daemon = True
+agent_runner.start()
 
 
 import traceback

From 1e9167f9a9cf88cef7bcc898c49ce267764d4d3b Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 22 Sep 2010 11:09:37 +0530
Subject: [PATCH 15/61] [IMP] hr_* : Usability improvements

bzr revid: vir@tinyerp.com-20100922053937-5gah2r12uvewy210
---
 addons/hr/hr_department_view.xml                   |  4 ++--
 addons/hr/hr_view.xml                              |  4 ++--
 addons/hr_expense/hr_expense.py                    |  2 +-
 addons/hr_expense/hr_expense_view.xml              |  4 ++--
 addons/hr_holidays/hr_holidays_view.xml            | 14 +++++++-------
 addons/hr_holidays/security/ir.model.access.csv    |  1 +
 addons/hr_recruitment/hr_recruitment.py            |  2 +-
 addons/hr_recruitment/hr_recruitment_view.xml      |  4 ++--
 addons/hr_timesheet/hr_timesheet_view.xml          | 11 ++++++-----
 .../hr_timesheet_sheet/hr_timesheet_sheet_view.xml |  4 ++--
 10 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index ccbd506b7e6..d4f13458f1c 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -14,9 +14,9 @@
             <field name="arch" type="xml">
                 <form string="department">
                     <group col="6" colspan="4">
-                        <field colspan="4" name="name" select="1"/>
+                        <field name="name" select="1"/>
                         <field name="parent_id"/>
-                        <field colspan="4" name="manager_id" select="1"/>
+                        <field name="manager_id" select="1"/>
                         <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
                     </group>
                     <notebook colspan="4" >
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index e0efa92056b..83b5b266e5e 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -99,7 +99,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Employees">
-                    <filter icon="terp-personal-" domain="[('active','=',False)]" string="Unactive" groups="base.group_extended"/>
+                    <filter icon="terp-personal+" domain="[('active','=',True)]" string="Active" groups="base.group_extended"/>
                     <separator orientation="vertical" />
                     <field name="name"/>
                     <field name="department_id" widget="selection">
@@ -114,7 +114,7 @@
                     <separator orientation="vertical" />
                     <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
                     <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
-                    <filter string="Company" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'company_id'}"/>
+                    <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"/>
                     </group>
                 </search>
              </field>
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 6c2f44dfb8c..4003cded168 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -81,7 +81,7 @@ class hr_expense_expense(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'state': fields.selection([
             ('draft', 'Draft'),
-            ('confirm', 'Waiting Approved'),
+            ('confirm', 'Waiting Approval'),
             ('accepted', 'Approved'),
             ('invoiced', 'Invoiced'),
             ('paid', 'Reimbursed'),
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 4fc5b0412f8..79c0d5513f0 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -77,7 +77,7 @@
                         <field name="company_id" groups="base.group_multi_company"/>
                     </group>
                     <notebook colspan="4">
-                        <page string="Expense Sheet">
+                        <page string="Description">
                             <newline/>
                             <field colspan="4" name="line_ids" nolabel="1">
                                 <form string="Expense Lines">
@@ -99,7 +99,7 @@
                                 <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply"/>
                                 <button name="cancel" states="cancel" string="Cancel" type="workflow" icon="gtk-cancel"/>
                                 <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" icon="gtk-convert"/>                                                                
-                                <button name="validate" states="confirm" string="Approve" type="workflow" icon="gtk-ok"/>
+                                <button name="validate" states="confirm" string="Approve" type="workflow" icon="terp-camera_test"/>
                                 <button name="invoice" states="accepted" string="Invoice" type="workflow" icon="gtk-execute"/>
                                 <button name="refuse" states="confirm,draft,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_manager" />
                             </group>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index aaa0628bc11..b73604bba7c 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -12,12 +12,13 @@
                         <filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated"
                             default="context.get('report', False)"/> 
                         <separator orientation="vertical"/>                    
-                        <filter icon="terp-gtk-go-back-rtl" domain="[('state','=','draft')]" string="To Confirm"/>
-                        <filter icon="terp-gtk-go-back-rtl" domain="[('state','=','confirm')]" string="To Approve"/>
+                        <filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/>
+                        <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve"/>
                         <separator orientation="vertical"/>
                        <filter string="This Month" icon="terp-go-month" name="This Month"
                            domain="[('date_from','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_from','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
-                        <field name="user_id"/>
+                        <separator orientation="vertical"/>
+                        <field name="employee_id"/>
                         <field name="department_id" widget="selection">
                             <filter icon="terp-personal+" help="My Department Holidays"
                                 domain="[('department_id.manager_id','=',uid)]" />
@@ -228,14 +229,14 @@
                 <tree colors="red:state in ('refuse');blue:state in (' draft');black:state in ('confirm','validate','validate1');gray:state in ('cancel')">
                     <field name="employee_id"/>
                     <field name="department_id" invisible="not context.get('set_visible',False)"/>
+                    <field name="holiday_status_id"/>
+                    <field name="name"/>
                     <field name="number_of_days" string="Number of Days" sum='Remaining Days'/>
                     <field name="date_from"/>
                     <field name="date_to"/>
-                    <field name="name"/>
-                    <field name="holiday_status_id"/>
                     <field name="manager_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
-                    <field name="type"/>
+                    <!--field name="type"/-->
                     <field name="state"/>
                     <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
@@ -259,7 +260,6 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="edit_holiday_new"/>
             <field name="domain">[('type','=','remove')]</field>
-            <field name="context">{'search_default_user_id':uid}</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
             <field name="help">Leaves requests can be recorded by employees and validated by their managers. Once a leave request is validated it appears automatically in the agenda of the employee. You can define several allowance types (paid holidays, sickness, etc) and manage allowances per type.</field>
         </record>
diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv
index a7022f1c1ea..c9d1d8afc6d 100644
--- a/addons/hr_holidays/security/ir.model.access.csv
+++ b/addons/hr_holidays/security/ir.model.access.csv
@@ -11,3 +11,4 @@
 "access_hr_holidays_system","hr.holidays.system","model_hr_holidays","base.group_system",1,0,0,0
 "access_hr_holidays_employee","hr.holidays.employee","model_hr_holidays","base.group_user",1,0,0,0
 "access_hr_holydays_status_employee","hr.holidays.status.employee","model_hr_holidays_status","base.group_user",1,0,0,0
+"access_resource_calendar_leaves_employee","resource_calendar_leaves_employee","resource.model_resource_calendar_leaves","base.group_hr_user",1,1,1,1
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index c98b6c485f6..b9241477409 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -437,7 +437,7 @@ class hr_applicant(crm.crm_case, osv.osv):
             emp_id = employee_obj.create(cr,uid,{'name':applicant.name,'job_id':applicant.job_id.id})
             job_data = job_obj.browse(cr,uid, applicant.job_id.id)
             expected_emp = job_data['expected_employees'] - 1
-            job_obj.write(cr,uid, [applicant.job_id.id],{'expected_employees':expected_emp})
+            job_obj.write(cr,uid, [applicant.job_id.id],{'expected_employees':expected_emp,'state': 'old'})
 
         return res
 
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 5ecb50a828c..57141b34212 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -78,7 +78,7 @@
                         <field name="partner_name"/>
                         <field name="job_id" on_change="onchange_job(job_id)"/>
                         <button string="Schedule a Phone Call" name="%(action_hr_recruitment_phonecall)d" icon="terp-call-start" type="action" groups="base.group_extended"/>
-                        <button name="action_makeMeeting" type="object" string="Schedule Meeting" icon="terp-hr"/>
+                        <button name="action_makeMeeting" type="object" string="Schedule Meeting" icon="gtk-index"/>
                     <newline/>
                     <field name="department_id" widget="selection"/>
                     <group colspan="2" col="4">
@@ -100,7 +100,7 @@
                             <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" />
                             <button string="Create Partner"
                                     name="%(action_hr_recruitment_partner_create)d"
-                                    icon="terp-personal" type="action" attrs="{'readonly':[('partner_id','!=',False)]}"/>
+                                    icon="gtk-index" type="action" attrs="{'readonly':[('partner_id','!=',False)]}"/>
                             <newline/>
                             <field name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="3"/>
                             <field name="email_from" colspan="3"/>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index f8e8fd2ab7e..4165f71d73f 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -16,8 +16,8 @@
                     <field name="date" on_change="on_change_date(date)"/>
                     <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id"/>
                     <field name="name"/>
-                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" sum="Total time"/>
                     <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" required="1" domain="[('type','=','service')]"/>
+                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" sum="Total time"/>
                     <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
                     <field name="amount" sum="Total cost"/>
                     <field name="general_account_id"/>
@@ -77,10 +77,11 @@
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Users" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Anlytic account" icon="terp-personal+" domain="[]" context="{'group_by':'account_id'}"/>
-                        <separator orientation="vertical"/>                        
-                        <filter string="Product" icon="terp-personal" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="Date" icon="terp-personal+" domain="[]" context="{'group_by':'date'}"/>                        
+                        <separator orientation="vertical"/>
+                        <filter string="Anlytic account" icon="terp-folder-green" domain="[]" context="{'group_by':'account_id'}"/>
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>                        
                     </group>                     
                 </search>
             </field>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index d9b666cfbf1..657ec40288d 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -148,10 +148,10 @@
                     </notebook>
                     <field name="state"/>
                     <group col="4" colspan="2">
-                        <button name="button_confirm" states="draft" string="Confirm" type="object" icon="terp-camera_test"/>
+                        <button name="button_confirm" states="draft" string="Confirm" type="object" icon="terp-check"/>
                         <button name="action_set_to_draft" states="done" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
                         <button name="cancel" states="confirm" string="Refuse" type="workflow" icon="gtk-cancel"/>
-                        <button name="done" states="confirm" string="Approve" type="workflow" icon="gtk-jump-to"/>
+                        <button name="done" states="confirm" string="Approve" type="workflow" icon="terp-camera_test"/>
                     </group>
                 </form>
             </field>

From 2d2e0b25a3b43e000c4a16589aec799b7d5db979 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Wed, 22 Sep 2010 11:22:05 +0530
Subject: [PATCH 16/61] [FIX]:The records that has groupby field value = False
 or '' should also be returned to the client to show as 'Undefined'

bzr revid: nch@tinyerp.com-20100922055205-k9cu34iuzfhlvbg1
---
 bin/osv/orm.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 25a987dac61..64b118f3e15 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -2275,6 +2275,9 @@ class orm(orm_template):
             del r['id']
         if groupby and fget[groupby]['type'] == 'many2one':
             data_ids = self.search(cr, uid, [('id', 'in', alldata.keys())], order=groupby, context=context)
+            # the IDS of the records that has groupby field value = False or ''
+            # should be added too
+            data_ids += filter(lambda x:x not in data_ids, alldata.keys())
             data = self.read(cr, uid, data_ids, groupby and [groupby] or ['id'], context=context)
             # restore order of the search as read() uses the default _order (this is only for groups, so the size of data_read shoud be small):
             data.sort(lambda x,y: cmp(data_ids.index(x['id']), data_ids.index(y['id'])))

From 4fc298f756aa40cf83d3b1a8c47dd2dcb4de0d53 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 22 Sep 2010 11:46:55 +0530
Subject: [PATCH 17/61] [IMP] hr_holidays : Improvements in view

bzr revid: vir@tinyerp.com-20100922061655-m0dvhpzlhqdv39is
---
 addons/hr_holidays/hr_holidays_view.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index b73604bba7c..e6cb46ab03d 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -25,6 +25,11 @@
                         </field>
                         <field name="holiday_status_id" widget="selection"/>
                     </group>
+                    <newline/>
+                    <group expand="0" string="Extended options...">
+                        <field name="date_from"/>
+                        <field name="date_to"/>
+                    </group>
                     <newline />
                     <group expand="0" string="Group By...">
                         <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
@@ -216,6 +221,11 @@
                     <field name="manager_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="state"/>
+                    <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
+                    <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
+                    <button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
+                    <button string="Cancel" name="cancel" states="validate,refuse,validate1" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
+                    <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert" groups="base.group_hr_manager"/>
                 </tree>
             </field>
         </record>
@@ -320,7 +330,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="view_holiday_simple"/>
-            <field name="context">{'search_default_user_id':uid,'allocation_type':'company', 'report':True}</field>
+            <field name="context">{'allocation_type':'company', 'report':True}</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
 

From a640ecc89e0bc7c27795c6beb21dec0603a3f1b6 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Wed, 22 Sep 2010 11:53:31 +0530
Subject: [PATCH 18/61] [IMP]hr_holidays : Usability improvement in grops

bzr revid: amp@tinyerp.com-20100922062331-gchm37fo6oq60wgz
---
 addons/hr_holidays/hr_holidays_view.xml       | 24 +++++++++----------
 .../hr_holidays/security/ir.model.access.csv  |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index e6cb46ab03d..12d347cd876 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -90,12 +90,12 @@
                             <newline/>
                             <field name="state" colspan="2"/>
                             <group colspan="2">
-                                <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
-                                <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
-                                <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply"/>
-                                <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no"/>
-                                <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel"/>
-                                <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert"/>
+                                <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
+                                <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
+                                <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
+                                <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
+                                <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
+                                <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert" groups="base.group_hr_manager"/>
                             </group>
                         </page>
                     </notebook>
@@ -133,12 +133,12 @@
                         <newline/>
                         <field name="state" colspan="2"/>
                         <group colspan="2">
-                            <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
-                            <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
-                            <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply"/>
-                            <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no"/>
-                            <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel"/>
-                            <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert"/>
+                            <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
+                            <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
+                            <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
+                            <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
+                            <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
+                            <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert" groups="base.group_hr_manager"/>
                         </group>
                     </page>
                 </notebook>
diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv
index c9d1d8afc6d..0e7b122a943 100644
--- a/addons/hr_holidays/security/ir.model.access.csv
+++ b/addons/hr_holidays/security/ir.model.access.csv
@@ -11,4 +11,4 @@
 "access_hr_holidays_system","hr.holidays.system","model_hr_holidays","base.group_system",1,0,0,0
 "access_hr_holidays_employee","hr.holidays.employee","model_hr_holidays","base.group_user",1,0,0,0
 "access_hr_holydays_status_employee","hr.holidays.status.employee","model_hr_holidays_status","base.group_user",1,0,0,0
-"access_resource_calendar_leaves_employee","resource_calendar_leaves_employee","resource.model_resource_calendar_leaves","base.group_hr_user",1,1,1,1
+"access_resource_calendar_leaves_manager","resource_calendar_leaves_manager","resource.model_resource_calendar_leaves","base.group_hr_manager",1,1,1,1

From 50e75a080e9ba5612f376b070ec2fa7776cfaead Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 22 Sep 2010 12:35:07 +0530
Subject: [PATCH 19/61] [IMP] hr_evaluation : Usability Improvements

bzr revid: vir@tinyerp.com-20100922070507-w2j7bjl80s4gz6fx
---
 addons/hr_evaluation/hr_evaluation.py       |  4 ++--
 addons/hr_evaluation/hr_evaluation_view.xml | 12 +++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index a3db4b08f93..263b34322b9 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -161,13 +161,13 @@ class hr_evaluation(osv.osv):
             ('2','Meet expectations'),
             ('3','Exceeds expectations'),
             ('4','Significantly exceeds expectations'),
-        ], "Overall Rating", help="This is the overall rating on that summarize the evaluation"),
+        ], "Appreciation", help="This is the appreciation on that summarize the evaluation"),
         'survey_request_ids': fields.one2many('hr.evaluation.interview','evaluation_id','Appraisal Forms'),
         'plan_id': fields.many2one('hr_evaluation.plan', 'Plan', required=True),
         'state': fields.selection([
             ('draft','Draft'),
             ('wait','Plan In Progress'),
-            ('progress','Waiting Validation'),
+            ('progress','Waiting Appreciation'),
             ('done','Done'),
             ('cancel','Cancelled'),
         ], 'State', required=True, readonly=True),
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index cafffe2646e..9ec02b4ad0b 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -231,14 +231,12 @@
             <field name="arch" type="xml">
                 <search string="Search Evaluation">
                    <group col='10' colspan='4'>
-                    <filter icon="terp-check" string="Current" domain="[('state','in',('wait', 'progress'))]"/>                                       
-                    <separator orientation="vertical"/> 
-                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
-                    <filter icon="terp-dialog-close" string="Waiting Final Validation" domain="[('state','=','progress')]"/>                                        
-                    <filter icon="terp-check" string="In progress" domain="[('state','=','wait')]"/>
+                    <filter icon="terp-check" string="Current" domain="[('state','=','wait'))]" help="Evaluations that are in waiting state"/>                                       
+                    <filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Evaluations that are in progress state"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-go-week" string="7 Days" help="Evaluations to close within the next 7 days"
                         domain="[('date', '&gt;=', (datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" />
+                    <separator orientation="vertical"/> 
                     <filter icon="terp-gnome-cpu-frequency-applet+" string="Overpassed Deadline"
                         help="Evaluations that overpassed the deadline" domain="[('date','&lt;=',(datetime.date.today()).strftime('%%Y-%%m-%%d'))]" />
                     <separator orientation="vertical"/>
@@ -321,7 +319,7 @@
             <field name="arch" type="xml">
                 <search string="Search Evaluation">
                    <group col='10' colspan='4'>
-                        <filter icon="terp-document-new" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
+                        <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
                         <separator orientation="vertical"/>
@@ -332,7 +330,7 @@
                     <group expand="0" string="Group By...">
                         <filter string="Interviewer" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Survey" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'survey_id'}"/>
+                        <filter string="Survey" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'survey_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="State" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>

From c842650ff486e33b5392c627cf295de9f6964dfe Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Wed, 22 Sep 2010 12:47:45 +0530
Subject: [PATCH 20/61] [IMP] auction: Undo the changes in field name. Title
 corrected.

bzr revid: uco@tinyerp.com-20100922071745-59hzyzfkprrq665w
---
 addons/auction/auction.py             | 3 +--
 addons/auction/auction_demo.xml       | 6 ++----
 addons/auction/auction_view.xml       | 6 ++----
 addons/auction/board_auction_view.xml | 2 +-
 addons/auction/report/artists.xml     | 3 +--
 addons/auction/test/auction.yml       | 3 +--
 6 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index 4fb99a2efbf..1a61355f382 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -37,8 +37,7 @@ class auction_artists(osv.osv):
     _columns = {
         'name': fields.char('Artist/Author Name', size=64, required=True),
         'pseudo': fields.char('Pseudo', size=64),
-        'birth_date':fields.date('Birth date'),
-        'death_date':fields.date('Death date'),
+        'birth_death_dates':fields.char('Lifespan', size=64),
         'biography': fields.text('Biography'),
     }
 auction_artists()
diff --git a/addons/auction/auction_demo.xml b/addons/auction/auction_demo.xml
index 94ee1ec98a2..a26e5355cde 100644
--- a/addons/auction/auction_demo.xml
+++ b/addons/auction/auction_demo.xml
@@ -144,14 +144,12 @@
 
     <record model="auction.artists" id="auction_art_1">
         <field name="name">Philippe Lavilier</field>
-        <field name="birth_date">1345-08-10</field>
-        <field name="death_date">1450-10-21</field>
+        <field name="birth_death_dates">1345-1450</field>
     </record>
 
     <record model="auction.artists" id="auction_art_2">
         <field name="name">POREAU OSWALD</field>
-        <field name="birth_date">1877-03-12</field>
-        <field name="death_date">1955-09-11</field>
+        <field name="birth_death_dates">1877-1955</field>
     </record>
 
         <!-- demo data for the account tax code-->
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index 1ec39f8c0f0..d149fc89f1c 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -15,8 +15,7 @@
         <field name="arch" type="xml">
             <tree string="Artists">
 	            <field name="name"/>
-	            <field name="birth_date"/>
-	            <field name="death_date"/>
+	            <field name="birth_death_dates"/>
             </tree>
         </field>
     </record>
@@ -31,8 +30,7 @@
 	                <field name="name" colspan="4" string="Name"/>
 	                <newline/>
 	                <field name="pseudo"/>
-	                <field name="birth_date"/>
-	                <field name="death_date"/>
+	                <field name="birth_death_dates"/>
                 </group>
                 <separator string="Biography" colspan="4"/>
                 <field name="biography" nolabel="1" colspan="4"/>
diff --git a/addons/auction/board_auction_view.xml b/addons/auction/board_auction_view.xml
index 8865550949e..56ed41e2ca5 100644
--- a/addons/auction/board_auction_view.xml
+++ b/addons/auction/board_auction_view.xml
@@ -111,7 +111,7 @@
             sequence="1"
             id="menu_board_auction_open"  icon="terp-graph" parent="menu_board_auction"/>
         
-        <menuitem name="Auction Management" id="auction.auction_menu_root" icon="terp-purchase" sequence="26" groups="base.group_system" action="open_board_auction"/>
+        <menuitem name="Auction" id="auction.auction_menu_root" icon="terp-purchase" sequence="26" groups="base.group_system" action="open_board_auction"/>
 
     </data>
 </openerp>
diff --git a/addons/auction/report/artists.xml b/addons/auction/report/artists.xml
index 360930f9f0c..0c63f338051 100644
--- a/addons/auction/report/artists.xml
+++ b/addons/auction/report/artists.xml
@@ -3,8 +3,7 @@
 <artists>
 	<artist type="fields" name="name,id">
 		<name type="field" name="name"></name>
-		<birth_date type="field" name="birth_date"></birth_date>
-		<death_date type="field" name="death_date"></death_date>
+		<birth_death_dates type="field" name="birth_death_dates"></birth_death_dates>
 		<biography type="field" name="biography"></biography>
 	</artist>
 </artists>
diff --git a/addons/auction/test/auction.yml b/addons/auction/test/auction.yml
index 8ef1e72ede3..6d07f5fc0a5 100644
--- a/addons/auction/test/auction.yml
+++ b/addons/auction/test/auction.yml
@@ -21,8 +21,7 @@
   I create a new artist for an object. 
 - 
   !record {model: auction.artists, id: auction_artists_vincentvangogh0}:
-    birth_date: "1853-03-30"
-    death_date: "1890-07-29"
+    birth_death_dates: 1853-1900
     name: Vincent van Gogh
  
 - 

From bbd126478ca0c1bcc01fe9ddc8adb884af5fb4f5 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 22 Sep 2010 16:32:14 +0530
Subject: [PATCH 21/61] [IMP] hr_recruitment : Improvement in Recruitment
 analysis report

bzr revid: vir@tinyerp.com-20100922110214-8krfx2lbhzh8ffl0
---
 .../report/hr_recruitment_report.py           |  4 +-
 .../report/hr_recruitment_report_view.xml     | 81 ++++++++++---------
 2 files changed, 45 insertions(+), 40 deletions(-)

diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py
index 4e2b160f3ea..2a2ab8fce2b 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report.py
+++ b/addons/hr_recruitment/report/hr_recruitment_report.py
@@ -69,10 +69,11 @@ class hr_recruitment_report(osv.osv):
         'date_closed': fields.date('Closed', readonly=True),
         'job_id': fields.many2one('hr.job', 'Applied Job',readonly=True),
         'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage'),
-        'type_id': fields.many2one('crm.case.resource.type', 'Degree', domain="[('object_id.model', '=', 'hr.applicant')]"),
+        'type_id': fields.many2one('hr.recruitment.degree', 'Degree'),
         'department_id':fields.many2one('hr.department','Department',readonly=True),
         'priority': fields.selection(hr_recruitment.AVAILABLE_PRIORITIES, 'Appreciation'),
         'salary_prop' : fields.float("Salary Proposed"),
+        'salary_prop_avg' : fields.float("Avg Salary Proposed", group_operator="avg"),
         'salary_exp' : fields.float("Salary Expected"),
         'partner_id': fields.many2one('res.partner', 'Partner',readonly=True),
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact Name',readonly=True),
@@ -107,6 +108,7 @@ class hr_recruitment_report(osv.osv):
                      s.priority,
                      s.stage_id,
                      sum(salary_proposed) as salary_prop,
+                     (sum(salary_proposed)/count(*)) as salary_prop_avg,
                      sum(salary_expected) as salary_exp,
                      extract('epoch' from (s.date_open-s.create_date))/(3600*24) as  delay_open,
                      extract('epoch' from (s.date_closed-s.create_date))/(3600*24) as  delay_close,
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index edb00d1f727..d527120c801 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -21,11 +21,12 @@
                 <field name="day" invisible="1"/>
                 <field name="month" invisible="1"/>
                 <field name="nbr" sum="# Cases"/>
-                <field name="salary_prop" sum="Salary Proposed" />
-                <field name="salary_exp" sum="Salary Expected"/>
-                <field name="delay_open" avg='Avg Opening Delay'/>
-                <field name="delay_close" avg='Avg Closing Delay'/>
                 <field name="available" sum="Available"/>
+                <field name="salary_exp" sum="Expected Salary"/>
+                <field name="salary_prop" sum="Proposed Salary" />
+                <field name="salary_prop_avg" sum="Avg Proposed Salary" />
+                <field name="delay_open" avg='Avg Delay to Open'/>
+                <field name="delay_close" avg='Avg Delay to Close'/>
             </tree>
         </field>
     </record>
@@ -49,18 +50,18 @@
         <field name="arch" type="xml">
             <search string="Recruitment Analysis">
             	<group>
-            	    <filter icon="terp-go-year" string="365 Days"
-	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-	                    help="Recruitment performed in last 356 days"/>
-	                <filter icon="terp-go-month" string="30 Days"
+            	    <filter icon="terp-go-year" string="Year"
+	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
+	                    help="Recruitment performed in current year"/>
+	                <filter icon="terp-go-month" string="Month"
 	                    name="month"
-	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-	                    help="Recruitment performed in this month"/>
-		            <filter icon="terp-go-week"
-	                    string="    7 Days    "
+	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+	                    help="Recruitment performed in current month"/>
+		            <filter icon="terp-go-month"
+	                    string="    Month-1    "
 	                    separator="1"
-	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-	                    help="Recruitment during last 7 days"/>
+	                    domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+	                    help="Recruitment during last month"/>
 	                <separator orientation="vertical"/>
 	                <filter string="New"
                     	icon="terp-document-new"
@@ -74,50 +75,52 @@
                    		icon="terp-gtk-media-pause"
                    		domain="[('state','=','pending')]"
                    		help = "Pending recruitment"/>
+                    <filter string="Hired"
+                   		icon="terp-camera_test"
+                   		domain="[('state','=','done')]"
+                   		help = "Hired employees"/>
   					<separator orientation="vertical"/>
   					<field name="job_id"/>
 					<field name="department_id" widget="selection"/>
-                    <field name="user_id">
-                        <filter icon="terp-hr"
+                    <field name="user_id" string="Responsible">
+                        <filter icon="terp-personal"
                             string="My Recruitment"
                             help="My Recruitment"
                             domain="[('user_id','=',uid)]"/>
                     </field>
                 </group>
                 <newline/>
-                <group expand="0" string="Group By ...">
-                   <filter string="User" name='User' icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                    <field name="job_id" widget="selection"/>
+                    <field name="type_id" widget="selection"/>
+                    <field name="priority"/>
+                    <field name="stage_id" widget="selection"/>
+                    <field name="state"/>
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    <newline/>
+                    <field name="date"/>
+                    <field name="date_closed"/>
+                </group>
+                <newline/>
+                <group expand="1" string="Group By ...">
+                   <filter string="Responsible" name='User' icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                    <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                    <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}" />
                    <separator orientation="vertical"/>
+                    <filter string="Jobs" name="job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
+                   <filter string="Department" name="department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
+                   <separator orientation="vertical"/>
+                   <filter string="Degree" name="degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/>
+            	   <separator orientation="vertical"/>
                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                    <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
                    <separator orientation="vertical"/>
-                   <filter string="Jobs" name="job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
-                   <filter string="Department" name="department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
-                   <filter string="Degree" name="degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/>
-            	   <separator orientation="vertical"/>
             	   <filter string="Day" name = "day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}"/>
             	   <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}"/>
             	   <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}"/>
                 </group>
 
-                <newline/>
-                <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                    <field name="state"/>
-                    <separator orientation="vertical"/>
-                    <field name="date"/>
-                    <separator orientation="vertical"/>
-                    <field name="stage_id" widget="selection"/>
-                    <field name="type_id" widget="selection"/>
-                    <newline/>
-                    <field name="priority"/>
-                    <separator orientation="vertical"/>
-                    <field name="date_closed"/>
-                    <separator orientation="vertical"/>
-                  	<field name="job_id" widget="selection"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                </group>
+                
                 </search>
         </field>
     </record>
@@ -127,7 +130,7 @@
         <field name="res_model">hr.recruitment.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_month':1,'search_default_User':1,'search_default_user_id':uid,'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="context">{'search_default_month':1,'search_default_department':1,'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="search_view_id" ref="view_hr_recruitment_report_search"/>
     </record>
 	<menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10" groups="base.group_hr_manager"/>

From c7fedc09fdeac8142731e88e3f9ded518b441886 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 22 Sep 2010 13:32:56 +0200
Subject: [PATCH 22/61] [IMP] openerp-server.py: cleanup + double CTRL-C can
 now be used to force immediate shutdown of server

bzr revid: odo@openerp.com-20100922113256-z3rmztczeivddk9q
---
 bin/openerp-server.py | 94 +++++++++++++++++++++++++------------------
 1 file changed, 55 insertions(+), 39 deletions(-)

diff --git a/bin/openerp-server.py b/bin/openerp-server.py
index f03c64d3400..9061b0ae3c8 100755
--- a/bin/openerp-server.py
+++ b/bin/openerp-server.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -16,7 +16,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -27,16 +27,19 @@ OpenERP is an ERP+CRM program for small and medium businesses.
 The whole source code is distributed under the terms of the
 GNU Public Licence.
 
-(c) 2003-TODAY, Fabien Pinckaers - Tiny sprl
+(c) 2003-TODAY, Fabien Pinckaers - OpenERP s.a.
 """
 
 #----------------------------------------------------------
 # python imports
 #----------------------------------------------------------
-import sys
+import logging
 import os
-import signal
 import pwd
+import signal
+import sys
+import threading
+import traceback
 
 import release
 __author__ = release.author
@@ -52,23 +55,22 @@ if pwd.getpwuid(os.getuid())[0] == 'root' :
 # get logger
 #----------------------------------------------------------
 import netsvc
-logger = netsvc.Logger()
+logger = logging.getLogger('server')
 
 #-----------------------------------------------------------------------
 # import the tools module so that the commandline parameters are parsed
 #-----------------------------------------------------------------------
 import tools
-
-logger.notifyChannel("server", netsvc.LOG_INFO, "version - %s" % release.version )
+logger.info("OpenERP version - %s", release.version)
 for name, value in [('addons_path', tools.config['addons_path']),
                     ('database hostname', tools.config['db_host'] or 'localhost'),
                     ('database port', tools.config['db_port'] or '5432'),
                     ('database user', tools.config['db_user'])]:
-    logger.notifyChannel("server", netsvc.LOG_INFO, "%s - %s" % ( name, value ))
+    logger.info("%s - %s", name, value)
 
 # Don't allow if the connection to PostgreSQL done by postgres user
 if tools.config['db_user'] == 'postgres':
-    logger.notifyChannel("server", netsvc.LOG_ERROR, "%s" % ("Attempted to connect database with postgres user. This is a security flaws, aborting."))
+    logger.error("Connecting to the database as 'postgres' user is forbidden, as it present major security issues. Shutting down.")
     sys.exit(1)
 
 import time
@@ -76,7 +78,7 @@ import time
 #----------------------------------------------------------
 # init net service
 #----------------------------------------------------------
-logger.notifyChannel("objects", netsvc.LOG_INFO, 'initialising distributed objects services')
+logger.info('initialising distributed objects services')
 
 #---------------------------------------------------------------
 # connect to the database and initialize it with base if needed
@@ -117,8 +119,7 @@ if tools.config['db_name']:
     for dbname in tools.config['db_name'].split(','):
         db,pool = pooler.get_db_and_pool(dbname, update_module=tools.config['init'] or tools.config['update'], pooljobs=False)
         if tools.config["test_file"]:
-            logger.notifyChannel("init", netsvc.LOG_INFO, 
-                 'loading test file %s' % (tools.config["test_file"],))
+            logger.info('loading test file %s', tools.config["test_file"])
             cr = db.cursor()
             tools.convert_yaml_import(cr, 'base', file(tools.config["test_file"]), {}, 'test', True)
             cr.rollback()
@@ -134,16 +135,14 @@ if tools.config["translate_out"]:
         msg = "language %s" % (tools.config["language"],)
     else:
         msg = "new language"
-    logger.notifyChannel("init", netsvc.LOG_INFO, 
-                         'writing translation file for %s to %s' % (msg, 
-                                                                    tools.config["translate_out"]))
+    logger.info('writing translation file for %s to %s', msg, tools.config["translate_out"])
 
     fileformat = os.path.splitext(tools.config["translate_out"])[-1][1:].lower()
     buf = file(tools.config["translate_out"], "w")
     tools.trans_export(tools.config["language"], tools.config["translate_modules"], buf, fileformat)
     buf.close()
 
-    logger.notifyChannel("init", netsvc.LOG_INFO, 'translation file written successfully')
+    logger.info('translation file written successfully')
     sys.exit(0)
 
 if tools.config["translate_in"]:
@@ -169,27 +168,19 @@ SIGNALS = dict(
     [(getattr(signal, sign), sign) for sign in LST_SIGNALS]
 )
 
-def handler(signum, _):
+netsvc.quit_signals_received = 0
+
+def handler(signum, frame):
     """
     :param signum: the signal number
-    :param _: 
+    :param frame: the interrupted stack frame or None
     """
-    netsvc.Agent.quit()
-    netsvc.Server.quitAll()
-    if tools.config['pidfile']:
-        os.unlink(tools.config['pidfile'])
-    logger.notifyChannel('shutdown', netsvc.LOG_INFO, 
-                         "Shutdown Server! - %s" % ( SIGNALS[signum], ))
-    logger.shutdown()
-    sys.exit(0)
+    netsvc.quit_signals_received += 1
+    if netsvc.quit_signals_received > 1:
+        sys.stderr.write("Forced shutdown.\n")
+        os._exit(0)
 
-for signum in SIGNALS:
-    signal.signal(signum, handler)
-
-
-import threading
-import traceback
-def dumpstacks(signum, _):
+def dumpstacks(signum, frame):
     # code from http://stackoverflow.com/questions/132058/getting-stack-trace-from-a-running-python-application#answer-2569696
 
     id2name = dict([(th.ident, th.name) for th in threading.enumerate()])
@@ -201,24 +192,49 @@ def dumpstacks(signum, _):
             if line:
                 code.append("  %s" % (line.strip()))
 
-    logger.notifyChannel("dumpstacks", netsvc.LOG_INFO, "\n".join(code))
+    logging.getLogger('dumpstacks').info("\n".join(code))
+
+for signum in SIGNALS:
+    signal.signal(signum, handler)
 
 if os.name == 'posix':
     signal.signal(signal.SIGQUIT, dumpstacks)
 
+def quit():
+    netsvc.Agent.quit()
+    netsvc.Server.quitAll()
+    if tools.config['pidfile']:
+        os.unlink(tools.config['pidfile'])
+    logger = logging.getLogger('shutdown')
+    logger.info("Initiating OpenERP Server shutdown")
+    logger.info("Hit CTRL-C again or send a second signal to immediately terminate the server...")
+    logging.shutdown()
+
+    # manually join() all threads before calling sys.exit() to allow a second signal
+    # to trigger _force_quit() in case some non-daemon threads won't exit cleanly.
+    # threading.Thread.join() should not mask signals (at least in python 2.5)
+    for thread in threading.enumerate():
+        if thread != threading.currentThread() and not thread.daemon:
+            while thread.isAlive():
+                # need a busyloop here as thread.join() masks signals
+                # and would present the forced shutdown
+                thread.join(0.05)
+                time.sleep(0.05)
+    sys.exit(0)
+
 if tools.config['pidfile']:
     fd = open(tools.config['pidfile'], 'w')
     pidtext = "%d" % (os.getpid())
     fd.write(pidtext)
     fd.close()
 
-
 netsvc.Server.startAll()
 
-logger.notifyChannel("web-services", netsvc.LOG_INFO, 
-                     'the server is running, waiting for connections...')
+logger.info('OpenERP server is running, waiting for connections...')
 
-while True:
+while netsvc.quit_signals_received == 0:
     time.sleep(60)
 
+quit()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From c6d238654cd923856d516212690acf83865ed499 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 22 Sep 2010 13:45:25 +0200
Subject: [PATCH 23/61] [IMP] netsvc.Agent: spawned task threads should not be
 marked as daemon

bzr revid: odo@openerp.com-20100922114525-sxl26m5ilum0uscj
---
 bin/netsvc.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/netsvc.py b/bin/netsvc.py
index ce9b35d2a5b..ca81372a8fe 100644
--- a/bin/netsvc.py
+++ b/bin/netsvc.py
@@ -348,7 +348,10 @@ class Agent(object):
                 current_thread.dbname = dbname   # hack hack
                 cls._logger.notifyChannel('timers', LOG_DEBUG, "Run %s.%s(*%r, **%r)" % (function.im_class.__name__, function.func_name, args, kwargs))
                 delattr(current_thread, 'dbname')
-                threading.Thread(target=function, args=args, kwargs=kwargs).start()
+                task_thread = threading.Thread(target=function, name='netsvc.Agent.task', args=args, kwargs=kwargs)
+                # force non-daemon task threads (the runner thread must be daemon, and this property is inherited by default)
+                task_thread.daemon = False
+                task_thread.start()
                 time.sleep(1)
             time.sleep(60)
 

From 68d0f64128b3592bf1ed8e0665f12b00529f4f8c Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 22 Sep 2010 13:46:31 +0200
Subject: [PATCH 24/61] [IMP] netrpc/http servers: consistently name server
 threads

bzr revid: odo@openerp.com-20100922114631-umxz97owiuvlcf0r
---
 bin/service/http_server.py   | 2 +-
 bin/service/netrpc_server.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/service/http_server.py b/bin/service/http_server.py
index 7b62dda6c05..86e5943f170 100644
--- a/bin/service/http_server.py
+++ b/bin/service/http_server.py
@@ -137,7 +137,7 @@ class BaseHttpDaemon(threading.Thread, netsvc.Server):
     _RealProto = '??'
 
     def __init__(self, interface, port, handler):
-        threading.Thread.__init__(self)
+        threading.Thread.__init__(self, name='%sDaemon-%d'%(self._RealProto, port))
         netsvc.Server.__init__(self)
         self.__port = port
         self.__interface = interface
diff --git a/bin/service/netrpc_server.py b/bin/service/netrpc_server.py
index 80cb968c8e9..9d25c98083a 100644
--- a/bin/service/netrpc_server.py
+++ b/bin/service/netrpc_server.py
@@ -102,7 +102,7 @@ class TinySocketClientThread(threading.Thread, netsvc.OpenERPDispatcher):
 
 class TinySocketServerThread(threading.Thread,netsvc.Server):
     def __init__(self, interface, port, secure=False):
-        threading.Thread.__init__(self, name="Net-RPC socket")
+        threading.Thread.__init__(self, name="NetRPCDaemon-%d"%port)
         netsvc.Server.__init__(self)
         self.__port = port
         self.__interface = interface

From 6acee33b4ea931747895c373cd0b3c352d95f372 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Wed, 22 Sep 2010 11:23:49 +0200
Subject: [PATCH 25/61] [FIX] osv.fields: fromkeys second argument is only
 evaluated once

bzr revid: olt@tinyerp.com-20100922092349-ab36ynbdzqvexryb
---
 bin/osv/fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/osv/fields.py b/bin/osv/fields.py
index 3ab140e4088..64432ba15d7 100644
--- a/bin/osv/fields.py
+++ b/bin/osv/fields.py
@@ -777,7 +777,7 @@ class related(function):
         if not ids: return {}
         relation = obj._name
         if self._type in ('one2many', 'many2many'):
-            res = {}.fromkeys(ids, [])
+            res = dict([(i, []) for i in ids])
         else:
             res = {}.fromkeys(ids, False)
 

From c19c1fd5e35237cb69bf11ad0d32b55bab93e8d5 Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Wed, 22 Sep 2010 17:36:14 +0530
Subject: [PATCH 26/61] [IMP] point_of_sale: Improved view of Return and
 exchange goods wizard.

bzr revid: uco@tinyerp.com-20100922120614-ihnf2l7ilz0nc39v
---
 .../point_of_sale/wizard/pos_add_product.xml  | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/addons/point_of_sale/wizard/pos_add_product.xml b/addons/point_of_sale/wizard/pos_add_product.xml
index 966a21baa4b..ac5fd1c6f65 100644
--- a/addons/point_of_sale/wizard/pos_add_product.xml
+++ b/addons/point_of_sale/wizard/pos_add_product.xml
@@ -4,25 +4,32 @@
         <!--  Add  Product -->
         
 		<record id="view_add_product" model="ir.ui.view">
-            <field name="name">Add  Product</field>
+            <field name="name">Add Product</field>
             <field name="model">pos.add.product</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Add product :">
-				    <group col="2" colspan="4">
+				    <group col="6" colspan="4">
 				    	<field name="product_id"/>
 				    	<field name="quantity"/>
-                		<button icon='gtk-cancel' name="close_action"
-                			string="Close" type="object"  />
-                		<button name="select_product" string="Continue"
-                			colspan="1" type="object" icon="gtk-ok" />
+				    	<separator string="" colspan="4"/>
+				    	<newline/>
+				    	<group colspan="4" col="4">
+				    	    <label string="" colspan="1"/>
+					    	<button icon="gtk-stop" special="cancel"
+	                            string="Cancel"/>
+	                		<button icon="gtk-ok" name="close_action"
+	                			string="Save &amp; Close" type="object"/>
+	                		<button name="select_product" string="Save &amp; New"
+	                			colspan="1" type="object" icon="gtk-add"/>
+	                    </group>
                 	</group>
                 </form>
             </field>
         </record>
 
         <record id="action_add_product" model="ir.actions.act_window">
-            <field name="name">Add  Product</field>
+            <field name="name">Add Product</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">pos.add.product</field>
             <field name="view_type">form</field>

From 703708c614004150a441a39313279e64eea9fef6 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 22 Sep 2010 17:53:15 +0530
Subject: [PATCH 27/61] [IMP] hr_expense : Improvement in Expenses analysis
 report

bzr revid: vir@tinyerp.com-20100922122315-wcuibr61gafanqw6
---
 addons/hr_expense/report/hr_expense_report.py |  8 +--
 .../report/hr_expense_report_view.xml         | 66 +++++++++----------
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/addons/hr_expense/report/hr_expense_report.py b/addons/hr_expense/report/hr_expense_report.py
index a885dfc55a0..1de708d2beb 100644
--- a/addons/hr_expense/report/hr_expense_report.py
+++ b/addons/hr_expense/report/hr_expense_report.py
@@ -48,8 +48,8 @@ class hr_expense_report(osv.osv):
         'user_id':fields.many2one('res.users', 'Validation User', readonly=True),
         'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
         'price_total':fields.float('Total Price', readonly=True),
-        'delay_valid':fields.float('Delay Valid', readonly=True),
-        'delay_confirm':fields.float('Delay Confirm', readonly=True),
+        'delay_valid':fields.float('Delay to Valid', readonly=True),
+        'delay_confirm':fields.float('Delay to Confirm', readonly=True),
         'analytic_account': fields.many2one('account.analytic.account','Analytic account',readonly=True),
         'price_average':fields.float('Average Price', readonly=True),
         'nbr':fields.integer('# of Lines', readonly=True),
@@ -71,7 +71,7 @@ class hr_expense_report(osv.osv):
             create or replace view hr_expense_report as (
                  select
                      min(l.id) as id,
-                     date_trunc('day',s.create_date) as date,
+                     date_trunc('day',s.date) as date,
                      s.employee_id,
                      s.journal_id,
                      s.currency_id,
@@ -100,7 +100,7 @@ class hr_expense_report(osv.osv):
                  left join hr_expense_expense s on (s.id=l.expense_id)
                  left join product_uom u on (u.id=l.uom_id)
                  group by
-                     date_trunc('day',s.create_date),
+                     date_trunc('day',s.date),
                      to_char(date_trunc('day',s.create_date), 'YYYY'),
                      to_char(date_trunc('day',s.create_date), 'MM'),
                      to_char(date_trunc('day',s.create_date), 'YYYY-MM-DD'),
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 0f3f74a1ce5..8458936cd74 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -22,9 +22,9 @@
                 <field name="product_id" invisible="1"/>
                 <field name="product_qty" invisible="1"/>
                 <field name="state" invisible="1"/>
-                <field name="invoiced" sum="Total Invoiced Lines"/>
                 <field name="nbr" sum="# of Lines"/>
                 <field name="no_of_products" sum="# of Products"/>
+                <field name="invoiced" sum="Total Invoiced Lines"/>
                 <field name="price_average" avg="Average Price"/>
                 <field name="price_total" sum="Total Price"/>
                 <field name="delay_confirm"/>
@@ -53,46 +53,29 @@
         <field name="arch" type="xml">
             <search string="Expenses Analysis">
               <group>
-                <filter icon="terp-go-year" string="  365 Days  "
-                      domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                      help="Expenses during last 7 year"/>
-                  <filter icon="terp-go-month" string="   30 Days   "
+                <filter icon="terp-go-year" string="  Year  "
+                      domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
+                      help="Expenses during current year"/>
+                  <filter icon="terp-go-month" string="   Month   "
                       name="month"
-                      domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-                      help="Expenses during last month"/>
-                <filter icon="terp-go-week" string="    7 Days    " separator="1"
-                      domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" help="Expenses during last 7 days"/>
+                      domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                      help="Expenses during current month"/>
+                <filter icon="terp-go-week" string="    Month-1    " separator="1"
+                      domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]" help="Expenses during last month"/>
                   <separator orientation="vertical"/>
-                    <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft Expenses"/>
                     <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state', '=' ,'confirm')]"
                     help = "Confirm Expenses"/>
                     <filter string="Accepted" icon="terp-camera_test" domain="[('state','=','accepted')]"
                       help = "Accepted Expenses"/>
                     <separator orientation="vertical"/>
+                    <filter string="Invoiced" icon="terp-dolar" domain="[('state','=','invoiced')]"
+                      help = "Invoiced Expenses"/>
+                    <separator orientation="vertical"/>
                     <field name="employee_id"/>
                     <field name="department_id"/>
-        </group>
-        <newline/>
-                <group expand="0" string="Group By...">
-                    <filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}"/>
-                    <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Analytic account" icon="terp-folder-green" context="{'group_by':'analytic_account'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Validation User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
-                </group>
-                <newline/>
-                <group expand="0" string="Extended filters..." groups="base.group_extended">
+            </group>
+            <newline/>
+            <group expand="0" string="Extended filters..." groups="base.group_extended">
                 <field name="product_id"/>
                 <separator orientation="vertical"/>
                 <field name="user_id"/>
@@ -102,7 +85,24 @@
                 <field name="date"/>
                 <field name="date_confirm"/>
                 <field name="date_valid"/>
-                </group>
+            </group>
+            <newline/>
+            <group expand="1" string="Group By...">
+                <filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}"/>
+                <filter string="Validation User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
+                <separator orientation="vertical"/>
+                <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+                <separator orientation="vertical"/>
+                <filter string="Analytic account" icon="terp-folder-green" context="{'group_by':'analytic_account'}"/>
+                <separator orientation="vertical"/>
+                <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                <separator orientation="vertical"/>
+                <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by Create Date"/>
+                <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of Create Date"/>
+                <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of Create Date"/>
+            </group>
             </search>
         </field>
     </record>

From ba4f8ad2233f5657461663e5d5a710a1f8a43f31 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Wed, 22 Sep 2010 14:31:35 +0200
Subject: [PATCH 28/61] [FIX] addons: tried to remove a non existing key in
 dict

bzr revid: olt@tinyerp.com-20100922123135-qmh4hpfgr9iexs03
---
 bin/addons/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index 297cf73c6f4..0c591f9ca4f 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -761,7 +761,8 @@ def _check_module_names(cr, module_names):
     mod_names = set(module_names)
     if 'base' in mod_names:
         # ignore dummy 'all' module
-        mod_names.remove('all')
+        if 'all' in mod_names:
+            mod_names.remove('all')
     if mod_names:
         cr.execute("SELECT count(id) AS count FROM ir_module_module WHERE name in %s", (tuple(mod_names),))
         if cr.dictfetchone()['count'] != len(mod_names):

From 14e03b34b705b9f4b81c28ee33eb1f53f0968c64 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Wed, 22 Sep 2010 14:54:03 +0200
Subject: [PATCH 29/61] [IMP] ir.attachment: performance improvement:
 'res_name' -> 'store=True' to avoid unecessary db lookup

bzr revid: olt@tinyerp.com-20100922125403-sw7yfp9rsr7i2g93
---
 bin/addons/base/ir/ir_attachment.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/ir/ir_attachment.py b/bin/addons/base/ir/ir_attachment.py
index abba9222d25..173632c4411 100644
--- a/bin/addons/base/ir/ir_attachment.py
+++ b/bin/addons/base/ir/ir_attachment.py
@@ -105,8 +105,8 @@ class ir_attachment(osv.osv):
         'datas': fields.binary('Data'),
         'datas_fname': fields.char('Filename',size=256),
         'description': fields.text('Description'),
-        'res_name': fields.function(_name_get_resname, type='char', 
-                string='Resource Name', method=True),
+        'res_name': fields.function(_name_get_resname, type='char', size=128,
+                string='Resource Name', method=True, store=True),
         'res_model': fields.char('Resource Object',size=64, readonly=True,
                 help="The database object this attachment will be attached to"),
         'res_id': fields.integer('Resource ID', readonly=True,

From 9a1ccd6f6a0be405b5f5142244a3a71d2a48d17d Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Wed, 22 Sep 2010 18:49:01 +0530
Subject: [PATCH 30/61] [FIX] point_of_sale: Report error corrected.

bzr revid: uco@tinyerp.com-20100922131901-pcepmy97f75dpygv
---
 addons/point_of_sale/report/all_closed_cashbox_of_the_day.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
index dcbba147b59..fce080dfd0b 100644
--- a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
+++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
@@ -67,7 +67,7 @@ class all_closed_cashbox_of_the_day(report_sxw.rml_parse):
 
     def _get_bal(self,data):
         res = {}
-        sql =""" select sum(pieces*number) as bal from singer_statement where starting_id = %d """%(data['id'])
+        sql =""" select sum(pieces*number) as bal from account_cashbox_line where starting_id = %d """%(data['id'])
         self.cr.execute(sql)
         res = self.cr.dictfetchall()
         if res :
@@ -115,7 +115,7 @@ class all_closed_cashbox_of_the_day(report_sxw.rml_parse):
         res = self.cr.dictfetchall()
         for r in res :
             total_ending_bal += (r['net_total'] or 0.0)
-            sql1 =""" select sum(pieces*number) as bal from singer_statement where starting_id = %d"""%(r['id'])
+            sql1 =""" select sum(pieces*number) as bal from account_cashbox_line where starting_id = %d"""%(r['id'])
             self.cr.execute(sql1)
             data = self.cr.dictfetchall()
             if data[0]['bal']:

From c00d1711754e7d763e8e6085c9566c32b21eb8da Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Thu, 23 Sep 2010 16:35:37 +0530
Subject: [PATCH 31/61] [IMP] point_of_sale: 'Return Picking' wizard corrected.

bzr revid: uco@tinyerp.com-20100923110537-se0su7963fdel66c
---
 .../point_of_sale/wizard/pos_add_product.py   |  2 +-
 addons/point_of_sale/wizard/pos_return.py     | 24 ++++++++++++-------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/addons/point_of_sale/wizard/pos_add_product.py b/addons/point_of_sale/wizard/pos_add_product.py
index c0604fc0bee..d3ac9c8c394 100644
--- a/addons/point_of_sale/wizard/pos_add_product.py
+++ b/addons/point_of_sale/wizard/pos_add_product.py
@@ -29,7 +29,7 @@ class add_product(osv.osv_memory):
 
     _columns = {
         'product_id': fields.many2one('product.product', 'Product', required=True),
-        'quantity': fields.float('Quantity ', required=True),
+        'quantity': fields.float('Quantity', required=True),
     }
     _defaults = {
         'quantity': lambda *a: 1,
diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
index cbfe4c5365a..84f02011f5a 100644
--- a/addons/point_of_sale/wizard/pos_return.py
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -296,7 +296,6 @@ class add_product(osv.osv_memory):
                 picking_obj.force_assign(cr, uid, [new_picking], context)
                 order_obj.write(cr,uid,active_id,{'picking_id':new_picking})
 
-
         return {
             'name': _('Add Product'),
             'view_type': 'form',
@@ -326,6 +325,9 @@ class add_product(osv.osv_memory):
         return_id=return_boj.search(cr,uid,[])
         data=return_boj.read(cr,uid,return_id,[])[0]
         wf_service = netsvc.LocalService("workflow")
+        self_data = self.read(cr, uid, ids)[0]
+        order_obj.add_product(cr, uid, active_ids[0], self_data['product_id'], self_data['quantity'], context=context)
+        
         for order_id in order_obj.browse(cr, uid, active_ids, context=context):
             prop_ids =property_obj.search(cr, uid, [('name', '=', 'property_stock_customer')])
             val = property_obj.browse(cr, uid, prop_ids[0]).value_reference
@@ -345,10 +347,18 @@ class add_product(osv.osv_memory):
                         })
             for line in order_id.lines:
                 key=('return%s') %line.id
-                if line.id  and  data.has_key(key):
-                    new_move=stock_move_obj.create(cr, uid, {
-                        'product_qty': data['return%s' %line.id ],
-                        'product_uos_qty': uom_obj._compute_qty(cr, uid, data['return%s' %line.id], line.product_id.uom_id.id),
+                if line.id: 
+                    if data.has_key(key):
+                        qty = data['return%s' %line.id]
+                        lines_obj.write(cr,uid,[line.id], {
+                                'qty_rfd':(line.qty or 0.0) + data['return%s' %line.id],
+                                'qty':line.qty-(data['return%s' %line.id] or 0.0)
+                        })
+                    else:
+                        qty = line.qty
+                    stock_move_obj.create(cr, uid, {
+                        'product_qty': qty,
+                        'product_uos_qty': uom_obj._compute_qty(cr, uid, qty, line.product_id.uom_id.id),
                         'picking_id':new_picking,
                         'product_uom':line.product_id.uom_id.id,
                         'location_id':location_id,
@@ -358,10 +368,6 @@ class add_product(osv.osv_memory):
                         'date':date_cur,
                         'date_planned':date_cur
                     })
-                    lines_obj.write(cr,uid,[line.id], {
-                                'qty_rfd':(line.qty or 0.0) + data['return%s' %line.id],
-                                'qty':line.qty-(data['return%s' %line.id] or 0.0)
-                            })
             wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
             picking_obj.force_assign(cr, uid, [new_picking], context)
         obj=order_obj.browse(cr,uid, active_ids[0])

From 60d11142587d0d9c5e77d0afb394aa63435e194e Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Thu, 23 Sep 2010 17:44:36 +0530
Subject: [PATCH 32/61] [REF] mrp_repair, point_of_sale: Cleaning the code.

bzr revid: uco@tinyerp.com-20100923121436-35j9nenzuei3vl9d
---
 addons/mrp_repair/mrp_repair.py                |  7 +------
 addons/point_of_sale/wizard/pos_add_product.py |  1 -
 addons/point_of_sale/wizard/pos_return.py      | 18 ++----------------
 3 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 5868fa5c8e7..9c4a11cb9e0 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -19,12 +19,10 @@
 #
 ##############################################################################
 
-import time
 from osv import fields,osv
 import netsvc
 import mx.DateTime
-from mx.DateTime import RelativeDateTime, today, DateTime, localtime
-from tools import config
+from mx.DateTime import RelativeDateTime, today
 from tools.translate import _
 import decimal_precision as dp
 
@@ -286,7 +284,6 @@ class mrp_repair(osv.osv):
 
         if not lot:
             return data
-        lot_info = prodlot_obj.browse(cr, uid, lot)
         move_ids = move_obj.search(cr, uid, [('prodlot_id', '=', lot)])
 
         if not len(move_ids):
@@ -339,7 +336,6 @@ class mrp_repair(osv.osv):
         """ Cancels repair order.
         @return: True
         """
-        ok=True
         mrp_line_obj = self.pool.get('mrp.repair.line')
         for repair in self.browse(cr, uid, ids):
             mrp_line_obj.write(cr, uid, [l.id for l in repair.operations], {'state': 'cancel'})
@@ -520,7 +516,6 @@ class mrp_repair(osv.osv):
         repair_line_obj = self.pool.get('mrp.repair.line')
         seq_obj = self.pool.get('ir.sequence')
         pick_obj = self.pool.get('stock.picking')
-        company = self.pool.get('res.users').browse(cr, uid, uid).company_id
         for repair in self.browse(cr, uid, ids, context=context):
             for move in repair.operations:
                 move_id = move_obj.create(cr, uid, {
diff --git a/addons/point_of_sale/wizard/pos_add_product.py b/addons/point_of_sale/wizard/pos_add_product.py
index d3ac9c8c394..5735d2976a4 100644
--- a/addons/point_of_sale/wizard/pos_add_product.py
+++ b/addons/point_of_sale/wizard/pos_add_product.py
@@ -73,7 +73,6 @@ class add_product(osv.osv_memory):
 
         record_id = context and context.get('active_id', False)
         order_obj= self.pool.get('pos.order')
-        order_line_obj= self.pool.get('pos.order.line')
         obj=order_obj.browse(cr, uid, record_id)
         order_obj.write(cr, uid, [record_id], {'state':'done'})
         if obj.amount_total != obj.amount_paid:
diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
index 84f02011f5a..46e7fd8ca27 100644
--- a/addons/point_of_sale/wizard/pos_return.py
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -22,11 +22,7 @@
 import netsvc
 from osv import osv,fields
 from tools.translate import _
-from mx import DateTime
 import time
-import pos_box_entries
-import pos_add_product
-import pos_payment
 
 class pos_return(osv.osv_memory):
     _name = 'pos.return'
@@ -169,9 +165,7 @@ class pos_return(osv.osv_memory):
         wf_service = netsvc.LocalService("workflow")
         #Todo :Need to clean the code
         if active_id:
-            picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in',[active_id]), ('state', '=', 'done')])
             data = self.read(cr, uid, ids)[0]
-            clone_list = []
             date_cur = time.strftime('%Y-%m-%d %H:%M:%S')
 
             for order_id in order_obj.browse(cr, uid, [active_id], context=context):
@@ -197,7 +191,7 @@ class pos_return(osv.osv_memory):
                             qty = data['return%s' %line.id]
                         except :
                             qty = line.qty
-                        new_move = stock_move_obj.create(cr, uid, {
+                        stock_move_obj.create(cr, uid, {
                             'product_qty': qty ,
                             'product_uos_qty': uom_obj._compute_qty(cr, uid, qty ,line.product_id.uom_id.id),
                             'picking_id': new_picking,
@@ -249,16 +243,11 @@ class add_product(osv.osv_memory):
             lines_obj = self.pool.get('pos.order.line')
             picking_obj = self.pool.get('stock.picking')
             stock_move_obj = self.pool.get('stock.move')
-            move_obj = self.pool.get('stock.move')
             property_obj= self.pool.get("ir.property")
-            invoice_obj= self.pool.get('account.invoice')
-            picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in',[active_id]), ('state', '=', 'done')])
-            clone_list = []
             date_cur=time.strftime('%Y-%m-%d')
             uom_obj = self.pool.get('product.uom')
             prod_obj=self.pool.get('product.product')
             wf_service = netsvc.LocalService("workflow")
-            return_boj=self.pool.get('pos.return')
             order_obj.add_product(cr, uid, active_id, data['product_id'], data['quantity'], context=context)
 
             for order_id in order_obj.browse(cr, uid, [active_id], context=context):
@@ -279,7 +268,7 @@ class add_product(osv.osv_memory):
                                 'type':'out',
                                 'date':date_cur
                             })
-                new_move=stock_move_obj.create(cr, uid, {
+                stock_move_obj.create(cr, uid, {
                                 'product_qty': qty,
                                 'product_uos_qty': uom_obj._compute_qty(cr, uid, prod_id.uom_id.id, qty, prod_id.uom_id.id),
                                 'picking_id':new_picking,
@@ -314,11 +303,8 @@ class add_product(osv.osv_memory):
         lines_obj = self.pool.get('pos.order.line')
         picking_obj = self.pool.get('stock.picking')
         stock_move_obj = self.pool.get('stock.move')
-        move_obj = self.pool.get('stock.move')
         property_obj= self.pool.get("ir.property")
         invoice_obj=self.pool.get('account.invoice')
-        picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in', active_ids), ('state', '=', 'done')])
-        clone_list = []
         date_cur=time.strftime('%Y-%m-%d %H:%M:%S')
         uom_obj = self.pool.get('product.uom')
         return_boj=self.pool.get('pos.return')

From fa9a98c6924b0cf1a8d56dbbe71f29ea910f682c Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Fri, 24 Sep 2010 11:05:35 +0530
Subject: [PATCH 33/61] [FIX] mrp: Corrected error on saving production order
 record.

bzr revid: uco@tinyerp.com-20100924053535-qnt5or0p9lpg1h15
---
 addons/mrp/mrp.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 33828840eeb..1a71114c336 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -361,11 +361,12 @@ class many2many_domain(fields.many2many):
         for i in ids:
             res[i] = []
         valid_move_ids = move_obj.search(cr, user, self._domain) # move ids relative to domain argument
-        cr.execute("SELECT production_id, move_id from mrp_production_move_ids where production_id in %s and move_id in %s",
-            [tuple(ids), tuple(valid_move_ids)])
-        related_move_map = cr.fetchall()
-        related_move_dict = dict((k, list(set([v[1] for v in itr]))) for k, itr in groupby(related_move_map, itemgetter(0)))
-        res.update(related_move_dict)
+        if valid_move_ids:
+            cr.execute("SELECT production_id, move_id from mrp_production_move_ids where production_id in %s and move_id in %s",
+                [tuple(ids), tuple(valid_move_ids)])
+            related_move_map = cr.fetchall()
+            related_move_dict = dict((k, list(set([v[1] for v in itr]))) for k, itr in groupby(related_move_map, itemgetter(0)))
+            res.update(related_move_dict)
 
         return res
 

From 63b6ec6050abd49262b25b84f93a5e7228817962 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Fri, 24 Sep 2010 10:46:36 +0200
Subject: [PATCH 34/61] [FIX] project_planning: revision 4965 added a bug:
 removed field 'child_ids' was used in project_planning module

bzr revid: olt@tinyerp.com-20100924084636-czxo56j2ck1nwutj
---
 addons/project_planning/project_planning.py | 37 +++++++++++++++++++--
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/addons/project_planning/project_planning.py b/addons/project_planning/project_planning.py
index e248fe1c050..2044772e6cc 100644
--- a/addons/project_planning/project_planning.py
+++ b/addons/project_planning/project_planning.py
@@ -25,6 +25,7 @@ import mx.DateTime
 
 from osv import fields, osv
 from tools.translate import _
+import tools
 
 
 class one2many_mod3(fields.one2many):
@@ -35,8 +36,9 @@ class one2many_mod3(fields.one2many):
         for obj in obj.browse(cr, user, ids, context=context):
             res[obj.id] = []
             list_ids = []
-            for item in obj.user_id.child_ids:
-                list_ids.append(item.id)
+            children = obj.pool.get('report_account_analytic.planning')._child_compute(cr, user, [obj.user_id.id], '', [])
+            for u_id in children.get(obj.user_id.id, []):
+                list_ids.append(u_id)
             list_ids.append(obj.user_id.id)
             ids2 = obj.pool.get(self._obj).search(cr, user, ['&',(self._fields_id,'=',obj.id),'|',('user_id','in',list_ids),('user_id','=',False)], limit=self._limit)
             for r in obj.pool.get(self._obj)._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_write'):
@@ -49,6 +51,35 @@ class report_account_analytic_planning(osv.osv):
     _name = "report_account_analytic.planning"
     _description = "Planning"
 
+    def _child_compute(self, cr, uid, ids, name, args, context=None):
+        if context is None:
+            context = {}
+        obj_dept = self.pool.get('hr.department')
+        obj_user = self.pool.get('res.users')
+        result = {}
+        for user_id in ids:
+            child_ids = []
+            cr.execute('SELECT dept.id FROM hr_department AS dept \
+                        LEFT JOIN hr_employee AS emp ON dept.manager_id = emp.id \
+                        WHERE emp.id IN \
+                            (SELECT emp.id FROM hr_employee \
+                                JOIN resource_resource r ON r.id = emp.resource_id WHERE r.user_id=' + str(user_id) + ') ')
+            mgnt_dept_ids = [x[0] for x in cr.fetchall()]
+            ids_dept = obj_dept.search(cr, uid, [('id', 'child_of', mgnt_dept_ids)], context=context)
+            if ids_dept:
+                data_dept = obj_dept.read(cr, uid, ids_dept, ['member_ids'], context=context)
+                childs = map(lambda x: x['member_ids'], data_dept)
+                childs = tools.flatten(childs)
+                childs = obj_user.search(cr, uid, [('id', 'in', childs),('active', '=', True)], context=context)
+                if user_id in childs:
+                    childs.remove(user_id)
+                child_ids.extend(tools.flatten(childs))
+                set = {}
+                map(set.__setitem__, child_ids, [])
+                child_ids = set.keys()
+            result[user_id] = child_ids
+        return result
+
     def _get_total_planned(self, cr, uid, ids, name, args, context=None):
         result = {}
         for plan in self.browse(cr, uid, ids, context):
@@ -583,4 +614,4 @@ class res_company(osv.osv):
     }
 res_company()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 31c545ac6f31931f57bfb686058fe65f34ac0cda Mon Sep 17 00:00:00 2001
From: "RME(OpenERP)" <>
Date: Fri, 24 Sep 2010 15:42:04 +0530
Subject: [PATCH 35/61] [FIX] Account_payment : Demo corrected

bzr revid: jvo@tinyerp.com-20100924101204-enl5v3b417t6o4u0
---
 addons/account_payment/account_payment_demo.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_payment/account_payment_demo.xml b/addons/account_payment/account_payment_demo.xml
index 25fe4a2c55b..37705a05b07 100644
--- a/addons/account_payment/account_payment_demo.xml
+++ b/addons/account_payment/account_payment_demo.xml
@@ -5,7 +5,7 @@
             <field name="name">Reserve Bank</field>
             <field name="acc_number">00987654321</field>
             <field name="partner_id" ref="base.res_partner_agrolait"></field>
-            <field name="state" eval="bank"/>
+            <field name="state">bank</field>
         </record>
     	<record id="payment_mode_1" model="payment.mode">
             <field name="name">Direct Payment</field>

From d7ed28f534b42c198e2595b1cde400d83d23596a Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Fri, 24 Sep 2010 15:43:44 +0530
Subject: [PATCH 36/61] [FIX] POS : Correction in wizard,NEVER ever return
 None,it can break xmlrpc request.

bzr revid: jvo@tinyerp.com-20100924101344-7eu0pcp6y8cql8hw
---
 addons/point_of_sale/wizard/pos_payment.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
index 27c04a6dfba..5b6c5f167fb 100644
--- a/addons/point_of_sale/wizard/pos_payment.py
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -43,7 +43,6 @@ class pos_make_payment(osv.osv_memory):
          @return: A dictionary which of fields with values.
         """
         res = super(pos_make_payment, self).default_get(cr, uid, fields, context=context)
-
         active_id = context and context.get('active_id',False)
         if active_id:
             j_obj = self.pool.get('account.journal')
@@ -51,10 +50,7 @@ class pos_make_payment(osv.osv_memory):
             j_ids = map(lambda x1: x1[0], cr.fetchall())
             journal = j_obj.search(cr, uid, [('type', '=', 'cash'), ('id', 'in', j_ids)])
 
-            if journal:
-                journal = journal[0]
-            else:
-                journal = None
+            journal = journal and journal[0] or False
             wf_service = netsvc.LocalService("workflow")
 
             order_obj=self.pool.get('pos.order')

From a525b4733ca5159827d8bedf23748df8d4205d24 Mon Sep 17 00:00:00 2001
From: "RME(OpenERP)" <>
Date: Fri, 24 Sep 2010 15:50:33 +0530
Subject: [PATCH 37/61] [FIX] account_payment : Corrections

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

bzr revid: jvo@tinyerp.com-20100924102033-sw8cjvew49bhzcnd
---
 addons/account_payment/account_payment_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 93ba4b85de0..b7cef21f8e0 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -38,7 +38,7 @@
             </field>
         </record>
 
-        <menuitem id="menu_main" name="Payment" parent="account.menu_finance" sequence="6"/>
+        <menuitem id="menu_main_payment" name="Payment" parent="account.menu_finance" sequence="6"/>
 
         <record id="view_payment_mode_tree" model="ir.ui.view">
             <field name="name">payment.mode.tree</field>
@@ -203,7 +203,7 @@
             <field name="search_view_id" ref="view_payment_order_search"/>
         </record>
 
-        <menuitem action="action_payment_order_tree" id="menu_action_payment_order_form" parent="account_payment.menu_main" sequence="3"/>
+        <menuitem action="action_payment_order_tree" id="menu_action_payment_order_form" parent="menu_main_payment" sequence="3"/>
 
         <record id="action_payment_order_tree_new" model="ir.actions.act_window">
             <field name="name">New Payment Order</field>

From 214960b36e9a3bf83ed20f8209c62fbc339d792e Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Fri, 24 Sep 2010 16:09:46 +0530
Subject: [PATCH 38/61] [FIX] pos : pylint test passed. Thanks to buildbot

bzr revid: jvo@tinyerp.com-20100924103946-8fj8ksrzyu00kxpi
---
 addons/point_of_sale/wizard/pos_payment.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
index 5b6c5f167fb..8330be2772c 100644
--- a/addons/point_of_sale/wizard/pos_payment.py
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -19,14 +19,10 @@
 #
 ##############################################################################
 
-import netsvc
 from osv import osv,fields
 from tools.translate import _
 import pos_box_entries
 import time
-from decimal import Decimal
-from tools.translate import _
-import pos_receipt
 
 class pos_make_payment(osv.osv_memory):
     _name = 'pos.make.payment'
@@ -51,7 +47,6 @@ class pos_make_payment(osv.osv_memory):
             journal = j_obj.search(cr, uid, [('type', '=', 'cash'), ('id', 'in', j_ids)])
 
             journal = journal and journal[0] or False
-            wf_service = netsvc.LocalService("workflow")
 
             order_obj=self.pool.get('pos.order')
             order = order_obj.browse(cr, uid, active_id, context)
@@ -88,7 +83,7 @@ class pos_make_payment(osv.osv_memory):
         if active_id:
             order = self.pool.get('pos.order').browse(cr, uid, active_id)
             if not order.lines:
-                raise osv.except_osv('Error!','No order lines defined for this sale ')
+                raise osv.except_osv(_('Error!'),_('No order lines defined for this sale '))
         return True
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):

From c3d7dedf07424c5272383e5d1ebeec66e89cd6bf Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Fri, 24 Sep 2010 16:11:24 +0530
Subject: [PATCH 39/61] [REF] hr_timesheet : Better readable messages

bzr revid: jvo@tinyerp.com-20100924104124-s0dtgin32s4ezyef
---
 addons/hr_timesheet/test/hr_timesheet_report.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_timesheet/test/hr_timesheet_report.yml b/addons/hr_timesheet/test/hr_timesheet_report.yml
index 811858eb7f2..2f19f75618f 100644
--- a/addons/hr_timesheet/test/hr_timesheet_report.yml
+++ b/addons/hr_timesheet/test/hr_timesheet_report.yml
@@ -1,5 +1,5 @@
 -
- In order to test the PDF reports defined on HR Timesheet User Report, we will print a  HR Timesheet User Report
+ In order to test the PDF reports defined on Employee, we will print Timesheet of a User
 -
   !python {model: hr.employee}: |
     import netsvc, tools, os, time
@@ -11,7 +11,7 @@
        file(os.path.join(tools.config['test_report_directory'], 'hr_timesheet-user_report.'+format), 'wb+').write(data)
 
 -
- In order to test the PDF reports defined on HR Timesheet Users Report, we will print a  HR Timesheet Users Report
+ In order to test the PDF reports defined on Employee, we will print Timesheet of Users
 -
   !python {model: hr.employee}: |
     import netsvc, tools, os, time

From 14d55ddd6dbcb00cf23237a91a9467a89d232e55 Mon Sep 17 00:00:00 2001
From: "SAZ(OpenERP)" <>
Date: Fri, 24 Sep 2010 16:13:20 +0530
Subject: [PATCH 40/61] [FIX] hr_timesheet_invoice : Passed the yaml report
 test

bzr revid: jvo@tinyerp.com-20100924104320-2f7dgfk43rp1i6l1
---
 .../report/account_analytic_profit.rml        | 118 +++++++++---------
 .../test/hr_timesheet_invoice_report.yml      |   2 +-
 2 files changed, 62 insertions(+), 58 deletions(-)

diff --git a/addons/hr_timesheet_invoice/report/account_analytic_profit.rml b/addons/hr_timesheet_invoice/report/account_analytic_profit.rml
index 3cb4b150395..b6d9f155cab 100644
--- a/addons/hr_timesheet_invoice/report/account_analytic_profit.rml
+++ b/addons/hr_timesheet_invoice/report/account_analytic_profit.rml
@@ -74,24 +74,24 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table_Move_line">
+    <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
-    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
     <paraStyle name="Preformatted Text" fontName="Courier" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
@@ -115,8 +115,8 @@
     <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9_bold_U" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
     <blockTable colWidths="175.0,175.0,175.0" repeatRows="1" style="Table_Title">
       <tr>
@@ -157,12 +157,10 @@
     <blockTable colWidths="175.0,175.0,175.0" style="Table_Content_Date">
       <tr>
         <td>
-          <para style="terp_default_Centre_8">[[ formatLang (data['form']['date_from'],date=True)
-]]</para>
+          <para style="terp_default_Centre_8">[[ formatLang(data['form']['date_from'],date=True) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ formatLang (data['form']['date_to'],date=True)
- ]]</para>
+          <para style="terp_default_Centre_8">[[ formatLang (data['form']['date_to'] ,date=True)]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ company.currency_id.name ]]</para>
@@ -209,7 +207,7 @@
           <para style="terp_default_Bold_9">Totals:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_bold_U"><u>[[ reduce(lambda x, y: x+y['unit_amount'], line(data['form'], data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0) ]]</u></para>
+          <para style="terp_default_Right_9_bold_U">[[ reduce(lambda x, y: x+y['unit_amount'], line(data['form'], data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0) ]]</para>
         </td>
         <td>
           <para style="terp_default_Right_9_bold">
@@ -217,47 +215,47 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_Right_9_bold_U"><u>[[ reduce(lambda x, y: x+y['amount'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0) ]]</u></para>
+          <para style="terp_default_Right_9_bold_U">[[ reduce(lambda x, y: x+y['amount'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_bold_U"><u>[[ reduce(lambda x, y: x+y['cost'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0) ]]</u></para>
+          <para style="terp_default_Right_9_bold_U">[[ reduce(lambda x, y: x+y['cost'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_bold_U"><u>[[ reduce(lambda x, y: x+y['profit'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0) ]]</u></para>
+          <para style="terp_default_Right_9_bold_U">[[ reduce(lambda x, y: x+y['profit'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_bold_U"><u>[[ reduce(lambda x, y: x+y['cost'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0) and round(reduce(lambda x, y: x+y['amount'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0)/reduce(lambda x, y: x+y['cost'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0)* -100, 2)]] %</u></para>
+          <para style="terp_default_Right_9_bold_U">[[ reduce(lambda x, y: x+y['cost'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0) and round(reduce(lambda x, y: x+y['amount'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0)/reduce(lambda x, y: x+y['cost'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0)* -100, 2)]] %</para>
         </td>
       </tr>
     </blockTable>
     <para style="terp_default_2"/>
     <section>
       <para style="terp_default_8">[[ repeatIn(user_ids(lines(data['form'])), 'e') ]]</para>
-      <blockTable colWidths="137.0,16.0,65.0,61.0,71.0,66.0,52.0,51.0" style="Table_Journal_Total_detail">
+      <blockTable colWidths="137.0,29.0,52.0,61.0,71.0,66.0,52.0,51.0" style="Table_Journal_Total_detail">
         <tr>
           <td>
             <para style="terp_default_Bold_9">[[ e.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_8">[[ repeatIn(journal_ids(data['form'], e.id), 'j') ]]</para>
+            <para style="terp_default_8">[[ repeatIn(journal_ids(data['form'], [e.id]), 'j') ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9_bold_U"><u>[[ reduce(lambda x, y: x+y['unit_amount'], line(data['form'], [j.id], [e.id]), 0) ]]</u></para>
+            <para style="terp_default_Right_9_bold_U">[[ reduce(lambda x, y: x+y['unit_amount'], line(data['form'], [j.id], [e.id]), 0) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9_bold_U"><u>[[ reduce(lambda x, y: x+y['amount_th'], line(data['form'], [j.id], [e.id]), 0) ]]</u></para>
+            <para style="terp_default_Right_9_bold_U">[[ reduce(lambda x, y: x+y['amount_th'], line(data['form'], [j.id], [e.id]), 0) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9_bold_U"><u>[[ reduce(lambda x, y: x+y['amount'], line(data['form'], [j.id], [e.id]), 0) ]]</u></para>
+            <para style="terp_default_Right_9_bold_U">[[ reduce(lambda x, y: x+y['amount'], line(data['form'], [j.id], [e.id]), 0) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9_bold_U"><u>[[ reduce(lambda x, y: x+y['cost'], line(data['form'], [j.id], [e.id]), 0) ]]</u></para>
+            <para style="terp_default_Right_9_bold_U">[[ reduce(lambda x, y: x+y['cost'], line(data['form'], [j.id], [e.id]), 0) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9_bold_U"><u>[[ reduce(lambda x, y: x+y['profit'], line(data['form'], [j.id], [e.id]), 0) ]]</u></para>
+            <para style="terp_default_Right_9_bold_U">[[ reduce(lambda x, y: x+y['profit'], line(data['form'], [j.id], [e.id]), 0) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9_bold_U"><u>[[ reduce(lambda x, y: x+y['cost'], line(data['form'], [j.id], [e.id]), 0) and  (reduce(lambda x, y: x+y['amount'], line(data['form'], [j.id], [e.id]), 0) / reduce(lambda x, y: x+y['cost'], line(data['form'], [j.id], [e.id]), 0) * 100.0)]] %</u></para>
+            <para style="terp_default_Right_9_bold_U">[[reduce(lambda x, y: x+y['cost'], line(data['form'], [j.id], [e.id]), 0) and '%d' % (reduce(lambda x, y: x+y['amount'], line(data['form'], [j.id], [e.id]), 0) / reduce(lambda x, y: x+y['cost'], line(data['form'], [j.id], [e.id]), 0) * 100.0, 2)]] %</para>
           </td>
         </tr>
       </blockTable>
@@ -298,35 +296,41 @@
           </td>
         </tr>
       </blockTable>
-      </section>
+      <para style="terp_default_2">
+        <font color="white"> </font>
+      </para>
       <section>
-      <para style="terp_default_8">[[ repeatIn(line(data['form'], [j.id],[e.id]), 'l') ]] </para>
-      <blockTable colWidths="155.0,64.0,61.0,71.0,66.0,52.0,50.0" style="Table_Move_line">
-        <tr>
-          <td>
-            <para style="terp_default_8">[[ l['name'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ l['unit_amount'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ l['amount_th'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ l['amount'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ l['cost'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ l['profit'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ l['eff'] ]] %</para>
-          </td>
-        </tr>
-      </blockTable>
-      <para style="terp_default_9">
+        <para style="terp_default_8">[[ repeatIn(line(data['form'], [j.id],[e.id]), 'l') ]] </para>
+        <blockTable colWidths="155.0,64.0,61.0,71.0,66.0,52.0,50.0" style="Table1">
+          <tr>
+            <td>
+              <para style="terp_default_8">[[ l['name'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ l['unit_amount'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ l['amount_th'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ l['amount'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ l['cost'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ l['profit'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ l['eff'] ]] %</para>
+            </td>
+          </tr>
+        </blockTable>
+        <para style="terp_default_2">
+          <font color="white"> </font>
+        </para>
+      </section>
+      <para style="terp_default_2">
         <font color="white"> </font>
       </para>
     </section>
@@ -334,4 +338,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/hr_timesheet_invoice/test/hr_timesheet_invoice_report.yml b/addons/hr_timesheet_invoice/test/hr_timesheet_invoice_report.yml
index ecdd486a65e..32f22e7eb4b 100644
--- a/addons/hr_timesheet_invoice/test/hr_timesheet_invoice_report.yml
+++ b/addons/hr_timesheet_invoice/test/hr_timesheet_invoice_report.yml
@@ -3,7 +3,7 @@
 -
   !python {model: account.analytic.line}: |
     import netsvc, tools, os, time
-    data_dict = {'model': 'ir.ui.menu', 'form': {'date_from': time.strftime('%Y-%m-01'), 'employee_ids': [[6,0,[ref('hr.employee1'), ref('hr.employee2'),ref('hr.employee3')]]], 'journal_ids': [[6,0,[ref('account.cose_journal_sale'),ref('account.exp'),ref('account.sit')]]], 'date_to': time.strftime('%Y-%m-%d')}}
+    data_dict = {'model': 'ir.ui.menu', 'form': {'date_from': time.strftime('%Y-%m-01'), 'employee_ids': [[6,0,[ref('hr.employee1'), ref('hr.employee2'),ref('hr.employee3')]]], 'journal_ids': [[6,0,[ref('hr_timesheet.analytic_journal')]]], 'date_to': time.strftime('%Y-%m-%d')}}
     (data, format) = netsvc.LocalService('report.account.analytic.profit').create(cr, uid, [], data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'hr_timesheet_invoice-account_analytic_profit_report.'+format), 'wb+').write(data)

From df261181c191fc4f5d0c27858e2d81655e62daa6 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Fri, 24 Sep 2010 13:30:21 +0200
Subject: [PATCH 41/61] [IMP] base_contact: performance improvement:

  * rewriten res_partner_job.name_get
  * res_partner_contact.job_id: store=True

bzr revid: olt@tinyerp.com-20100924113021-hf86aenloztuftpe
---
 addons/base_contact/base_contact.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index 1c0525931c7..8e3a4ded7eb 100644
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -61,7 +61,7 @@ class res_partner_contact(osv.osv):
         'function': fields.related('job_ids', 'function', type='char', \
                                  string='Main Function'),
         'job_id': fields.function(_main_job, method=True, type='many2one',\
-                                 relation='res.partner.job', string='Main Job'),
+                                 relation='res.partner.job', string='Main Job', store=True),
         'email': fields.char('E-Mail', size=240),
         'comment': fields.text('Notes', translate=True),
         'photo': fields.binary('Image'),
@@ -151,10 +151,15 @@ class res_partner_job(osv.osv):
         if not len(ids):
             return []
         res = []
-        for r in self.browse(cr, uid, ids):
-            funct = r.function and (", " + r.function) or ""
-            res.append((r.id, self.pool.get('res.partner.contact').name_get(cr, uid, \
-                                    [r.contact_id.id])[0][1] + funct))
+
+        jobs = self.browse(cr, uid, ids)
+        contact_ids = [rec.contact_id.id for rec in jobs]
+        contact_names = dict(self.pool.get('res.partner.contact').name_get(cr, uid, contact_ids, context=context))
+
+        for r in jobs:
+            function_name = r.function
+            funct = function_name and (", " + function_name) or ""
+            res.append((r.id, contact_names.get(r.contact_id.id, '') + funct))
         return res
 
     def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):

From 9e50339257b7e3619201e7ad01eb9a5913f0d71c Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Fri, 24 Sep 2010 13:32:32 +0200
Subject: [PATCH 42/61] [FIX] product_margin: tab2space

bzr revid: olt@tinyerp.com-20100924113232-vy055qmmzmbtyj98
---
 addons/product_margin/product_margin.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/product_margin/product_margin.py b/addons/product_margin/product_margin.py
index ad6ef680a98..d8d6d7a1702 100644
--- a/addons/product_margin/product_margin.py
+++ b/addons/product_margin/product_margin.py
@@ -36,11 +36,11 @@ class product_product(osv.osv):
             date_to = context.get('date_to', time.strftime('%Y-12-31'))
             invoice_state = context.get('invoice_state', 'open_paid')
             if 'date_from' in field_names:
-            	res[val.id]['date_from']=date_from
+                res[val.id]['date_from']=date_from
             if 'date_to' in field_names:
                 res[val.id]['date_to']=date_to
             if 'invoice_state' in field_names:
-            	res[val.id]['invoice_state']=invoice_state
+                res[val.id]['invoice_state']=invoice_state
             invoice_types = ()
             states = ()
             if invoice_state=='paid':
@@ -114,4 +114,4 @@ class product_product(osv.osv):
 
 product_product()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From a3900f6daf0aec8500339beb73049845065aeff8 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Fri, 24 Sep 2010 18:12:28 +0530
Subject: [PATCH 43/61] [FIX] auction : Auction Artists Report Corrected

bzr revid: ach@tinyerp.com-20100924124228-uoj22v0xiaka4soo
---
 addons/auction/report/auction_artists.rml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/auction/report/auction_artists.rml b/addons/auction/report/auction_artists.rml
index dfe81549245..1a0688825d4 100644
--- a/addons/auction/report/auction_artists.rml
+++ b/addons/auction/report/auction_artists.rml
@@ -62,7 +62,7 @@
           </para>
           <para style="P6">[[o.artist2_id and 'Artist2: '+o.artist2_id.name or False]]</para>
           <para style="P8">
-            <font face="Courier">[[o.artist_id2 and 'Biography: '+o.artist_id2.biography or False]]</font>
+            <font face="Courier">[[o.artist2_id and 'Biography: '+o.artist2_id.biography or False]]</font>
           </para>
         </td>
       </tr>

From 0c20778e1c2c2d7fbd4436d2589b2f9d4510c42c Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Fri, 24 Sep 2010 18:14:30 +0530
Subject: [PATCH 44/61] [FIX] document_email : Missing dependency added

bzr revid: ach@tinyerp.com-20100924124430-rou6fhggcngzitxp
---
 addons/document_email/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/document_email/__openerp__.py b/addons/document_email/__openerp__.py
index e341678e009..9ac6dc2fd84 100644
--- a/addons/document_email/__openerp__.py
+++ b/addons/document_email/__openerp__.py
@@ -24,7 +24,7 @@
 {
     "name" : "Email Integrated Document",
     "version" : "1.1",
-    "depends" : ["base", "document", "mail_gateway"],
+    "depends" : ["base", "document", "fetchmail","mail_gateway"],
     "author" : "Tiny",
     "description": """Email Integrated Document
     * Email based Document submission

From 984163134f6909bd8c6c986acb66b45e75ff198e Mon Sep 17 00:00:00 2001
From: "rch (Open ERP)" <>
Date: Fri, 24 Sep 2010 18:26:04 +0530
Subject: [PATCH 45/61] [IMP]: Add internal header on printscreen report.

bzr revid: rch_open_erp-20100924125604-48m4q8yz7o9pm3jl
---
 .../report/custom_default_printscreen.xsl     | 22 ++++++++++++++
 bin/addons/base/report/custom_new.xsl         |  4 +--
 .../base/report/custom_rml_printscreen.xsl    | 29 +++++++++++++++++++
 bin/report/printscreen/ps_list.py             |  7 +++++
 4 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 bin/addons/base/report/custom_default_printscreen.xsl
 create mode 100644 bin/addons/base/report/custom_rml_printscreen.xsl

diff --git a/bin/addons/base/report/custom_default_printscreen.xsl b/bin/addons/base/report/custom_default_printscreen.xsl
new file mode 100644
index 00000000000..46bcb0b843a
--- /dev/null
+++ b/bin/addons/base/report/custom_default_printscreen.xsl
@@ -0,0 +1,22 @@
+<?xml version = '1.0' encoding="utf-8"?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
+	<xsl:template name="first_page_graphics_corporation">
+		<!--logo-->
+		<fill color="black"/>
+        <stroke color="black"/>
+        <setFont name="DejaVu Sans" size="8"/>
+        <drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//header-date"/></drawString>
+        <setFont name="DejaVu Sans Bold" size="10"/>
+        <drawString x="13.8cm" y="19.5cm"><xsl:value-of select="//company"/></drawString>
+        <setFont name="DejaVu Sans" size="8"/>
+        <drawRightString x="28.4cm" y="19.5cm"><pageNumber/> /  </drawRightString>
+        <stroke color="#000000"/>
+        <lines size="8">1.3cm 19.3cm 28.5cm 19.3cm</lines>
+	</xsl:template>
+
+   <xsl:template name="first_page_frames">
+			<frame id="col1" x1="2.0cm" y1="2.5cm" width="24.7cm" height="16cm"/>
+	</xsl:template>
+
+</xsl:stylesheet>
diff --git a/bin/addons/base/report/custom_new.xsl b/bin/addons/base/report/custom_new.xsl
index 6680314ca40..3a988a56373 100644
--- a/bin/addons/base/report/custom_new.xsl
+++ b/bin/addons/base/report/custom_new.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
-	<xsl:import href="../../base/report/custom_default.xsl"/>
-	<xsl:import href="../../base/report/custom_rml.xsl"/>
+	<xsl:import href="../../base/report/custom_default_printscreen.xsl"/>
+	<xsl:import href="../../base/report/custom_rml_printscreen.xsl"/>
 	<xsl:template match="/">
 		<xsl:call-template name="rml">
 			<xsl:with-param name="pageSize" select="report/config/PageSize"/>
diff --git a/bin/addons/base/report/custom_rml_printscreen.xsl b/bin/addons/base/report/custom_rml_printscreen.xsl
new file mode 100644
index 00000000000..38e3a207b6f
--- /dev/null
+++ b/bin/addons/base/report/custom_rml_printscreen.xsl
@@ -0,0 +1,29 @@
+<?xml version = '1.0' encoding="utf-8"?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
+
+	<xsl:template name="first_page_graphics_report"/>
+
+	<xsl:template name="rml">
+		<document filename="example.pdf">
+			<template pageSize="29.7cm,21cm" leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Report" author="Generated by Open ERP, Fabien Pinckaers" allowSplitting="20">
+				<pageTemplate id="first_page">
+					<pageGraphics>
+						<xsl:call-template name="first_page_graphics_corporation"/>
+					</pageGraphics>
+
+					<xsl:call-template name="first_page_frames"/>
+				</pageTemplate>
+			</template>
+
+			<stylesheet>
+			    <xsl:call-template name="stylesheet"/>
+		    </stylesheet>
+
+			<story>
+				<xsl:call-template name="story"/>
+			</story>
+
+		</document>
+    </xsl:template>
+</xsl:stylesheet>
diff --git a/bin/report/printscreen/ps_list.py b/bin/report/printscreen/ps_list.py
index a350f52aa8c..142cb41d447 100644
--- a/bin/report/printscreen/ps_list.py
+++ b/bin/report/printscreen/ps_list.py
@@ -30,12 +30,14 @@ import locale
 import time, os
 from operator import itemgetter
 from datetime import datetime
+from report import report_sxw
 
 class report_printscreen_list(report_int):
     def __init__(self, name):
         report_int.__init__(self, name)
         self.context = {}
         self.groupby = []
+        self.cr=''
 
     def _parse_node(self, root_node):
         result = []
@@ -60,6 +62,7 @@ class report_printscreen_list(report_int):
     def create(self, cr, uid, ids, datas, context=None):
         if not context:
             context={}
+        self.cr=cr
         self.context = context
         self.groupby = context.get('group_by',[])
         self.groupby_no_leaf = context.get('group_by_no_leaf',False)
@@ -129,6 +132,10 @@ class report_printscreen_list(report_int):
         _append_node('PageHeight', '%.2f' %(pageSize[1] * 2.8346,))
         _append_node('report-header', title)
 
+        _append_node('company', pooler.get_pool(self.cr.dbname).get('res.users').browse(self.cr,uid,uid).company_id.name)
+        rpt_obj = pooler.get_pool(self.cr.dbname).get('res.users')
+        rml_obj=report_sxw.rml_parse(self.cr, uid, rpt_obj._name,context)
+        _append_node('header-date', str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")))
         l = []
         t = 0
         rowcount = 0;

From 937d8fe3306a1cb31ccbe532531eaadc4ff639d6 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Fri, 24 Sep 2010 15:17:09 +0200
Subject: [PATCH 46/61] [IMP] base_calendar: performance improvement in
 project.task (progress field)

bzr revid: olt@tinyerp.com-20100924131709-cqsd1ut234ni6txn
---
 addons/base_calendar/base_calendar.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index facb598427b..5ccfbdb23d8 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1531,8 +1531,12 @@ true, it will allow you to hide the event alarm information without removing it.
         result = []
         if fields and 'date' not in fields:
             fields.append('date')
+
+        real_ids = [item2 for item1, item2 in select]
+        event_values = dict([(res['id'], res) for res in super(calendar_event, self).read(cr, uid, real_ids, fields=fields, context=context, load=load)])
+
         for base_calendar_id, real_id in select:
-            res = super(calendar_event, self).read(cr, uid, real_id, fields=fields, context=context, load=load)
+            res = event_values[real_id]
             ls = base_calendar_id2real_id(base_calendar_id, with_date=res and res.get('duration', 0) or 0)
             if not isinstance(ls, (str, int, long)) and len(ls) >= 2:
                 res['date'] = ls[1]

From 21ba77896d1b2bc489cd124740cf9ff39ed06675 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Mon, 27 Sep 2010 11:16:42 +0530
Subject: [PATCH 47/61] [IMP]:remove implementation of help on menu items

bzr revid: nch@tinyerp.com-20100927054642-d081zya54g1ot5l3
---
 bin/addons/base/ir/ir_actions.py | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index a20d780c671..4b9d59743cb 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -209,16 +209,6 @@ class act_window(osv.osv):
                 res[act.id] = str(form_arch)
         return res
 
-    def _get_help_status(self, cr, uid, ids, name, arg, context={}):
-        activate_tips = self.pool.get('res.users').browse(cr, uid, uid).menu_tips
-        if activate_tips:
-            cr.execute(""" SELECT action.id,
-                         CASE WHEN r.uid IS NULL THEN True ELSE False END
-                         AS help_status FROM ir_act_window action
-                         LEFT JOIN ir_act_window_user_rel r ON
-                         (action.id = r.act_id AND (r.uid IS NULL or r.uid= %s)) WHERE action.id = ANY(%s)""",(uid,ids,))
-            return dict(cr.fetchall())
-
     _columns = {
         'name': fields.char('Action Name', size=64, translate=True),
         'type': fields.char('Action Type', size=32, required=True),
@@ -252,8 +242,6 @@ class act_window(osv.osv):
         'menus': fields.char('Menus', size=4096),
         'help': fields.text('Action description',
             help='Optional help text for the users with a description of the target view, such as its usage and purpose.'),
-        'display_help':fields.function(_get_help_status, type='boolean', method=True, string='Display Help',
-            help='It gives the status if the help message has to be displayed or not when a user performs an action')
 
     }
     _defaults = {
@@ -266,12 +254,7 @@ class act_window(osv.osv):
         'auto_refresh': lambda *a: 0,
         'auto_search':lambda *a: True
     }
-    def _auto_init(self, cr, context={}):
-        super(act_window, self)._auto_init(cr, context)
-        cr.execute('SELECT indexname FROM pg_indexes WHERE indexname = \'act_window_action_uid_index\'')
-        if not cr.fetchone():
-            cr.execute('CREATE INDEX act_window_action_uid_index ON ir_act_window_user_rel (act_id, uid)')
-            cr.commit()
+
 act_window()
 
 class act_window_view(osv.osv):

From 30ec71647b3e2c01b48c1efb1b36a5913371d3b4 Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Mon, 27 Sep 2010 11:37:12 +0530
Subject: [PATCH 48/61] [FIX] point_of_sale: Report corrected.

bzr revid: uco@tinyerp.com-20100927060712-c9ag98irq1mpuihf
---
 addons/point_of_sale/report/pos_payment_report_user.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/report/pos_payment_report_user.py b/addons/point_of_sale/report/pos_payment_report_user.py
index dc829859c3e..c7f31ffcd6f 100644
--- a/addons/point_of_sale/report/pos_payment_report_user.py
+++ b/addons/point_of_sale/report/pos_payment_report_user.py
@@ -53,7 +53,7 @@ class pos_payment_report_user(report_sxw.rml_parse):
                          "and po.state='paid' and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date = current_date " \
                          "and po.user_id IN %s",(tuple(ids),))
         res=self.cr.fetchone()
-        res = res and res[0] or None
+        res = res and res[0] or 0.0
 
         return res
 

From 8326778771c63b2fafe34acfef8cbeabb95cc164 Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Mon, 27 Sep 2010 11:45:56 +0530
Subject: [PATCH 49/61] [FIX] auction: Reports corrected

bzr revid: uco@tinyerp.com-20100927061556-xfncjfhw8ls13nuw
---
 addons/auction/report/auction_artists.rml     | 2 +-
 addons/auction/report/bids_lots.rml           | 4 ++--
 addons/auction/report/bids_phones_details.rml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/auction/report/auction_artists.rml b/addons/auction/report/auction_artists.rml
index dfe81549245..1a0688825d4 100644
--- a/addons/auction/report/auction_artists.rml
+++ b/addons/auction/report/auction_artists.rml
@@ -62,7 +62,7 @@
           </para>
           <para style="P6">[[o.artist2_id and 'Artist2: '+o.artist2_id.name or False]]</para>
           <para style="P8">
-            <font face="Courier">[[o.artist_id2 and 'Biography: '+o.artist_id2.biography or False]]</font>
+            <font face="Courier">[[o.artist2_id and 'Biography: '+o.artist2_id.biography or False]]</font>
           </para>
         </td>
       </tr>
diff --git a/addons/auction/report/bids_lots.rml b/addons/auction/report/bids_lots.rml
index 9d688868d30..c2cad707a57 100644
--- a/addons/auction/report/bids_lots.rml
+++ b/addons/auction/report/bids_lots.rml
@@ -74,10 +74,10 @@
           <para style="P4">[[ o.ach_uid and o.ach_uid.name or False]]</para>
         </td>
         <td>
-          <para style="P5"><font>[[o.bid_lines[0] and o.bid_lines[0].bid_id.name or removeParentNode('font')]]</font></para>
+          <para style="P5"><font>[[ o.bid_lines and o.bid_lines[0] and o.bid_lines[0].bid_id.name or removeParentNode('font')]]</font></para>
         </td>
         <td>
-          <para style="P6"><font>[[o.bid_lines[0] and o.bid_lines[0].bid_id.contact_tel or removeParentNode('font')]]</font></para>
+          <para style="P6"><font>[[o.bid_lines and o.bid_lines[0] and o.bid_lines[0].bid_id.contact_tel or removeParentNode('font')]]</font></para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/auction/report/bids_phones_details.rml b/addons/auction/report/bids_phones_details.rml
index 17ba5f94b81..adf9e6a63b3 100644
--- a/addons/auction/report/bids_phones_details.rml
+++ b/addons/auction/report/bids_phones_details.rml
@@ -88,7 +88,7 @@
           <para style="P8">[[o.lot_est1]]-[[o.lot_est2]]</para>
         </td>
         <td>
-          <para style="P7"><font>[[o.bid_lines[0] and o.bid_lines[0].bid_id.contact_tel or removeParentNode('font')]]</font></para>
+          <para style="P7"><font>[[o.bid_lines and o.bid_lines[0] and o.bid_lines[0].bid_id.contact_tel or removeParentNode('font')]]</font></para>
         </td>
       </tr>
     </blockTable>

From 8817e1a28652fddf1debe589a82e2cd14ab77445 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 27 Sep 2010 11:53:07 +0530
Subject: [PATCH 50/61] [IMP/MOD] account,crm_* : Extended filter option set
 before group by in search view

bzr revid: vir@tinyerp.com-20100927062307-gkdneuj86c3y2l71
---
 .../account_analytic_entries_report_view.xml  | 22 +++++------
 .../report/account_entries_report_view.xml    | 28 +++++++-------
 .../report/account_invoice_report_view.xml    | 22 +++++------
 addons/crm/crm_lead_view.xml                  | 30 +++++++--------
 addons/crm/crm_opportunity_view.xml           | 28 +++++++-------
 addons/crm/report/crm_lead_report_view.xml    | 32 ++++++++--------
 .../crm/report/crm_phonecall_report_view.xml  | 29 +++++++--------
 .../report/crm_claim_report_view.xml          | 37 +++++++++----------
 .../report/crm_fundraising_report_view.xml    | 33 ++++++++---------
 .../report/crm_helpdesk_report_view.xml       | 15 +++-----
 .../report/crm_lead_report_view.xml           | 27 +++++++-------
 11 files changed, 149 insertions(+), 154 deletions(-)

diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index b837186f23c..1df0cf011fd 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -54,6 +54,17 @@
                     </field>
                 </group>
                 <newline/>
+                <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                    <field name="currency_id" widget="selection"/>
+                    <field name="general_account_id" widget="selection"/>
+                    <field name="product_uom_id" widget="selection"/>
+                    <field name="journal_id" widget="selection"/>
+                    <separator orientation="vertical"/>
+                    <field name="name"/>
+                    <field name="account_id"/>
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                </group>
+                <newline/>
                 <group expand="1" string="Group By...">
                     <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
                     <filter string="Currency" icon="terp-dolar" context="{'group_by':'currency_id'}"/>
@@ -70,17 +81,6 @@
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
-                <newline/>
-                <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                    <field name="currency_id" widget="selection"/>
-                    <field name="general_account_id" widget="selection"/>
-                    <field name="product_uom_id" widget="selection"/>
-                    <field name="journal_id" widget="selection"/>
-                    <separator orientation="vertical"/>
-                    <field name="name"/>
-                    <field name="account_id"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                </group>
             </search>
         </field>
     </record>
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index f6282046e00..f7dd6da49e3 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -56,7 +56,7 @@
                 <group colspan="10" col="12">
                     <filter icon="terp-go-year" string="This F.Year"
                             name="thisyear"
-                            domain="[('period_id','in','current_year')]"                        
+                            domain="[('period_id','in','current_year')]"
                             help="Journal Entries with period in current year"/>
                     <filter icon="terp-go-month" string="This Period"
                             name="period"
@@ -73,6 +73,19 @@
                     <field name="journal_id" widget="selection"/>
                     <field name="period_id"/>
                 </group>
+                <newline/>
+                 <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                    <field name="fiscalyear_id"/>
+                    <separator orientation="vertical"/>
+                    <field name="product_id"/>
+                    <field name="partner_id"/>
+                    <separator orientation="vertical" groups="base.group_multi_company"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <newline/>
+                    <field name="date_created"/>
+                    <field name="date"/>
+                    <field name="date_maturity"/>
+                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">
                     <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
@@ -92,19 +105,6 @@
                     <filter string="Period" icon="terp-go-month" name="group_period" context="{'group_by':'period_id'}"/>
                     <filter string="Fiscal Year" icon="terp-go-year" context="{'group_by':'fiscalyear_id'}"/>
                  </group>
-                 <newline/>
-                 <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                    <field name="fiscalyear_id"/>
-                    <separator orientation="vertical"/>
-                    <field name="product_id"/>
-                    <field name="partner_id"/>
-                    <separator orientation="vertical" groups="base.group_multi_company"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <newline/>
-                    <field name="date_created"/>
-                    <field name="date"/>
-                    <field name="date_maturity"/>
-                 </group>
             </search>
         </field>
     </record>
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 98dd3f64fb7..80985fb3d6a 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -97,6 +97,17 @@
                    <field name="categ_id" />
                 </group>
                 <newline/>
+                <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                    <field name="product_id"/>
+                    <separator orientation="vertical"/>
+                    <field name="journal_id" widget="selection"/>
+                    <field name="account_id"/>
+                    <separator orientation="vertical"/>
+                    <field name="date_due"/>
+                    <separator orientation="vertical" groups="base.group_multi_company"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                </group>
+                <newline/>
                 <group expand="1" string="Group By...">
                     <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id','residual_visible':True}"/>
                     <filter string="Salesman" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
@@ -118,17 +129,6 @@
                     <filter string="Month" name="month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of Invoice Date"/>
                     <filter string="Year" name="year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of Invoice Date"/>
                 </group>
-                <newline/>
-                <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                    <field name="product_id"/>
-                    <separator orientation="vertical"/>
-                    <field name="journal_id" widget="selection"/>
-                    <field name="account_id"/>
-                    <separator orientation="vertical"/>
-                    <field name="date_due"/>
-                    <separator orientation="vertical" groups="base.group_multi_company"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                </group>
             </search>
         </field>
     </record>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index f9a3a1fb629..41d41ef0502 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -31,7 +31,7 @@
         <menuitem action="crm_lead_categ_action"
             id="menu_crm_lead_categ" name="Categories"
             parent="base.menu_crm_config_lead" sequence="1"/>
-        
+
         <!--  Resource Type Form View -->
         <record id="crm_lead_resource_act" model="ir.actions.act_window">
             <field name="name">Lead Sources</field>
@@ -337,6 +337,20 @@
                         help="Show Sales Team"/>
                 </field>
                 <newline/>
+                <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                      <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+                      <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+                      <separator orientation="vertical"/>
+                      <field name="country_id" context="{'invisible_country': False}">
+                          <filter icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
+                      </field>
+                      <separator orientation="vertical"/>
+                      <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                      <newline/>
+                      <field name="create_date" string="Creation Date"/>
+                      <field name="date_closed"/>
+                </group>
+                <newline/>
                 <group expand="0" string="Group By...">
                     <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
@@ -354,20 +368,6 @@
                     <filter string="Creation" icon="terp-go-month"
                         domain="[]" context="{'group_by':'create_date'}" />
                 </group>
-                <newline/>
-                <group  expand="0" string="Extended Filters..." groups="base.group_extended">
-                      <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
-                      <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
-                      <separator orientation="vertical"/>
-                      <field name="country_id" context="{'invisible_country': False}">
-                          <filter icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
-                      </field>
-                      <separator orientation="vertical"/>
-                      <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                      <newline/>
-                      <field name="create_date" string="Creation Date"/>
-                      <field name="date_closed"/>
-                </group>
            </search>
         </field>
     </record>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index e816e3f0b1d..8101a0bcfb2 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -311,6 +311,20 @@
                                 help="Show Sales Team"/>
                         </field>
                         <newline/>
+                        <group  expand="0" string="Extended Filters..." groups="base.group_extended">
+                              <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+                              <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+                              <separator orientation="vertical"/>
+                              <field name="country_id" context="{'invisible_country': False}">
+                                  <filter icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
+                              </field>
+                              <separator orientation="vertical"/>
+                              <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                              <newline/>
+                              <field name="create_date" string="Creation Date"/>
+                              <field name="date_closed"/>
+                        </group>
+                        <newline/>
                         <group expand="0" string="Group By..." colspan="16">
                             <filter string="Stage" icon="terp-stage" domain="[]"
                                 context="{'group_by':'stage_id'}" />
@@ -335,20 +349,6 @@
                                 help="Expected Closing" domain="[]"
                                 context="{'group_by':'date_deadline'}" />
                         </group>
-                        <newline/>
-                        <group  expand="0" string="Extended Filters..." groups="base.group_extended">
-                              <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
-                              <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
-                              <separator orientation="vertical"/>
-                              <field name="country_id" context="{'invisible_country': False}">
-                                  <filter icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
-                              </field>
-                              <separator orientation="vertical"/>
-                              <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                              <newline/>
-                              <field name="create_date" string="Creation Date"/>
-                              <field name="date_closed"/>
-                        </group>
                     </search>
                 </field>
             </record>
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 42adda76dbe..1939965c0dc 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -110,7 +110,22 @@
                         </field>
                    </group>
                    <newline/>
-                   <group  expand="1" string="Group By...">
+                  <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                      <field name="partner_id"/>
+                      <separator orientation="vertical"/>
+                      <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]" />
+                      <field name="categ_id" widget="selection"/>
+                      <field name="type_id" widget="selection"/>
+                      <field name="channel_id" widget="selection"/>
+                      <separator orientation="vertical"/>
+                      <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                      <newline/>
+                      <field name="creation_date"/>
+                      <field name="opening_date"/>
+                      <field name="date_closed"/>
+                  </group>
+                   <newline/>
+                   <group expand="1" string="Group By...">
                         <filter string="User" name="user" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
                        <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}" />
@@ -144,21 +159,6 @@
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'name'}" />
                   </group>
-                  <newline/>
-                  <group  expand="0" string="Extended Filters..." groups="base.group_extended">
-                      <field name="partner_id"/>
-                      <separator orientation="vertical"/>
-                      <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]" />
-                      <field name="categ_id" widget="selection"/>
-                      <field name="type_id" widget="selection"/>
-                      <field name="channel_id" widget="selection"/>
-                      <separator orientation="vertical"/>
-                      <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                      <newline/>
-                      <field name="creation_date"/>
-                      <field name="opening_date"/>
-                      <field name="date_closed"/>
-                  </group>
                </search>
             </field>
         </record>
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 69402603d17..8024ca78bd5 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -110,7 +110,20 @@
                            </field>
                    </group>
                    <newline/>
-                   <group  expand="1" string="Group By...">
+                   <group expand="0" string="Extended Filters..."  groups="base.group_extended">
+                      <field name="partner_id"/>
+                        <separator orientation="vertical"/>
+                        <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
+                        <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
+                        <separator orientation="vertical"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
+                           <newline/>
+                        <field name="creation_date"/>
+                        <field name="opening_date"/>
+                        <field name="date_closed"/>
+                   </group>
+                   <newline/>
+                   <group expand="1" string="Group By...">
                         <filter string="User" name="User" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
                        <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}" />
@@ -139,20 +152,6 @@
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'name'}" />
                   </group>
-
-                   <newline/>
-                   <group  expand="0" string="Extended Filters..."  groups="base.group_extended">
-                      <field name="partner_id"/>
-                        <separator orientation="vertical"/>
-                        <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
-                        <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
-                        <separator orientation="vertical"/>
-                        <field name="company_id" groups="base.group_multi_company"/>
-                           <newline/>
-                        <field name="creation_date"/>
-                        <field name="opening_date"/>
-                        <field name="date_closed"/>
-                   </group>
                </search>
             </field>
         </record>
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 3a1e8f45f26..edb3dc2b6db 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -119,7 +119,24 @@
                			</field>
                    </group>
                    <newline/>
-                   <group  expand="0" string="Group By...">
+                   <group  expand="0" string="Extended Filters..." groups="base.group_extended">
+                         <filter icon="terp-dialog-close"
+                            string="Done"
+                            domain="[('state','=','done')]"/>
+                        <filter icon="gtk-cancel"
+                            string="Cancel"
+                            domain="[('state','=','cancel')]"/>
+                        <group>
+                            <separator orientation="vertical"/>
+                            <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
+                            <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
+                            <separator orientation="vertical"/>
+                            <field name="priority" />
+                            <field name="type_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
+                        </group>
+                   </group>
+                   <newline/>
+                   <group  expand="1" string="Group By...">
                         <filter string="User" name="User" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
 
@@ -157,25 +174,7 @@
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'name'}" />
                   </group>
-                   <newline/>
-                   <group  expand="0" string="Extended Filters..." groups="base.group_extended">
-                         <filter icon="terp-dialog-close"
-                    		string="Done"
-                    		domain="[('state','=','done')]"/>
 
-                    	<filter icon="gtk-cancel"
-                    		string="Cancel"
-                    		domain="[('state','=','cancel')]"/>
-
-                    	<group>
-		            	    <separator orientation="vertical"/>
-		            	    <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
-			                <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
-			                <separator orientation="vertical"/>
-			                <field name="priority" />
-			                <field name="type_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
-		                </group>
-                   </group>
                </search>
             </field>
         </record>
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 8e9f1611af6..989b364a488 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -118,7 +118,22 @@
                			</field>
                    </group>
                    <newline/>
-                   <group  expand="0" string="Group By...">
+                   <group  expand="0" string="Extended Filters..." groups="base.group_extended">
+                         <filter icon="terp-dialog-close"
+                            string="Done"
+                            domain="[('state','=','done')]"/>
+
+                        <filter icon="gtk-cancel"
+                            string="Cancel"
+                            domain="[('state','=','cancel')]"/>
+
+                        <group>
+                            <separator orientation="vertical"/>
+                            <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
+                         </group>
+                   </group>
+                   <newline/>
+                   <group  expand="1" string="Group By...">
                         <filter string="User" name="User" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
 
@@ -146,23 +161,7 @@
 
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'name'}" />
-
                   </group>
-                   <newline/>
-                   <group  expand="0" string="Extended Filters..." groups="base.group_extended">
-                         <filter icon="terp-dialog-close"
-                    		string="Done"
-                    		domain="[('state','=','done')]"/>
-
-                    	<filter icon="gtk-cancel"
-                    		string="Cancel"
-                    		domain="[('state','=','cancel')]"/>
-
-                    	<group>
-		            	    <separator orientation="vertical"/>
-			                <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
-			             </group>
-                   </group>
                </search>
             </field>
         </record>
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index 2544a506fd5..1d494103dc3 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -114,7 +114,12 @@
                          <field name="user_id" widget="selection"/>
                    </group>
                    <newline/>
-                  <group expand="0" string="Group By...">
+                   <group expand="0" string="Extended Filters..."  groups="base.group_extended">
+                        <filter string="Priority" icon="terp-rating-rated"
+                            domain="[]" context="{'group_by':'priority'}" />
+                   </group>
+                   <newline/>
+                   <group expand="1" string="Group By...">
                         <filter string="User" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}"
                             default="1" />
@@ -141,15 +146,7 @@
 
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'name'}" />
-
                   </group>
-                    <newline/>
-                   <group expand="0" string="Extended Filters..."  groups="base.group_extended">
-                        <filter string="Priority" icon="terp-rating-rated"
-                            domain="[]" context="{'group_by':'priority'}" />
-                   </group>
-
-
                </search>
             </field>
         </record>
diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml
index 3424fc44fbe..2d38cd8862b 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -31,6 +31,19 @@
                         <field name="partner_assigned_id"/>
                    </group>
                    <newline/>
+                   <group  expand="0" string="Extended Filters..." groups="base.group_extended">
+                      <field name="partner_id"/>
+                      <separator orientation="vertical"/>
+                      <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]" />
+                      <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+                      <separator orientation="vertical"/>
+                      <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                      <newline/>
+                      <field name="creation_date"/>
+                      <field name="opening_date"/>
+                      <field name="date_closed"/>
+                   </group>
+                   <newline/>
                    <group  expand="1" string="Group By...">
                        <filter string="User" name="user" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
@@ -69,19 +82,7 @@
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'name'}" />
                   </group>
-                  <newline/>
-                  <group  expand="0" string="Extended Filters..." groups="base.group_extended">
-                      <field name="partner_id"/>
-                      <separator orientation="vertical"/>
-                      <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]" />
-                      <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
-                      <separator orientation="vertical"/>
-                      <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                      <newline/>
-                      <field name="creation_date"/>
-                      <field name="opening_date"/>
-                      <field name="date_closed"/>
-                  </group>
+
                </search>
             </field>
         </record>

From b9c2e86993e883675e081b9a0938b44bb8b04527 Mon Sep 17 00:00:00 2001
From: Panos Christeas <p_chr...@hol.gr>
Date: Mon, 27 Sep 2010 08:28:36 +0200
Subject: [PATCH 51/61] [FIX] account_analytic_analysis: added patch from Panos
 Christeas fixing a bug in _analysis_all and removing the use of 'sum' as a
 variable

bzr revid: olt@tinyerp.com-20100927062836-fuojzdp1jk31bdey
---
 .../account_analytic_analysis.py              | 16 +++---
 addons/point_of_sale/pos.py                   | 56 +++++++++++++++----
 2 files changed, 53 insertions(+), 19 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 6bd2f2138ec..5a393e1dd83 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -126,8 +126,8 @@ class account_analytic_account(osv.osv):
                             where account_analytic_line.account_id IN %s \
                                 and account_analytic_line.invoice_id is not null \
                             GROUP BY account_analytic_line.account_id",(parent_ids,))
-                    for account_id, sum in cr.fetchall():
-                        res[account_id] = sum
+                    for account_id, lid in cr.fetchall():
+                        res[account_id][f] = lid
                 for account in accounts:
                     for child in account.child_ids:
                         if res[account.id][f] < res.get(child.id, {}).get(f, ''):
@@ -141,8 +141,8 @@ class account_analytic_account(osv.osv):
                             where account_id IN %s \
                                 and invoice_id is null \
                             GROUP BY account_analytic_line.account_id" ,(parent_ids,))
-                    for account_id, sum in cr.fetchall():
-                        res[account_id][f] = sum
+                    for account_id, lwd in cr.fetchall():
+                        res[account_id][f] = lwd
                 for account in accounts:
                     for child in account.child_ids:
                         if res[account.id][f] < res.get(child.id, {}).get(f, ''):
@@ -160,8 +160,8 @@ class account_analytic_account(osv.osv):
                                 and invoice_id is null \
                                 AND to_invoice IS NOT NULL \
                             GROUP BY account_analytic_line.account_id;",(parent_ids,))
-                    for account_id, sum in cr.fetchall():
-                        res[account_id][f] = round(sum, dp)
+                    for account_id, sua in cr.fetchall():
+                        res[account_id][f] = round(sua, dp)
                 for account in accounts:
                     for child in account.child_ids:
                         if account.id != child.id:
@@ -180,8 +180,8 @@ class account_analytic_account(osv.osv):
                                 and account_analytic_journal.type='general' \
                             GROUP BY account_analytic_line.account_id",(parent_ids,))
                     ff =  cr.fetchall()
-                    for account_id, sum in ff:
-                        res[account_id][f] = round(sum, dp)
+                    for account_id, hq in ff:
+                        res[account_id][f] = round(hq, dp)
                 for account in accounts:
                     for child in account.child_ids:
                         if account.id != child.id:
diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 769d3a0460e..2db6b6e5531 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -619,7 +619,7 @@ class pos_order(osv.osv):
         pricelist = values['pricelist_id'] and values['pricelist_id'][0]
         product = values['partner_id'] and values['partner_id'][0]
 
-        price = line_obj.price_by_product(cr, uid, [],
+        price = line_obj.price_by_product_OLD(cr, uid, [],
                 pricelist, product_id, qty, product)
 
         order_line_id = line_obj.create(cr, uid, {
@@ -1015,7 +1015,7 @@ class pos_order_line(osv.osv):
     def _get_amount(self, cr, uid, ids, field_name, arg, context):
         res = {}
         for line in self.browse(cr, uid, ids):
-            price = self.price_by_product(cr, uid, ids, line.order_id.pricelist_id.id, line.product_id.id, line.qty, line.order_id.partner_id.id)
+            price = self.price_by_product_OLD(cr, uid, ids, line.order_id.pricelist_id.id, line.product_id.id, line.qty, line.order_id.partner_id.id)
             res[line.id]=price
         return res
 
@@ -1025,12 +1025,12 @@ class pos_order_line(osv.osv):
         for line in self.browse(cr, uid, ids):
             tax_amount = 0.0
             taxes = [t for t in line.product_id.taxes_id]
-	    if line.qty == 0.0:
-		continue
+            if line.qty == 0.0:
+                continue
             computed_taxes = account_tax_obj.compute_all(cr, uid, taxes, line.price_unit, line.qty)['taxes']
             for tax in computed_taxes:
                 tax_amount += tax['amount']
-            price = self.price_by_product(cr, uid, ids, line.order_id.pricelist_id.id, line.product_id.id, line.qty, line.order_id.partner_id.id)
+            price = self.price_by_product_OLD(cr, uid, ids, line.order_id.pricelist_id.id, line.product_id.id, line.qty, line.order_id.partner_id.id)
             if line.discount!=0.0:
                 res[line.id] = line.price_unit * line.qty * (1 - (line.discount or 0.0) / 100.0)
             else:
@@ -1041,15 +1041,49 @@ class pos_order_line(osv.osv):
     def _amount_line(self, cr, uid, ids, field_name, arg, context):
         res = {}
 
+        prices = self.price_by_product_NEW(cr, uid, ids)
         for line in self.browse(cr, uid, ids):
-            price = self.price_by_product(cr, uid, ids, line.order_id.pricelist_id.id, line.product_id.id, line.qty, line.order_id.partner_id.id)
+            price = prices[line.id]
             if line.discount!=0.0:
                 res[line.id] = line.price_unit * line.qty * (1 - (line.discount or 0.0) / 100.0)
             else:
                 res[line.id]=line.price_unit*line.qty
         return res
 
-    def price_by_product(self, cr, uid, ids, pricelist, product_id, qty=0, partner_id=False):
+    def price_by_product_NEW(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+
+        res = {}.fromkeys(ids, 0.0)
+        return res
+
+        for line in self.browse(cr, uid, ids):
+            pricelist = line.order_id.pricelist_id.id
+            product_id = line.product_id
+            qty = line.qty or 0
+            partner_id = line.order_id.partner_id.id or False
+
+            if not product_id:
+                res[line.id] = 0.0
+                continue
+            if not pricelist:
+                raise osv.except_osv(_('No Pricelist !'),
+                    _('You have to select a pricelist in the sale form !\n' \
+                    'Please set one before choosing a product.'))
+
+            uom_id = product_id.uom_po_id.id
+
+            price = self.pool.get('product.pricelist').price_get(cr, uid, [pricelist], product_id.id, qty or 1.0, partner_id, {'uom': uom_id})[pricelist]
+            unit_price = price or product_id.list_price
+            res[line.id] = unit_price
+            if unit_price is False:
+                raise osv.except_osv(_('No valid pricelist line found !'),
+                    _("Couldn't find a pricelist line matching this product" \
+                    " and quantity.\nYou have to change either the product," \
+                    " the quantity or the pricelist."))
+        return res
+
+    def price_by_product_OLD(self, cr, uid, ids, pricelist, product_id, qty=0, partner_id=False):
         if not product_id:
             return 0.0
         if not pricelist:
@@ -1057,7 +1091,7 @@ class pos_order_line(osv.osv):
                 _('You have to select a pricelist in the sale form !\n' \
                 'Please set one before choosing a product.'))
         p_obj = self.pool.get('product.product').browse(cr,uid,[product_id])[0]
-        uom_id=p_obj.uom_po_id.id
+        uom_id = p_obj.uom_po_id.id
         price = self.pool.get('product.pricelist').price_get(cr, uid,
             [pricelist], product_id, qty or 1.0, partner_id,{'uom': uom_id})[pricelist]
         unit_price=price or p_obj.list_price
@@ -1069,14 +1103,14 @@ class pos_order_line(osv.osv):
         return unit_price
 
     def onchange_product_id(self, cr, uid, ids, pricelist, product_id, qty=0, partner_id=False):
-        price = self.price_by_product(cr, uid, ids, pricelist, product_id, qty, partner_id)
+        price = self.price_by_product_OLD(cr, uid, ids, pricelist, product_id, qty, partner_id)
         self.write(cr,uid,ids,{'price_unit':price})
         pos_stot = (price * qty)
         return {'value': {'price_unit': price,'price_subtotal_incl': pos_stot}}
 
     def onchange_subtotal(self, cr, uid, ids, discount, price, pricelist,qty,partner_id, product_id,*a):
         prod_obj = self.pool.get('product.product')
-        price_f = self.price_by_product(cr, uid, ids, pricelist, product_id, qty, partner_id)
+        price_f = self.price_by_product_OLD(cr, uid, ids, pricelist, product_id, qty, partner_id)
         prod_id=''
         if product_id:
             prod_id=prod_obj.browse(cr,uid,product_id).disc_controle
@@ -1179,7 +1213,7 @@ class pos_order_line(osv.osv):
         # search price product
         product =product_obj.read(cr, uid, product_id)
         product_name = product[0]['name']
-        price = self.price_by_product(cr, uid, 0, pricelist_id[0]['pricelist_id'][0], product_id[0], 1)
+        price = self.price_by_product_OLD(cr, uid, 0, pricelist_id[0]['pricelist_id'][0], product_id[0], 1)
 
         order_line_ids = self.search(cr, uid, [('name','=',product_name),('order_id','=',order)])
         if order_line_ids:

From cf44617d4b4a5eb6212740174011fdb0d3ae48aa Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Mon, 27 Sep 2010 08:31:15 +0200
Subject: [PATCH 52/61] [FIX] revert

bzr revid: olt@tinyerp.com-20100927063115-q5w66ct4a58uugbb
---
 addons/point_of_sale/pos.py | 56 ++++++++-----------------------------
 1 file changed, 11 insertions(+), 45 deletions(-)

diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 2db6b6e5531..769d3a0460e 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -619,7 +619,7 @@ class pos_order(osv.osv):
         pricelist = values['pricelist_id'] and values['pricelist_id'][0]
         product = values['partner_id'] and values['partner_id'][0]
 
-        price = line_obj.price_by_product_OLD(cr, uid, [],
+        price = line_obj.price_by_product(cr, uid, [],
                 pricelist, product_id, qty, product)
 
         order_line_id = line_obj.create(cr, uid, {
@@ -1015,7 +1015,7 @@ class pos_order_line(osv.osv):
     def _get_amount(self, cr, uid, ids, field_name, arg, context):
         res = {}
         for line in self.browse(cr, uid, ids):
-            price = self.price_by_product_OLD(cr, uid, ids, line.order_id.pricelist_id.id, line.product_id.id, line.qty, line.order_id.partner_id.id)
+            price = self.price_by_product(cr, uid, ids, line.order_id.pricelist_id.id, line.product_id.id, line.qty, line.order_id.partner_id.id)
             res[line.id]=price
         return res
 
@@ -1025,12 +1025,12 @@ class pos_order_line(osv.osv):
         for line in self.browse(cr, uid, ids):
             tax_amount = 0.0
             taxes = [t for t in line.product_id.taxes_id]
-            if line.qty == 0.0:
-                continue
+	    if line.qty == 0.0:
+		continue
             computed_taxes = account_tax_obj.compute_all(cr, uid, taxes, line.price_unit, line.qty)['taxes']
             for tax in computed_taxes:
                 tax_amount += tax['amount']
-            price = self.price_by_product_OLD(cr, uid, ids, line.order_id.pricelist_id.id, line.product_id.id, line.qty, line.order_id.partner_id.id)
+            price = self.price_by_product(cr, uid, ids, line.order_id.pricelist_id.id, line.product_id.id, line.qty, line.order_id.partner_id.id)
             if line.discount!=0.0:
                 res[line.id] = line.price_unit * line.qty * (1 - (line.discount or 0.0) / 100.0)
             else:
@@ -1041,49 +1041,15 @@ class pos_order_line(osv.osv):
     def _amount_line(self, cr, uid, ids, field_name, arg, context):
         res = {}
 
-        prices = self.price_by_product_NEW(cr, uid, ids)
         for line in self.browse(cr, uid, ids):
-            price = prices[line.id]
+            price = self.price_by_product(cr, uid, ids, line.order_id.pricelist_id.id, line.product_id.id, line.qty, line.order_id.partner_id.id)
             if line.discount!=0.0:
                 res[line.id] = line.price_unit * line.qty * (1 - (line.discount or 0.0) / 100.0)
             else:
                 res[line.id]=line.price_unit*line.qty
         return res
 
-    def price_by_product_NEW(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-
-        res = {}.fromkeys(ids, 0.0)
-        return res
-
-        for line in self.browse(cr, uid, ids):
-            pricelist = line.order_id.pricelist_id.id
-            product_id = line.product_id
-            qty = line.qty or 0
-            partner_id = line.order_id.partner_id.id or False
-
-            if not product_id:
-                res[line.id] = 0.0
-                continue
-            if not pricelist:
-                raise osv.except_osv(_('No Pricelist !'),
-                    _('You have to select a pricelist in the sale form !\n' \
-                    'Please set one before choosing a product.'))
-
-            uom_id = product_id.uom_po_id.id
-
-            price = self.pool.get('product.pricelist').price_get(cr, uid, [pricelist], product_id.id, qty or 1.0, partner_id, {'uom': uom_id})[pricelist]
-            unit_price = price or product_id.list_price
-            res[line.id] = unit_price
-            if unit_price is False:
-                raise osv.except_osv(_('No valid pricelist line found !'),
-                    _("Couldn't find a pricelist line matching this product" \
-                    " and quantity.\nYou have to change either the product," \
-                    " the quantity or the pricelist."))
-        return res
-
-    def price_by_product_OLD(self, cr, uid, ids, pricelist, product_id, qty=0, partner_id=False):
+    def price_by_product(self, cr, uid, ids, pricelist, product_id, qty=0, partner_id=False):
         if not product_id:
             return 0.0
         if not pricelist:
@@ -1091,7 +1057,7 @@ class pos_order_line(osv.osv):
                 _('You have to select a pricelist in the sale form !\n' \
                 'Please set one before choosing a product.'))
         p_obj = self.pool.get('product.product').browse(cr,uid,[product_id])[0]
-        uom_id = p_obj.uom_po_id.id
+        uom_id=p_obj.uom_po_id.id
         price = self.pool.get('product.pricelist').price_get(cr, uid,
             [pricelist], product_id, qty or 1.0, partner_id,{'uom': uom_id})[pricelist]
         unit_price=price or p_obj.list_price
@@ -1103,14 +1069,14 @@ class pos_order_line(osv.osv):
         return unit_price
 
     def onchange_product_id(self, cr, uid, ids, pricelist, product_id, qty=0, partner_id=False):
-        price = self.price_by_product_OLD(cr, uid, ids, pricelist, product_id, qty, partner_id)
+        price = self.price_by_product(cr, uid, ids, pricelist, product_id, qty, partner_id)
         self.write(cr,uid,ids,{'price_unit':price})
         pos_stot = (price * qty)
         return {'value': {'price_unit': price,'price_subtotal_incl': pos_stot}}
 
     def onchange_subtotal(self, cr, uid, ids, discount, price, pricelist,qty,partner_id, product_id,*a):
         prod_obj = self.pool.get('product.product')
-        price_f = self.price_by_product_OLD(cr, uid, ids, pricelist, product_id, qty, partner_id)
+        price_f = self.price_by_product(cr, uid, ids, pricelist, product_id, qty, partner_id)
         prod_id=''
         if product_id:
             prod_id=prod_obj.browse(cr,uid,product_id).disc_controle
@@ -1213,7 +1179,7 @@ class pos_order_line(osv.osv):
         # search price product
         product =product_obj.read(cr, uid, product_id)
         product_name = product[0]['name']
-        price = self.price_by_product_OLD(cr, uid, 0, pricelist_id[0]['pricelist_id'][0], product_id[0], 1)
+        price = self.price_by_product(cr, uid, 0, pricelist_id[0]['pricelist_id'][0], product_id[0], 1)
 
         order_line_ids = self.search(cr, uid, [('name','=',product_name),('order_id','=',order)])
         if order_line_ids:

From 518d5c001892486830b58893d6b865395c11b24b Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 27 Sep 2010 12:07:09 +0530
Subject: [PATCH 53/61] [IMP/MOD] hr__* : Extended filter option set before
 group by in search view

bzr revid: vir@tinyerp.com-20100927063709-stm755mntl90jzem
---
 .../report/available_holidays_view.xml        | 30 +++++++++----------
 .../hr_timesheet_invoice_report_view.xml      | 16 +++++-----
 .../report/timesheet_report_view.xml          | 30 +++++++++----------
 3 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index ebdd65b84c8..372d9158599 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -58,24 +58,24 @@
 		                <separator orientation="vertical"/>
                     <field name="employee_id"/>
 		            </group>
-		            <newline/>
-	                <group expand="0" string="Group By..." colspan="10" col="12">
-	                    <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
-	                    <filter icon="terp-personal" string="Employee"
-                          name="user" context="{'group_by':'employee_id'}"
-	                        help="Leaves by employee"/>
-                        <separator orientation="vertical"/>
-	                    <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'holiday_status_id'}"/>
-	                    <separator orientation="vertical"/>
-	                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
-	                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
-	                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
-	                </group>
 	                <newline/>
 	                <group expand="0" string="Extended Filters..." colspan="10" col="12">
-                    <field name="holiday_status_id" widget="selection"/>
-                	<field name="department_id" widget="selection"/>
+	                    <field name="holiday_status_id" widget="selection"/>
+	                	<field name="department_id" widget="selection"/>
 	                </group>
+	                <newline/>
+                    <group expand="1" string="Group By..." colspan="10" col="12">
+                        <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
+                        <filter icon="terp-personal" string="Employee"
+                          name="user" context="{'group_by':'employee_id'}"
+                          help="Leaves by employee"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'holiday_status_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
+                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
+                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
+                    </group>
 	            </search>
 	        </field>
 	    </record>
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index 163e641582c..ba155d3590a 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -60,7 +60,7 @@
                               domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                               help="Timesheet lines during last 7 days"/>
                       <separator orientation="vertical"/>
-              <field name="user_id" widget="selection">
+                      <field name="user_id" widget="selection">
                           <filter icon="terp-personal"
                               string="Non Assigned timesheets to users"
                               help="Non Assigned timesheets to users"
@@ -69,7 +69,13 @@
                       <field name="account_id"/>
                         <field name="product_id"/>
                     </group>
-                    <group expand="0" string="Group By...">
+                    <newline/>
+                    <group expand="0" string="Extended Filters..." colspan="10" col="12">
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
+                        <field name="invoice_id" widget="selection"/>
+                    </group>
+                    <group expand="1" string="Group By...">
                         <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Account" icon="terp-folder-orange" context="{'group_by':'account_id'}"/>
@@ -80,12 +86,6 @@
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'name'}"/>
                     </group>
-                    <newline/>
-                    <group expand="0" string="Extended Filters..." colspan="10" col="12">
-                        <field name="date"/>
-                        <separator orientation="vertical"/>
-                        <field name="invoice_id" widget="selection"/>
-                    </group>
                 </search>
             </field>
         </record>
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index 43bc0d2b9cc..08abc6db63b 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -75,7 +75,21 @@
                       <field name="user_id" />
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By...">
+                    <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                        <field name="general_account_id"/>
+                        <field name="to_invoice" widget="selection"/>
+                        <separator orientation="vertical"/>
+                        <field name="product_id"/>
+                        <separator orientation="vertical"/>
+                        <field name="department_id" widget="selection"/>
+                        <separator orientation="vertical"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        <newline/>
+                        <field name="date_to"/>
+                        <field name="date_from"/>
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By...">
                         <filter string="User" name="User_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
                         <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
                         <separator orientation="vertical"/>
@@ -94,20 +108,6 @@
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of date"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of date"/>
                     </group>
-                    <newline/>
-                    <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                        <field name="general_account_id"/>
-                        <field name="to_invoice" widget="selection"/>
-                        <separator orientation="vertical"/>
-                        <field name="product_id"/>
-                        <separator orientation="vertical"/>
-                        <field name="department_id" widget="selection"/>
-                        <separator orientation="vertical"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                        <newline/>
-                        <field name="date_to"/>
-                        <field name="date_from"/>
-                    </group>
                 </search>
             </field>
         </record>

From 9338fc0c4838de6da3f4e8b7897009ba230641b4 Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Mon, 27 Sep 2010 12:08:09 +0530
Subject: [PATCH 54/61] [FIX] Export : Corrections for exportation of
 relational fields

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

bzr revid: jvo@tinyerp.com-20100927063809-9xbpi309bffmzbuo
---
 bin/osv/orm.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 64b118f3e15..1024136093f 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -548,11 +548,10 @@ class orm_template(object):
             else:
                 return False
 
-
         lines = []
         data = map(lambda x: '', range(len(fields)))
-        done = []
         for fpos in range(len(fields)):
+            done = []
             f = fields[fpos]
             if f:
                 r = row

From 6652e6b0eb382c0bbb449c12d62b5e5a89586b51 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 27 Sep 2010 13:11:24 +0530
Subject: [PATCH 55/61] [IMP/MOD]
 mrp,point_of_sale,product,project,project_issue,purchase,sale,sale_margin * :
 Extended filter option set before group by in search view

bzr revid: vir@tinyerp.com-20100927074124-j4waeanwhbhvb0kn
---
 .../mrp/report/mrp_production_order_view.xml  | 31 ++++++-----
 .../report/report_cash_register_view.xml      |  2 +-
 .../report/report_pos_order_view.xml          | 12 ++---
 addons/product/product_view.xml               |  9 ++--
 addons/project/report/project_report_view.xml | 22 ++++----
 .../report/project_issue_report_view.xml      | 35 ++++++------
 .../purchase/report/purchase_report_view.xml  | 28 +++++-----
 addons/sale/report/sale_report_view.xml       | 22 ++++----
 .../sale_margin/report/report_margin_view.xml | 53 ++++++++++---------
 9 files changed, 109 insertions(+), 105 deletions(-)

diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index efacd8b675d..ea1f15bc3ea 100644
--- a/addons/mrp/report/mrp_production_order_view.xml
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -69,8 +69,21 @@
                         <field name="location_dest_id" />
                    </group>
                    <newline/>
-
-                   <group expand="0" string="Group By...">
+                    <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                        <filter icon="terp-emblem-important" string="Picking Exception" domain="[('state','=','picking_except')]"/>
+                        <filter icon="terp-gtk-media-pause" string="Waiting Goods" domain="[('state','=','confirmed')]"/>
+                        <filter icon="terp-camera_test" string="Ready to Produce" domain="[('state','=','ready')]"/>
+                        <separator orientation="vertical"/>
+                      <field name="priority"/>
+                      <separator orientation="vertical"/>
+                      <field name="company_id" groups="base.group_multi_company"/>
+                      <newline/>
+                        <field name="date_start"/>
+                      <field name="date_planned"/>
+                      <field name="date_finnished"/>
+                    </group>
+                   <newline/>
+                   <group expand="1" string="Group By...">
                     	<filter string="Raw Material Location" icon="terp-gtk-jump-to-rtl" context="{'group_by':'location_src_id'}"/>
                     	<filter string="Finished Products Location" icon="terp-gtk-jump-to-ltr" context="{'group_by':'location_dest_id'}"/>
                     	<separator orientation="vertical"/>
@@ -87,20 +100,6 @@
                     	<separator orientation="vertical"/>
                     	<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                    </group>
-                    <newline/>
-	                <group expand="0" string="Extended Filters..." groups="base.group_extended">
-	                    <filter icon="terp-emblem-important" string="Picking Exception" domain="[('state','=','picking_except')]"/>
-	                    <filter icon="terp-gtk-media-pause" string="Waiting Goods" domain="[('state','=','confirmed')]"/>
-	                    <filter icon="terp-camera_test" string="Ready to Produce" domain="[('state','=','ready')]"/>
-	                    <separator orientation="vertical"/>
-                      <field name="priority"/>
-                      <separator orientation="vertical"/>
-                      <field name="company_id" groups="base.group_multi_company"/>
-                      <newline/>
-	                    <field name="date_start"/>
-                      <field name="date_planned"/>
-                      <field name="date_finnished"/>
-	                </group>
                   </search>
             </field>
         </record>
diff --git a/addons/point_of_sale/report/report_cash_register_view.xml b/addons/point_of_sale/report/report_cash_register_view.xml
index 3cda047598f..fb498336fb5 100644
--- a/addons/point_of_sale/report/report_cash_register_view.xml
+++ b/addons/point_of_sale/report/report_cash_register_view.xml
@@ -61,7 +61,7 @@
                         </field>
                     </group>  
                     <newline/>
-	                <group expand="0" string="Group By..." colspan="10" col="12">
+	                <group expand="1" string="Group By..." colspan="10" col="12">
 	                    <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
 	                    <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
                         <separator orientation="vertical"/>
diff --git a/addons/point_of_sale/report/report_pos_order_view.xml b/addons/point_of_sale/report/report_pos_order_view.xml
index 6a9bc6823cc..b149ebf3fb8 100644
--- a/addons/point_of_sale/report/report_pos_order_view.xml
+++ b/addons/point_of_sale/report/report_pos_order_view.xml
@@ -73,7 +73,12 @@
                     </field>
 	                </group>
 	                <newline/>
-	                <group expand="0" string="Group By..." colspan="10" col="12">
+                    <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                        <field name="date_validation"/>
+                        <field name="date_payment"/>
+                    </group>
+	                <newline/>
+	                <group expand="1" string="Group By..." colspan="10" col="12">
 	                    <filter string="Salesman" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
 	                    <filter string="Customer" icon="terp-personal" context="{'group_by':'partner_id'}"/>
 	                    <separator orientation="vertical"/>
@@ -83,11 +88,6 @@
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Month of order date"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Year of order date"/>
 	                </group>
-	                <newline/>
-	                <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                        <field name="date_validation"/>
-                        <field name="date_payment"/>
-                    </group>
 	            </search>
 	        </field>
         </record>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 1d40945f2f8..45ebaa8ee57 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -21,6 +21,10 @@
                    <field name="name"/>
                    <field name="categ_id" widget="selection" operator="child_of"/>
                    <newline/>
+                   <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                       <field name="pricelist_id" widget="selection" context="{'pricelist': self}" />
+                   </group>
+                   <newline/>
                    <group  expand='0' string='Group by...' groups="base.group_extended">
                        <filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'categ_id'}" />
                        <separator orientation="vertical"/>
@@ -28,10 +32,7 @@
                        <separator orientation="vertical"/>
                        <filter string='Type' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'type'}" />
                    </group>
-                   <newline/>
-                   <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                       <field name="pricelist_id" widget="selection" context="{'pricelist': self}" />
-                   </group>
+                   
                 </search>
             </field>
         </record>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 9db500d93ff..f269399877c 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -107,6 +107,17 @@
                       <field name="partner_id" />
                     </group>
                     <newline/>
+                    <group expand="0" string="Extended Filters..." colspan="10" col="12" groups="base.group_extended">
+                        <field name="type_id" widget="selection"/>
+                        <separator orientation="vertical"/>
+                        <field name="date_start"/>
+                        <field name="date_deadline"/>
+                        <field name="date_end"/>
+                        <separator orientation="vertical"/>
+                        <field name="priority"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    </group>
+                    <newline/>
                     <group expand="1" string="Group By..." colspan="10" col="12">
                         <filter string="Project" name="project" icon="terp-folder-blue" context="{'group_by':'project_id'}"/>
                         <filter string="Assigned to" name="User" icon="terp-personal" context="{'group_by':'user_id'}" />
@@ -122,17 +133,6 @@
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                     </group>
-                    <newline/>
-	                <group expand="0" string="Extended Filters..." colspan="10" col="12" groups="base.group_extended">
-	                    <field name="type_id" widget="selection"/>
-	                    <separator orientation="vertical"/>
-                        <field name="date_start"/>
-                        <field name="date_deadline"/>
-                        <field name="date_end"/>
-	                    <separator orientation="vertical"/>
-	                    <field name="priority"/>
-	                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    </group>
                 </search>
             </field>
         </record>
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index c80ccc86e28..9ceded378ba 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -90,6 +90,23 @@
                       	<field name="user_id"  select="1" widget="selection"/>
                    </group>
                    <newline/>
+                   <group expand="0" string="Extended Filters..." colspan="10" col="12" groups="base.group_extended">
+                       <field name="partner_id"/>
+                       <field name="assigned_to" widget="selection"/>
+                       <separator orientation="vertical"/>
+                       <field name="priority" />
+                       <separator orientation="vertical"/>
+                       <field name="type_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
+                       <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
+                       <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]" />
+                       <separator orientation="vertical"/>
+                       <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                       <newline/>
+                       <field name="creation_date"/>
+                       <field name="opening_date"/>
+                       <field name="date_closed" string="Date Closed"/>
+                   </group>
+                   <newline/>
                    <group  expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="Project"  name="project" icon="terp-folder-blue" context="{'group_by':'project_id'}" />
                         <filter string="Task"  icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'task_id'}"/>
@@ -129,23 +146,7 @@
                         	domain="[]" context="{'group_by':'name'}" />
 
                   </group>
-                   <newline/>
-                   <group  expand="0" string="Extended Filters..." colspan="10" col="12" groups="base.group_extended">
-                    		<field name="partner_id"/>
-                    		<field name="assigned_to" widget="selection"/>
-                    		<separator orientation="vertical"/>
-                    		<field name="priority" />
-                    		<separator orientation="vertical"/>
-                    		<field name="type_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
-                    		<field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
-                    		<field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]" />
-                    		<separator orientation="vertical"/>
-                   		<field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    		<newline/>
-                            <field name="creation_date"/>
-                            <field name="opening_date"/>
-                            <field name="date_closed" string="Date Closed"/>
-                        </group>
+
                </search>
             </field>
         </record>
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index bd69e4dfce0..b8831ed11e0 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -78,6 +78,20 @@
                 <field name="product_id"/>
                 </group>
                 <newline/>
+                <group expand="0" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
+                    <field name="user_id"/>
+                    <field name="validator"/>
+                    <separator orientation="vertical"/>
+                    <field name="location_id"/>
+                    <field name="warehouse_id" widget="selection"/>
+                    <separator orientation="vertical"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <newline/>
+                    <field name="date"/>
+                    <field name="date_approve"/>
+                    <field name="expected_date"/>
+                </group>
+                <newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
                     <filter string="Supplier" name="group_partner_id" icon="terp-personal" context="{'group_by':'partner_id'}"/>
                     <filter string="Product" name="group_product_id" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
@@ -96,20 +110,6 @@
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'name'}"/>
                 </group>
-                <newline/>
-                <group expand="0" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
-                    <field name="user_id"/>
-                    <field name="validator"/>
-                    <separator orientation="vertical"/>
-                    <field name="location_id"/>
-                    <field name="warehouse_id" widget="selection"/>
-                    <separator orientation="vertical"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <newline/>
-                    <field name="date"/>
-                    <field name="date_approve"/>
-                    <field name="expected_date"/>
-                </group>
             </search>
         </field>
     </record>
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 36b1afee891..f1ff0e17ca6 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -85,6 +85,15 @@
                     </field>
                 </group>
                 <newline/>
+                <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                    <field name="date"/>
+                    <field name="date_confirm"/>
+                    <separator orientation="vertical"/>
+                    <field name="shop_id" widget="selection"/>
+                    <field name="categ_id" widget="selection"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                </group>
+                <newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
                     <filter string="Salesman" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
                     <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
@@ -99,19 +108,10 @@
                     <filter string="Shop" icon="terp-go-home" context="{'group_by':'shop_id'}"/>
                     <filter string="Company" icon="terp-go-home" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
                     <separator orientation="vertical"/>
-                   <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
-                   <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
+                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
-                <newline/>
-                <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                    <field name="date"/>
-                    <field name="date_confirm"/>
-                    <separator orientation="vertical"/>
-                    <field name="shop_id" widget="selection"/>
-                    <field name="categ_id" widget="selection"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                </group>
             </search>
         </field>
     </record>
diff --git a/addons/sale_margin/report/report_margin_view.xml b/addons/sale_margin/report/report_margin_view.xml
index 31616ff96fe..8c0aaa05d8c 100644
--- a/addons/sale_margin/report/report_margin_view.xml
+++ b/addons/sale_margin/report/report_margin_view.xml
@@ -32,35 +32,38 @@
             <field name="arch" type="xml">
                 <search string="Search Margin">
                     <group col="10" colspan="4">
-						<filter icon="terp-account" string="This Year" domain="[('year','=',time.strftime('%%Y'))]" help="All Months Sales by Margin"/>
-						<filter icon="terp-account" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This Months Sales by Margin"/>
-						<filter string="Draft" icon="terp-account" domain="[('state','=','draft')]" help="Draft Invoices"/>
-                   		<filter string="Pro-forma" icon="terp-account" domain="[('state','=','proforma')]" help="Pro-forma Invoices"/>
-                   		<filter string="Current" icon="terp-account" domain="[('state', '=' ,'open')]" help="open Invoices"/>
-	                	<filter string="Done" icon="terp-account" domain="[('state','=','paid')]" help="Done Invoices"/>
+						<filter icon="terp-go-year" string="This Year" domain="[('year','=',time.strftime('%%Y'))]" help="All Months Sales by Margin"/>
+						<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This Months Sales by Margin"/>
+						<separator orientation="vertical"/>
+						<filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Draft Invoices"/>
+                   		<filter string="Pro-forma" icon="terp-check" domain="[('state','=','proforma')]" help="Pro-forma Invoices"/>
+                   		<filter string="Current" icon="terp-check" domain="[('state', '=' ,'open')]" help="open Invoices"/>
+	                	<filter string="Done" icon="terp-dialog-close" domain="[('state','=','paid')]" help="Done Invoices"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                        <field name="date" string="Date Invoiced"/>
+                        <separator orientation="vertical"/>
+                        <field name="partner_id" widget="selection"/>
+                        <separator orientation="vertical"/>
+                        <field name="amount" />
+                        <field name="state"/>
+                        <newline/>
+                        <field name="product_id"/>
+                        <field name="categ_id"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="10">
-                        <filter string="Partner" icon="terp-account" context="{'group_by':'partner_id'}"/>
-	                    <filter string="Product" icon="terp-account" context="{'group_by':'product_id'}"/>
-	                    <filter string="Category" icon="terp-account" context="{'group_by':'categ_id'}"/>
- 						<filter string="State" icon="terp-account" context="{'group_by':'state'}"/>	
-	                    <filter string="Day" icon="terp-account" context="{'group_by':'day'}"/>
-    	                <filter string="Month" icon="terp-account" context="{'group_by':'month'}"/>
-        	            <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/> 						                    
+                        <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
+                        <separator orientation="vertical"/>
+	                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+	                    <filter string="Category" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id'}"/>
+ 						<filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+ 						<separator orientation="vertical"/>
+	                    <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+    	                <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
+        	            <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                     </group>
-                     <newline/>
-	    			<group expand="0" string="Extended Filters..." groups="base.group_extended">
-	                    <field name="date" string="Date Invoiced"/>
-	                    <separator orientation="vertical"/>
-	                    <field name="partner_id" widget="selection"/>
-	                    <field name="amount" />
-	                    <field name="state"/>
-	                    <newline/>
-	                    <separator orientation="vertical"/>
-	                	<field name="product_id"/>
-	                	<field name="categ_id"/>
-	                </group>                    
                 </search>
             </field>
         </record>

From 83a1255311f65e4596c20f25de8ec3d65464ebf9 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 27 Sep 2010 15:27:48 +0530
Subject: [PATCH 56/61] [IMP]:improved internal header and print pagecount
 without black square on the right of the page number

bzr revid: apa@tinyerp.com-20100927095748-9927u4i2y1rmmo9f
---
 bin/addons/base/res/res_company.py    | 6 +++---
 bin/report/render/rml2pdf/trml2pdf.py | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/bin/addons/base/res/res_company.py b/bin/addons/base/res/res_company.py
index 1bc0f7372ee..2f0b567666e 100644
--- a/bin/addons/base/res/res_company.py
+++ b/bin/addons/base/res/res_company.py
@@ -212,8 +212,8 @@ class res_company(osv.osv):
         <setFont name="DejaVu Sans Bold" size="10"/>
         <drawString x="490" y="725">[[ company.partner_id.name ]]</drawString>
         <setFont name="DejaVu Sans" size="8"/>
-        <drawRightString x="1065" y="725"><pageNumber/>/  </drawRightString>
-        <drawString x="1065" y="725"><pageCount/></drawString>
+        <drawRightString x="1073" y="725"><pageNumber/>/  </drawRightString>
+        <drawString x="1073" y="725"><pageCount/></drawString>
         <stroke color="#000000"/>
         <lines>25 720 1085 720</lines>
     </pageGraphics>
@@ -233,7 +233,7 @@ class res_company(osv.osv):
         <drawString x="9.8cm" y="28.3cm">[[ company.partner_id.name ]]</drawString>
         <setFont name="DejaVu Sans" size="8"/>
         <drawRightString x="19.7cm" y="28.3cm"><pageNumber/> /  </drawRightString>
-        <drawString x="19.8cm" y="28.3cm"><pageCount/></drawString>
+        <drawString x="19.7cm" y="28.3cm"><pageCount/></drawString>
         <stroke color="#000000"/>
         <lines>1.3cm 28.1cm 20cm 28.1cm</lines>
         </pageGraphics>
diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index ca47423008b..be8cde09259 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -42,11 +42,12 @@ class PageCount(platypus.Flowable):
     def draw(self):
         self.canv.beginForm("pageCount")
         self.canv.setFont("Helvetica", utils.unit_get(str(8)))
-        self.canv.drawString(0, 0, str(self.canv.getPageNumber()))
+        self.canv.drawString(0, 0, str(self.canv._pageCount))
         self.canv.endForm()
 
 class PageReset(platypus.Flowable):
     def draw(self):
+        self.canv._pageCount = self.canv.getPageNumber()
         self.canv._pageNumber = 0
 
 class _rml_styles(object,):
@@ -261,7 +262,7 @@ class _rml_canvas(object):
             if n.tag == 'pageNumber':
                 rc += str(self.canvas.getPageNumber())
             rc += utils._process_text(self, n.tail)
-        return rc
+        return rc.replace(' ','').replace('\n','')
 
     def _drawString(self, node):
         v = utils.attr_get(node, ['x','y'])

From bf0124f28c9ea9bbc8866b23f7feb89b7ebf4716 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 27 Sep 2010 15:39:55 +0530
Subject: [PATCH 57/61] [IMP]:improved for internal header

bzr revid: apa@tinyerp.com-20100927100955-m0nh5r0sdp8r4yvt
---
 bin/report/render/rml2pdf/trml2pdf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index be8cde09259..30df7b6211e 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -262,7 +262,7 @@ class _rml_canvas(object):
             if n.tag == 'pageNumber':
                 rc += str(self.canvas.getPageNumber())
             rc += utils._process_text(self, n.tail)
-        return rc.replace(' ','').replace('\n','')
+        return rc.replace('\n','')
 
     def _drawString(self, node):
         v = utils.attr_get(node, ['x','y'])

From 6860beac3e044ce28e3f9a43e50561de7348b68d Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 27 Sep 2010 16:32:15 +0530
Subject: [PATCH 58/61] [IMP]:improved header

bzr revid: apa@tinyerp.com-20100927110215-pua562rflkics8j2
---
 bin/addons/base/res/res_company.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/res/res_company.py b/bin/addons/base/res/res_company.py
index 2f0b567666e..6d78062a0e9 100644
--- a/bin/addons/base/res/res_company.py
+++ b/bin/addons/base/res/res_company.py
@@ -212,7 +212,7 @@ class res_company(osv.osv):
         <setFont name="DejaVu Sans Bold" size="10"/>
         <drawString x="490" y="725">[[ company.partner_id.name ]]</drawString>
         <setFont name="DejaVu Sans" size="8"/>
-        <drawRightString x="1073" y="725"><pageNumber/>/  </drawRightString>
+        <drawRightString x="1073" y="725"><pageNumber/>/</drawRightString>
         <drawString x="1073" y="725"><pageCount/></drawString>
         <stroke color="#000000"/>
         <lines>25 720 1085 720</lines>
@@ -232,7 +232,7 @@ class res_company(osv.osv):
         <setFont name="DejaVu Sans Bold" size="10"/>
         <drawString x="9.8cm" y="28.3cm">[[ company.partner_id.name ]]</drawString>
         <setFont name="DejaVu Sans" size="8"/>
-        <drawRightString x="19.7cm" y="28.3cm"><pageNumber/> /  </drawRightString>
+        <drawRightString x="19.7cm" y="28.3cm"><pageNumber/>/</drawRightString>
         <drawString x="19.7cm" y="28.3cm"><pageCount/></drawString>
         <stroke color="#000000"/>
         <lines>1.3cm 28.1cm 20cm 28.1cm</lines>

From a4f08919b1bb435b3858d385c34facc181e14dc3 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 27 Sep 2010 16:58:25 +0530
Subject: [PATCH 59/61] [IMP]:improved internal header for pagereset

bzr revid: apa@tinyerp.com-20100927112825-t8f7vkdut97fnfcv
---
 bin/report/render/rml2pdf/trml2pdf.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index 30df7b6211e..c7ffc965649 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -42,12 +42,11 @@ class PageCount(platypus.Flowable):
     def draw(self):
         self.canv.beginForm("pageCount")
         self.canv.setFont("Helvetica", utils.unit_get(str(8)))
-        self.canv.drawString(0, 0, str(self.canv._pageCount))
+        self.canv.drawString(0, 0, str(self.canv.getPageNumber()))
         self.canv.endForm()
 
 class PageReset(platypus.Flowable):
     def draw(self):
-        self.canv._pageCount = self.canv.getPageNumber()
         self.canv._pageNumber = 0
 
 class _rml_styles(object,):
@@ -811,7 +810,8 @@ class _rml_template(object):
                 fis.append(platypus.PageBreak())
             fis += r.render(node_story)
             # Reset Page Number with new story tag
-            fis.append(PageReset())
+            if self.localcontext.has_key('active_ids') and len(self.localcontext.get('active_ids')) > 1:
+                fis.append(PageReset())
             story_cnt += 1
         if self.localcontext:
             fis.append(PageCount())

From 0e2eba601dfc16d4145eebb100e00d3a40ea4e3f Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 27 Sep 2010 18:22:23 +0530
Subject: [PATCH 60/61] [IMP]:improved internal header for pagereset

bzr revid: apa@tinyerp.com-20100927125223-jkqs7z851d4jer1x
---
 bin/report/render/rml2pdf/trml2pdf.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index c7ffc965649..f0a945eb7f5 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -42,11 +42,15 @@ class PageCount(platypus.Flowable):
     def draw(self):
         self.canv.beginForm("pageCount")
         self.canv.setFont("Helvetica", utils.unit_get(str(8)))
-        self.canv.drawString(0, 0, str(self.canv.getPageNumber()))
+        if '_pageCount' in dir(self.canv):
+            self.canv.drawString(0, 0, str(self.canv._pageCount))
+        else:
+            self.canv.drawString(0, 0, str(self.canv.getPageNumber()))
         self.canv.endForm()
 
 class PageReset(platypus.Flowable):
     def draw(self):
+        self.canv._pageCount = self.canv.getPageNumber()
         self.canv._pageNumber = 0
 
 class _rml_styles(object,):
@@ -810,8 +814,7 @@ class _rml_template(object):
                 fis.append(platypus.PageBreak())
             fis += r.render(node_story)
             # Reset Page Number with new story tag
-            if self.localcontext.has_key('active_ids') and len(self.localcontext.get('active_ids')) > 1:
-                fis.append(PageReset())
+            fis.append(PageReset())
             story_cnt += 1
         if self.localcontext:
             fis.append(PageCount())

From 573ea5722f467031b1b018a3aa7e107c206da1ef Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Mon, 27 Sep 2010 23:35:06 +0530
Subject: [PATCH 61/61] [FIX] wizard exception replaced by osv exception

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

bzr revid: jvo@tinyerp.com-20100927180506-w5oq9ia1pjgjdyqd
---
 bin/addons/base/module/wizard/base_module_upgrade.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/module/wizard/base_module_upgrade.py b/bin/addons/base/module/wizard/base_module_upgrade.py
index fe85cb0422c..500622489e7 100644
--- a/bin/addons/base/module/wizard/base_module_upgrade.py
+++ b/bin/addons/base/module/wizard/base_module_upgrade.py
@@ -95,7 +95,7 @@ class base_module_upgrade(osv.osv_memory):
                 if dep_mod.state in ('unknown','uninstalled'):
                     unmet_packages.append(dep_mod.name)
         if len(unmet_packages):
-            raise wizard.except_wizard('Unmet dependency !', 'Following modules are uninstalled or unknown. \n\n'+'\n'.join(unmet_packages))
+            raise osv.except_osv('Unmet dependency !', 'Following modules are uninstalled or unknown. \n\n'+'\n'.join(unmet_packages))
         mod_obj.download(cr, uid, ids, context=context)
         cr.commit()
         db, pool = pooler.restart_pool(cr.dbname, update_module=True)