From 18bcd1c980f3618b744c72c7f6ab6267cd27aaf0 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Fri, 28 Jan 2011 16:28:18 +0530
Subject: [PATCH 01/73] [IMP, ADD] account:Improve the logic to create period
 so it can create one more period and add two journals for opening entries

bzr revid: psi@tinyerp.co.in-20110128105818-ptd5vk4xsaowmnec
---
 addons/account/account.py                     | 45 ++++++++++++++++---
 addons/account/account_view.xml               |  2 +
 addons/account/configurable_account_chart.xml | 17 +++++++
 addons/account/demo/account_minimal.xml       |  9 ++++
 addons/account/installer.py                   | 24 ++++++++++
 5 files changed, 90 insertions(+), 7 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 3abbe4cef2e..ada9a12cb4a 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -805,19 +805,28 @@ class account_fiscalyear(osv.osv):
         (_check_fiscal_year, 'Error! You cannot define overlapping fiscal years',['date_start', 'date_stop'])
     ]
 
-    def create_period3(self,cr, uid, ids, context=None):
+    def create_period3(self, cr, uid, ids, context=None):
         return self.create_period(cr, uid, ids, context, 3)
 
-    def create_period(self,cr, uid, ids, context=None, interval=1):
+    def create_period(self, cr, uid, ids, context=None, interval=1):
+        period_obj = self.pool.get('account.period')
         for fy in self.browse(cr, uid, ids, context=context):
             ds = datetime.strptime(fy.date_start, '%Y-%m-%d')
-            while ds.strftime('%Y-%m-%d')<fy.date_stop:
+            period_obj.create(cr, uid, {
+                    'name': 'Opening Period',
+                    'code': ds.strftime('00/%Y'),
+                    'date_start': ds + relativedelta(years=-1, days=-1),
+                    'date_stop': ds + relativedelta(years=-1),
+                    'special': True,
+                    'fiscalyear_id': fy.id,
+                })
+            while ds.strftime('%Y-%m-%d') < fy.date_stop:
                 de = ds + relativedelta(months=interval, days=-1)
 
-                if de.strftime('%Y-%m-%d')>fy.date_stop:
+                if de.strftime('%Y-%m-%d') > fy.date_stop:
                     de = datetime.strptime(fy.date_stop, '%Y-%m-%d')
 
-                self.pool.get('account.period').create(cr, uid, {
+                period_obj.create(cr, uid, {
                     'name': ds.strftime('%m/%Y'),
                     'code': ds.strftime('%m/%Y'),
                     'date_start': ds.strftime('%Y-%m-%d'),
@@ -2449,6 +2458,8 @@ class account_chart_template(osv.osv):
         'property_account_expense': fields.many2one('account.account.template','Expense Account on Product Template'),
         'property_account_income': fields.many2one('account.account.template','Income Account on Product Template'),
         'property_reserve_and_surplus_account': fields.many2one('account.account.template', 'Reserve and Profit/Loss Account', domain=[('type', '=', 'payable')], help='This Account is used for transferring Profit/Loss(If It is Profit: Amount will be added, Loss: Amount will be deducted.), Which is calculated from Profilt & Loss Report'),
+        'property_account_income_opening': fields.many2one('account.account.template','Opening Entries Income Account'),
+        'property_account_expense_opening': fields.many2one('account.account.template','Opening Entries Expense Account'),
     }
 
 account_chart_template()
@@ -2681,6 +2692,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         obj_data = self.pool.get('ir.model.data')
         analytic_journal_obj = self.pool.get('account.analytic.journal')
         obj_tax_code = self.pool.get('account.tax.code')
+        obj_tax_code_template = self.pool.get('account.tax.code.template')
         # Creating Account
         obj_acc_root = obj_multi.chart_template_id.account_root_id
         tax_code_root_id = obj_multi.chart_template_id.tax_code_root_id.id
@@ -2693,9 +2705,9 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         todo_dict = {}
 
         #create all the tax code
-        children_tax_code_template = self.pool.get('account.tax.code.template').search(cr, uid, [('parent_id','child_of',[tax_code_root_id])], order='id')
+        children_tax_code_template = obj_tax_code_template.search(cr, uid, [('parent_id','child_of',[tax_code_root_id])], order='id')
         children_tax_code_template.sort()
-        for tax_code_template in self.pool.get('account.tax.code.template').browse(cr, uid, children_tax_code_template, context=context):
+        for tax_code_template in obj_tax_code_template.browse(cr, uid, children_tax_code_template, context=context):
             vals={
                 'name': (tax_code_root_id == tax_code_template.id) and obj_multi.company_id.name or tax_code_template.name,
                 'code': tax_code_template.code,
@@ -2806,11 +2818,15 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             seq_id_purchase_refund = obj_sequence.search(cr, uid, [('name','=','Purchase Refund Journal')])
             if seq_id_purchase_refund:
                 seq_id_purchase_refund = seq_id_purchase_refund[0]
+            seq_id_opening = obj_sequence.search(cr, uid, [('name','=','Opening Entries Journal')])
+            if seq_id_opening:
+                seq_id_opening = seq_id_opening[0]
         else:
             seq_id_sale = seq_id
             seq_id_purchase = seq_id
             seq_id_sale_refund = seq_id
             seq_id_purchase_refund = seq_id
+            seq_id_opening = seq_id
 
         vals_journal['view_id'] = view_id
 
@@ -2903,6 +2919,21 @@ class wizard_multi_charts_accounts(osv.osv_memory):
 #            })
         obj_journal.create(cr, uid, vals_journal, context=context)
 
+        # Opening Entries Journal
+        if obj_multi.chart_template_id.property_account_income_opening and obj_multi.chart_template_id.property_account_expense_opening:
+            vals_journal = {
+                'view_id': view_id,
+                'name': _('Opening Entries Journal'),
+                'type': 'situation',
+                'code': _('TOEJ'),
+                'sequence_id': seq_id_opening,
+                'analytic_journal_id': analitical_journal_purchase,
+                'company_id': company_id,
+                'default_credit_account_id': acc_template_ref[obj_multi.chart_template_id.property_account_income_opening.id],
+                'default_debit_account_id': acc_template_ref[obj_multi.chart_template_id.property_account_expense_opening.id]
+                }
+            obj_journal.create(cr, uid, vals_journal, context=context)
+
         # Bank Journals
         data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view')])
         data = obj_data.browse(cr, uid, data_id[0], context=context)
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 1812e800880..cafc99b51de 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2150,6 +2150,8 @@
                     <field name="property_account_income_categ" domain="[('id', 'child_of', [account_root_id])]" />
                     <field name="property_account_expense" domain="[('id', 'child_of', [account_root_id])]"/>
                     <field name="property_account_income" domain="[('id', 'child_of', [account_root_id])]"/>
+                    <field name="property_account_income_opening" domain="[('id', 'child_of', [account_root_id])]"/>
+                    <field name="property_account_expense_opening" domain="[('id', 'child_of', [account_root_id])]"/>
                     <field name="property_reserve_and_surplus_account" />
                     </group>
                 </form>
diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml
index dd9c01142c3..4734e030113 100644
--- a/addons/account/configurable_account_chart.xml
+++ b/addons/account/configurable_account_chart.xml
@@ -191,6 +191,14 @@
 			            <field name="user_type" ref="conf_account_type_asset"/>
 			        </record>
 
+			        <record id="conf_o_income" model="account.account.template">
+			            <field name="code">1106</field>
+			            <field name="name">Opening Income Account</field>
+			            <field ref="conf_cas" name="parent_id"/>
+			            <field name="type">closed</field>
+			            <field name="user_type" ref="conf_account_type_income"/>
+			        </record>
+
 		        <record id="conf_cli" model="account.account.template">
 		            <field name="code">111</field>
 		            <field name="name">Current Liabilities</field>
@@ -225,6 +233,13 @@
 			            <field name="user_type" ref="conf_account_type_liability"/>
 			        </record>
 
+			        <record id="conf_o_expense" model="account.account.template">
+			            <field name="code">1114</field>
+			            <field name="name">Opening Expense Account</field>
+			            <field ref="conf_cli" name="parent_id"/>
+			            <field name="type">closed</field>
+			            <field name="user_type" ref="conf_account_type_expense"/>
+			        </record>
 
         <!-- Profit and Loss -->
 
@@ -431,6 +446,8 @@
             <field name="property_account_payable" ref="conf_a_pay"/>
             <field name="property_account_expense_categ" ref="conf_a_expense"/>
             <field name="property_account_income_categ" ref="conf_a_sale"/>
+            <field name="property_account_income_opening" ref="conf_o_income"/>
+            <field name="property_account_expense_opening" ref="conf_o_expense"/>            
             <field name="property_reserve_and_surplus_account" ref="conf_a_reserve_and_surplus"/>
         </record>
 
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 65184b3d130..6ae6188ec62 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -421,6 +421,15 @@
             <field name="analytic_journal_id" ref="sit"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
+        <record id="miscellaneous_journal" model="account.journal">
+            <field name="name">Miscellaneous Journal - (test)</field>
+            <field name="code">TMIS</field>
+            <field name="type">general</field>
+            <field name="view_id" ref="account_journal_bank_view"/>
+            <field name="sequence_id" ref="sequence_journal"/>
+            <field name="analytic_journal_id" ref="sit"/>
+            <field name="user_id" ref="base.user_root"/>
+        </record>
 
         <!--
         Product income and expense accounts, default parameters
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 78eb8cf16e0..4a4d945f72b 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -416,11 +416,20 @@ class account_installer(osv.osv_memory):
                 'company_id': company_id.id
             }
             seq_id_purchase_refund = obj_sequence.create(cr, uid, seq_refund_purchase, context=context)
+            seq_opening_journal = {
+                'name': 'Opening Entries Journal',
+                'code': 'account.journal',
+                'prefix': 'TOEJ/%(year)s/',
+                'padding': 3,
+                'company_id': company_id.id
+            }
+            seq_id_opening = obj_sequence.create(cr, uid, seq_opening_journal, context=context)
         else:
             seq_id_sale = seq_id
             seq_id_purchase = seq_id
             seq_id_sale_refund = seq_id
             seq_id_purchase_refund = seq_id
+            seq_id_opening = seq_id
 
         vals_journal['view_id'] = view_id
 
@@ -508,6 +517,21 @@ class account_installer(osv.osv_memory):
             })
         obj_journal.create(cr, uid, vals_journal, context=context)
 
+        # Opening Entries Journal
+        if obj_multi.property_account_income_opening and obj_multi.property_account_expense_opening:
+            vals_journal = {
+                'view_id': view_id,
+                'name': _('Opening Entries Journal'),
+                'type': 'situation',
+                'code': _('TOEJ'),
+                'sequence_id': seq_id_opening,
+                'analytic_journal_id': analitical_journal_purchase,
+                'company_id': company_id.id,
+                'default_credit_account_id': acc_template_ref[obj_multi.property_account_income_opening.id],
+                'default_debit_account_id': acc_template_ref[obj_multi.property_account_expense_opening.id]
+                }
+            obj_journal.create(cr, uid, vals_journal, context=context)
+
         # Bank Journals
         view_id_cash = obj_acc_journal_view.search(cr, uid, [('name', '=', 'Bank/Cash Journal View')], context=context)[0] #TOFIX: Why put fixed name ?
         view_id_cur = obj_acc_journal_view.search(cr, uid, [('name', '=', 'Bank/Cash Journal (Multi-Currency) View')], context=context)[0] #TOFIX: why put fixed name?

From e6bdb08b5a096a2642f9bd660d20ce2ecba3e557 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 1 Feb 2011 18:06:52 +0530
Subject: [PATCH 02/73] [IMP, ADD] account: add Opening entry Journal,
 Miscellenous journal and respective accounts

bzr revid: psi@tinyerp.co.in-20110201123652-805x6523dq3lk4ix
---
 addons/account/account.py               | 30 ++++++++++++++++---------
 addons/account/demo/account_minimal.xml | 29 +++++++++++++++++++++++-
 addons/account/installer.py             | 27 ++++++++++++++++++++--
 3 files changed, 72 insertions(+), 14 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index c2d98c56bba..a17eff7a71f 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2822,12 +2822,16 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             seq_id_opening = obj_sequence.search(cr, uid, [('name','=','Opening Entries Journal')])
             if seq_id_opening:
                 seq_id_opening = seq_id_opening[0]
+            seq_id_miscellaneous = obj_sequence.search(cr, uid, [('name','=','Miscellaneous Journal')])
+            if seq_id_miscellaneous:
+                seq_id_miscellaneous = seq_id_miscellaneous[0]
         else:
             seq_id_sale = seq_id
             seq_id_purchase = seq_id
             seq_id_sale_refund = seq_id
             seq_id_purchase_refund = seq_id
             seq_id_opening = seq_id
+            seq_id_miscellaneous = seq_id
 
         vals_journal['view_id'] = view_id
 
@@ -2888,12 +2892,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_income_categ.id]
             vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_income_categ.id]
 
-
-#        if obj_multi.property_account_receivable:
-#            vals_journal.update({
-#                'default_credit_account_id': acc_template_ref[obj_multi.chart_template_id.property_account_income_categ.id],
-#                'default_debit_account_id': acc_template_ref[obj_multi.chart_template_id.property_account_income_categ.id]
-#            })
         obj_journal.create(cr, uid, vals_journal, context=context)
 
         # Purchase Refund Journal
@@ -2912,12 +2910,20 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_expense_categ.id]
             vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_expense_categ.id]
 
+        obj_journal.create(cr, uid, vals_journal, context=context)
+
+        # Miscellaneous Journal
+        vals_journal = {
+            'view_id': view_id,
+            'name': _('Miscellaneous Journal'),
+            'type': 'general',
+            'refund_journal': True,
+            'code': _('MISC'),
+            'sequence_id': seq_id_miscellaneous,
+            'analytic_journal_id': analitical_journal_purchase,
+            'company_id': company_id
+        }
 
-#        if obj_multi.property_account_payable:
-#            vals_journal.update({
-#                'default_credit_account_id': acc_template_ref[obj_multi.property_account_expense_categ.id],
-#                'default_debit_account_id': acc_template_ref[obj_multi.property_account_expense_categ.id]
-#            })
         obj_journal.create(cr, uid, vals_journal, context=context)
 
         # Opening Entries Journal
@@ -2930,11 +2936,13 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                 'sequence_id': seq_id_opening,
                 'analytic_journal_id': analitical_journal_purchase,
                 'company_id': company_id,
+                'centralisation': True,
                 'default_credit_account_id': acc_template_ref[obj_multi.chart_template_id.property_account_income_opening.id],
                 'default_debit_account_id': acc_template_ref[obj_multi.chart_template_id.property_account_expense_opening.id]
                 }
             obj_journal.create(cr, uid, vals_journal, context=context)
 
+
         # Bank Journals
         data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view')])
         data = obj_data.browse(cr, uid, data_id[0], context=context)
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 6ae6188ec62..61a580835ab 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -163,6 +163,14 @@
             <field name="user_type" ref="account_type_asset"/>
         </record>
 
+        <record id="o_income" model="account.account">
+            <field name="code">X11006</field>
+            <field name="name">Opening Income - (test)</field>
+            <field ref="cas" name="parent_id"/>
+            <field name="type">closed</field>
+            <field name="user_type" ref="account_type_income"/>
+        </record>
+
         <record model="account.account" id="liabilities_view">
             <field name="name">Liabilities - (test)</field>
             <field name="code">X11</field>
@@ -205,6 +213,14 @@
             <field name="user_type" ref="account_type_liability"/>
         </record>
 
+        <record id="o_expense" model="account.account">
+            <field name="code">X1114</field>
+            <field name="name">Opening Expense - (test)</field>
+            <field ref="cli" name="parent_id"/>
+            <field name="type">closed</field>
+            <field name="user_type" ref="account_type_expense"/>
+        </record>
+
         <!-- Profit and Loss -->
 
         <record id="gpf" model="account.account">
@@ -430,7 +446,18 @@
             <field name="analytic_journal_id" ref="sit"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
-
+        <record id="opening_journal" model="account.journal">
+            <field name="name">Opening Entries Journal - (test)</field>
+            <field name="code">TOEJ</field>
+            <field name="type">situation</field>
+            <field name="view_id" ref="account_journal_bank_view"/>
+            <field name="sequence_id" ref="sequence_cash_journal"/>
+            <field model="account.account" name="default_debit_account_id" ref="o_income"/>
+            <field model="account.account" name="default_credit_account_id" ref="o_expense"/>
+            <field eval="True" name="centralisation"/>
+            <field name="analytic_journal_id" ref="sit"/>
+            <field name="user_id" ref="base.user_root"/>
+        </record>
         <!--
         Product income and expense accounts, default parameters
         -->
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 4a4d945f72b..65d8d7fa99f 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -424,13 +424,21 @@ class account_installer(osv.osv_memory):
                 'company_id': company_id.id
             }
             seq_id_opening = obj_sequence.create(cr, uid, seq_opening_journal, context=context)
+            seq_miscellaneous_journal = {
+                'name': 'Miscellaneous Journal',
+                'code': 'account.journal',
+                'prefix': 'MISC/%(year)s/',
+                'padding': 3,
+                'company_id': company_id.id
+            }
+            seq_id_miscellaneous = obj_sequence.create(cr, uid, seq_opening_journal, context=context)
         else:
             seq_id_sale = seq_id
             seq_id_purchase = seq_id
             seq_id_sale_refund = seq_id
             seq_id_purchase_refund = seq_id
             seq_id_opening = seq_id
-
+            seq_id_miscellaneous = seq_id
         vals_journal['view_id'] = view_id
 
         #Sales Journal
@@ -517,16 +525,31 @@ class account_installer(osv.osv_memory):
             })
         obj_journal.create(cr, uid, vals_journal, context=context)
 
+        # Miscellaneous Journal
+        vals_journal = {
+            'view_id': view_id,
+            'name': _('Miscellaneous Journal'),
+            'type': 'general',
+            'refund_journal': True,
+            'code': _('MISC'),
+            'sequence_id': seq_id_miscellaneous,
+            'analytic_journal_id': analitical_journal_purchase,
+            'company_id': company_id.id
+        }
+
+        obj_journal.create(cr, uid, vals_journal, context=context)
+
         # Opening Entries Journal
         if obj_multi.property_account_income_opening and obj_multi.property_account_expense_opening:
             vals_journal = {
                 'view_id': view_id,
                 'name': _('Opening Entries Journal'),
                 'type': 'situation',
-                'code': _('TOEJ'),
+                'code': _('OPEJ'),
                 'sequence_id': seq_id_opening,
                 'analytic_journal_id': analitical_journal_purchase,
                 'company_id': company_id.id,
+                'centralisation': True,
                 'default_credit_account_id': acc_template_ref[obj_multi.property_account_income_opening.id],
                 'default_debit_account_id': acc_template_ref[obj_multi.property_account_expense_opening.id]
                 }

From e2afe7b13aae0281eeaf4464ba04cf6233b6116a Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Wed, 2 Feb 2011 10:50:09 +0530
Subject: [PATCH 03/73] [IMP] l10n_de,l10n_ec,l10n_gr: correct property account
 in account.chart.template

bzr revid: mtr@mtr-20110202052009-3b1xknulownwwild
---
 addons/l10n_de/account_chart_template_skr04.xml | 4 ++--
 addons/l10n_ec/account_chart.xml                | 4 ++--
 addons/l10n_gr/account_tax.xml                  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/l10n_de/account_chart_template_skr04.xml b/addons/l10n_de/account_chart_template_skr04.xml
index cd7f5ca724b..c33c0d415eb 100644
--- a/addons/l10n_de/account_chart_template_skr04.xml
+++ b/addons/l10n_de/account_chart_template_skr04.xml
@@ -8,8 +8,8 @@
             <field name="account_root_id" ref="chart_skr04"/>
             <field name="tax_code_root_id" ref="tax_code_USTVA_skr04"/>
             <field name="bank_account_view_id" ref="chart_skr04_1800"/>
-            <field name="property_account_receivable" ref="chart_skr04_1200"/>
-            <field name="property_account_payable" ref="chart_skr04_3300"/>
+            <field name="property_account_receivable" ref="chart_skr04_1206"/>
+            <field name="property_account_payable" ref="chart_skr04_3301"/>
             <field name="property_account_expense_categ" ref="chart_skr04_5400"/>
             <field name="property_account_income_categ" ref="chart_skr04_4400"/>
         </record>
diff --git a/addons/l10n_ec/account_chart.xml b/addons/l10n_ec/account_chart.xml
index b4ab542dc81..3b3be8bc2c0 100644
--- a/addons/l10n_ec/account_chart.xml
+++ b/addons/l10n_ec/account_chart.xml
@@ -4201,8 +4201,8 @@
 	  <field name="bank_account_view_id" ref="10"/>
 	  <field name="property_account_receivable" ref="4"/>
 	  <field name="property_account_payable" ref="5"/>
-	  <field name="property_account_expense_categ" ref="6"/>
-	  <field name="property_account_income_categ" ref="7"/>		    
+	  <field name="property_account_expense_categ" ref="60101"/>
+	  <field name="property_account_income_categ" ref="710101"/>		    
 	</record>	
 
   </data>
diff --git a/addons/l10n_gr/account_tax.xml b/addons/l10n_gr/account_tax.xml
index bd9ca16bfdd..92a2188a8cb 100644
--- a/addons/l10n_gr/account_tax.xml
+++ b/addons/l10n_gr/account_tax.xml
@@ -19,7 +19,7 @@
         <field name="bank_account_view_id" ref="chartgr_38_03"/>
         <field name="property_account_receivable" ref="chartgr_30_00"/>
         <field name="property_account_payable" ref="chartgr_50_00"/>
-        <field name="property_account_expense_categ" ref="chartgr_64_98"/>
+        <field name="property_account_expense_categ" ref="chartgr_64_98_00"/>
         <field name="property_account_income_categ" ref="chartgr_71_00"/>
     </record>
 

From e0b487ad771c44f9b642aa2ba44422b35b080f5f Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Wed, 2 Feb 2011 12:53:34 +0530
Subject: [PATCH 04/73] [REVERT] l10n_gr: revert changes for property

bzr revid: mra@mra-laptop-20110202072334-givoepuyttwnk5tp
---
 addons/l10n_gr/account_tax.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_gr/account_tax.xml b/addons/l10n_gr/account_tax.xml
index 92a2188a8cb..c3de033869b 100644
--- a/addons/l10n_gr/account_tax.xml
+++ b/addons/l10n_gr/account_tax.xml
@@ -3,7 +3,7 @@
 <data noupdate="False">
 
     <!-- Chart Template -->
-    
+
     <!-- this file contains the base (common) data for all kinds
         of taxes, as well as the chart of accounts sum-up.
     -->
@@ -19,7 +19,7 @@
         <field name="bank_account_view_id" ref="chartgr_38_03"/>
         <field name="property_account_receivable" ref="chartgr_30_00"/>
         <field name="property_account_payable" ref="chartgr_50_00"/>
-        <field name="property_account_expense_categ" ref="chartgr_64_98_00"/>
+        <field name="property_account_expense_categ" ref="chartgr_64_98"/>
         <field name="property_account_income_categ" ref="chartgr_71_00"/>
     </record>
 

From 2caa4c37b357130f6592d2c233613eab6c0a3d36 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Wed, 2 Feb 2011 15:24:46 +0530
Subject: [PATCH 05/73] [IMP] l10n_lu,l10n_cr: correct property account in
 account.chart.template

bzr revid: mtr@mtr-20110202095446-170cxzgzkm6eijqp
---
 addons/l10n_cr/data/account_chart_template.xml | 8 ++++----
 addons/l10n_lu/l10n_lu_data.xml                | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/l10n_cr/data/account_chart_template.xml b/addons/l10n_cr/data/account_chart_template.xml
index bdf09c3dab1..e84ea73fbed 100644
--- a/addons/l10n_cr/data/account_chart_template.xml
+++ b/addons/l10n_cr/data/account_chart_template.xml
@@ -14,8 +14,8 @@
             <field name="property_account_payable" ref="account_account_template_0_211001"/>
             <field name="property_account_income" ref="account_account_template_0_410001"/>
             <field name="property_account_expense" ref="account_account_template_0_511301"/>
-            <field name="property_account_income_categ" ref="account_account_template_0_400000"/>
-            <field name="property_account_expense_categ" ref="account_account_template_0_500000"/>
+            <field name="property_account_income_categ" ref="account_account_template_0_410001"/>
+            <field name="property_account_expense_categ" ref="account_account_template_0_511301"/>
         </record>
         <record id="account_chart_template_x" model="account.chart.template">
             <field name="name">Costa Rica - Company 1</field>
@@ -26,8 +26,8 @@
             <field name="property_account_payable" ref="account_account_template_x211001"/>
             <field name="property_account_income" ref="account_account_template_x410001"/>
             <field name="property_account_expense" ref="account_account_template_x511301"/>
-            <field name="property_account_income_categ" ref="account_account_template_x400000"/>
-            <field name="property_account_expense_categ" ref="account_account_template_x500000"/>
+            <field name="property_account_income_categ" ref="account_account_template_x410001"/>
+            <field name="property_account_expense_categ" ref="account_account_template_x511301"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/l10n_lu/l10n_lu_data.xml b/addons/l10n_lu/l10n_lu_data.xml
index 940da2177e5..775fc72f02e 100644
--- a/addons/l10n_lu/l10n_lu_data.xml
+++ b/addons/l10n_lu/l10n_lu_data.xml
@@ -3783,9 +3783,9 @@
             <field name="tax_code_root_id" ref="account_tax_code_template_1"/>
             <field name="bank_account_view_id" ref="account_550"/>
             <field name="property_account_receivable" ref="account_401000"/>
-            <field name="property_account_payable" ref="account_441000"/>
+            <field name="property_account_payable" ref="account_700000"/>
             <field name="property_account_expense_categ" ref="account_600000"/>
-            <field name="property_account_income_categ" ref="account_700000"/>
+            <field name="property_account_income_categ" ref="account_441000"/>
         </record>
 
 

From 36c8648d41237db0f41eec61bc2337d52cff6ef8 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Wed, 2 Feb 2011 16:10:49 +0530
Subject: [PATCH 06/73] [IMP] hr_attendance:removed print statement

bzr revid: mtr@mtr-20110202104049-4g37pfocg7b4wwl8
---
 addons/hr_attendance/report/attendance_by_month.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/hr_attendance/report/attendance_by_month.py b/addons/hr_attendance/report/attendance_by_month.py
index c70ca8a90df..ced701ac661 100644
--- a/addons/hr_attendance/report/attendance_by_month.py
+++ b/addons/hr_attendance/report/attendance_by_month.py
@@ -83,9 +83,7 @@ class report_custom(report_rml):
                     # sum up the attendances' durations
                     ldt = None
                     for att in attendences:
-                        print"--att---",att
                         dt = datetime.strptime(att['name'], '%Y-%m-%d %H:%M:%S')
-                        print"--dt---",dt
                         if ldt and att['action'] == 'sign_out':
                             wh += (dt - ldt).seconds/60/60
                         else:

From fe01aaef74566bdc377566e6f96d62ee336a51fa Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Wed, 2 Feb 2011 17:17:28 +0530
Subject: [PATCH 07/73] [REF] account

bzr revid: mra@mra-laptop-20110202114728-3ifqa2gfy6ubka9g
---
 addons/account/account.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 8a2cbdb8451..ca46696ad01 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1911,7 +1911,7 @@ class account_tax(osv.osv):
             totalex -= r.get('amount', 0.0)
         totlex_qty = 0.0
         try:
-            totlex_qty=totalex/quantity
+            totlex_qty = totalex/quantity
         except:
             pass
         tex = self._compute(cr, uid, tex, totlex_qty, quantity, address_id=address_id, product=product, partner=partner)

From 31552ce80de93043b63241a79385da14074a8705 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Wed, 2 Feb 2011 17:24:39 +0530
Subject: [PATCH 08/73] [REF] account

bzr revid: mra@mra-laptop-20110202115439-e98y2mjze50g5luw
---
 addons/account/account.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index ca46696ad01..d51f6f8cdfd 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -334,7 +334,7 @@ class account_account(osv.osv):
         return result
 
     def _get_level(self, cr, uid, ids, field_name, arg, context=None):
-        res={}
+        res = {}
         accounts = self.browse(cr, uid, ids, context=context)
         for account in accounts:
             level = 0
@@ -475,7 +475,7 @@ class account_account(osv.osv):
         for record in reads:
             name = record['name']
             if record['code']:
-                name = record['code'] + ' '+name
+                name = record['code'] + ' ' + name
             res.append((record['id'], name))
         return res
 
@@ -743,9 +743,7 @@ class account_journal(osv.osv):
         }
 
         res = {}
-
         view_id = type_map.get(type, 'account_journal_view')
-
         user = user_pool.browse(cr, uid, uid)
         if type in ('cash', 'bank') and currency and user.company_id.currency_id.id != currency:
             view_id = 'account_journal_bank_view_multi'
@@ -756,7 +754,6 @@ class account_journal(osv.osv):
             'centralisation':type == 'situation',
             'view_id':data.res_id,
         })
-
         return {
             'value':res
         }
@@ -3052,4 +3049,4 @@ class account_bank_accounts_wizard(osv.osv_memory):
 
 account_bank_accounts_wizard()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

From 5e988a705726627dd868b963b06b76df64bf5736 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 3 Feb 2011 10:58:27 +0530
Subject: [PATCH 09/73] [FIX] account_analytic_analysis: last_invoice_date
 field does not include manual invoices => changed the help string

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

bzr revid: mra@mra-laptop-20110203052827-pcd1qdpdwoipuiep
---
 addons/account_analytic_analysis/account_analytic_analysis.py | 2 +-
 .../i18n/account_analytic_analysis.pot                        | 2 +-
 addons/account_analytic_analysis/i18n/ar.po                   | 2 +-
 addons/account_analytic_analysis/i18n/bg.po                   | 4 ++--
 addons/account_analytic_analysis/i18n/bs.po                   | 4 ++--
 addons/account_analytic_analysis/i18n/ca.po                   | 4 ++--
 addons/account_analytic_analysis/i18n/cs.po                   | 2 +-
 addons/account_analytic_analysis/i18n/da.po                   | 2 +-
 addons/account_analytic_analysis/i18n/de.po                   | 4 ++--
 addons/account_analytic_analysis/i18n/el.po                   | 2 +-
 addons/account_analytic_analysis/i18n/es.po                   | 4 ++--
 addons/account_analytic_analysis/i18n/es_AR.po                | 4 ++--
 addons/account_analytic_analysis/i18n/es_EC.po                | 4 ++--
 addons/account_analytic_analysis/i18n/et.po                   | 4 ++--
 addons/account_analytic_analysis/i18n/fi.po                   | 4 ++--
 addons/account_analytic_analysis/i18n/fr.po                   | 2 +-
 addons/account_analytic_analysis/i18n/gl.po                   | 4 ++--
 addons/account_analytic_analysis/i18n/hr.po                   | 4 ++--
 addons/account_analytic_analysis/i18n/hu.po                   | 4 ++--
 addons/account_analytic_analysis/i18n/id.po                   | 2 +-
 addons/account_analytic_analysis/i18n/it.po                   | 4 ++--
 addons/account_analytic_analysis/i18n/ko.po                   | 4 ++--
 addons/account_analytic_analysis/i18n/lt.po                   | 4 ++--
 addons/account_analytic_analysis/i18n/lv.po                   | 2 +-
 addons/account_analytic_analysis/i18n/mn.po                   | 4 ++--
 addons/account_analytic_analysis/i18n/nb.po                   | 2 +-
 addons/account_analytic_analysis/i18n/nl.po                   | 4 ++--
 addons/account_analytic_analysis/i18n/nl_BE.po                | 2 +-
 addons/account_analytic_analysis/i18n/oc.po                   | 2 +-
 addons/account_analytic_analysis/i18n/pl.po                   | 4 ++--
 addons/account_analytic_analysis/i18n/pt.po                   | 4 ++--
 addons/account_analytic_analysis/i18n/pt_BR.po                | 4 ++--
 addons/account_analytic_analysis/i18n/ro.po                   | 4 ++--
 addons/account_analytic_analysis/i18n/ru.po                   | 4 ++--
 addons/account_analytic_analysis/i18n/sl.po                   | 4 ++--
 addons/account_analytic_analysis/i18n/sq.po                   | 2 +-
 addons/account_analytic_analysis/i18n/sr.po                   | 4 ++--
 addons/account_analytic_analysis/i18n/sr@latin.po             | 4 ++--
 addons/account_analytic_analysis/i18n/sv.po                   | 4 ++--
 addons/account_analytic_analysis/i18n/tlh.po                  | 2 +-
 addons/account_analytic_analysis/i18n/tr.po                   | 4 ++--
 addons/account_analytic_analysis/i18n/uk.po                   | 2 +-
 addons/account_analytic_analysis/i18n/vi.po                   | 4 ++--
 addons/account_analytic_analysis/i18n/zh_CN.po                | 4 ++--
 addons/account_analytic_analysis/i18n/zh_TW.po                | 2 +-
 45 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 8c35b9924e5..11f92614b73 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -390,7 +390,7 @@ class account_analytic_account(osv.osv):
         'hours_quantity': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='float', string='Hours Tot',
             help="Number of hours you spent on the analytic account (from timesheet). It computes on all journal of type 'general'."),
         'last_invoice_date': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='date', string='Last Invoice Date',
-            help="Date of the last invoice created for this analytic account."),
+            help="If invoice from the costs, this is the date of the latest invoiced."),
         'last_worked_invoiced_date': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='date', string='Date of Last Invoiced Cost',
             help="If invoice from the costs, this is the date of the latest work or cost that have been invoiced."),
         'last_worked_date': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='date', string='Date of Last Cost/Work',
diff --git a/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot b/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot
index af5f75c85c3..cc3cf72e6fb 100644
--- a/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot
+++ b/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot
@@ -39,7 +39,7 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/ar.po b/addons/account_analytic_analysis/i18n/ar.po
index 00aec1e027b..5fd562cb5a2 100644
--- a/addons/account_analytic_analysis/i18n/ar.po
+++ b/addons/account_analytic_analysis/i18n/ar.po
@@ -42,7 +42,7 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/bg.po b/addons/account_analytic_analysis/i18n/bg.po
index 96055270a4c..9165ac48922 100644
--- a/addons/account_analytic_analysis/i18n/bg.po
+++ b/addons/account_analytic_analysis/i18n/bg.po
@@ -44,8 +44,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr "Дата на последната фактура създадена за тази аналитична сметка."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
+msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
diff --git a/addons/account_analytic_analysis/i18n/bs.po b/addons/account_analytic_analysis/i18n/bs.po
index 873bb7319c4..9a26a5fb3eb 100644
--- a/addons/account_analytic_analysis/i18n/bs.po
+++ b/addons/account_analytic_analysis/i18n/bs.po
@@ -45,8 +45,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr "Datum zadnje fakture stvorene za ovaj analitički račun."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
+msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
diff --git a/addons/account_analytic_analysis/i18n/ca.po b/addons/account_analytic_analysis/i18n/ca.po
index 3baf314e1b6..ce58c28a6fa 100644
--- a/addons/account_analytic_analysis/i18n/ca.po
+++ b/addons/account_analytic_analysis/i18n/ca.po
@@ -45,8 +45,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr "Data de l'última factura creat per a aquesta compte analític."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
+msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
diff --git a/addons/account_analytic_analysis/i18n/cs.po b/addons/account_analytic_analysis/i18n/cs.po
index 02617123dfa..8e727d7a186 100644
--- a/addons/account_analytic_analysis/i18n/cs.po
+++ b/addons/account_analytic_analysis/i18n/cs.po
@@ -42,7 +42,7 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/da.po b/addons/account_analytic_analysis/i18n/da.po
index 7e3852b3010..06f6f000d5b 100644
--- a/addons/account_analytic_analysis/i18n/da.po
+++ b/addons/account_analytic_analysis/i18n/da.po
@@ -43,7 +43,7 @@ msgstr "Adgangsfejl"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/de.po b/addons/account_analytic_analysis/i18n/de.po
index 38df8864a23..929f8d734b4 100644
--- a/addons/account_analytic_analysis/i18n/de.po
+++ b/addons/account_analytic_analysis/i18n/de.po
@@ -44,8 +44,8 @@ msgstr "Verbindungsfehler"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr "Datum der letzten Rechnungserfassung auf diesem analytischen Konto."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
+msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
diff --git a/addons/account_analytic_analysis/i18n/el.po b/addons/account_analytic_analysis/i18n/el.po
index 938c05a7565..4a0ac64e6ea 100644
--- a/addons/account_analytic_analysis/i18n/el.po
+++ b/addons/account_analytic_analysis/i18n/el.po
@@ -48,7 +48,7 @@ msgstr "Πρόβλημα πρόσβασης"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
 msgstr ""
 "Ημερομηνία του τελευταίου τιμολογίου που δημιουργήθηκε για αυτόν τον "
 "λογαριασμό της αναλυτικής."
diff --git a/addons/account_analytic_analysis/i18n/es.po b/addons/account_analytic_analysis/i18n/es.po
index f62c01351a8..b9e35edd426 100644
--- a/addons/account_analytic_analysis/i18n/es.po
+++ b/addons/account_analytic_analysis/i18n/es.po
@@ -45,8 +45,8 @@ msgstr "Error de acceso"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr "Fecha de la última factura creada para esta cuenta analítica."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
+msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
diff --git a/addons/account_analytic_analysis/i18n/es_AR.po b/addons/account_analytic_analysis/i18n/es_AR.po
index 5d50810481f..ced28ccfb59 100644
--- a/addons/account_analytic_analysis/i18n/es_AR.po
+++ b/addons/account_analytic_analysis/i18n/es_AR.po
@@ -45,8 +45,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr "Fecha de la última factura creada para esta cuenta analítica."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
+msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
diff --git a/addons/account_analytic_analysis/i18n/es_EC.po b/addons/account_analytic_analysis/i18n/es_EC.po
index 27dfbba7567..b94a029c83b 100644
--- a/addons/account_analytic_analysis/i18n/es_EC.po
+++ b/addons/account_analytic_analysis/i18n/es_EC.po
@@ -45,8 +45,8 @@ msgstr "Error de acceso"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr "Fecha de la última factura creada para esta cuenta analítica."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
+msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
diff --git a/addons/account_analytic_analysis/i18n/et.po b/addons/account_analytic_analysis/i18n/et.po
index 32b01e96735..c91798b545f 100644
--- a/addons/account_analytic_analysis/i18n/et.po
+++ b/addons/account_analytic_analysis/i18n/et.po
@@ -43,8 +43,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr "Sellele analüütilisele kontole viimati loodud arve kuupäev."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
+msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
diff --git a/addons/account_analytic_analysis/i18n/fi.po b/addons/account_analytic_analysis/i18n/fi.po
index b942f0fd0cd..67fac264de2 100644
--- a/addons/account_analytic_analysis/i18n/fi.po
+++ b/addons/account_analytic_analysis/i18n/fi.po
@@ -44,8 +44,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr "Viimeksi luodun laskun päiväys tällä analyyttiselle tilille"
+msgid "If invoice from the costs, this is the date of the latest invoiced."
+msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
diff --git a/addons/account_analytic_analysis/i18n/fr.po b/addons/account_analytic_analysis/i18n/fr.po
index fa91989095b..2916347b49f 100644
--- a/addons/account_analytic_analysis/i18n/fr.po
+++ b/addons/account_analytic_analysis/i18n/fr.po
@@ -46,7 +46,7 @@ msgstr "Erreur d'accès"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
 msgstr ""
 "Date de la dernière facture créée à partir des prestations liés à ce compte "
 "analytique (heures sur timesheet, facturation de notes de frais, facturation "
diff --git a/addons/account_analytic_analysis/i18n/gl.po b/addons/account_analytic_analysis/i18n/gl.po
index c1a54cf0f3b..9093785e033 100644
--- a/addons/account_analytic_analysis/i18n/gl.po
+++ b/addons/account_analytic_analysis/i18n/gl.po
@@ -46,8 +46,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr "Data da última factura creada para esta conta analítica."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
+msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
diff --git a/addons/account_analytic_analysis/i18n/hr.po b/addons/account_analytic_analysis/i18n/hr.po
index 1c2a880a89b..09ab8dfcb6f 100644
--- a/addons/account_analytic_analysis/i18n/hr.po
+++ b/addons/account_analytic_analysis/i18n/hr.po
@@ -43,8 +43,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr "Datum zadnje fakture kreirana za ovaj analitički račun."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
+msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
diff --git a/addons/account_analytic_analysis/i18n/hu.po b/addons/account_analytic_analysis/i18n/hu.po
index b96dc6584ff..667cb35fa25 100644
--- a/addons/account_analytic_analysis/i18n/hu.po
+++ b/addons/account_analytic_analysis/i18n/hu.po
@@ -44,8 +44,8 @@ msgstr "Hozzáférési hiba"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr "A gyűjtőkód alapján kiállított utolsó kimenő számla dátuma."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
+msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
diff --git a/addons/account_analytic_analysis/i18n/id.po b/addons/account_analytic_analysis/i18n/id.po
index 29aa828acbc..2c8b7337ab0 100644
--- a/addons/account_analytic_analysis/i18n/id.po
+++ b/addons/account_analytic_analysis/i18n/id.po
@@ -42,7 +42,7 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/it.po b/addons/account_analytic_analysis/i18n/it.po
index aebf270cb06..3a160403bc3 100644
--- a/addons/account_analytic_analysis/i18n/it.po
+++ b/addons/account_analytic_analysis/i18n/it.po
@@ -45,8 +45,8 @@ msgstr "Errore di Accesso"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr "Data dell'ultima fattura creata per questo conto analitico"
+msgid "If invoice from the costs, this is the date of the latest invoiced."
+msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
diff --git a/addons/account_analytic_analysis/i18n/ko.po b/addons/account_analytic_analysis/i18n/ko.po
index b9868988252..e32a29a7572 100644
--- a/addons/account_analytic_analysis/i18n/ko.po
+++ b/addons/account_analytic_analysis/i18n/ko.po
@@ -43,8 +43,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr "이 분석 계정에서 처리한 마지막 송장 일자"
+msgid "If invoice from the costs, this is the date of the latest invoiced."
+msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
diff --git a/addons/account_analytic_analysis/i18n/lt.po b/addons/account_analytic_analysis/i18n/lt.po
index 14b957267cf..a2d2e2c472b 100644
--- a/addons/account_analytic_analysis/i18n/lt.po
+++ b/addons/account_analytic_analysis/i18n/lt.po
@@ -45,8 +45,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr "Paskutinės sąskaitos data šiai analitinei sąskaitai."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
+msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
diff --git a/addons/account_analytic_analysis/i18n/lv.po b/addons/account_analytic_analysis/i18n/lv.po
index 84cca4e8b1d..1a4427e518f 100644
--- a/addons/account_analytic_analysis/i18n/lv.po
+++ b/addons/account_analytic_analysis/i18n/lv.po
@@ -43,7 +43,7 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/mn.po b/addons/account_analytic_analysis/i18n/mn.po
index 264e31cf53e..203180c8380 100644
--- a/addons/account_analytic_analysis/i18n/mn.po
+++ b/addons/account_analytic_analysis/i18n/mn.po
@@ -45,8 +45,8 @@ msgstr "ХандалтынАлдаа"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr "Энэ аналитик дансыг үүсэгсэн сүүлийн нэхэмжлэлийн огноо"
+msgid "If invoice from the costs, this is the date of the latest invoiced."
+msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
diff --git a/addons/account_analytic_analysis/i18n/nb.po b/addons/account_analytic_analysis/i18n/nb.po
index 0a6792d76ed..6e8f6d6adfd 100644
--- a/addons/account_analytic_analysis/i18n/nb.po
+++ b/addons/account_analytic_analysis/i18n/nb.po
@@ -43,7 +43,7 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/nl.po b/addons/account_analytic_analysis/i18n/nl.po
index 96885382ba9..4ce9833d844 100644
--- a/addons/account_analytic_analysis/i18n/nl.po
+++ b/addons/account_analytic_analysis/i18n/nl.po
@@ -44,8 +44,8 @@ msgstr "Toegangsfout"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr "Datum van de laatst aangemaakte factuur voor deze kostenplaats"
+msgid "If invoice from the costs, this is the date of the latest invoiced."
+msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
diff --git a/addons/account_analytic_analysis/i18n/nl_BE.po b/addons/account_analytic_analysis/i18n/nl_BE.po
index ccc1e0e7c03..5275bc2aa7d 100644
--- a/addons/account_analytic_analysis/i18n/nl_BE.po
+++ b/addons/account_analytic_analysis/i18n/nl_BE.po
@@ -43,7 +43,7 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/oc.po b/addons/account_analytic_analysis/i18n/oc.po
index aa190c8d2bf..aaae78e3e36 100644
--- a/addons/account_analytic_analysis/i18n/oc.po
+++ b/addons/account_analytic_analysis/i18n/oc.po
@@ -43,7 +43,7 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/pl.po b/addons/account_analytic_analysis/i18n/pl.po
index 39be9add211..ef4c696d43c 100644
--- a/addons/account_analytic_analysis/i18n/pl.po
+++ b/addons/account_analytic_analysis/i18n/pl.po
@@ -44,8 +44,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr "Data ostatniej faktury utworzonej dla tego konta analitycznego."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
+msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
diff --git a/addons/account_analytic_analysis/i18n/pt.po b/addons/account_analytic_analysis/i18n/pt.po
index 2cca059f6f7..3c967c8cbd7 100644
--- a/addons/account_analytic_analysis/i18n/pt.po
+++ b/addons/account_analytic_analysis/i18n/pt.po
@@ -45,8 +45,8 @@ msgstr "Erro de acesso"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr "Data da última factura criada para esta conta analítica."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
+msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
diff --git a/addons/account_analytic_analysis/i18n/pt_BR.po b/addons/account_analytic_analysis/i18n/pt_BR.po
index 3869aacdcaf..6060bd7076a 100644
--- a/addons/account_analytic_analysis/i18n/pt_BR.po
+++ b/addons/account_analytic_analysis/i18n/pt_BR.po
@@ -43,8 +43,8 @@ msgstr "Erro de acesso"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr "Data da última fatura criada para esta conta analítica."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
+msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
diff --git a/addons/account_analytic_analysis/i18n/ro.po b/addons/account_analytic_analysis/i18n/ro.po
index 3e946617224..f89765dc69b 100644
--- a/addons/account_analytic_analysis/i18n/ro.po
+++ b/addons/account_analytic_analysis/i18n/ro.po
@@ -43,8 +43,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr "Data ultimei facturi create pentru acest cont analitic."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
+msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
diff --git a/addons/account_analytic_analysis/i18n/ru.po b/addons/account_analytic_analysis/i18n/ru.po
index 2023e3cbfaf..7a7ca737d2a 100644
--- a/addons/account_analytic_analysis/i18n/ru.po
+++ b/addons/account_analytic_analysis/i18n/ru.po
@@ -46,8 +46,8 @@ msgstr "Ошибка доступа"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr "Дата последнего счета, созданного для этого аналитического счета."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
+msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
diff --git a/addons/account_analytic_analysis/i18n/sl.po b/addons/account_analytic_analysis/i18n/sl.po
index fae1bf8431f..a117482b7a1 100644
--- a/addons/account_analytic_analysis/i18n/sl.po
+++ b/addons/account_analytic_analysis/i18n/sl.po
@@ -44,8 +44,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr "Datum izdaje zadnjega računa za ta analitični konto"
+msgid "If invoice from the costs, this is the date of the latest invoiced."
+msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
diff --git a/addons/account_analytic_analysis/i18n/sq.po b/addons/account_analytic_analysis/i18n/sq.po
index 8a839c85d92..da8ff612073 100644
--- a/addons/account_analytic_analysis/i18n/sq.po
+++ b/addons/account_analytic_analysis/i18n/sq.po
@@ -43,7 +43,7 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/sr.po b/addons/account_analytic_analysis/i18n/sr.po
index 61a7d1a871d..5f58114a0d6 100644
--- a/addons/account_analytic_analysis/i18n/sr.po
+++ b/addons/account_analytic_analysis/i18n/sr.po
@@ -44,8 +44,8 @@ msgstr "Greška u pristupu"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr "Datum zadnje fakture kreirana za ovaj analitički račun."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
+msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
diff --git a/addons/account_analytic_analysis/i18n/sr@latin.po b/addons/account_analytic_analysis/i18n/sr@latin.po
index c76aade651c..e1a03369214 100644
--- a/addons/account_analytic_analysis/i18n/sr@latin.po
+++ b/addons/account_analytic_analysis/i18n/sr@latin.po
@@ -44,8 +44,8 @@ msgstr "Greška u pristupu"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr "Datum zadnje fakture kreirana za ovaj analitički račun."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
+msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
diff --git a/addons/account_analytic_analysis/i18n/sv.po b/addons/account_analytic_analysis/i18n/sv.po
index 9a01d7d9260..17bed46cbe7 100644
--- a/addons/account_analytic_analysis/i18n/sv.po
+++ b/addons/account_analytic_analysis/i18n/sv.po
@@ -44,8 +44,8 @@ msgstr "Access fel"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr "Date of the last invoice created for this analytic account."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
+msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
diff --git a/addons/account_analytic_analysis/i18n/tlh.po b/addons/account_analytic_analysis/i18n/tlh.po
index 3d84f4fddc0..8ea31db615a 100644
--- a/addons/account_analytic_analysis/i18n/tlh.po
+++ b/addons/account_analytic_analysis/i18n/tlh.po
@@ -42,7 +42,7 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/tr.po b/addons/account_analytic_analysis/i18n/tr.po
index a655c1d4a84..143bf9d50d7 100644
--- a/addons/account_analytic_analysis/i18n/tr.po
+++ b/addons/account_analytic_analysis/i18n/tr.po
@@ -43,8 +43,8 @@ msgstr "Erişim Hatası"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr "Bu analitik hesap için oluşturulan son fatura tarihi."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
+msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
diff --git a/addons/account_analytic_analysis/i18n/uk.po b/addons/account_analytic_analysis/i18n/uk.po
index b7c860a48be..6ab39d5bcd5 100644
--- a/addons/account_analytic_analysis/i18n/uk.po
+++ b/addons/account_analytic_analysis/i18n/uk.po
@@ -42,7 +42,7 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
 msgstr ""
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/vi.po b/addons/account_analytic_analysis/i18n/vi.po
index 83bee164489..1a4c0b8fd67 100644
--- a/addons/account_analytic_analysis/i18n/vi.po
+++ b/addons/account_analytic_analysis/i18n/vi.po
@@ -44,8 +44,8 @@ msgstr "Lỗi truy cập"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr "Ngày của hóa đơn mới nhất được tạo cho tài khoản kế toán này."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
+msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
diff --git a/addons/account_analytic_analysis/i18n/zh_CN.po b/addons/account_analytic_analysis/i18n/zh_CN.po
index aaf02e0a84c..98a4540177c 100644
--- a/addons/account_analytic_analysis/i18n/zh_CN.po
+++ b/addons/account_analytic_analysis/i18n/zh_CN.po
@@ -42,8 +42,8 @@ msgstr "访问错误"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr "这辅助核算项的最近开票日期"
+msgid "If invoice from the costs, this is the date of the latest invoiced."
+msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
diff --git a/addons/account_analytic_analysis/i18n/zh_TW.po b/addons/account_analytic_analysis/i18n/zh_TW.po
index b9a0c6492d4..335a4de3826 100644
--- a/addons/account_analytic_analysis/i18n/zh_TW.po
+++ b/addons/account_analytic_analysis/i18n/zh_TW.po
@@ -42,7 +42,7 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
+msgid "If invoice from the costs, this is the date of the latest invoiced."
 msgstr ""
 
 #. module: account_analytic_analysis

From 8c316dca64466f5f89676f832dd39e59fefcbf5b Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 3 Feb 2011 14:52:55 +0530
Subject: [PATCH 10/73] [FIX] Account: Add company on period and fiscalyear
 tree view with multicompany group

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

bzr revid: mra@mra-laptop-20110203092255-qpprxha1wur2br98
---
 addons/account/account_view.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 1812e800880..dabba60849c 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -47,6 +47,7 @@
                 <tree colors="blue:state in ('draft');gray:state in ('done') " string="Fiscalyear">
                     <field name="code"/>
                     <field name="name"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -116,6 +117,7 @@
                     <field name="date_start"/>
                     <field name="date_stop"/>
                     <field name="special"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <field name="state"/>
                     <button name="action_draft" states="done" string="Set to Draft" type="object" icon="terp-document-new" groups="account.group_account_manager"/>
                     <button name="%(action_account_period_close)d" states="draft" string="Close Period" type="action" icon="terp-camera_test"/>

From 43b097f7ddc52f8070f9e5c86bcb4b136575dcb3 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Thu, 3 Feb 2011 15:46:30 +0530
Subject: [PATCH 11/73] [ADD, IMP] account: changes in my last commite as per
 merge suggetion(New Opening and Miscellaneous journal)

bzr revid: psi@tinyerp.co.in-20110203101630-rvzgahp15111jf8s
---
 addons/account/account.py                     | 14 +++++++++----
 addons/account/configurable_account_chart.xml |  4 ++--
 addons/account/data/account_data2.xml         | 13 ++++++++++++
 addons/account/demo/account_minimal.xml       | 13 ++++++------
 addons/account/installer.py                   | 20 +++++++++++--------
 5 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index a17eff7a71f..9a6c47f287a 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2459,8 +2459,8 @@ class account_chart_template(osv.osv):
         'property_account_expense': fields.many2one('account.account.template','Expense Account on Product Template'),
         'property_account_income': fields.many2one('account.account.template','Income Account on Product Template'),
         'property_reserve_and_surplus_account': fields.many2one('account.account.template', 'Reserve and Profit/Loss Account', domain=[('type', '=', 'payable')], help='This Account is used for transferring Profit/Loss(If It is Profit: Amount will be added, Loss: Amount will be deducted.), Which is calculated from Profilt & Loss Report'),
-        'property_account_income_opening': fields.many2one('account.account.template','Opening Entries Income Account'),
-        'property_account_expense_opening': fields.many2one('account.account.template','Opening Entries Expense Account'),
+        'property_account_income_opening': fields.many2one('account.account.template','Opening Entries Income Account', help='This Account is used for income opening entries'),
+        'property_account_expense_opening': fields.many2one('account.account.template','Opening Entries Expense Account', help='This Account is used for expense opening entires'),
     }
 
 account_chart_template()
@@ -2913,6 +2913,13 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         obj_journal.create(cr, uid, vals_journal, context=context)
 
         # Miscellaneous Journal
+        data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_view')])
+        data = obj_data.browse(cr, uid, data_id[0], context=context)
+        view_id = data.res_id
+
+        analitical_miscellaneous_ids = analytic_journal_obj.search(cr, uid, [('type', '=', 'situation')], context=context)
+        analitical_journal_miscellaneous = analitical_miscellaneous_ids and analitical_miscellaneous_ids[0] or False
+
         vals_journal = {
             'view_id': view_id,
             'name': _('Miscellaneous Journal'),
@@ -2920,7 +2927,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             'refund_journal': True,
             'code': _('MISC'),
             'sequence_id': seq_id_miscellaneous,
-            'analytic_journal_id': analitical_journal_purchase,
+            'analytic_journal_id': analitical_journal_miscellaneous,
             'company_id': company_id
         }
 
@@ -2934,7 +2941,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                 'type': 'situation',
                 'code': _('TOEJ'),
                 'sequence_id': seq_id_opening,
-                'analytic_journal_id': analitical_journal_purchase,
                 'company_id': company_id,
                 'centralisation': True,
                 'default_credit_account_id': acc_template_ref[obj_multi.chart_template_id.property_account_income_opening.id],
diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml
index 4734e030113..5818314c814 100644
--- a/addons/account/configurable_account_chart.xml
+++ b/addons/account/configurable_account_chart.xml
@@ -195,7 +195,7 @@
 			            <field name="code">1106</field>
 			            <field name="name">Opening Income Account</field>
 			            <field ref="conf_cas" name="parent_id"/>
-			            <field name="type">closed</field>
+			            <field name="type">other</field>
 			            <field name="user_type" ref="conf_account_type_income"/>
 			        </record>
 
@@ -237,7 +237,7 @@
 			            <field name="code">1114</field>
 			            <field name="name">Opening Expense Account</field>
 			            <field ref="conf_cli" name="parent_id"/>
-			            <field name="type">closed</field>
+			            <field name="type">other</field>
 			            <field name="user_type" ref="conf_account_type_expense"/>
 			        </record>
 
diff --git a/addons/account/data/account_data2.xml b/addons/account/data/account_data2.xml
index b1fe4bd8e88..4f482b496af 100644
--- a/addons/account/data/account_data2.xml
+++ b/addons/account/data/account_data2.xml
@@ -483,6 +483,19 @@
             <field eval="3" name="padding"/>
             <field name="prefix">CSH/%(year)s/</field>
         </record>
+        <record id="sequence_opening_journal" model="ir.sequence">
+            <field name="name">Opening Entries Journal</field>
+            <field name="code">account.journal</field>
+            <field eval="3" name="padding"/>
+            <field name="prefix">OPEJ/%(year)s/</field>
+        </record>
+        <record id="sequence_miscellaneous_journal" model="ir.sequence">
+            <field name="name">Miscellaneous Journal</field>
+            <field name="code">account.journal</field>
+            <field eval="3" name="padding"/>
+            <field name="prefix">MISJ/%(year)s/</field>
+        </record>
+
         <!--
         Account Statement Sequences
         -->
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 61a580835ab..a4d1510d54d 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -167,7 +167,7 @@
             <field name="code">X11006</field>
             <field name="name">Opening Income - (test)</field>
             <field ref="cas" name="parent_id"/>
-            <field name="type">closed</field>
+            <field name="type">other</field>
             <field name="user_type" ref="account_type_income"/>
         </record>
 
@@ -217,7 +217,7 @@
             <field name="code">X1114</field>
             <field name="name">Opening Expense - (test)</field>
             <field ref="cli" name="parent_id"/>
-            <field name="type">closed</field>
+            <field name="type">other</field>
             <field name="user_type" ref="account_type_expense"/>
         </record>
 
@@ -441,8 +441,8 @@
             <field name="name">Miscellaneous Journal - (test)</field>
             <field name="code">TMIS</field>
             <field name="type">general</field>
-            <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="sequence_id" ref="sequence_journal"/>
+            <field name="view_id" ref="account_journal_view"/>
+            <field name="sequence_id" ref="sequence_miscellaneous_journal"/>
             <field name="analytic_journal_id" ref="sit"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
@@ -450,12 +450,11 @@
             <field name="name">Opening Entries Journal - (test)</field>
             <field name="code">TOEJ</field>
             <field name="type">situation</field>
-            <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="sequence_id" ref="sequence_cash_journal"/>
+            <field name="view_id" ref="account_journal_view"/>
+            <field name="sequence_id" ref="sequence_opening_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="o_income"/>
             <field model="account.account" name="default_credit_account_id" ref="o_expense"/>
             <field eval="True" name="centralisation"/>
-            <field name="analytic_journal_id" ref="sit"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
         <!--
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 65d8d7fa99f..27295bc4de9 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -382,7 +382,6 @@ class account_installer(osv.osv_memory):
         data = mod_obj.browse(cr, uid, data_id[0], context=context)
         view_id = data.res_id
         seq_id = obj_sequence.search(cr,uid,[('name', '=', 'Account Journal')], context=context)[0]
-
         if seq_journal:
             seq_sale = {
                 'name': 'Sale Journal',
@@ -419,7 +418,7 @@ class account_installer(osv.osv_memory):
             seq_opening_journal = {
                 'name': 'Opening Entries Journal',
                 'code': 'account.journal',
-                'prefix': 'TOEJ/%(year)s/',
+                'prefix': 'OPEJ/%(year)s/',
                 'padding': 3,
                 'company_id': company_id.id
             }
@@ -427,11 +426,11 @@ class account_installer(osv.osv_memory):
             seq_miscellaneous_journal = {
                 'name': 'Miscellaneous Journal',
                 'code': 'account.journal',
-                'prefix': 'MISC/%(year)s/',
+                'prefix': 'MISJ/%(year)s/',
                 'padding': 3,
                 'company_id': company_id.id
             }
-            seq_id_miscellaneous = obj_sequence.create(cr, uid, seq_opening_journal, context=context)
+            seq_id_miscellaneous = obj_sequence.create(cr, uid, seq_miscellaneous_journal, context=context)
         else:
             seq_id_sale = seq_id
             seq_id_purchase = seq_id
@@ -526,14 +525,20 @@ class account_installer(osv.osv_memory):
         obj_journal.create(cr, uid, vals_journal, context=context)
 
         # Miscellaneous Journal
+        data_id = mod_obj.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_view')], context=context)
+        data = mod_obj.browse(cr, uid, data_id[0], context=context)
+        view_id_misc = data.res_id
+
+        analitical_miscellaneous_ids = analytic_journal_obj.search(cr, uid, [('type', '=', 'situation')], context=context)
+        analitical_journal_miscellaneous = analitical_miscellaneous_ids and analitical_miscellaneous_ids[0] or False
+
         vals_journal = {
-            'view_id': view_id,
+            'view_id': view_id_misc,
             'name': _('Miscellaneous Journal'),
             'type': 'general',
-            'refund_journal': True,
             'code': _('MISC'),
             'sequence_id': seq_id_miscellaneous,
-            'analytic_journal_id': analitical_journal_purchase,
+            'analytic_journal_id': analitical_journal_miscellaneous,
             'company_id': company_id.id
         }
 
@@ -547,7 +552,6 @@ class account_installer(osv.osv_memory):
                 'type': 'situation',
                 'code': _('OPEJ'),
                 'sequence_id': seq_id_opening,
-                'analytic_journal_id': analitical_journal_purchase,
                 'company_id': company_id.id,
                 'centralisation': True,
                 'default_credit_account_id': acc_template_ref[obj_multi.property_account_income_opening.id],

From 94c626ed9ae08d3fcb7fe1fc54918673867d535d Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Thu, 3 Feb 2011 15:47:17 +0530
Subject: [PATCH 12/73] [FIX] hr_attendance:Attendance by month report now
 prints minutes also

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

bzr revid: mtr@mtr-20110203101717-2hr3a3q83fto442h
---
 addons/hr_attendance/report/attendance_by_month.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/addons/hr_attendance/report/attendance_by_month.py b/addons/hr_attendance/report/attendance_by_month.py
index ced701ac661..7087256646e 100644
--- a/addons/hr_attendance/report/attendance_by_month.py
+++ b/addons/hr_attendance/report/attendance_by_month.py
@@ -85,7 +85,14 @@ class report_custom(report_rml):
                     for att in attendences:
                         dt = datetime.strptime(att['name'], '%Y-%m-%d %H:%M:%S')
                         if ldt and att['action'] == 'sign_out':
-                            wh += (dt - ldt).seconds/60/60
+                            tot_tim = (str(float((dt - ldt).seconds)/3600))
+                            hrs = int(tot_tim.split('.')[0])
+                            mints = int(tot_tim.split('.')[1])
+                            tot_min = (int(mints * 60) / 10)
+                            if tot_min < (10) or tot_tim < ('0.09'):
+                                wh += float((str(hrs))+ '.' + '0' +(str(tot_min)))
+                            else:
+                                wh += float((str(hrs))+ '.' + (str(tot_min)))
                         else:
                             ldt = dt
                     # Week xml representation

From eff87b20eca6e9726151d31f9f0b0bc1a6c02dd4 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 3 Feb 2011 16:25:28 +0530
Subject: [PATCH 13/73] [FIX] pos: [wizard: pos_payment] When you create
 invoices with different currencies set, the price is well mapped, but with
 the wrong currency

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

bzr revid: mra@mra-laptop-20110203105528-0pe8uzhg0brgib58
---
 addons/point_of_sale/point_of_sale.py       | 2 ++
 addons/point_of_sale/point_of_sale_view.xml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 8873ecf07e4..846c9e44514 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -70,6 +70,7 @@ class pos_order(osv.osv):
         return super(pos_order, self).unlink(cr, uid, ids, context=context)
 
     def onchange_partner_pricelist(self, cr, uid, ids, part=False, context=None):
+
         """ Changed price list on_change of partner_id"""
         if not part:
             return {'value': {}}
@@ -647,6 +648,7 @@ class pos_order(osv.osv):
                 'reference': order.name,
                 'partner_id': order.partner_id.id,
                 'comment': order.note or '',
+                'currency_id': order.partner_id.property_product_pricelist.currency_id.id, # considering partner's sale pricelist's currency
             }
             inv.update(inv_ref.onchange_partner_id(cr, uid, [], 'out_invoice', order.partner_id.id)['value'])
             if not inv.get('account_id', None):
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 5bf85aba602..50108d26dad 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -88,7 +88,7 @@
                             </group>
                             <group colspan="4">
                                 <field name="sale_journal" domain="[('type','=','sale')]" widget="selection" invisible="1"/>
-                                <field name="pricelist_id" domain="[('type','=','sale')]" widget="selection" invisible="1"/>
+                                <field name="pricelist_id" domain="[('type','=','sale')]" widget="selection" invisible="0"/>
                             </group>
                         </page>
                         <page string="Notes" >

From 90fe3e95fe81acec181ebdf8c6e9d46686191c9a Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Fri, 4 Feb 2011 14:17:25 +0530
Subject: [PATCH 14/73] [FIX] hr_attendance:'Attendance by month' and 'Weekly
 Attendance' report now prints minutes also

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

bzr revid: mtr@mtr-20110204084725-y2kjj4arrnv62zds
---
 .../hr_attendance/report/attendance_by_month.py  | 15 +++++++--------
 addons/hr_attendance/report/timesheet.py         | 16 ++++++++++++----
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/addons/hr_attendance/report/attendance_by_month.py b/addons/hr_attendance/report/attendance_by_month.py
index 7087256646e..069c1adad88 100644
--- a/addons/hr_attendance/report/attendance_by_month.py
+++ b/addons/hr_attendance/report/attendance_by_month.py
@@ -85,14 +85,13 @@ class report_custom(report_rml):
                     for att in attendences:
                         dt = datetime.strptime(att['name'], '%Y-%m-%d %H:%M:%S')
                         if ldt and att['action'] == 'sign_out':
-                            tot_tim = (str(float((dt - ldt).seconds)/3600))
-                            hrs = int(tot_tim.split('.')[0])
-                            mints = int(tot_tim.split('.')[1])
-                            tot_min = (int(mints * 60) / 10)
-                            if tot_min < (10) or tot_tim < ('0.09'):
-                                wh += float((str(hrs))+ '.' + '0' +(str(tot_min)))
-                            else:
-                                wh += float((str(hrs))+ '.' + (str(tot_min)))
+                           tot_time = (dt - ldt).seconds
+                           hrs, remainder = divmod(tot_time, 3600)
+                           min, sec = divmod(remainder, 60)
+                           if min < 10:
+                               wh += float((str(hrs))+ '.' + '0' +(str(min)))
+                           else:
+                               wh += float((str(hrs))+ '.' + (str(min)))
                         else:
                             ldt = dt
                     # Week xml representation
diff --git a/addons/hr_attendance/report/timesheet.py b/addons/hr_attendance/report/timesheet.py
index 1ca7eeb584a..77196c4f0ae 100644
--- a/addons/hr_attendance/report/timesheet.py
+++ b/addons/hr_attendance/report/timesheet.py
@@ -43,7 +43,7 @@ class report_custom(report_rml):
         end_date = datetime.strptime(datas['form']['end_date'], '%Y-%m-%d')
         first_monday = start_date - relativedelta(days=start_date.date().weekday())
         last_monday = end_date + relativedelta(days=7 - end_date.date().weekday())
-        
+
         if last_monday < first_monday:
             first_monday, last_monday = last_monday, first_monday
 
@@ -80,10 +80,18 @@ class report_custom(report_rml):
                         attendances.append({'name': n_monday.strftime('%Y-%m-%d %H:%M:%S'), 'action': 'sign_out'})
                     # sum up the attendances' durations
                     ldt = None
+                    wh = 0.0
                     for att in attendances:
                         dt = datetime.strptime(att['name'], '%Y-%m-%d %H:%M:%S')
                         if ldt and att['action'] == 'sign_out':
-                            week_wh[ldt.date().weekday()] = week_wh.get(ldt.date().weekday(), 0) + ((dt - ldt).seconds/3600)
+                           tot_time = (dt - ldt).seconds
+                           hrs, remainder = divmod(tot_time, 3600)
+                           min, sec = divmod(remainder, 60)
+                           if min < 10:
+                               wh = float((str(hrs))+ '.' + '0' +(str(min)))
+                           else:
+                               wh = float((str(hrs))+ '.' + (str(min)))
+                           week_wh[ldt.date().weekday()] = week_wh.get(ldt.date().weekday(), 0) + round(wh,2)
                         else:
                             ldt = dt
 
@@ -92,10 +100,10 @@ class report_custom(report_rml):
                 for idx in range(7):
                     week_repr.append('<%s>' % num2day[idx])
                     if idx in week_wh:
-                        week_repr.append('<workhours>%sh%02d</workhours>' % to_hour(week_wh[idx]))
+                        week_repr.append('<workhours>%s</workhours>' %(week_wh[idx]))
                     week_repr.append('</%s>' % num2day[idx])
                 week_repr.append('<total>')
-                week_repr.append('<worked>%sh%02d</worked>' % to_hour(reduce(lambda x,y:x+y, week_wh.values(), 0)))
+                week_repr.append('<worked>%s</worked>' % sum(week_wh.values()))
                 week_repr.append('</total>')
                 week_repr.append('</week>')
                 if len(week_repr) > 21: # 21 = minimal length of week_repr

From 8f43d299d08b7c3b00921b6ce5b1e6d47b700276 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Fri, 4 Feb 2011 17:02:47 +0530
Subject: [PATCH 15/73] [FIX] POS: Lots in POS => Add product lot on pos order
 line for validate pos order for product which has tracking outgoing set to
 true

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

bzr revid: mra@mra-laptop-20110204113247-732fgockzszz7n6k
---
 addons/point_of_sale/i18n/point_of_sale.pot | 5 +++++
 addons/point_of_sale/point_of_sale.py       | 5 +++--
 addons/point_of_sale/point_of_sale_view.xml | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/addons/point_of_sale/i18n/point_of_sale.pot b/addons/point_of_sale/i18n/point_of_sale.pot
index e4dcfccbe50..3a67697cf51 100644
--- a/addons/point_of_sale/i18n/point_of_sale.pot
+++ b/addons/point_of_sale/i18n/point_of_sale.pot
@@ -1428,6 +1428,11 @@ msgstr ""
 msgid "Person who uses the the cash register. It could be a reliever, a student or an interim employee."
 msgstr ""
 
+#. module: point_of_sale
+#: help:pos.order.line, prodlot_id:0
+msgid "You can specify Production lot for stock move created when you validate the pos order"
+msgstr ""
+
 #. module: point_of_sale
 #: field:report.transaction.pos,invoice_id:0
 msgid "Nbr Invoice"
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 846c9e44514..58e83a7e89e 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -423,7 +423,7 @@ class pos_order(osv.osv):
         """Create a picking for each order and validate it."""
         picking_obj = self.pool.get('stock.picking')
         property_obj = self.pool.get("ir.property")
-        move_obj=self.pool.get('stock.move')
+        move_obj = self.pool.get('stock.move')
         pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.out')
         orders = self.browse(cr, uid, ids, context=context)
         for order in orders:
@@ -464,7 +464,6 @@ class pos_order(osv.osv):
                     stock_dest_id = val.id
                     if line.qty < 0:
                         location_id, stock_dest_id = stock_dest_id, location_id
-
                     move_obj.create(cr, uid, {
                             'name': '(POS %d)' % (order.id, ),
                             'product_uom': line.product_id.uom_id.id,
@@ -478,6 +477,7 @@ class pos_order(osv.osv):
                             'state': 'waiting',
                             'location_id': location_id,
                             'location_dest_id': stock_dest_id,
+                            'prodlot_id': line.prodlot_id and line.prodlot_id.id or False
                         }, context=context)
 
             wf_service = netsvc.LocalService("workflow")
@@ -1147,6 +1147,7 @@ class pos_order_line(osv.osv):
         'discount': fields.float('Discount (%)', digits=(16, 2)),
         'order_id': fields.many2one('pos.order', 'Order Ref', ondelete='cascade'),
         'create_date': fields.datetime('Creation Date', readonly=True),
+        'prodlot_id': fields.many2one('stock.production.lot', 'Production Lot', help="You can specify Production lot for stock move created when you validate the pos order"),
     }
 
     _defaults = {
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 50108d26dad..acc0a72ff3b 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -41,6 +41,7 @@
                                     <field name="price_unit"/>
                                     <field name="notice"/>
                                     <field name="serial_number"/>
+                                    <field name="prodlot_id" domain="[('product_id','=',product_id)]"/>
                                 </form>
                             </field>
                             <group colspan="4" col="7">

From ded6ee0b08abafa5f82e971a0cad80cb1f972e5d Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Mon, 7 Feb 2011 11:59:20 +0530
Subject: [PATCH 16/73] [FIX] hr_attendance:improved 'Weekly Attendance'
 report, prints 'h' for hours i.e.'7h06'

bzr revid: mtr@mtr-20110207062920-3mudqqxvxr80d4ip
---
 addons/hr_attendance/report/timesheet.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_attendance/report/timesheet.py b/addons/hr_attendance/report/timesheet.py
index 77196c4f0ae..de5bf225b4d 100644
--- a/addons/hr_attendance/report/timesheet.py
+++ b/addons/hr_attendance/report/timesheet.py
@@ -100,10 +100,10 @@ class report_custom(report_rml):
                 for idx in range(7):
                     week_repr.append('<%s>' % num2day[idx])
                     if idx in week_wh:
-                        week_repr.append('<workhours>%s</workhours>' %(week_wh[idx]))
+                        week_repr.append('<workhours>%s</workhours>' %(str(week_wh[idx])).replace('.','h'))
                     week_repr.append('</%s>' % num2day[idx])
                 week_repr.append('<total>')
-                week_repr.append('<worked>%s</worked>' % sum(week_wh.values()))
+                week_repr.append('<worked>%s</worked>' % str(sum(week_wh.values())).replace('.','h'))
                 week_repr.append('</total>')
                 week_repr.append('</week>')
                 if len(week_repr) > 21: # 21 = minimal length of week_repr

From bcc2d840b2ff9625014fd03f5c85b78076c38ddf Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Mon, 7 Feb 2011 15:06:21 +0530
Subject: [PATCH 17/73] [FIX] hr_attendance:improved 'Attendance by month' and
 'Weekly Attendance' report by changing the code into float

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

bzr revid: mtr@mtr-20110207093621-6r52uwthtmc08wk7
---
 .../report/attendance_by_month.py             | 20 +++++++------------
 addons/hr_attendance/report/timesheet.py      | 13 +++---------
 2 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/addons/hr_attendance/report/attendance_by_month.py b/addons/hr_attendance/report/attendance_by_month.py
index 069c1adad88..2b708434317 100644
--- a/addons/hr_attendance/report/attendance_by_month.py
+++ b/addons/hr_attendance/report/attendance_by_month.py
@@ -34,10 +34,10 @@ from tools import ustr
 one_day = relativedelta(days=1)
 month2name = [0, 'January', 'February', 'March', 'April', 'May', 'Jun', 'July', 'August', 'September', 'October', 'November', 'December']
 
-#def hour2str(h):
-#    hours = int(h)
-#    minutes = int(round((h - hours) * 60, 0))
-#    return '%02dh%02d' % (hours, minutes)
+def hour2str(h):
+    hours = int(h)
+    minutes = int(round((h - hours) * 60, 0))
+    return '%02dh%02d' % (hours, minutes)
 
 def lengthmonth(year, month):
     if month == 2 and ((year % 4 == 0) and ((year % 100 != 0) or (year % 400 == 0))):
@@ -85,18 +85,12 @@ class report_custom(report_rml):
                     for att in attendences:
                         dt = datetime.strptime(att['name'], '%Y-%m-%d %H:%M:%S')
                         if ldt and att['action'] == 'sign_out':
-                           tot_time = (dt - ldt).seconds
-                           hrs, remainder = divmod(tot_time, 3600)
-                           min, sec = divmod(remainder, 60)
-                           if min < 10:
-                               wh += float((str(hrs))+ '.' + '0' +(str(min)))
-                           else:
-                               wh += float((str(hrs))+ '.' + (str(min)))
+                            wh += (float((dt - ldt).seconds)/60/60)
                         else:
                             ldt = dt
                     # Week xml representation
-#                    wh = hour2str(wh)
-                    today_xml = '<day num="%s"><wh>%s</wh></day>' % ((today - month).days+1, round(wh,2))
+                    wh = hour2str(wh)
+                    today_xml = '<day num="%s"><wh>%s</wh></day>' % ((today - month).days+1, (wh))
                     dy=(today - month).days+1
                     days_xml.append(today_xml)
                     today, tomor = tomor, tomor + one_day
diff --git a/addons/hr_attendance/report/timesheet.py b/addons/hr_attendance/report/timesheet.py
index de5bf225b4d..7203b7d4f1d 100644
--- a/addons/hr_attendance/report/timesheet.py
+++ b/addons/hr_attendance/report/timesheet.py
@@ -84,14 +84,7 @@ class report_custom(report_rml):
                     for att in attendances:
                         dt = datetime.strptime(att['name'], '%Y-%m-%d %H:%M:%S')
                         if ldt and att['action'] == 'sign_out':
-                           tot_time = (dt - ldt).seconds
-                           hrs, remainder = divmod(tot_time, 3600)
-                           min, sec = divmod(remainder, 60)
-                           if min < 10:
-                               wh = float((str(hrs))+ '.' + '0' +(str(min)))
-                           else:
-                               wh = float((str(hrs))+ '.' + (str(min)))
-                           week_wh[ldt.date().weekday()] = week_wh.get(ldt.date().weekday(), 0) + round(wh,2)
+                            week_wh[ldt.date().weekday()] = week_wh.get(ldt.date().weekday(), 0) + (float((dt - ldt).seconds)/3600)
                         else:
                             ldt = dt
 
@@ -100,10 +93,10 @@ class report_custom(report_rml):
                 for idx in range(7):
                     week_repr.append('<%s>' % num2day[idx])
                     if idx in week_wh:
-                        week_repr.append('<workhours>%s</workhours>' %(str(week_wh[idx])).replace('.','h'))
+                        week_repr.append('<workhours>%sh%02d</workhours>' % to_hour(week_wh[idx]))
                     week_repr.append('</%s>' % num2day[idx])
                 week_repr.append('<total>')
-                week_repr.append('<worked>%s</worked>' % str(sum(week_wh.values())).replace('.','h'))
+                week_repr.append('<worked>%sh%02d</worked>' % to_hour(reduce(lambda x,y:x+y, week_wh.values(), 0)))
                 week_repr.append('</total>')
                 week_repr.append('</week>')
                 if len(week_repr) > 21: # 21 = minimal length of week_repr

From e0e8422db15161b6483f42f3fb730d9a8cf4096d Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Mon, 7 Feb 2011 15:13:22 +0530
Subject: [PATCH 18/73] [IMP] hr_attendance:removed unused variable from
 'Weekly Attendance' report

bzr revid: mtr@mtr-20110207094322-im3nesr9lxx080vy
---
 addons/hr_attendance/report/timesheet.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/hr_attendance/report/timesheet.py b/addons/hr_attendance/report/timesheet.py
index 7203b7d4f1d..7adfe98ef13 100644
--- a/addons/hr_attendance/report/timesheet.py
+++ b/addons/hr_attendance/report/timesheet.py
@@ -80,7 +80,6 @@ class report_custom(report_rml):
                         attendances.append({'name': n_monday.strftime('%Y-%m-%d %H:%M:%S'), 'action': 'sign_out'})
                     # sum up the attendances' durations
                     ldt = None
-                    wh = 0.0
                     for att in attendances:
                         dt = datetime.strptime(att['name'], '%Y-%m-%d %H:%M:%S')
                         if ldt and att['action'] == 'sign_out':

From 0016233f6339b8638e5d06681b1e00364ec682a3 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Mon, 7 Feb 2011 17:18:54 +0530
Subject: [PATCH 19/73] [FIX] account : period selection not working for BS and
 PL legal reports

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

bzr revid: ara@tinyerp.com-20110207114854-b7hi16pe98i3w2kh
---
 addons/account/report/account_balance_sheet.py | 3 ++-
 addons/account/report/account_profit_loss.py   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/account/report/account_balance_sheet.py b/addons/account/report/account_balance_sheet.py
index f22061a5785..e13fa43fac5 100644
--- a/addons/account/report/account_balance_sheet.py
+++ b/addons/account/report/account_balance_sheet.py
@@ -100,7 +100,8 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header)
         ctx['fiscalyear'] = data['form'].get('fiscalyear_id', False)
 
         if data['form']['filter'] == 'filter_period':
-            ctx['periods'] = data['form'].get('periods', False)
+            ctx['period_from'] = data['form'].get('period_from', False)
+            ctx['period_to'] =  data['form'].get('period_to', False)
         elif data['form']['filter'] == 'filter_date':
             ctx['date_from'] = data['form'].get('date_from', False)
             ctx['date_to'] =  data['form'].get('date_to', False)
diff --git a/addons/account/report/account_profit_loss.py b/addons/account/report/account_profit_loss.py
index bd1635e91fc..6f16048d3a8 100644
--- a/addons/account/report/account_profit_loss.py
+++ b/addons/account/report/account_profit_loss.py
@@ -93,7 +93,8 @@ class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header):
         ctx['fiscalyear'] = data['form'].get('fiscalyear_id', False)
 
         if data['form']['filter'] == 'filter_period':
-            ctx['periods'] =  data['form'].get('periods', False)
+            ctx['period_from'] = data['form'].get('period_from', False)
+            ctx['period_to'] =  data['form'].get('period_to', False)
         elif data['form']['filter'] == 'filter_date':
             ctx['date_from'] = data['form'].get('date_from', False)
             ctx['date_to'] =  data['form'].get('date_to', False)

From 5008f8c2d92368380877c0ef9ecdbd631daec907 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Mon, 7 Feb 2011 18:04:32 +0530
Subject: [PATCH 20/73] [FIX] account - demo data - all periods have special =
 true

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

bzr revid: ara@tinyerp.com-20110207123432-6d83n6agja02v4zu
---
 addons/account/account_demo.xml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/account/account_demo.xml b/addons/account/account_demo.xml
index 566185c70c3..487819effe8 100644
--- a/addons/account/account_demo.xml
+++ b/addons/account/account_demo.xml
@@ -21,7 +21,7 @@
         <record id="period_1" model="account.period">
             <field eval="'01/'+time.strftime('%Y')" name="code"/>
             <field eval="'01/'+time.strftime('%Y')" name="name"/>
-            <field eval="True" name="special"/>
+            <field name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-01-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-01-31'" name="date_stop"/>
@@ -30,7 +30,7 @@
         <record id="period_2" model="account.period">
             <field eval="'02/'+time.strftime('%Y')" name="code"/>
             <field eval="'02/'+time.strftime('%Y')" name="name"/>
-            <field eval="True" name="special"/>
+            <field name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-02-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-02-28'" name="date_stop"/>
@@ -39,7 +39,7 @@
         <record id="period_3" model="account.period">
             <field eval="'03/'+time.strftime('%Y')" name="code"/>
             <field eval="'03/'+time.strftime('%Y')" name="name"/>
-            <field eval="True" name="special"/>
+            <field name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-03-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-03-31'" name="date_stop"/>
@@ -48,7 +48,7 @@
         <record id="period_4" model="account.period">
             <field eval="'04/'+time.strftime('%Y')" name="code"/>
             <field eval="'04/'+time.strftime('%Y')" name="name"/>
-            <field eval="True" name="special"/>
+            <field name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-04-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-04-30'" name="date_stop"/>
@@ -57,7 +57,7 @@
         <record id="period_5" model="account.period">
             <field eval="'05/'+time.strftime('%Y')" name="code"/>
             <field eval="'05/'+time.strftime('%Y')" name="name"/>
-            <field eval="True" name="special"/>
+            <field name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-05-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-05-31'" name="date_stop"/>
@@ -67,7 +67,7 @@
             <field eval="'06/'+time.strftime('%Y')" name="code"/>
             <field eval="'06/'+time.strftime('%Y')" name="name"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
-            <field eval="True" name="special"/>
+            <field name="special"/>
             <field eval="time.strftime('%Y')+'-06-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-06-30'" name="date_stop"/>
             <field name="company_id" ref="base.main_company"/>
@@ -75,7 +75,7 @@
         <record id="period_7" model="account.period">
             <field eval="'07/'+time.strftime('%Y')" name="code"/>
             <field eval="'07/'+time.strftime('%Y')" name="name"/>
-            <field eval="True" name="special"/>
+            <field name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-07-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-07-31'" name="date_stop"/>
@@ -84,7 +84,7 @@
         <record id="period_8" model="account.period">
             <field eval="'08/'+time.strftime('%Y')" name="code"/>
             <field eval="'08/'+time.strftime('%Y')" name="name"/>
-            <field eval="True" name="special"/>
+            <field name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-08-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-08-31'" name="date_stop"/>
@@ -93,7 +93,7 @@
         <record id="period_9" model="account.period">
             <field eval="'09/'+time.strftime('%Y')" name="code"/>
             <field eval="'09/'+time.strftime('%Y')" name="name"/>
-            <field eval="True" name="special"/>
+            <field name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-09-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-09-30'" name="date_stop"/>
@@ -102,7 +102,7 @@
         <record id="period_10" model="account.period">
             <field eval="'10/'+time.strftime('%Y')" name="code"/>
             <field eval="'10/'+time.strftime('%Y')" name="name"/>
-            <field eval="True" name="special"/>
+            <field name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-10-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-10-31'" name="date_stop"/>
@@ -111,7 +111,7 @@
         <record id="period_11" model="account.period">
             <field eval="'11/'+time.strftime('%Y')" name="code"/>
             <field eval="'11/'+time.strftime('%Y')" name="name"/>
-            <field eval="True" name="special"/>
+            <field name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-11-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-11-30'" name="date_stop"/>
@@ -120,7 +120,7 @@
         <record id="period_12" model="account.period">
             <field eval="'12/'+time.strftime('%Y')" name="code"/>
             <field eval="'12/'+time.strftime('%Y')" name="name"/>
-            <field eval="True" name="special"/>
+            <field name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-12-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-12-31'" name="date_stop"/>

From 20de3c399f771876446ff8a5fc4813b1deb599bc Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Mon, 7 Feb 2011 18:45:34 +0530
Subject: [PATCH 21/73] [FIX] account - demo data - all periods have special =
 true

bzr revid: ara@tinyerp.com-20110207131534-nn1mwnan81mldur3
---
 addons/account/account_demo.xml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/addons/account/account_demo.xml b/addons/account/account_demo.xml
index 487819effe8..5e877427091 100644
--- a/addons/account/account_demo.xml
+++ b/addons/account/account_demo.xml
@@ -21,7 +21,6 @@
         <record id="period_1" model="account.period">
             <field eval="'01/'+time.strftime('%Y')" name="code"/>
             <field eval="'01/'+time.strftime('%Y')" name="name"/>
-            <field name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-01-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-01-31'" name="date_stop"/>
@@ -30,7 +29,6 @@
         <record id="period_2" model="account.period">
             <field eval="'02/'+time.strftime('%Y')" name="code"/>
             <field eval="'02/'+time.strftime('%Y')" name="name"/>
-            <field name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-02-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-02-28'" name="date_stop"/>
@@ -39,7 +37,6 @@
         <record id="period_3" model="account.period">
             <field eval="'03/'+time.strftime('%Y')" name="code"/>
             <field eval="'03/'+time.strftime('%Y')" name="name"/>
-            <field name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-03-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-03-31'" name="date_stop"/>
@@ -48,7 +45,6 @@
         <record id="period_4" model="account.period">
             <field eval="'04/'+time.strftime('%Y')" name="code"/>
             <field eval="'04/'+time.strftime('%Y')" name="name"/>
-            <field name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-04-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-04-30'" name="date_stop"/>
@@ -57,7 +53,6 @@
         <record id="period_5" model="account.period">
             <field eval="'05/'+time.strftime('%Y')" name="code"/>
             <field eval="'05/'+time.strftime('%Y')" name="name"/>
-            <field name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-05-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-05-31'" name="date_stop"/>
@@ -67,7 +62,6 @@
             <field eval="'06/'+time.strftime('%Y')" name="code"/>
             <field eval="'06/'+time.strftime('%Y')" name="name"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
-            <field name="special"/>
             <field eval="time.strftime('%Y')+'-06-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-06-30'" name="date_stop"/>
             <field name="company_id" ref="base.main_company"/>
@@ -75,7 +69,6 @@
         <record id="period_7" model="account.period">
             <field eval="'07/'+time.strftime('%Y')" name="code"/>
             <field eval="'07/'+time.strftime('%Y')" name="name"/>
-            <field name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-07-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-07-31'" name="date_stop"/>
@@ -84,7 +77,6 @@
         <record id="period_8" model="account.period">
             <field eval="'08/'+time.strftime('%Y')" name="code"/>
             <field eval="'08/'+time.strftime('%Y')" name="name"/>
-            <field name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-08-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-08-31'" name="date_stop"/>
@@ -93,7 +85,6 @@
         <record id="period_9" model="account.period">
             <field eval="'09/'+time.strftime('%Y')" name="code"/>
             <field eval="'09/'+time.strftime('%Y')" name="name"/>
-            <field name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-09-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-09-30'" name="date_stop"/>
@@ -102,7 +93,6 @@
         <record id="period_10" model="account.period">
             <field eval="'10/'+time.strftime('%Y')" name="code"/>
             <field eval="'10/'+time.strftime('%Y')" name="name"/>
-            <field name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-10-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-10-31'" name="date_stop"/>
@@ -111,7 +101,6 @@
         <record id="period_11" model="account.period">
             <field eval="'11/'+time.strftime('%Y')" name="code"/>
             <field eval="'11/'+time.strftime('%Y')" name="name"/>
-            <field name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-11-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-11-30'" name="date_stop"/>
@@ -120,7 +109,6 @@
         <record id="period_12" model="account.period">
             <field eval="'12/'+time.strftime('%Y')" name="code"/>
             <field eval="'12/'+time.strftime('%Y')" name="name"/>
-            <field name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-12-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-12-31'" name="date_stop"/>

From 4db07670163eee3c596815f4a948e0507033370f Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 8 Feb 2011 10:27:50 +0530
Subject: [PATCH 22/73] [FIX] HR : Correction on List view definition for model
 hr.employee (Ref : SaaS Maintenance Case 3990)

bzr revid: mra@mra-laptop-20110208045750-9okcwgulbh1ijaw3
---
 addons/hr/hr_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index c2b738351aa..cf7fe75e986 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -82,7 +82,6 @@
             <field name="name">hr.employee.tree</field>
             <field name="model">hr.employee</field>
             <field name="type">tree</field>
-            <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
                 <tree string="Employees">
                     <field name="name"/>

From b18aa2ecefc1ae2fa97a19d08309ca74c91770a6 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 8 Feb 2011 10:49:51 +0530
Subject: [PATCH 23/73] [FIX] hr: try to create an employee as employee -> bug

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

bzr revid: mra@mra-laptop-20110208051951-usjzx6dih5ap9o45
---
 addons/hr/hr.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index e2b9a7089f3..90605e1a745 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -191,7 +191,7 @@ class hr_employee(osv.osv):
     _defaults = {
         'active': 1,
         'photo': _get_photo,
-        'address_id': lambda self,cr,uid,c: self.pool.get('res.partner.address').browse(cr, uid, uid, c).partner_id.id
+        'address_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).address_id.id
     }
 
     def _check_recursion(self, cr, uid, ids, context=None):

From 2762d10d8e8ee80e40fe653659248ad19156dfe2 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 8 Feb 2011 12:28:24 +0530
Subject: [PATCH 24/73] [REF] account_anglo_saxon/stock.py => remove unused
 import of fields

bzr revid: mra@mra-laptop-20110208065824-6vl7noekz1grku36
---
 addons/account_anglo_saxon/stock.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_anglo_saxon/stock.py b/addons/account_anglo_saxon/stock.py
index a544b9a6e2a..9ddfab86a94 100644
--- a/addons/account_anglo_saxon/stock.py
+++ b/addons/account_anglo_saxon/stock.py
@@ -15,11 +15,11 @@
 #    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/>.
 #
 ##############################################################################
 
-from osv import fields,osv
+from osv import osv
 
 #----------------------------------------------------------
 # Stock Picking

From ff225574c77ab682a98a26f2a484218bac692d7a Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 8 Feb 2011 12:47:02 +0530
Subject: [PATCH 25/73] [REF] Account: typo

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

diff --git a/addons/account/account.py b/addons/account/account.py
index adddf4bd3f2..78c8bb31031 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2690,6 +2690,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         analytic_journal_obj = self.pool.get('account.analytic.journal')
         obj_tax_code = self.pool.get('account.tax.code')
         obj_tax_code_template = self.pool.get('account.tax.code.template')
+        ir_values = self.pool.get('ir.values')
         # Creating Account
         obj_acc_root = obj_multi.chart_template_id.account_root_id
         tax_code_root_id = obj_multi.chart_template_id.tax_code_root_id.id
@@ -2789,7 +2790,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             new_account = obj_acc.create(cr, uid, vals, context=ctx)
             acc_template_ref[account_template.id] = new_account
         #reactivate the parent_store functionnality on account_account
-        self.pool.get('account.account')._parent_store_compute(cr)
+        obj_acc._parent_store_compute(cr)
 
         for key,value in todo_dict.items():
             if value['account_collected_id'] or value['account_paid_id']:
@@ -3026,7 +3027,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                 'name': record[0],
                 'company_id': company_id,
                 'fields_id': field[0],
-                'value': account and 'account.account,'+str(acc_template_ref[account.id]) or False,
+                'value': account and 'account.account,' + str(acc_template_ref[account.id]) or False,
             }
 
             if r:
@@ -3039,7 +3040,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         fp_ids = obj_fiscal_position_template.search(cr, uid, [('chart_template_id', '=', obj_multi.chart_template_id.id)])
 
         if fp_ids:
-
             obj_tax_fp = self.pool.get('account.fiscal.position.tax')
             obj_ac_fp = self.pool.get('account.fiscal.position.account')
 
@@ -3067,7 +3067,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                     }
                     obj_ac_fp.create(cr, uid, vals_acc)
 
-        ir_values = self.pool.get('ir.values')
         if obj_multi.sale_tax:
             ir_values.set(cr, uid, key='default', key2=False, name="taxes_id", company=obj_multi.company_id.id,
                             models =[('product.product',False)], value=[tax_template_to_tax[obj_multi.sale_tax.id]])

From c162de5ab1c203a1def6b00a61681ee2aeed97e7 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 8 Feb 2011 12:55:57 +0530
Subject: [PATCH 26/73] [REF] Account: typo

bzr revid: mra@mra-laptop-20110208072557-uzi20kapg0c6w4nf
---
 addons/account/account.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 78c8bb31031..968af43396e 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2238,6 +2238,7 @@ class account_subscription(osv.osv):
                     ds = (datetime.strptime(ds, '%Y-%m-%d') + relativedelta(years=sub.period_nbr)).strftime('%Y-%m-%d')
         self.write(cr, uid, ids, {'state':'running'})
         return True
+
 account_subscription()
 
 class account_subscription_line(osv.osv):
@@ -2266,6 +2267,7 @@ class account_subscription_line(osv.osv):
         return all_moves
 
     _rec_name = 'date'
+
 account_subscription_line()
 
 #  ---------------------------------------------------------------
@@ -2534,7 +2536,6 @@ class account_tax_template(osv.osv):
     }
     _order = 'sequence'
 
-
 account_tax_template()
 
 # Fiscal Position Templates
@@ -2643,10 +2644,9 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         return False
 
     def _get_default_accounts(self, cr, uid, context=None):
-        accounts = [{'acc_name':'Current','account_type':'bank'},
+        return [{'acc_name':'Current','account_type':'bank'},
                     {'acc_name':'Deposit','account_type':'bank'},
                     {'acc_name':'Cash','account_type':'cash'}]
-        return accounts
 
     _defaults = {
         'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, [uid], c)[0].company_id.id,
@@ -3086,7 +3086,7 @@ class account_bank_accounts_wizard(osv.osv_memory):
         'account_type': fields.selection([('cash','Cash'),('check','Check'),('bank','Bank')], 'Type', size=32),
     }
     _defaults = {
-        'currency_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id,
+        'currency_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id,
     }
 
 account_bank_accounts_wizard()

From f979cdb477566979f2704b354b3ac9eb45179632 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Tue, 8 Feb 2011 13:02:12 +0530
Subject: [PATCH 27/73] [FIX] account_payment: increased size of col.date in
 payment order report

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

bzr revid: mtr@mtr-20110208073212-51a487pz5rrijrsw
---
 addons/account_payment/report/order.rml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account_payment/report/order.rml b/addons/account_payment/report/order.rml
index 9198b12db25..3dbf1591b60 100644
--- a/addons/account_payment/report/order.rml
+++ b/addons/account_payment/report/order.rml
@@ -123,7 +123,7 @@
   <story>
   <pto>
   <pto_header>
-    <blockTable colWidths="112.0,86.0,106.0,63.0,85.0,75.0" style="Table3">
+    <blockTable colWidths="112.0,86.0,102.0,70.0,82.0,75.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Partner</para>
@@ -217,7 +217,7 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="112.0,86.0,106.0,63.0,85.0,75.0" style="Table3">
+    <blockTable colWidths="112.0,86.0,102.0,70.0,82.0,75.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Partner</para>
@@ -241,7 +241,7 @@
     </blockTable>
     <section>
       <para style="terp_default_2">[[repeatIn(o.line_ids, 'line') ]]</para>
-      <blockTable colWidths="112.0,86.0,106.0,64.0,85.0,75.0" style="Table4">
+      <blockTable colWidths="112.0,86.0,102.0,70.0,82.0,75.0" style="Table4">
         <tr>
           <td>
             <para style="terp_default_9">[[line.partner_id and line.partner_id.name or '-' ]]</para>

From 070af5401888d0e75a8eb5b0cd1f1034ad4634de Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Tue, 8 Feb 2011 14:23:39 +0530
Subject: [PATCH 28/73] [FIX] analytic account - Wrong demo data and account
 type must be come in tree view

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

bzr revid: ara@tinyerp.com-20110208085339-lmn3perl9h040j16
---
 .../account/project/analytic_account_demo.xml | 41 ++++++++++++++++++-
 addons/account/project/project_view.xml       |  7 ++--
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/addons/account/project/analytic_account_demo.xml b/addons/account/project/analytic_account_demo.xml
index 8f33f70f856..6df74d0a0ba 100644
--- a/addons/account/project/analytic_account_demo.xml
+++ b/addons/account/project/analytic_account_demo.xml
@@ -8,89 +8,106 @@
         <record id="analytic_absences" model="account.analytic.account">
             <field name="name">Leaves</field>
             <field name="code">1</field>
+            <field name="type">view</field>
             <field name="parent_id" ref="analytic_root"/>
         </record>
         <record id="analytic_internal" model="account.analytic.account">
             <field name="name">Internal</field>
             <field name="code">2</field>
+            <field name="type">view</field>
             <field name="parent_id" ref="analytic_root"/>
         </record>
         <record id="analytic_our_super_product" model="account.analytic.account">
             <field name="name">Our Super Product</field>
             <field name="code">100</field>
             <field name="state">open</field>
+            <field name="type">view</field>
             <field name="parent_id" ref="analytic_root"/>
         </record>
         <record id="analytic_project_1" model="account.analytic.account">
             <field name="name">Project 1</field>
             <field name="code">101</field>
+            <field name="type">view</field>
             <field name="parent_id" ref="analytic_root"/>
         </record>
         <record id="analytic_project_2" model="account.analytic.account">
             <field name="name">Project 2</field>
             <field name="code">102</field>
+            <field name="type">view</field>
             <field name="parent_id" ref="analytic_root"/>
         </record>
         <record id="analytic_journal_trainings" model="account.analytic.account">
             <field name="name">Training</field>
             <field name="code">4</field>
+            <field name="type">view</field>
             <field name="parent_id" ref="analytic_internal"/>
         </record>
         <record id="analytic_in_house" model="account.analytic.account">
             <field name="name">In House</field>
             <field name="code">1</field>
+            <field name="type">normal</field>
             <field name="parent_id" ref="analytic_journal_trainings"/>
         </record>
         <record id="analytic_online" model="account.analytic.account">
             <field name="name">Online</field>
             <field name="code">2</field>
+            <field name="type">normal</field>
             <field name="parent_id" ref="analytic_journal_trainings"/>
         </record>
         <record id="analytic_support" model="account.analytic.account">
             <field name="name">Support</field>
             <field name="code">support</field>
+            <field name="type">view</field>
             <field name="parent_id" ref="analytic_our_super_product"/>
         </record>
         <record id="analytic_partners" model="account.analytic.account">
             <field name="name">Partners</field>
             <field name="code">partners</field>
+            <field name="type">view</field>
             <field name="parent_id" ref="analytic_support"/>
         </record>
         <record id="analytic_customers" model="account.analytic.account">
             <field name="name">Customers</field>
             <field name="code">customers</field>
+            <field name="type">view</field>
             <field name="parent_id" ref="analytic_support"/>
         </record>
         <record id="analytic_support_internal" model="account.analytic.account">
             <field name="name">Internal</field>
             <field name="code">3</field>
+            <field name="type">normal</field>
             <field name="parent_id" ref="analytic_support"/>
         </record>
         <record id="analytic_integration" model="account.analytic.account">
             <field name="name">Integration</field>
             <field name="code">integration</field>
+            <field name="type">view</field>
             <field name="parent_id" ref="analytic_our_super_product"/>
         </record>
         <record id="analytic_consultancy" model="account.analytic.account">
             <field name="name">Consultancy</field>
             <field name="code">4</field>
+            <field name="type">normal</field>
             <field name="parent_id" ref="analytic_our_super_product"/>
         </record>
         <record id="analytic_super_product_trainings" model="account.analytic.account">
             <field name="name">Training</field>
             <field name="code">5</field>
+            <field name="type">normal</field>
             <field name="parent_id" ref="analytic_our_super_product"/>
         </record>
         <record id="analytic_seagate_p1" model="account.analytic.account">
             <field name="name">Seagate P1</field>
             <field name="code">1</field>
             <field name="parent_id" ref="analytic_integration"/>
+            <field name="type">normal</field>
             <field name="state">open</field>
             <field name="partner_id" ref="base.res_partner_seagate"/>
         </record>
         <record id="analytic_seagate_p2" model="account.analytic.account">
             <field name="name">Seagate P2</field>
             <field name="code">2</field>
+            <field name="type">normal</field>
             <field name="parent_id" ref="analytic_integration"/>
             <field name="state">open</field>
             <field name="partner_id" ref="base.res_partner_seagate"/>
@@ -99,11 +116,13 @@
             <field name="name">Magasin BML 1</field>
             <field name="code">3</field>
             <field name="parent_id" ref="analytic_integration"/>
+            <field name="type">normal</field>
             <field name="partner_id" ref="base.res_partner_15"/>
         </record>
         <record id="analytic_integration_c2c" model="account.analytic.account">
             <field name="name">CampToCamp</field>
             <field name="code">7</field>
+            <field name="type">normal</field>
             <field eval="str(time.localtime()[0] - 1) + '-08-07'" name="date_start"/>
             <field eval="time.strftime('%Y-12-31')" name="date"/>
             <field name="parent_id" ref="analytic_integration"/>
@@ -114,18 +133,21 @@
             <field name="name">Agrolait</field>
             <field name="code">3</field>
             <field name="parent_id" ref="analytic_customers"/>
+            <field name="type">normal</field>
             <field name="partner_id" ref="base.res_partner_agrolait"/>
         </record>
         <record id="analytic_asustek" model="account.analytic.account">
             <field name="name">Asustek</field>
             <field name="code">4</field>
-            <field name="parent_id" ref="analytic_customers"/>
+            <field name="type">normal</field>
+            <field name="parent_id" ref="analytic_customers"/>            
             <field name="partner_id" ref="base.res_partner_asus"/>
         </record>
         <record id="analytic_distripc" model="account.analytic.account">
             <field name="name">DistriPC</field>
             <field name="code">7</field>
             <field name="parent_id" ref="analytic_customers"/>
+            <field name="type">normal</field>
             <field name="partner_id" ref="base.res_partner_4"/>
         </record>
         <record id="analytic_sednacom" model="account.analytic.account">
@@ -134,6 +156,7 @@
             <field eval="str(time.localtime()[0] - 1) + '-05-09'" name="date_start"/>
             <field eval="time.strftime('%Y-05-08')" name="date"/>
             <field name="parent_id" ref="analytic_partners"/>
+            <field name="type">normal</field>
             <field name="partner_id" ref="base.res_partner_sednacom"/>
             <field name="state">open</field>
         </record>
@@ -142,6 +165,7 @@
             <field name="code">3</field>
             <field eval="time.strftime('%Y-02-01')" name="date_start"/>
             <field eval="time.strftime('%Y-07-01')" name="date"/>
+            <field name="type">normal</field>
             <field name="parent_id" ref="analytic_partners"/>
             <field name="partner_id" ref="base.res_partner_thymbra"/>
             <field name="state">open</field>
@@ -151,6 +175,7 @@
             <field name="code">10</field>
             <field eval="time.strftime('%Y-04-24')" name="date_start"/>
             <field eval="str(time.localtime()[0] + 1) + '-04-24'" name="date"/>
+            <field name="type">normal</field>
             <field name="parent_id" ref="analytic_partners"/>
             <field name="partner_id" ref="base.res_partner_11"/>
         </record>
@@ -159,12 +184,14 @@
             <field name="code">12</field>
             <field eval="time.strftime('%Y-02-01')" name="date_start"/>
             <field eval="str(time.localtime()[0] + 1) + '-02-01'" name="date"/>
+            <field name="type">normal</field>
             <field name="parent_id" ref="analytic_partners"/>
             <field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
         </record>
         <record id="analytic_tiny_at_work" model="account.analytic.account">
             <field name="name">OpenERP SA AT Work</field>
             <field name="code">15</field>
+            <field name="type">normal</field>
             <field name="parent_id" ref="analytic_partners"/>
             <field name="partner_id" ref="base.res_partner_tinyatwork"/>
         </record>
@@ -173,6 +200,7 @@
             <field name="code">21</field>
             <field eval="time.strftime('%Y-%m-%d', time.localtime(time.time() - 365 * 86400))" name="date_start"/>
             <field eval="time.strftime('%Y-%m-%d')" name="date"/>
+            <field name="type">normal</field>
             <field name="parent_id" ref="analytic_partners"/>
             <field name="partner_id" ref="base.res_partner_c2c"/>
             <field name="state">open</field>
@@ -180,56 +208,67 @@
         <record id="analytic_project_2_support" model="account.analytic.account">
             <field name="name">Support</field>
             <field name="code">1</field>
+            <field name="type">normal</field>
             <field name="parent_id" ref="analytic_project_2"/>
         </record>
         <record id="analytic_project_2_development" model="account.analytic.account">
             <field name="name">Development</field>
             <field name="code">2</field>
+            <field name="type">normal</field>
             <field name="parent_id" ref="analytic_project_2"/>
         </record>
         <record id="analytic_project_1_trainings" model="account.analytic.account">
             <field name="name">Training</field>
             <field name="code">1</field>
+            <field name="type">normal</field>
             <field name="parent_id" ref="analytic_project_1"/>
         </record>
         <record id="analytic_project_1_development" model="account.analytic.account">
             <field name="name">Development</field>
             <field name="code">2</field>
+            <field name="type">normal</field>
             <field name="parent_id" ref="analytic_project_1"/>
         </record>
         <record id="analytic_administratif" model="account.analytic.account">
             <field name="name">Administrative</field>
             <field name="code">1</field>
+            <field name="type">normal</field>
             <field name="parent_id" ref="analytic_internal"/>
         </record>
         <record id="analytic_commercial_marketing" model="account.analytic.account">
             <field name="name">Commercial &amp; Marketing</field>
             <field name="code">2</field>
+            <field name="type">normal</field>
             <field name="parent_id" ref="analytic_internal"/>
         </record>
         <record id="analytic_our_super_product_development" model="account.analytic.account">
             <field name="name">Our Super Product Development</field>
             <field name="code">3</field>
+            <field name="type">view</field>
             <field name="parent_id" ref="analytic_internal"/>
         </record>
         <record id="analytic_stable" model="account.analytic.account">
             <field name="name">Stable</field>
             <field name="code">1</field>
+            <field name="type">normal</field>
             <field name="parent_id" ref="analytic_our_super_product_development"/>
         </record>
         <record id="analytic_trunk" model="account.analytic.account">
             <field name="name">Trunk</field>
             <field name="code">2</field>
+            <field name="type">normal</field>
             <field name="parent_id" ref="analytic_our_super_product_development"/>
         </record>
         <record id="analytic_paid" model="account.analytic.account">
             <field name="name">Paid</field>
             <field name="code">1</field>
+            <field name="type">normal</field>
             <field name="parent_id" ref="analytic_absences"/>
         </record>
         <record id="analytic_unpaid" model="account.analytic.account">
             <field name="name">Unpaid</field>
             <field name="code">2</field>
+            <field name="type">normal</field>
             <field name="parent_id" ref="analytic_absences"/>
         </record>
     </data>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index ce3496e3e30..380db5b0291 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -55,19 +55,20 @@
             <field name="type">tree</field>
             <field name="field_parent">child_complete_ids</field>
             <field name="arch" type="xml">
-                <tree colors="red:(date&lt;current_date);black:(date&gt;=current_date);black:(date==False)" string="Analytic account" toolbar="1">
-                    <field name="name"/>
+                <tree colors="blue:type in ('view');red:(date&lt;current_date);black:(date&gt;=current_date);black:(date==False)" string="Analytic account" toolbar="1">
+                    <field name="name"/>                    
                     <field name="code"/>
                     <field name="quantity"/>
                     <field name="quantity_max"/>
                     <field name="debit"/>
                     <field name="credit"/>
                     <field name="balance"/>
-                    <field name="currency_id" groups="base.group_extended"/>
+                    <field name="currency_id" groups="base.group_extended"/>                    
                     <field name="date" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
                     <field name="parent_id" invisible="1"/>
+                    <field name="type"/>
                 </tree>
             </field>
         </record>

From 9e95ff425cdf0079656ad3cf723b7b718ee9452a Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Tue, 8 Feb 2011 14:23:50 +0530
Subject: [PATCH 29/73] [IMP] account_payment: reverted the changes in the
 Table3 of <pto_header> of payment order report

bzr revid: mtr@mtr-20110208085350-720dooos21203isd
---
 addons/account_payment/report/order.rml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_payment/report/order.rml b/addons/account_payment/report/order.rml
index 3dbf1591b60..9db71e5f3b0 100644
--- a/addons/account_payment/report/order.rml
+++ b/addons/account_payment/report/order.rml
@@ -123,7 +123,7 @@
   <story>
   <pto>
   <pto_header>
-    <blockTable colWidths="112.0,86.0,102.0,70.0,82.0,75.0" style="Table3">
+    <blockTable colWidths="112.0,86.0,106.0,63.0,85.0,75.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Partner</para>

From adb0329f7ecccedf7fe32c36b7f686543aef31cc Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 8 Feb 2011 16:54:38 +0530
Subject: [PATCH 30/73] [REF] account: typos

bzr revid: mra@mra-laptop-20110208112438-gtm9zoh7uzx8n8xi
---
 addons/account/account.py | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 968af43396e..b9cc9473579 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -395,7 +395,7 @@ class account_account(osv.osv):
         'reconcile': False,
         'active': True,
         'currency_mode': 'current',
-        'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'account.account', context=c),
+        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'account.account', context=c),
     }
 
     def _check_recursion(self, cr, uid, ids, context=None):
@@ -1121,9 +1121,8 @@ class account_move(osv.osv):
             res_ids = set(id[0] for id in cr.fetchall())
             ids = ids and (ids & res_ids) or res_ids
         if ids:
-            return [('id','in',tuple(ids))]
-        else:
-            return [('id', '=', '0')]
+            return [('id', 'in', tuple(ids))]
+        return [('id', '=', '0')]
 
     _columns = {
         'name': fields.char('Number', size=64, required=True),
@@ -1207,7 +1206,6 @@ class account_move(osv.osv):
                    'SET state=%s '\
                    'WHERE id IN %s',
                    ('posted', tuple(valid_moves),))
-
         return True
 
     def button_validate(self, cursor, user, ids, context=None):
@@ -1522,7 +1520,6 @@ class account_move_reconcile(osv.osv):
                 result.append((r.id,r.name))
         return result
 
-
 account_move_reconcile()
 
 #----------------------------------------------------------
@@ -1834,7 +1831,6 @@ class account_tax(osv.osv):
         obj_partener_address = self.pool.get('res.partner.address')
         for tax in taxes:
             # we compute the amount for the current tax object and append it to the result
-
             data = {'id':tax.id,
                     'name':tax.description and tax.description + " - " + tax.name or tax.name,
                     'account_collected_id':tax.account_collected_id.id,
@@ -2049,6 +2045,7 @@ class account_tax(osv.osv):
                 r['amount'] = round(r['amount'] * quantity, prec)
                 total += r['amount']
         return res
+
 account_tax()
 
 # ---------------------------------------------------------
@@ -2177,13 +2174,11 @@ class account_subscription(osv.osv):
         'name': fields.char('Name', size=64, required=True),
         'ref': fields.char('Reference', size=16),
         'model_id': fields.many2one('account.model', 'Model', required=True),
-
         'date_start': fields.date('Start Date', required=True),
         'period_total': fields.integer('Number of Periods', required=True),
         'period_nbr': fields.integer('Period', required=True),
         'period_type': fields.selection([('day','days'),('month','month'),('year','year')], 'Period Type', required=True),
         'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'State', required=True, readonly=True),
-
         'lines_id': fields.one2many('account.subscription.line', 'subscription_id', 'Subscription Lines')
     }
     _defaults = {
@@ -2354,9 +2349,9 @@ class account_add_tmpl_wizard(osv.osv_memory):
     _name = 'account.addtmpl.wizard'
 
     def _get_def_cparent(self, cr, uid, context=None):
-        acc_obj=self.pool.get('account.account')
-        tmpl_obj=self.pool.get('account.account.template')
-        tids=tmpl_obj.read(cr, uid, [context['tmpl_ids']], ['parent_id'])
+        acc_obj = self.pool.get('account.account')
+        tmpl_obj = self.pool.get('account.account.template')
+        tids = tmpl_obj.read(cr, uid, [context['tmpl_ids']], ['parent_id'])
         if not tids or not tids[0]['parent_id']:
             return False
         ptids = tmpl_obj.read(cr, uid, [tids[0]['parent_id'][0]], ['code'])
@@ -2364,7 +2359,6 @@ class account_add_tmpl_wizard(osv.osv_memory):
         if not ptids or not ptids[0]['code']:
             raise osv.except_osv(_('Error !'), _('Cannot locate parent code for template account!'))
             res = acc_obj.search(cr, uid, [('code','=',ptids[0]['code'])])
-
         return res and res[0] or False
 
     _columns = {

From 4087891ac8d240005cca9a45315750acf126fc0b Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 8 Feb 2011 18:26:53 +0530
Subject: [PATCH 31/73] [REF] Account: account invoice model translation
 problem with no context param

bzr revid: mra@mra-laptop-20110208125653-uyw5y167go3kqgxw
---
 addons/account/invoice.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index a50bb37a981..cd855bfef4b 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -657,7 +657,9 @@ class account_invoice(osv.osv):
     def _convert_ref(self, cr, uid, ref):
         return (ref or '').replace('/','')
 
-    def _get_analytic_lines(self, cr, uid, id):
+    def _get_analytic_lines(self, cr, uid, id, context=None):
+        if context is None:
+            context = {}
         inv = self.browse(cr, uid, id)
         cur_obj = self.pool.get('res.currency')
 
@@ -667,7 +669,7 @@ class account_invoice(osv.osv):
         else:
             sign = -1
 
-        iml = self.pool.get('account.invoice.line').move_line_get(cr, uid, inv.id)
+        iml = self.pool.get('account.invoice.line').move_line_get(cr, uid, inv.id, context=context)
         for il in iml:
             if il['account_analytic_id']:
                 if inv.type in ('in_invoice', 'in_refund'):

From 85ef7e9c6a3176bfcbfdbb880da8f1fc42a97d03 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Wed, 9 Feb 2011 15:19:22 +0530
Subject: [PATCH 32/73] [FIX] l10n_uk:improved the account type of tax,residual
 amount is correctly referenced and calculated

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

bzr revid: mtr@mtr-20110209094922-6fa3ozq12mmtvhro
---
 addons/l10n_uk/l10n_uk_chart.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_uk/l10n_uk_chart.xml b/addons/l10n_uk/l10n_uk_chart.xml
index 9dc51fd3ad9..d82f9d40fde 100644
--- a/addons/l10n_uk/l10n_uk_chart.xml
+++ b/addons/l10n_uk/l10n_uk_chart.xml
@@ -50,7 +50,7 @@
             <field name="code">1112</field>
             <field name="name">Input VAT</field>
             <field ref="cli" name="parent_id"/>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="account_type_liability"/>
         </record>
 
@@ -124,7 +124,7 @@
             <field name="code">11003</field>
             <field name="name">Output VAT</field>
             <field ref="cas" name="parent_id"/>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="account_type_asset"/>
         </record>
 

From e0a95e80c1b3ccf79bd157a146ad8c519d299da3 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Wed, 9 Feb 2011 17:35:35 +0530
Subject: [PATCH 33/73] [FIX] Multi-Company Environment :Configuration of
 consolidated type of account is not possible due to the _check_type
 constraints

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

bzr revid: ara@tinyerp.com-20110209120535-o3htlw38zves04fm
---
 addons/account/account.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index b9cc9473579..602b3679ed4 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -424,7 +424,7 @@ class account_account(osv.osv):
             context = {}
         accounts = self.browse(cr, uid, ids, context=context)
         for account in accounts:
-            if account.child_id and account.type != 'view':
+            if account.child_id and account.type not in ('view', 'consolidation'):
                 return False
         return True
 

From 4ce06e0f88ab9594a36a3db7b1175668170a8236 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Wed, 9 Feb 2011 18:58:30 +0530
Subject: [PATCH 34/73] [IMP] account: refactor code for generation of chart of
 templates

bzr revid: psi@tinyerp.co.in-20110209132830-srd9cfw1i9dnm77u
---
 addons/account/account.py                     | 215 ++++--
 addons/account/account_installer.xml          |  19 -
 addons/account/configurable_account_chart.xml |   7 +
 addons/account/installer.py                   | 643 +-----------------
 4 files changed, 176 insertions(+), 708 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index adddf4bd3f2..ceabe8e51c9 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2690,6 +2690,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         analytic_journal_obj = self.pool.get('account.analytic.journal')
         obj_tax_code = self.pool.get('account.tax.code')
         obj_tax_code_template = self.pool.get('account.tax.code.template')
+        obj_acc_journal_view = self.pool.get('account.journal.view')
         # Creating Account
         obj_acc_root = obj_multi.chart_template_id.account_root_id
         tax_code_root_id = obj_multi.chart_template_id.tax_code_root_id.id
@@ -2762,7 +2763,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
 
         children_acc_template = obj_acc_template.search(cr, uid, [('parent_id','child_of',[obj_acc_root.id]),('nocreate','!=',True)])
         children_acc_template.sort()
-        for account_template in obj_acc_template.browse(cr, uid, children_acc_template,context=context):
+        for account_template in obj_acc_template.browse(cr, uid, children_acc_template, context=context):
             tax_ids = []
             for tax in account_template.tax_ids:
                 tax_ids.append(tax_template_ref[tax.id])
@@ -2788,8 +2789,125 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             }
             new_account = obj_acc.create(cr, uid, vals, context=ctx)
             acc_template_ref[account_template.id] = new_account
+
+            ### Configure Bank Journal for generic chart of account
+            if account_template.name == 'Bank Current Account' and obj_multi.chart_template_id.name == 'Configurable Account Chart Template':
+                b_vals = {
+                    'name': 'Bank Accounts',
+                    'code': '110500',
+                    'type': 'view',
+                    'user_type': account_template.parent_id.user_type and account_template.user_type.id or False,
+                    'shortcut': account_template.shortcut,
+                    'note': account_template.note,
+                    'parent_id': account_template.parent_id and ((account_template.parent_id.id in acc_template_ref) and acc_template_ref[account_template.parent_id.id]) or False,
+                    'tax_ids': [(6,0,tax_ids)],
+                    'company_id': company_id,
+                }
+                bank_account = obj_acc.create(cr, uid, b_vals, context=ctx)
+
+                view_id_cash = obj_acc_journal_view.search(cr, uid, [('name', '=', 'Bank/Cash Journal View')], context=context)[0] #why fixed name here?
+                view_id_cur = obj_acc_journal_view.search(cr, uid, [('name', '=', 'Bank/Cash Journal (Multi-Currency) View')], context=context)[0] #Why Fixed name here?
+
+                cash_result = obj_data.get_object_reference(cr, uid, 'account', 'conf_account_type_cash')
+                cash_type_id = cash_result and cash_result[1] or False
+
+                bank_result = obj_data.get_object_reference(cr, uid, 'account', 'conf_account_type_bnk')
+                bank_type_id = bank_result and bank_result[1] or False
+
+                check_result = obj_data.get_object_reference(cr, uid, 'account', 'conf_account_type_chk')
+                check_type_id = check_result and check_result[1] or False
+
+#                record = self.browse(cr, uid, ids, context=context)[0]
+                code_cnt = 1
+                vals_seq = {
+                    'name': _('Bank Journal '),
+                    'code': 'account.journal',
+                    'prefix': 'BNK/%(year)s/',
+                    'company_id': company_id,
+                    'padding': 5
+                }
+                seq_id = obj_sequence.create(cr, uid, vals_seq, context=context)
+
+                #create the bank journals
+                analitical_bank_ids = analytic_journal_obj.search(cr, uid, [('type', '=', 'situation')], context=context)
+                analitical_journal_bank = analitical_bank_ids and analitical_bank_ids[0] or False
+                vals_journal = {
+                    'name': _('Bank Journal '),
+                    'code': _('BNK'),
+                    'sequence_id': seq_id,
+                    'type': 'bank',
+                    'company_id': company_id,
+                    'analytic_journal_id': analitical_journal_bank
+                }
+                if vals.get('currency_id', False):
+                    vals_journal.update({
+                        'view_id': view_id_cur,
+                        'currency': vals.get('currency_id', False)
+                    })
+                else:
+                    vals_journal.update({'view_id': view_id_cash})
+                vals_journal.update({
+                    'default_credit_account_id': new_account,
+                    'default_debit_account_id': new_account,
+                })
+                obj_journal.create(cr, uid, vals_journal, context=context)
+
+                for val in obj_multi.bank_accounts_id:
+                    seq_padding = 5
+                    if val.account_type == 'cash':
+                        type = cash_type_id
+                    elif val.account_type == 'bank':
+                        type = bank_type_id
+                    elif val.account_type == 'check':
+                        type = check_type_id
+                    else:
+                        type = check_type_id
+                        seq_padding = None
+
+                    vals_bnk = {
+                        'name': val.acc_name or '',
+                        'currency_id': val.currency_id.id or False,
+                        'code': str(110500 + code_cnt),
+                        'type': 'liquidity',
+                        'user_type': type,
+                        'parent_id': bank_account,
+                        'company_id': company_id
+                    }
+                    child_bnk_acc = obj_acc.create(cr, uid, vals_bnk, context=ctx)
+                    vals_seq_child = {
+                        'name': _(vals_bnk['name'] + ' ' + 'Journal'),
+                        'code': 'account.journal',
+                        'prefix': _((vals_bnk['name'][:3].upper()) + '/%(year)s/'),
+                        'padding': seq_padding
+                    }
+                    seq_id = obj_sequence.create(cr, uid, vals_seq_child, context=context)
+
+                    #create the bank journal
+                    vals_journal = {}
+                    vals_journal = {
+                        'name': vals_bnk['name'] + _(' Journal'),
+                        'code': _(vals_bnk['name'][:3]).upper(),
+                        'sequence_id': seq_id,
+                        'type': 'cash',
+                        'company_id': company_id
+                    }
+                    if vals.get('currency_id', False):
+                        vals_journal.update({
+                                'view_id': view_id_cur,
+                                'currency': vals_bnk.get('currency_id', False),
+                        })
+                    else:
+                        vals_journal.update({'view_id': view_id_cash})
+                    vals_journal.update({
+                        'default_credit_account_id': child_bnk_acc,
+                        'default_debit_account_id': child_bnk_acc,
+                        'analytic_journal_id': analitical_journal_bank
+                    })
+                    obj_journal.create(cr, uid, vals_journal, context=context)
+                    code_cnt += 1
+
         #reactivate the parent_store functionnality on account_account
-        self.pool.get('account.account')._parent_store_compute(cr)
+        obj_acc._parent_store_compute(cr)
 
         for key,value in todo_dict.items():
             if value['account_collected_id'] or value['account_paid_id']:
@@ -2934,7 +3052,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                 'view_id': view_id,
                 'name': _('Opening Entries Journal'),
                 'type': 'situation',
-                'code': _('TOEJ'),
+                'code': _('OPEJ'),
                 'sequence_id': seq_id_opening,
                 'company_id': company_id,
                 'centralisation': True,
@@ -2954,55 +3072,56 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         view_id_cur = data.res_id
         ref_acc_bank = obj_multi.chart_template_id.bank_account_view_id
 
-        current_num = 1
-        for line in obj_multi.bank_accounts_id:
-            #create the account_account for this bank journal
-            tmp = line.acc_name
-            dig = obj_multi.code_digits
-            if ref_acc_bank.code:
-                try:
-                    new_code = str(int(ref_acc_bank.code.ljust(dig,'0')) + current_num)
-                except:
-                    new_code = str(ref_acc_bank.code.ljust(dig-len(str(current_num)),'0')) + str(current_num)
-            vals = {
-                'name': tmp,
-                'currency_id': line.currency_id and line.currency_id.id or False,
-                'code': new_code,
-                'type': 'liquidity',
-                'user_type': account_template.user_type and account_template.user_type.id or False,
-                'reconcile': True,
-                'parent_id': acc_template_ref[ref_acc_bank.id] or False,
-                'company_id': company_id,
-            }
-            acc_cash_id  = obj_acc.create(cr,uid,vals)
-
-            if obj_multi.seq_journal:
-                vals_seq={
-                    'name': _('Bank Journal ') + vals['name'],
-                    'code': 'account.journal',
+        if obj_multi.chart_template_id.name != 'Configurable Account Chart Template':
+            current_num = 1
+            for line in obj_multi.bank_accounts_id:
+                #create the account_account for this bank journal
+                tmp = line.acc_name
+                dig = obj_multi.code_digits
+                if ref_acc_bank.code:
+                    try:
+                        new_code = str(int(ref_acc_bank.code.ljust(dig,'0')) + current_num)
+                    except:
+                        new_code = str(ref_acc_bank.code.ljust(dig-len(str(current_num)),'0')) + str(current_num)
+                vals = {
+                    'name': tmp,
+                    'currency_id': line.currency_id and line.currency_id.id or False,
+                    'code': new_code,
+                    'type': 'liquidity',
+                    'user_type': account_template.user_type and account_template.user_type.id or False,
+                    'reconcile': True,
+                    'parent_id': acc_template_ref[ref_acc_bank.id] or False,
+                    'company_id': company_id,
                 }
-                seq_id = obj_sequence.create(cr,uid,vals_seq)
+                acc_cash_id  = obj_acc.create(cr,uid,vals)
 
-            #create the bank journal
-            analitical_bank_ids = analytic_journal_obj.search(cr,uid,[('type','=','situation')])
-            analitical_journal_bank = analitical_bank_ids and analitical_bank_ids[0] or False
+                if obj_multi.seq_journal:
+                    vals_seq={
+                        'name': _('Bank Journal ') + vals['name'],
+                        'code': 'account.journal',
+                    }
+                    seq_id = obj_sequence.create(cr,uid,vals_seq)
 
-            vals_journal['name']= vals['name']
-            vals_journal['code']= _('BNK') + str(current_num)
-            vals_journal['sequence_id'] = seq_id
-            vals_journal['type'] = line.account_type == 'cash' and 'cash' or 'bank'
-            vals_journal['company_id'] =  company_id
-            vals_journal['analytic_journal_id'] = analitical_journal_bank
+                #create the bank journal
+                analitical_bank_ids = analytic_journal_obj.search(cr,uid,[('type','=','situation')])
+                analitical_journal_bank = analitical_bank_ids and analitical_bank_ids[0] or False
 
-            if line.currency_id:
-                vals_journal['view_id'] = view_id_cur
-                vals_journal['currency'] = line.currency_id.id
-            else:
-                vals_journal['view_id'] = view_id_cash
-            vals_journal['default_credit_account_id'] = acc_cash_id
-            vals_journal['default_debit_account_id'] = acc_cash_id
-            obj_journal.create(cr, uid, vals_journal)
-            current_num += 1
+                vals_journal['name']= vals['name']
+                vals_journal['code']= _('BNK') + str(current_num)
+                vals_journal['sequence_id'] = seq_id
+                vals_journal['type'] = line.account_type == 'cash' and 'cash' or 'bank'
+                vals_journal['company_id'] =  company_id
+                vals_journal['analytic_journal_id'] = analitical_journal_bank
+
+                if line.currency_id:
+                    vals_journal['view_id'] = view_id_cur
+                    vals_journal['currency'] = line.currency_id.id
+                else:
+                    vals_journal['view_id'] = view_id_cash
+                vals_journal['default_credit_account_id'] = acc_cash_id
+                vals_journal['default_debit_account_id'] = acc_cash_id
+                obj_journal.create(cr, uid, vals_journal)
+                current_num += 1
 
         #create the properties
         property_obj = self.pool.get('ir.property')
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 6ebdf74b977..8d7bb09d629 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -33,25 +33,6 @@
                                 <field name="date_stop"/>
                                 <field name="period" colspan="4"/>
                             </group>
-                            <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
-                                <field name="sale_tax" on_change="on_change_tax(sale_tax)" attrs="{'required':[('charts','=','configurable')]}"/>
-                                <field name="purchase_tax" groups="base.group_extended"/>
-                            </group>
-                            <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
-                                <separator col="4" colspan="4" string="Bank and Cash Accounts"/>
-                                <field colspan="4" mode="tree" height="200" name="bank_accounts_id" nolabel="1" widget="one2many_list">
-                                    <form string="">
-                                        <field name="acc_name"/>
-                                        <field name="account_type"/>
-                                        <field name="currency_id" widget="selection" groups="base.group_extended"/>
-                                    </form>
-                                    <tree editable="bottom" string="Your bank and cash accounts">
-                                        <field name="acc_name"/>
-                                        <field name="account_type"/>
-                                        <field name="currency_id" widget="selection" groups="base.group_extended"/>
-                                    </tree>
-                                </field>
-                            </group>
                         </group>
                     </group>
                 </data>
diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml
index 5818314c814..1a0a21d3971 100644
--- a/addons/account/configurable_account_chart.xml
+++ b/addons/account/configurable_account_chart.xml
@@ -613,6 +613,13 @@
 			<field name="tax_ids" eval="[(6,0,[ref('otaxs')])]"/>
 		</record>
 
+		<record id="action_wizard_multi_chart_todo" model="ir.actions.todo">
+			<field name="name">Generate Chart of Accounts from a Chart Template</field>
+			<field name="action_id" ref="account.action_wizard_multi_chart"/>
+			<field name="state">open</field>
+			<field name="restart">onskip</field>
+		</record>
+
 
     </data>
 </openerp>
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 6625e2a0644..104a1772d8a 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -34,12 +34,6 @@ class account_installer(osv.osv_memory):
     _name = 'account.installer'
     _inherit = 'res.config.installer'
 
-    def _get_default_accounts(self, cr, uid, context=None):
-        accounts = [{'acc_name': 'Current', 'account_type': 'bank'},
-                    {'acc_name': 'Deposit', 'account_type': 'bank'},
-                    {'acc_name': 'Cash', 'account_type': 'cash'}]
-        return accounts
-
     def _get_charts(self, cr, uid, context=None):
         modules = self.pool.get('ir.module.module')
         ids = modules.search(cr, uid, [('category_id', '=', 'Account Charts')], context=context)
@@ -60,9 +54,6 @@ class account_installer(osv.osv_memory):
         'date_start': fields.date('Start Date', required=True),
         'date_stop': fields.date('End Date', required=True),
         'period': fields.selection([('month', 'Monthly'), ('3months','3 Monthly')], 'Periods', required=True),
-        'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Your Bank and Cash Accounts'),
-        'sale_tax': fields.float('Sale Tax(%)'),
-        'purchase_tax': fields.float('Purchase Tax(%)'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
     }
 
@@ -89,10 +80,7 @@ class account_installer(osv.osv_memory):
         'date_start': lambda *a: time.strftime('%Y-01-01'),
         'date_stop': lambda *a: time.strftime('%Y-12-31'),
         'period': 'month',
-        'sale_tax': 0.0,
-        'purchase_tax': 0.0,
         'company_id': _default_company,
-        'bank_accounts_id': _get_default_accounts,
         'charts': _get_default_charts
     }
 
@@ -115,8 +103,8 @@ class account_installer(osv.osv_memory):
                    res['fields'][field]['selection'] = cmp_select
         return res
 
-    def on_change_tax(self, cr, uid, id, tax):
-        return {'value': {'purchase_tax': tax}}
+#    def on_change_tax(self, cr, uid, id, tax):
+#        return {'value': {'purchase_tax': tax}}
 
     def on_change_start_date(self, cr, uid, id, start_date=False):
         if start_date:
@@ -125,497 +113,6 @@ class account_installer(osv.osv_memory):
             return {'value': {'date_stop': end_date.strftime('%Y-%m-%d')}}
         return {}
 
-    def generate_configurable_chart(self, cr, uid, ids, context=None):
-        obj_acc = self.pool.get('account.account')
-        obj_acc_tax = self.pool.get('account.tax')
-        obj_journal = self.pool.get('account.journal')
-        obj_acc_tax_code = self.pool.get('account.tax.code')
-        obj_acc_template = self.pool.get('account.account.template')
-        obj_acc_tax_template = self.pool.get('account.tax.code.template')
-        obj_fiscal_position_template = self.pool.get('account.fiscal.position.template')
-        obj_fiscal_position = self.pool.get('account.fiscal.position')
-        analytic_journal_obj = self.pool.get('account.analytic.journal')
-        obj_acc_chart_template = self.pool.get('account.chart.template')
-        obj_acc_journal_view = self.pool.get('account.journal.view')
-        mod_obj = self.pool.get('ir.model.data')
-        obj_sequence = self.pool.get('ir.sequence')
-        property_obj = self.pool.get('ir.property')
-        fields_obj = self.pool.get('ir.model.fields')
-        obj_tax_fp = self.pool.get('account.fiscal.position.tax')
-        obj_ac_fp = self.pool.get('account.fiscal.position.account')
-
-        result = mod_obj.get_object_reference(cr, uid, 'account', 'configurable_chart_template')
-        id = result and result[1] or False
-        obj_multi = obj_acc_chart_template.browse(cr, uid, id, context=context)
-
-        record = self.browse(cr, uid, ids, context=context)[0]
-
-        if context is None:
-            context = {}
-        company_id = self.browse(cr, uid, ids, context=context)[0].company_id
-        seq_journal = True
-
-        # Creating Account
-        obj_acc_root = obj_multi.account_root_id
-        tax_code_root_id = obj_multi.tax_code_root_id.id
-
-        #new code
-        acc_template_ref = {}
-        tax_template_ref = {}
-        tax_code_template_ref = {}
-        todo_dict = {}
-
-        #create all the tax code
-        children_tax_code_template = obj_acc_tax_template.search(cr, uid, [('parent_id', 'child_of', [tax_code_root_id])], order='id')
-        children_tax_code_template.sort()
-        for tax_code_template in obj_acc_tax_template.browse(cr, uid, children_tax_code_template, context=context):
-            vals = {
-                'name': (tax_code_root_id == tax_code_template.id) and company_id.name or tax_code_template.name,
-                'code': tax_code_template.code,
-                'info': tax_code_template.info,
-                'parent_id': tax_code_template.parent_id and ((tax_code_template.parent_id.id in tax_code_template_ref) and tax_code_template_ref[tax_code_template.parent_id.id]) or False,
-                'company_id': company_id.id,
-                'sign': tax_code_template.sign,
-            }
-            new_tax_code = obj_acc_tax_code.create(cr, uid, vals, context=context)
-            #recording the new tax code to do the mapping
-            tax_code_template_ref[tax_code_template.id] = new_tax_code
-
-        #create all the tax
-        for tax in obj_multi.tax_template_ids:
-            #create it
-            vals_tax = {
-                'name': tax.name,
-                'sequence': tax.sequence,
-                'amount': tax.amount,
-                'type': tax.type,
-                'applicable_type': tax.applicable_type,
-                'domain': tax.domain,
-                'parent_id': tax.parent_id and ((tax.parent_id.id in tax_template_ref) and tax_template_ref[tax.parent_id.id]) or False,
-                'child_depend': tax.child_depend,
-                'python_compute': tax.python_compute,
-                'python_compute_inv': tax.python_compute_inv,
-                'python_applicable': tax.python_applicable,
-                'base_code_id': tax.base_code_id and ((tax.base_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.base_code_id.id]) or False,
-                'tax_code_id': tax.tax_code_id and ((tax.tax_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.tax_code_id.id]) or False,
-                'base_sign': tax.base_sign,
-                'tax_sign': tax.tax_sign,
-                'ref_base_code_id': tax.ref_base_code_id and ((tax.ref_base_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.ref_base_code_id.id]) or False,
-                'ref_tax_code_id': tax.ref_tax_code_id and ((tax.ref_tax_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.ref_tax_code_id.id]) or False,
-                'ref_base_sign': tax.ref_base_sign,
-                'ref_tax_sign': tax.ref_tax_sign,
-                'include_base_amount': tax.include_base_amount,
-                'description': tax.description,
-                'company_id': company_id.id,
-                'type_tax_use': tax.type_tax_use,
-                'price_include': tax.price_include
-            }
-            new_tax = obj_acc_tax.create(cr, uid, vals_tax, context=context)
-            #as the accounts have not been created yet, we have to wait before filling these fields
-            todo_dict[new_tax] = {
-                'account_collected_id': tax.account_collected_id and tax.account_collected_id.id or False,
-                'account_paid_id': tax.account_paid_id and tax.account_paid_id.id or False,
-            }
-            tax_template_ref[tax.id] = new_tax
-
-        #deactivate the parent_store functionnality on account_account for rapidity purpose
-        ctx = context and context.copy() or {}
-        ctx['defer_parent_store_computation'] = True
-
-        children_acc_template = obj_acc_template.search(cr, uid, [('parent_id', 'child_of', [obj_acc_root.id]), ('nocreate', '!=', True)], context=context)
-        children_acc_template.sort()
-        for account_template in obj_acc_template.browse(cr, uid, children_acc_template, context=context):
-            tax_ids = []
-            for tax in account_template.tax_ids:
-                tax_ids.append(tax_template_ref[tax.id])
-            #create the account_account
-
-            dig = 6
-            code_main = account_template.code and len(account_template.code) or 0
-            code_acc = account_template.code or ''
-            if code_main > 0 and code_main <= dig and account_template.type != 'view':
-                code_acc = str(code_acc) + (str('0'*(dig-code_main)))
-            vals = {
-                'name': (obj_acc_root.id == account_template.id) and company_id.name or account_template.name,
-                #'sign': account_template.sign,
-                'currency_id': account_template.currency_id and account_template.currency_id.id or False,
-                'code': code_acc,
-                'type': account_template.type,
-                'user_type': account_template.user_type and account_template.user_type.id or False,
-                'reconcile': account_template.reconcile,
-                'shortcut': account_template.shortcut,
-                'note': account_template.note,
-                'parent_id': account_template.parent_id and ((account_template.parent_id.id in acc_template_ref) and acc_template_ref[account_template.parent_id.id]) or False,
-                'tax_ids': [(6, 0, tax_ids)],
-                'company_id': company_id.id,
-            }
-            new_account = obj_acc.create(cr, uid, vals, context=ctx)
-            acc_template_ref[account_template.id] = new_account
-            if account_template.name == 'Bank Current Account':
-                b_vals = {
-                    'name': 'Bank Accounts',
-                    'code': '110500',
-                    'type': 'view',
-                    'user_type': account_template.parent_id.user_type and account_template.user_type.id or False,
-                    'shortcut': account_template.shortcut,
-                    'note': account_template.note,
-                    'parent_id': account_template.parent_id and ((account_template.parent_id.id in acc_template_ref) and acc_template_ref[account_template.parent_id.id]) or False,
-                    'tax_ids': [(6,0,tax_ids)],
-                    'company_id': company_id.id,
-                }
-                bank_account = obj_acc.create(cr, uid, b_vals, context=ctx)
-
-                view_id_cash = obj_acc_journal_view.search(cr, uid, [('name', '=', 'Bank/Cash Journal View')], context=context)[0] #why fixed name here?
-                view_id_cur = obj_acc_journal_view.search(cr, uid, [('name', '=', 'Bank/Cash Journal (Multi-Currency) View')], context=context)[0] #Why Fixed name here?
-
-                cash_result = mod_obj.get_object_reference(cr, uid, 'account', 'conf_account_type_cash')
-                cash_type_id = cash_result and cash_result[1] or False
-
-                bank_result = mod_obj.get_object_reference(cr, uid, 'account', 'conf_account_type_bnk')
-                bank_type_id = bank_result and bank_result[1] or False
-
-                check_result = mod_obj.get_object_reference(cr, uid, 'account', 'conf_account_type_chk')
-                check_type_id = check_result and check_result[1] or False
-
-#                record = self.browse(cr, uid, ids, context=context)[0]
-                code_cnt = 1
-                vals_seq = {
-                    'name': _('Bank Journal '),
-                    'code': 'account.journal',
-                    'prefix': 'BNK/%(year)s/',
-                    'company_id': company_id.id,
-                    'padding': 5
-                }
-                seq_id = obj_sequence.create(cr, uid, vals_seq, context=context)
-
-                #create the bank journals
-                analitical_bank_ids = analytic_journal_obj.search(cr, uid, [('type', '=', 'situation')], context=context)
-                analitical_journal_bank = analitical_bank_ids and analitical_bank_ids[0] or False
-                vals_journal = {
-                    'name': _('Bank Journal '),
-                    'code': _('BNK'),
-                    'sequence_id': seq_id,
-                    'type': 'bank',
-                    'company_id': company_id.id,
-                    'analytic_journal_id': analitical_journal_bank
-                }
-                if vals.get('currency_id', False):
-                    vals_journal.update({
-                        'view_id': view_id_cur,
-                        'currency': vals.get('currency_id', False)
-                    })
-                else:
-                    vals_journal.update({'view_id': view_id_cash})
-                vals_journal.update({
-                    'default_credit_account_id': new_account,
-                    'default_debit_account_id': new_account,
-                })
-                obj_journal.create(cr, uid, vals_journal, context=context)
-
-                for val in record.bank_accounts_id:
-                    seq_padding = 5
-                    if val.account_type == 'cash':
-                        type = cash_type_id
-                    elif val.account_type == 'bank':
-                        type = bank_type_id
-                    elif val.account_type == 'check':
-                        type = check_type_id
-                    else:
-                        type = check_type_id
-                        seq_padding = None
-
-                    vals_bnk = {
-                        'name': val.acc_name or '',
-                        'currency_id': val.currency_id.id or False,
-                        'code': str(110500 + code_cnt),
-                        'type': 'liquidity',
-                        'user_type': type,
-                        'parent_id': bank_account,
-                        'company_id': company_id.id
-                    }
-                    child_bnk_acc = obj_acc.create(cr, uid, vals_bnk, context=ctx)
-                    vals_seq_child = {
-                        'name': _(vals_bnk['name'] + ' ' + 'Journal'),
-                        'code': 'account.journal',
-                        'prefix': _((vals_bnk['name'][:3].upper()) + '/%(year)s/'),
-                        'padding': seq_padding
-                    }
-                    seq_id = obj_sequence.create(cr, uid, vals_seq_child, context=context)
-
-                    #create the bank journal
-                    vals_journal = {}
-                    vals_journal = {
-                        'name': vals_bnk['name'] + _(' Journal'),
-                        'code': _(vals_bnk['name'][:3]).upper(),
-                        'sequence_id': seq_id,
-                        'type': 'cash',
-                        'company_id': company_id.id
-                    }
-                    if vals.get('currency_id', False):
-                        vals_journal.update({
-                                'view_id': view_id_cur,
-                                'currency': vals_bnk.get('currency_id', False),
-                        })
-                    else:
-                        vals_journal.update({'view_id': view_id_cash})
-                    vals_journal.update({
-                        'default_credit_account_id': child_bnk_acc,
-                        'default_debit_account_id': child_bnk_acc,
-                        'analytic_journal_id': analitical_journal_bank
-                    })
-                    obj_journal.create(cr, uid, vals_journal, context=context)
-                    code_cnt += 1
-
-        #reactivate the parent_store functionality on account_account
-        obj_acc._parent_store_compute(cr)
-
-        for key, value in todo_dict.items():
-            if value['account_collected_id'] or value['account_paid_id']:
-                obj_acc_tax.write(cr, uid, [key], {
-                    'account_collected_id': acc_template_ref[value['account_collected_id']],
-                    'account_paid_id': acc_template_ref[value['account_paid_id']],
-                })
-
-        # Creating Journals Sales and Purchase
-        vals_journal = {}
-        data_id = mod_obj.search(cr, uid, [('model', '=', 'account.journal.view'), ('name', '=', 'account_sp_journal_view')], context=context)
-        data = mod_obj.browse(cr, uid, data_id[0], context=context)
-        view_id = data.res_id
-        seq_id = obj_sequence.search(cr,uid,[('name', '=', 'Account Journal')], context=context)[0]
-        if seq_journal:
-            seq_sale = {
-                'name': 'Sale Journal',
-                'code': 'account.journal',
-                'prefix': 'SAJ/%(year)s/',
-                'padding': 3,
-                'company_id': company_id.id
-            }
-            seq_id_sale = obj_sequence.create(cr, uid, seq_sale, context=context)
-            seq_purchase = {
-                'name': 'Purchase Journal',
-                'code': 'account.journal',
-                'prefix': 'EXJ/%(year)s/',
-                'padding': 3,
-                'company_id': company_id.id
-            }
-            seq_id_purchase = obj_sequence.create(cr, uid, seq_purchase, context=context)
-            seq_refund_sale = {
-                'name': 'Sales Refund Journal',
-                'code': 'account.journal',
-                'prefix': 'SCNJ/%(year)s/',
-                'padding': 3,
-                'company_id': company_id.id
-            }
-            seq_id_sale_refund = obj_sequence.create(cr, uid, seq_refund_sale, context=context)
-            seq_refund_purchase = {
-                'name': 'Purchase Refund Journal',
-                'code': 'account.journal',
-                'prefix': 'ECNJ/%(year)s/',
-                'padding': 3,
-                'company_id': company_id.id
-            }
-            seq_id_purchase_refund = obj_sequence.create(cr, uid, seq_refund_purchase, context=context)
-            seq_opening_journal = {
-                'name': 'Opening Entries Journal',
-                'code': 'account.journal',
-                'prefix': 'OPEJ/%(year)s/',
-                'padding': 3,
-                'company_id': company_id.id
-            }
-            seq_id_opening = obj_sequence.create(cr, uid, seq_opening_journal, context=context)
-            seq_miscellaneous_journal = {
-                'name': 'Miscellaneous Journal',
-                'code': 'account.journal',
-                'prefix': 'MISJ/%(year)s/',
-                'padding': 3,
-                'company_id': company_id.id
-            }
-            seq_id_miscellaneous = obj_sequence.create(cr, uid, seq_miscellaneous_journal, context=context)
-        else:
-            seq_id_sale = seq_id
-            seq_id_purchase = seq_id
-            seq_id_sale_refund = seq_id
-            seq_id_purchase_refund = seq_id
-            seq_id_opening = seq_id
-            seq_id_miscellaneous = seq_id
-        vals_journal['view_id'] = view_id
-
-        #Sales Journal
-        analitical_sale_ids = analytic_journal_obj.search(cr, uid, [('type','=','sale')], context=context)
-        analitical_journal_sale = analitical_sale_ids and analitical_sale_ids[0] or False
-
-        vals_journal.update({
-            'name': _('Sales Journal'),
-            'type': 'sale',
-            'code': _('SAJ'),
-            'sequence_id': seq_id_sale,
-            'analytic_journal_id': analitical_journal_sale,
-            'company_id': company_id.id
-        })
-
-        if obj_multi.property_account_receivable:
-            vals_journal.update({
-                    'default_credit_account_id': acc_template_ref[obj_multi.property_account_income_categ.id],
-                    'default_debit_account_id': acc_template_ref[obj_multi.property_account_income_categ.id],
-            })
-        obj_journal.create(cr, uid, vals_journal, context=context)
-
-        # Purchase Journal
-        analitical_purchase_ids = analytic_journal_obj.search(cr, uid, [('type', '=', 'purchase')], context=context)
-        analitical_journal_purchase = analitical_purchase_ids and analitical_purchase_ids[0] or False
-
-        vals_journal.update({
-            'name': _('Purchase Journal'),
-            'type': 'purchase',
-            'code': _('EXJ'),
-            'sequence_id': seq_id_purchase,
-            'analytic_journal_id': analitical_journal_purchase,
-            'company_id': company_id.id
-        })
-
-        if obj_multi.property_account_payable:
-            vals_journal.update({
-                'default_credit_account_id': acc_template_ref[obj_multi.property_account_expense_categ.id],
-                'default_debit_account_id': acc_template_ref[obj_multi.property_account_expense_categ.id]
-            })
-
-        obj_journal.create(cr, uid, vals_journal, context=context)
-        # Creating Journals Sales Refund and Purchase Refund
-        vals_journal = {}
-        data_id = mod_obj.search(cr, uid, [('model', '=', 'account.journal.view'), ('name', '=', 'account_sp_refund_journal_view')], context=context)
-        data = mod_obj.browse(cr, uid, data_id[0], context=context)
-        view_id = data.res_id
-
-        #Sales Refund Journal
-        vals_journal = {
-            'view_id': view_id,
-            'name': _('Sales Refund Journal'),
-            'type': 'sale_refund',
-            'refund_journal': True,
-            'code': _('SCNJ'),
-            'sequence_id': seq_id_sale_refund,
-            'analytic_journal_id': analitical_journal_sale,
-            'company_id': company_id.id
-        }
-        if obj_multi.property_account_receivable:
-            vals_journal.update({
-                'default_credit_account_id': acc_template_ref[obj_multi.property_account_income_categ.id],
-                'default_debit_account_id': acc_template_ref[obj_multi.property_account_income_categ.id]
-            })
-
-        obj_journal.create(cr, uid, vals_journal, context=context)
-
-        # Purchase Refund Journal
-        vals_journal = {
-            'view_id': view_id,
-            'name': _('Purchase Refund Journal'),
-            'type': 'purchase_refund',
-            'refund_journal': True,
-            'code': _('ECNJ'),
-            'sequence_id': seq_id_purchase_refund,
-            'analytic_journal_id': analitical_journal_purchase,
-            'company_id': company_id.id
-        }
-
-        if obj_multi.property_account_payable:
-            vals_journal.update({
-                'default_credit_account_id': acc_template_ref[obj_multi.property_account_expense_categ.id],
-                'default_debit_account_id': acc_template_ref[obj_multi.property_account_expense_categ.id]
-            })
-        obj_journal.create(cr, uid, vals_journal, context=context)
-
-        # Miscellaneous Journal
-        data_id = mod_obj.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_view')], context=context)
-        data = mod_obj.browse(cr, uid, data_id[0], context=context)
-        view_id_misc = data.res_id
-
-        analitical_miscellaneous_ids = analytic_journal_obj.search(cr, uid, [('type', '=', 'situation')], context=context)
-        analitical_journal_miscellaneous = analitical_miscellaneous_ids and analitical_miscellaneous_ids[0] or False
-
-        vals_journal = {
-            'view_id': view_id_misc,
-            'name': _('Miscellaneous Journal'),
-            'type': 'general',
-            'code': _('MISC'),
-            'sequence_id': seq_id_miscellaneous,
-            'analytic_journal_id': analitical_journal_miscellaneous,
-            'company_id': company_id.id
-        }
-
-        obj_journal.create(cr, uid, vals_journal, context=context)
-
-        # Opening Entries Journal
-        if obj_multi.property_account_income_opening and obj_multi.property_account_expense_opening:
-            vals_journal = {
-                'view_id': view_id_misc,
-                'name': _('Opening Entries Journal'),
-                'type': 'situation',
-                'code': _('OPEJ'),
-                'sequence_id': seq_id_opening,
-                'company_id': company_id.id,
-                'centralisation': True,
-                'default_credit_account_id': acc_template_ref[obj_multi.property_account_income_opening.id],
-                'default_debit_account_id': acc_template_ref[obj_multi.property_account_expense_opening.id]
-                }
-            obj_journal.create(cr, uid, vals_journal, context=context)
-
-        # Bank Journals
-        view_id_cash = obj_acc_journal_view.search(cr, uid, [('name', '=', 'Bank/Cash Journal View')], context=context)[0] #TOFIX: Why put fixed name ?
-        view_id_cur = obj_acc_journal_view.search(cr, uid, [('name', '=', 'Bank/Cash Journal (Multi-Currency) View')], context=context)[0] #TOFIX: why put fixed name?
-
-        #create the properties
-        todo_list = [
-            ('property_account_receivable', 'res.partner', 'account.account'),
-            ('property_account_payable', 'res.partner', 'account.account'),
-            ('property_account_expense_categ', 'product.category', 'account.account'),
-            ('property_account_income_categ', 'product.category', 'account.account'),
-            ('property_account_expense', 'product.template', 'account.account'),
-            ('property_account_income', 'product.template', 'account.account'),
-            ('property_reserve_and_surplus_account', 'res.company', 'account.account'),
-        ]
-
-        for record in todo_list:
-            r = []
-            r = property_obj.search(cr, uid, [('name', '=', record[0]), ('company_id', '=', company_id.id)], context=context)
-            account = getattr(obj_multi, record[0])
-            field = fields_obj.search(cr, uid, [('name', '=', record[0]), ('model', '=', record[1]), ('relation', '=', record[2])], context=context)
-            vals = {
-                'name': record[0],
-                'company_id': company_id.id,
-                'fields_id': field[0],
-                'value': account and 'account.account, '+str(acc_template_ref[account.id]) or False,
-            }
-            if r:
-                #the property exist: modify it
-                property_obj.write(cr, uid, r, vals, context=context)
-            else:
-                #create the property
-                property_obj.create(cr, uid, vals, context=context)
-
-        fp_ids = obj_fiscal_position_template.search(cr, uid, [('chart_template_id', '=', obj_multi.id)], context=context)
-        if fp_ids:
-            for position in obj_fiscal_position_template.browse(cr, uid, fp_ids, context=context):
-                vals_fp = {
-                    'company_id': company_id.id,
-                    'name': position.name,
-                }
-                new_fp = obj_fiscal_position.create(cr, uid, vals_fp, context=context)
-                for tax in position.tax_ids:
-                    vals_tax = {
-                        'tax_src_id': tax_template_ref[tax.tax_src_id.id],
-                        'tax_dest_id': tax.tax_dest_id and tax_template_ref[tax.tax_dest_id.id] or False,
-                        'position_id': new_fp,
-                    }
-                    obj_tax_fp.create(cr, uid, vals_tax, context=context)
-
-                for acc in position.account_ids:
-                    vals_acc = {
-                        'account_src_id': acc_template_ref[acc.account_src_id.id],
-                        'account_dest_id': acc_template_ref[acc.account_dest_id.id],
-                        'position_id': new_fp,
-                    }
-                    obj_ac_fp.create(cr, uid, vals_acc, context=context)
-
     def execute(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
@@ -635,129 +132,6 @@ class account_installer(osv.osv_memory):
                 fp = tools.file_open(opj('account', 'configurable_account_chart.xml'))
                 tools.convert_xml_import(cr, 'account', fp, {}, 'init', True, None)
                 fp.close()
-                self.generate_configurable_chart(cr, uid, ids, context=context)
-                s_tax = (res.get('sale_tax', 0.0))/100
-                p_tax = (res.get('purchase_tax', 0.0))/100
-                tax_val = {}
-                default_tax = []
-
-                pur_temp_tax = mod_obj.get_object_reference(cr, uid, 'account', 'tax_code_base_purchases')
-                pur_temp_tax_id = pur_temp_tax and pur_temp_tax[1] or False
-
-                pur_temp_tax_names = obj_temp_tax_code.read(cr, uid, [pur_temp_tax_id], ['name'], context=context)
-                pur_tax_parent_name = pur_temp_tax_names and pur_temp_tax_names[0]['name'] or False
-                pur_taxcode_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', pur_tax_parent_name)], context=context)
-                if pur_taxcode_parent_id:
-                    pur_taxcode_parent_id = pur_taxcode_parent_id[0]
-                else:
-                    pur_taxcode_parent_id = False
-                pur_temp_tax_paid = mod_obj.get_object_reference(cr, uid, 'account', 'tax_code_input')
-                pur_temp_tax_paid_id = pur_temp_tax_paid and pur_temp_tax_paid[1] or False
-                pur_temp_tax_paid_names = obj_temp_tax_code.read(cr, uid, [pur_temp_tax_paid_id], ['name'], context=context)
-                pur_tax_paid_parent_name = pur_temp_tax_names and pur_temp_tax_paid_names[0]['name'] or False
-                pur_taxcode_paid_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', pur_tax_paid_parent_name)], context=context)
-                if pur_taxcode_paid_parent_id:
-                    pur_taxcode_paid_parent_id = pur_taxcode_paid_parent_id[0]
-                else:
-                    pur_taxcode_paid_parent_id = False
-
-                sale_temp_tax = mod_obj.get_object_reference(cr, uid, 'account', 'tax_code_base_sales')
-                sale_temp_tax_id = sale_temp_tax and sale_temp_tax[1] or False
-                sale_temp_tax_names = obj_temp_tax_code.read(cr, uid, [sale_temp_tax_id], ['name'], context=context)
-                sale_tax_parent_name = sale_temp_tax_names and sale_temp_tax_names[0]['name'] or False
-                sale_taxcode_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', sale_tax_parent_name)], context=context)
-                if sale_taxcode_parent_id:
-                    sale_taxcode_parent_id = sale_taxcode_parent_id[0]
-                else:
-                    sale_taxcode_parent_id = False
-
-                sale_temp_tax_paid = mod_obj.get_object_reference(cr, uid, 'account', 'tax_code_output')
-                sale_temp_tax_paid_id = sale_temp_tax_paid and sale_temp_tax_paid[1] or False
-                sale_temp_tax_paid_names = obj_temp_tax_code.read(cr, uid, [sale_temp_tax_paid_id], ['name'], context=context)
-                sale_tax_paid_parent_name = sale_temp_tax_paid_names and sale_temp_tax_paid_names[0]['name'] or False
-                sale_taxcode_paid_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', sale_tax_paid_parent_name)], context=context)
-                if sale_taxcode_paid_parent_id:
-                    sale_taxcode_paid_parent_id = sale_taxcode_paid_parent_id[0]
-                else:
-                    sale_taxcode_paid_parent_id = False
-
-                if s_tax*100 > 0.0:
-                    tax_account_ids = obj_acc.search(cr, uid, [('name', '=', 'Tax Received')], context=context)
-                    sales_tax_account_id = tax_account_ids and tax_account_ids[0] or False
-                    vals_tax_code = {
-                        'name': 'TAX%s%%'%(s_tax*100),
-                        'code': 'TAX%s%%'%(s_tax*100),
-                        'company_id': company_id.id,
-                        'sign': 1,
-                        'parent_id': sale_taxcode_parent_id
-                    }
-                    new_tax_code = obj_tax_code.create(cr, uid, vals_tax_code, context=context)
-
-                    vals_paid_tax_code = {
-                        'name': 'TAX Received %s%%'%(s_tax*100),
-                        'code': 'TAX Received %s%%'%(s_tax*100),
-                        'company_id': company_id.id,
-                        'sign': 1,
-                        'parent_id': sale_taxcode_paid_parent_id
-                        }
-                    new_paid_tax_code = obj_tax_code.create(cr, uid, vals_paid_tax_code, context=context)
-
-                    sales_tax = obj_tax.create(cr, uid,
-                                           {'name': 'TAX %s%%'%(s_tax*100),
-                                            'amount': s_tax,
-                                            'base_code_id': new_tax_code,
-                                            'tax_code_id': new_paid_tax_code,
-                                            'type_tax_use': 'sale',
-                                            'account_collected_id': sales_tax_account_id,
-                                            'account_paid_id': sales_tax_account_id
-                                            }, context=context)
-                    default_account_ids = obj_acc.search(cr, uid, [('name', '=', 'Product Sales')], context=context)
-                    if default_account_ids:
-                        obj_acc.write(cr, uid, default_account_ids, {'tax_ids': [(6, 0, [sales_tax])]}, context=context)
-                    tax_val.update({'taxes_id': [(6, 0, [sales_tax])]})
-                    default_tax.append(('taxes_id', sales_tax))
-                if p_tax*100 > 0.0:
-                    tax_account_ids = obj_acc.search(cr, uid, [('name', '=', 'Tax Paid')], context=context)
-                    purchase_tax_account_id = tax_account_ids and tax_account_ids[0] or False
-                    vals_tax_code = {
-                        'name': 'TAX%s%%'%(p_tax*100),
-                        'code': 'TAX%s%%'%(p_tax*100),
-                        'company_id': company_id.id,
-                        'sign': 1,
-                        'parent_id': pur_taxcode_parent_id
-                    }
-                    new_tax_code = obj_tax_code.create(cr, uid, vals_tax_code, context=context)
-                    vals_paid_tax_code = {
-                        'name': 'TAX Paid %s%%'%(p_tax*100),
-                        'code': 'TAX Paid %s%%'%(p_tax*100),
-                        'company_id': company_id.id,
-                        'sign': 1,
-                        'parent_id': pur_taxcode_paid_parent_id
-                    }
-                    new_paid_tax_code = obj_tax_code.create(cr, uid, vals_paid_tax_code, context=context)
-
-                    purchase_tax = obj_tax.create(cr, uid,
-                                            {'name': 'TAX%s%%'%(p_tax*100),
-                                             'description': 'TAX%s%%'%(p_tax*100),
-                                             'amount': p_tax,
-                                             'base_code_id': new_tax_code,
-                                            'tax_code_id': new_paid_tax_code,
-                                            'type_tax_use': 'purchase',
-                                            'account_collected_id': purchase_tax_account_id,
-                                            'account_paid_id': purchase_tax_account_id
-                                             }, context=context)
-                    default_account_ids = obj_acc.search(cr, uid, [('name', '=', 'Expenses')], context=context)
-                    if default_account_ids:
-                        obj_acc.write(cr, uid, default_account_ids, {'tax_ids': [(6, 0, [purchase_tax])]}, context=context)
-                    tax_val.update({'supplier_taxes_id': [(6 ,0, [purchase_tax])]})
-                    default_tax.append(('supplier_taxes_id', purchase_tax))
-                if tax_val:
-                    product_ids = obj_product.search(cr, uid, [], context=context)
-                    for product in obj_product.browse(cr, uid, product_ids, context=context):
-                        obj_product.write(cr, uid, product.id, tax_val, context=context)
-                    for name, value in default_tax:
-                        ir_values.set(cr, uid, key='default', key2=False, name=name, models =[('product.product', False)], value=[value])
-
             if 'date_start' in res and 'date_stop' in res:
                 f_ids = fy_obj.search(cr, uid, [('date_start', '<=', res['date_start']), ('date_stop', '>=', res['date_stop']), ('company_id', '=', res['company_id'])], context=context)
                 if not f_ids:
@@ -778,7 +152,6 @@ class account_installer(osv.osv_memory):
                     elif res['period'] == '3months':
                         fy_obj.create_period3(cr, uid, [fiscal_id])
 
-
     def modules_to_install(self, cr, uid, ids, context=None):
         modules = super(account_installer, self).modules_to_install(
             cr, uid, ids, context=context)
@@ -791,18 +164,6 @@ class account_installer(osv.osv_memory):
 
 account_installer()
 
-class account_bank_accounts_wizard(osv.osv_memory):
-    _name='account.bank.accounts.wizard'
-
-    _columns = {
-        'acc_name': fields.char('Account Name.', size=64, required=True),
-        'bank_account_id': fields.many2one('account.installer', 'Bank Account', required=True),
-        'currency_id': fields.many2one('res.currency', 'Secondary Currency', help="Forces all moves for this account to have this secondary currency."),
-        'account_type': fields.selection([('cash','Cash'), ('check','Check'), ('bank','Bank')], 'Account Type', size=32),
-    }
-
-account_bank_accounts_wizard()
-
 class account_installer_modules(osv.osv_memory):
     _name = 'account.installer.modules'
     _inherit = 'res.config.installer'

From b2d1d230ce9a36e50cf9263829f2b6de1ca74f9b Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Thu, 10 Feb 2011 11:30:26 +0530
Subject: [PATCH 35/73] [FIX] account_payment:added the missing argument 'date'
 in the onchange_partner_id of wizard (account.payment.populate.statement) and
 passed the correct date in the onchange_partner_id of wizard
 (account.statement.from.invoice.lines)

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

bzr revid: mtr@mtr-20110210060026-waqyknss4283z004
---
 .../wizard/account_payment_populate_statement.py                | 2 +-
 addons/account_voucher/wizard/account_statement_from_invoice.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_payment/wizard/account_payment_populate_statement.py b/addons/account_payment/wizard/account_payment_populate_statement.py
index 340ab4bcb03..16d8dc5a7e4 100644
--- a/addons/account_payment/wizard/account_payment_populate_statement.py
+++ b/addons/account_payment/wizard/account_payment_populate_statement.py
@@ -76,7 +76,7 @@ class account_payment_populate_statement(osv.osv_memory):
                     statement.currency.id, line.amount_currency, context=ctx)
 
             context.update({'move_line_ids': [line.move_line_id.id]})
-            result = voucher_obj.onchange_partner_id(cr, uid, [], partner_id=line.partner_id.id, journal_id=statement.journal_id.id, price=abs(amount), currency_id= statement.currency.id, ttype='payment', context=context)
+            result = voucher_obj.onchange_partner_id(cr, uid, [], partner_id=line.partner_id.id, journal_id=statement.journal_id.id, price=abs(amount), currency_id= statement.currency.id, ttype='payment', date=line.ml_maturity_date, context=context)
 
             if line.move_line_id:
                 voucher_res = {
diff --git a/addons/account_voucher/wizard/account_statement_from_invoice.py b/addons/account_voucher/wizard/account_statement_from_invoice.py
index f3ce59f7b0b..e4d728c8867 100644
--- a/addons/account_voucher/wizard/account_statement_from_invoice.py
+++ b/addons/account_voucher/wizard/account_statement_from_invoice.py
@@ -75,7 +75,7 @@ class account_statement_from_invoice_lines(osv.osv_memory):
                     statement.currency.id, amount, context=ctx)
 
             context.update({'move_line_ids': [line.id]})
-            result = voucher_obj.onchange_partner_id(cr, uid, [], partner_id=line.partner_id.id, journal_id=statement.journal_id.id, price=abs(amount), currency_id= statement.currency.id, ttype=(amount < 0 and 'payment' or 'receipt'), date=time.strftime('%Y-%m-%d'), context=context)
+            result = voucher_obj.onchange_partner_id(cr, uid, [], partner_id=line.partner_id.id, journal_id=statement.journal_id.id, price=abs(amount), currency_id= statement.currency.id, ttype=(amount < 0 and 'payment' or 'receipt'), date=line_date, context=context)
             voucher_res = { 'type':(amount < 0 and 'payment' or 'receipt'),
                             'name': line.name,
                             'partner_id': line.partner_id.id,

From 8ef20c5b31ca09790b70abaee1fdf60d61a34e88 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Thu, 10 Feb 2011 12:20:57 +0530
Subject: [PATCH 36/73] [IMP] account: Improvement in refector code for tax,
 account, journal template generation

bzr revid: psi@tinyerp.co.in-20110210065057-3mvlgcyixg7pc900
---
 addons/account/account.py            |  11 +--
 addons/account/account_installer.xml |   4 +
 addons/account/installer.py          | 131 ++++++++++++++++++++++++++-
 3 files changed, 137 insertions(+), 9 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index e92ecf2aa98..11eaf5f3c68 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -3190,16 +3190,13 @@ class wizard_multi_charts_accounts(osv.osv_memory):
 wizard_multi_charts_accounts()
 
 class account_bank_accounts_wizard(osv.osv_memory):
-    _name = 'account.bank.accounts.wizard'
+    _name='account.bank.accounts.wizard'
 
     _columns = {
         'acc_name': fields.char('Account Name.', size=64, required=True),
-        'bank_account_id': fields.many2one('wizard.multi.charts.accounts', 'Bank Account', required=True),
-        'currency_id': fields.many2one('res.currency', 'Currency'),
-        'account_type': fields.selection([('cash','Cash'),('check','Check'),('bank','Bank')], 'Type', size=32),
-    }
-    _defaults = {
-        'currency_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id,
+        'bank_account_id': fields.many2one('account.installer', 'Bank Account', required=True),
+        'currency_id': fields.many2one('res.currency', 'Secondary Currency', help="Forces all moves for this account to have this secondary currency."),
+        'account_type': fields.selection([('cash','Cash'), ('check','Check'), ('bank','Bank')], 'Account Type', size=32),
     }
 
 account_bank_accounts_wizard()
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 8d7bb09d629..609dd8a6c5e 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -33,6 +33,10 @@
                                 <field name="date_stop"/>
                                 <field name="period" colspan="4"/>
                             </group>
+                            <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
+                                <field name="sale_tax" on_change="on_change_tax(sale_tax)" attrs="{'required':[('charts','=','configurable')]}"/>
+                                <field name="purchase_tax" groups="base.group_extended"/>
+                            </group>
                         </group>
                     </group>
                 </data>
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 104a1772d8a..10bee0af3f6 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -54,6 +54,8 @@ class account_installer(osv.osv_memory):
         'date_start': fields.date('Start Date', required=True),
         'date_stop': fields.date('End Date', required=True),
         'period': fields.selection([('month', 'Monthly'), ('3months','3 Monthly')], 'Periods', required=True),
+        'sale_tax': fields.float('Sale Tax(%)'),
+        'purchase_tax': fields.float('Purchase Tax(%)'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
     }
 
@@ -80,6 +82,8 @@ class account_installer(osv.osv_memory):
         'date_start': lambda *a: time.strftime('%Y-01-01'),
         'date_stop': lambda *a: time.strftime('%Y-12-31'),
         'period': 'month',
+        'sale_tax': 0.0,
+        'purchase_tax': 0.0,
         'company_id': _default_company,
         'charts': _get_default_charts
     }
@@ -103,8 +107,8 @@ class account_installer(osv.osv_memory):
                    res['fields'][field]['selection'] = cmp_select
         return res
 
-#    def on_change_tax(self, cr, uid, id, tax):
-#        return {'value': {'purchase_tax': tax}}
+    def on_change_tax(self, cr, uid, id, tax):
+        return {'value': {'purchase_tax': tax}}
 
     def on_change_start_date(self, cr, uid, id, start_date=False):
         if start_date:
@@ -132,6 +136,129 @@ class account_installer(osv.osv_memory):
                 fp = tools.file_open(opj('account', 'configurable_account_chart.xml'))
                 tools.convert_xml_import(cr, 'account', fp, {}, 'init', True, None)
                 fp.close()
+                s_tax = (res.get('sale_tax', 0.0))/100
+                p_tax = (res.get('purchase_tax', 0.0))/100
+                tax_val = {}
+                default_tax = []
+
+                pur_temp_tax = mod_obj.get_object_reference(cr, uid, 'account', 'tax_code_base_purchases')
+                pur_temp_tax_id = pur_temp_tax and pur_temp_tax[1] or False
+
+                pur_temp_tax_names = obj_temp_tax_code.read(cr, uid, [pur_temp_tax_id], ['name'], context=context)
+                pur_tax_parent_name = pur_temp_tax_names and pur_temp_tax_names[0]['name'] or False
+                pur_taxcode_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', pur_tax_parent_name)], context=context)
+                if pur_taxcode_parent_id:
+                    pur_taxcode_parent_id = pur_taxcode_parent_id[0]
+                else:
+                    pur_taxcode_parent_id = False
+                pur_temp_tax_paid = mod_obj.get_object_reference(cr, uid, 'account', 'tax_code_input')
+                pur_temp_tax_paid_id = pur_temp_tax_paid and pur_temp_tax_paid[1] or False
+                pur_temp_tax_paid_names = obj_temp_tax_code.read(cr, uid, [pur_temp_tax_paid_id], ['name'], context=context)
+                pur_tax_paid_parent_name = pur_temp_tax_names and pur_temp_tax_paid_names[0]['name'] or False
+                pur_taxcode_paid_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', pur_tax_paid_parent_name)], context=context)
+                if pur_taxcode_paid_parent_id:
+                    pur_taxcode_paid_parent_id = pur_taxcode_paid_parent_id[0]
+                else:
+                    pur_taxcode_paid_parent_id = False
+
+                sale_temp_tax = mod_obj.get_object_reference(cr, uid, 'account', 'tax_code_base_sales')
+                sale_temp_tax_id = sale_temp_tax and sale_temp_tax[1] or False
+                sale_temp_tax_names = obj_temp_tax_code.read(cr, uid, [sale_temp_tax_id], ['name'], context=context)
+                sale_tax_parent_name = sale_temp_tax_names and sale_temp_tax_names[0]['name'] or False
+                sale_taxcode_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', sale_tax_parent_name)], context=context)
+                if sale_taxcode_parent_id:
+                    sale_taxcode_parent_id = sale_taxcode_parent_id[0]
+                else:
+                    sale_taxcode_parent_id = False
+
+                sale_temp_tax_paid = mod_obj.get_object_reference(cr, uid, 'account', 'tax_code_output')
+                sale_temp_tax_paid_id = sale_temp_tax_paid and sale_temp_tax_paid[1] or False
+                sale_temp_tax_paid_names = obj_temp_tax_code.read(cr, uid, [sale_temp_tax_paid_id], ['name'], context=context)
+                sale_tax_paid_parent_name = sale_temp_tax_paid_names and sale_temp_tax_paid_names[0]['name'] or False
+                sale_taxcode_paid_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', sale_tax_paid_parent_name)], context=context)
+                if sale_taxcode_paid_parent_id:
+                    sale_taxcode_paid_parent_id = sale_taxcode_paid_parent_id[0]
+                else:
+                    sale_taxcode_paid_parent_id = False
+
+                if s_tax*100 > 0.0:
+                    tax_account_ids = obj_acc.search(cr, uid, [('name', '=', 'Tax Received')], context=context)
+                    sales_tax_account_id = tax_account_ids and tax_account_ids[0] or False
+                    vals_tax_code = {
+                        'name': 'TAX%s%%'%(s_tax*100),
+                        'code': 'TAX%s%%'%(s_tax*100),
+                        'company_id': company_id.id,
+                        'sign': 1,
+                        'parent_id': sale_taxcode_parent_id
+                    }
+                    new_tax_code = obj_tax_code.create(cr, uid, vals_tax_code, context=context)
+
+
+                    vals_paid_tax_code = {
+                        'name': 'TAX Received %s%%'%(s_tax*100),
+                        'code': 'TAX Received %s%%'%(s_tax*100),
+                        'company_id': company_id.id,
+                        'sign': 1,
+                        'parent_id': sale_taxcode_paid_parent_id
+                        }
+                    new_paid_tax_code = obj_tax_code.create(cr, uid, vals_paid_tax_code, context=context)
+
+                    sales_tax = obj_tax.create(cr, uid,
+                                           {'name': 'TAX %s%%'%(s_tax*100),
+                                            'amount': s_tax,
+                                            'base_code_id': new_tax_code,
+                                            'tax_code_id': new_paid_tax_code,
+                                            'type_tax_use': 'sale',
+                                            'account_collected_id': sales_tax_account_id,
+                                            'account_paid_id': sales_tax_account_id
+                                            }, context=context)
+                    default_account_ids = obj_acc.search(cr, uid, [('name', '=', 'Product Sales')], context=context)
+                    if default_account_ids:
+                        obj_acc.write(cr, uid, default_account_ids, {'tax_ids': [(6, 0, [sales_tax])]}, context=context)
+                    tax_val.update({'taxes_id': [(6, 0, [sales_tax])]})
+                    default_tax.append(('taxes_id', sales_tax))
+                if p_tax*100 > 0.0:
+                    tax_account_ids = obj_acc.search(cr, uid, [('name', '=', 'Tax Paid')], context=context)
+                    purchase_tax_account_id = tax_account_ids and tax_account_ids[0] or False
+                    vals_tax_code = {
+                        'name': 'TAX%s%%'%(p_tax*100),
+                        'code': 'TAX%s%%'%(p_tax*100),
+                        'company_id': company_id.id,
+                        'sign': 1,
+                        'parent_id': pur_taxcode_parent_id
+                    }
+                    new_tax_code = obj_tax_code.create(cr, uid, vals_tax_code, context=context)
+                    vals_paid_tax_code = {
+                        'name': 'TAX Paid %s%%'%(p_tax*100),
+                        'code': 'TAX Paid %s%%'%(p_tax*100),
+                        'company_id': company_id.id,
+                        'sign': 1,
+                        'parent_id': pur_taxcode_paid_parent_id
+                    }
+                    new_paid_tax_code = obj_tax_code.create(cr, uid, vals_paid_tax_code, context=context)
+
+                    purchase_tax = obj_tax.create(cr, uid,
+                                            {'name': 'TAX%s%%'%(p_tax*100),
+                                             'description': 'TAX%s%%'%(p_tax*100),
+                                             'amount': p_tax,
+                                             'base_code_id': new_tax_code,
+                                            'tax_code_id': new_paid_tax_code,
+                                            'type_tax_use': 'purchase',
+                                            'account_collected_id': purchase_tax_account_id,
+                                            'account_paid_id': purchase_tax_account_id
+                                             }, context=context)
+                    default_account_ids = obj_acc.search(cr, uid, [('name', '=', 'Expenses')], context=context)
+                    if default_account_ids:
+                        obj_acc.write(cr, uid, default_account_ids, {'tax_ids': [(6, 0, [purchase_tax])]}, context=context)
+                    tax_val.update({'supplier_taxes_id': [(6 ,0, [purchase_tax])]})
+                    default_tax.append(('supplier_taxes_id', purchase_tax))
+                if tax_val:
+                    product_ids = obj_product.search(cr, uid, [], context=context)
+                    for product in obj_product.browse(cr, uid, product_ids, context=context):
+                        obj_product.write(cr, uid, product.id, tax_val, context=context)
+                    for name, value in default_tax:
+                        ir_values.set(cr, uid, key='default', key2=False, name=name, models =[('product.product', False)], value=[value])
+
             if 'date_start' in res and 'date_stop' in res:
                 f_ids = fy_obj.search(cr, uid, [('date_start', '<=', res['date_start']), ('date_stop', '>=', res['date_stop']), ('company_id', '=', res['company_id'])], context=context)
                 if not f_ids:

From ffd85dccc6f8fec49cee6c2c96ff54bbe7bc4165 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Thu, 10 Feb 2011 16:37:35 +0530
Subject: [PATCH 37/73] [IMP] hr_attendance: added missing action in the wizard
 for 'Weekly Attendance Report'

bzr revid: mtr@mtr-20110210110735-4wqqa0p42q0ylq57
---
 addons/hr_attendance/report/timesheet.py      |  4 ++-
 .../wizard/hr_attendance_byweek_view.xml      | 34 +++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/addons/hr_attendance/report/timesheet.py b/addons/hr_attendance/report/timesheet.py
index 7adfe98ef13..0463c1ff698 100644
--- a/addons/hr_attendance/report/timesheet.py
+++ b/addons/hr_attendance/report/timesheet.py
@@ -28,6 +28,8 @@ import pooler
 from report.interface import report_rml
 from report.interface import toxml
 
+import tools
+
 one_week = relativedelta(days=7)
 num2day = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']
 
@@ -58,7 +60,7 @@ class report_custom(report_rml):
               <name>%s</name>
               %%s
             </user>
-            ''' % ustr(toxml(emp['name']))
+            ''' % tools.ustr(toxml(emp['name']))
             while monday != last_monday:
                 #### Work hour calculation
                 sql = '''
diff --git a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
index b87a3903a80..4ed56ce1800 100644
--- a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
@@ -1,6 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+        <record id="view_hr_attendance_week" model="ir.ui.view">
+            <field name="name">Attendances Report Weekly</field>
+            <field name="model">hr.attendance.week</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            <form string="Print Attendance Report Weekly">
+                <field name="init_date"/>
+                <field name="end_date"/>
+                <newline/>
+                <separator colspan="4"/>
+                <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                <button name="print_report" string="Print" type="object"  icon="gtk-print"/>
+            </form>
+            </field>
+        </record>
 
+        <record id="action_hr_attendance_week" model="ir.actions.act_window">
+            <field name="name">Attendances By Week</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr.attendance.week</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        
+        <record model="ir.values" id="hr_attendance_week_values">
+            <field name="model_id" ref="hr.model_hr_employee" />
+            <field name="object" eval="1" />
+            <field name="name">Attendances By Week</field>
+            <field name="key2">client_print_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_hr_attendance_week'))" />
+            <field name="key">action</field>
+            <field name="model">hr.employee</field>
+        </record>
+        
 	</data>
 </openerp>

From 71396272e04b0337fa1009c3a9cf1ea3a45d5237 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Fri, 11 Feb 2011 12:14:08 +0530
Subject: [PATCH 38/73] [FIX]sale margin module : wrong computation

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

bzr revid: ara@tinyerp.com-20110211064408-jc5g7d80y1qa4548
---
 addons/sale_margin/sale_margin.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/sale_margin/sale_margin.py b/addons/sale_margin/sale_margin.py
index f7bbf41e5d3..525338502e4 100644
--- a/addons/sale_margin/sale_margin.py
+++ b/addons/sale_margin/sale_margin.py
@@ -60,8 +60,13 @@ class sale_order(osv.osv):
 
     def _product_margin(self, cr, uid, ids, field_name, arg, context=None):
         result = {}
+        obj_line = self.pool.get('sale.order.line')
         for sale in self.browse(cr, uid, ids, context=context):
             result[sale.id] = 0.0
+            line_ids = []
+            if sale.order_line:
+                map(lambda x: line_ids.append(x.id), sale.order_line)
+            obj_line.write(cr, uid, line_ids, {})
             for line in sale.order_line:
                 result[sale.id] += line.margin or 0.0
         return result

From e365a48c773a9d1952f951dd946220003aaa7bfb Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Fri, 11 Feb 2011 15:38:04 +0530
Subject: [PATCH 39/73] [FIX] hr_holidays: manager user not get hr request send
 by employee

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

bzr revid: psi@tinyerp.co.in-20110211100804-ppf51573o389zpmy
---
 addons/hr_holidays/security/ir_rule.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/hr_holidays/security/ir_rule.xml b/addons/hr_holidays/security/ir_rule.xml
index 9a56336dcdc..a184ac072ab 100644
--- a/addons/hr_holidays/security/ir_rule.xml
+++ b/addons/hr_holidays/security/ir_rule.xml
@@ -20,6 +20,12 @@
         <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
         <field name="groups" eval="[(4,ref('base.group_user'))]"/>
     </record>
+    <record id="property_rule_holidays_department" model="ir.rule">
+        <field name="name">Department Holidays</field>
+        <field model="ir.model" name="model_id" ref="model_hr_holidays"/>
+        <field name="domain_force">[('department_id.manager_id.user_id','=',user.id)]</field>
+        <field name="groups" eval="[(6,0,[ref('base.group_hr_manager')])]"/>
+    </record>
 
   </data>
 </openerp>

From e93166a2c4fbf455320979e79965ef1e6d91a8d2 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Fri, 11 Feb 2011 16:57:37 +0530
Subject: [PATCH 40/73] [FIX] account:context is correctly passed in 'Chart of
 Accounts'

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

bzr revid: mtr@mtr-20110211112737-esnj1iyhcwlqn87v
---
 addons/account/account_move_line.py          | 7 +++++++
 addons/account/wizard/account_chart_view.xml | 1 +
 2 files changed, 8 insertions(+)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 85207cf5cb2..eb3c253d4f2 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -678,6 +678,13 @@ class account_move_line(osv.osv):
     def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
         if context is None:
             context = {}
+        if context and context.get('chart_of_account', False):
+            if context.get('periods', False):
+                args.append(('period_id', 'in', context['periods']))
+            if context.get('state', False) and context['state'] == 'posted':
+                args.append(('state', '=', 'valid')) 
+            if context.get('fiscalyear', False):
+                args.append(('period_id.fiscalyear_id.id', '=', context['fiscalyear'])) 
         if context and context.get('next_partner_only', False):
             if not context.get('partner_id', False):
                 partner = self.get_next_partner_only(cr, uid, offset, context)
diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index f2e278b06ce..22e823cd686 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -31,6 +31,7 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_account_chart"/>
             <field name="target">new</field>
+            <field name="context">{'chart_of_account': 1}</field>
             <field name="help">Display your company chart of accounts per fiscal year and filter by period. Have a complete tree view of all journal items per account code by clicking on an account.</field>
         </record>
 

From 2862f55c917ffa0ccbbc2f0fd5a826075a190f0b Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Fri, 11 Feb 2011 16:59:07 +0530
Subject: [PATCH 41/73] [FIX] Cannot specify RFC in the accounting options

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

bzr revid: ara@tinyerp.com-20110211112907-1bjk2d84wvuhclz5
---
 addons/base_vat/base_vat.py      | 15 ++++++++++++++-
 addons/base_vat/i18n/ab_AB.po    |  3 +--
 addons/base_vat/i18n/ar.po       |  4 +---
 addons/base_vat/i18n/bg.po       |  4 +---
 addons/base_vat/i18n/bs.po       |  4 +---
 addons/base_vat/i18n/ca.po       |  4 +---
 addons/base_vat/i18n/cs.po       |  4 +---
 addons/base_vat/i18n/da.po       |  4 +---
 addons/base_vat/i18n/de.po       |  4 +---
 addons/base_vat/i18n/el.po       |  4 +---
 addons/base_vat/i18n/en_AU.po    |  4 +---
 addons/base_vat/i18n/es.po       |  4 +---
 addons/base_vat/i18n/es_AR.po    |  4 +---
 addons/base_vat/i18n/es_EC.po    |  4 +---
 addons/base_vat/i18n/et.po       |  4 +---
 addons/base_vat/i18n/eu.po       |  4 +---
 addons/base_vat/i18n/fi.po       |  4 +---
 addons/base_vat/i18n/fr.po       |  4 +---
 addons/base_vat/i18n/gl.po       |  4 +---
 addons/base_vat/i18n/hr.po       |  4 +---
 addons/base_vat/i18n/hu.po       |  4 +---
 addons/base_vat/i18n/id.po       |  4 +---
 addons/base_vat/i18n/it.po       |  4 +---
 addons/base_vat/i18n/ko.po       |  4 +---
 addons/base_vat/i18n/lt.po       |  4 +---
 addons/base_vat/i18n/lv.po       |  4 +---
 addons/base_vat/i18n/mn.po       |  4 +---
 addons/base_vat/i18n/nb.po       |  4 +---
 addons/base_vat/i18n/nl.po       |  4 +---
 addons/base_vat/i18n/nl_BE.po    |  4 +---
 addons/base_vat/i18n/oc.po       |  4 +---
 addons/base_vat/i18n/pl.po       |  4 +---
 addons/base_vat/i18n/pt.po       |  4 +---
 addons/base_vat/i18n/pt_BR.po    |  4 +---
 addons/base_vat/i18n/ro.po       |  4 +---
 addons/base_vat/i18n/ru.po       |  4 +---
 addons/base_vat/i18n/sk.po       |  4 +---
 addons/base_vat/i18n/sl.po       |  4 +---
 addons/base_vat/i18n/sq.po       |  4 +---
 addons/base_vat/i18n/sr.po       |  4 +---
 addons/base_vat/i18n/sr@latin.po |  4 +---
 addons/base_vat/i18n/sv.po       |  4 +---
 addons/base_vat/i18n/th.po       |  4 +---
 addons/base_vat/i18n/tlh.po      |  4 +---
 addons/base_vat/i18n/tr.po       |  4 +---
 addons/base_vat/i18n/uk.po       |  4 +---
 addons/base_vat/i18n/vi.po       |  4 +---
 addons/base_vat/i18n/zh_CN.po    |  4 +---
 addons/base_vat/i18n/zh_TW.po    |  4 +---
 49 files changed, 62 insertions(+), 144 deletions(-)

diff --git a/addons/base_vat/base_vat.py b/addons/base_vat/base_vat.py
index bc1a083e041..102619e876d 100644
--- a/addons/base_vat/base_vat.py
+++ b/addons/base_vat/base_vat.py
@@ -38,7 +38,9 @@ _ref_vat = {
     'nl': 'NL123456782B90', 'pl': 'PL1234567883',
     'pt': 'PT123456789', 'ro': 'RO1234567897',
     'se': 'SE123456789701', 'si': 'SI12345679',
-    'sk': 'SK0012345675', 'el': 'EL12345670'
+    'sk': 'SK0012345675', 'el': 'EL12345670',
+    'mx': 'MXABC123456T1B'
+
             }
 
 def mult_add(i, j):
@@ -1064,6 +1066,17 @@ class res_partner(osv.osv):
                 return False
         return True
 
+    def check_vat_mx(self, vat):
+        '''
+        Verificar RFC méxico
+        '''
+        if not 12 <= len(vat) <= 13:
+            return False
+        elif len(vat)==12 and not vat[:3].isalpha() | vat[3:9].isdigit() | vat[-3:].isalnum():
+            return False
+        elif len(vat)==13 and not vat[:4].isalpha() | vat[4:10].isdigit() | vat[-3:].isalnum():
+            return False
+        return True
 res_partner()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_vat/i18n/ab_AB.po b/addons/base_vat/i18n/ab_AB.po
index babcebda3b5..3b7db851d65 100644
--- a/addons/base_vat/i18n/ab_AB.po
+++ b/addons/base_vat/i18n/ab_AB.po
@@ -19,8 +19,7 @@ msgstr ""
 
 #. module: base_vat
 #: model:ir.module.module,description:base_vat.module_meta_information
-msgid ""
-"Enable the VAT Number for the partner. Check the validity of that VAT Number."
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/ar.po b/addons/base_vat/i18n/ar.po
index b2763ef5fc5..91d92870728 100644
--- a/addons/base_vat/i18n/ar.po
+++ b/addons/base_vat/i18n/ar.po
@@ -19,9 +19,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/bg.po b/addons/base_vat/i18n/bg.po
index be689f4d6c4..9649fb81ccd 100644
--- a/addons/base_vat/i18n/bg.po
+++ b/addons/base_vat/i18n/bg.po
@@ -19,9 +19,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/bs.po b/addons/base_vat/i18n/bs.po
index fd53c568287..0b62db530ba 100644
--- a/addons/base_vat/i18n/bs.po
+++ b/addons/base_vat/i18n/bs.po
@@ -19,9 +19,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/ca.po b/addons/base_vat/i18n/ca.po
index 38646e37201..bd479d24394 100644
--- a/addons/base_vat/i18n/ca.po
+++ b/addons/base_vat/i18n/ca.po
@@ -19,9 +19,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/cs.po b/addons/base_vat/i18n/cs.po
index f13c5fddf20..688c049ad89 100644
--- a/addons/base_vat/i18n/cs.po
+++ b/addons/base_vat/i18n/cs.po
@@ -19,9 +19,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/da.po b/addons/base_vat/i18n/da.po
index 28652ceb9bb..13922920832 100644
--- a/addons/base_vat/i18n/da.po
+++ b/addons/base_vat/i18n/da.po
@@ -20,9 +20,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/de.po b/addons/base_vat/i18n/de.po
index e59084d7ce2..702ddbfaad8 100644
--- a/addons/base_vat/i18n/de.po
+++ b/addons/base_vat/i18n/de.po
@@ -20,9 +20,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 "Die UID (Umsatzsteueridentifikationsnummer) ist anscheinend nicht korrekt. "
 "Sie sollten in etwa eine Eingabe vornehmen, wie %s"
diff --git a/addons/base_vat/i18n/el.po b/addons/base_vat/i18n/el.po
index 234286d7321..d0b1dae2aea 100644
--- a/addons/base_vat/i18n/el.po
+++ b/addons/base_vat/i18n/el.po
@@ -20,9 +20,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr "Το ΦΠΑ δεν φαίνεται να είναι σωστό.Θα πρέπει να εισάγετε κάτι σαν %s"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/en_AU.po b/addons/base_vat/i18n/en_AU.po
index 3c265e693b1..548128a5dd3 100644
--- a/addons/base_vat/i18n/en_AU.po
+++ b/addons/base_vat/i18n/en_AU.po
@@ -20,9 +20,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/es.po b/addons/base_vat/i18n/es.po
index 76868f7dc99..0951396348d 100644
--- a/addons/base_vat/i18n/es.po
+++ b/addons/base_vat/i18n/es.po
@@ -20,9 +20,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 "El CIF/NIF parece que no sea correcto. Debería haber introducido algo como "
 "esto %s"
diff --git a/addons/base_vat/i18n/es_AR.po b/addons/base_vat/i18n/es_AR.po
index 243ae9e437a..af7fad5dcc2 100644
--- a/addons/base_vat/i18n/es_AR.po
+++ b/addons/base_vat/i18n/es_AR.po
@@ -19,9 +19,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/es_EC.po b/addons/base_vat/i18n/es_EC.po
index e85af14aa97..be77820de00 100644
--- a/addons/base_vat/i18n/es_EC.po
+++ b/addons/base_vat/i18n/es_EC.po
@@ -19,9 +19,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 "El CIF/NIF parece que no sea correcto. Debería haber introducido algo como "
 "esto %s"
diff --git a/addons/base_vat/i18n/et.po b/addons/base_vat/i18n/et.po
index 441dec91f03..28e6050f41b 100644
--- a/addons/base_vat/i18n/et.po
+++ b/addons/base_vat/i18n/et.po
@@ -19,9 +19,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/eu.po b/addons/base_vat/i18n/eu.po
index 517c0e1394f..2fa18760fc9 100644
--- a/addons/base_vat/i18n/eu.po
+++ b/addons/base_vat/i18n/eu.po
@@ -20,9 +20,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/fi.po b/addons/base_vat/i18n/fi.po
index e74c98cea30..1b0452a29df 100644
--- a/addons/base_vat/i18n/fi.po
+++ b/addons/base_vat/i18n/fi.po
@@ -20,9 +20,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/fr.po b/addons/base_vat/i18n/fr.po
index 0572ac6d3f8..ea4c6dff8ea 100644
--- a/addons/base_vat/i18n/fr.po
+++ b/addons/base_vat/i18n/fr.po
@@ -19,9 +19,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 "Le numéro de TVA semble incorrect. Vous devez saisir un numéro de la forme "
 "%s."
diff --git a/addons/base_vat/i18n/gl.po b/addons/base_vat/i18n/gl.po
index 8ecd83da7d6..03c269f87e7 100644
--- a/addons/base_vat/i18n/gl.po
+++ b/addons/base_vat/i18n/gl.po
@@ -20,9 +20,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/hr.po b/addons/base_vat/i18n/hr.po
index 15fa5c75406..db27954120e 100644
--- a/addons/base_vat/i18n/hr.po
+++ b/addons/base_vat/i18n/hr.po
@@ -19,9 +19,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/hu.po b/addons/base_vat/i18n/hu.po
index 2c9460d1b99..6de9cdc6a67 100644
--- a/addons/base_vat/i18n/hu.po
+++ b/addons/base_vat/i18n/hu.po
@@ -19,9 +19,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 "Az ÁFA nem tűnik helyesnek. Valami ehhez hasonlót kellett volna megadnia: %s"
 
diff --git a/addons/base_vat/i18n/id.po b/addons/base_vat/i18n/id.po
index d211363df39..d15b0222907 100644
--- a/addons/base_vat/i18n/id.po
+++ b/addons/base_vat/i18n/id.po
@@ -19,9 +19,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/it.po b/addons/base_vat/i18n/it.po
index 8e29799cb1e..18a4bb1d9c4 100644
--- a/addons/base_vat/i18n/it.po
+++ b/addons/base_vat/i18n/it.po
@@ -19,9 +19,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 "La partita IVA non sembra essere corretta. E' necessario inserire un valore "
 "simile a: %s"
diff --git a/addons/base_vat/i18n/ko.po b/addons/base_vat/i18n/ko.po
index 8e2203210e3..b2a9d85094d 100644
--- a/addons/base_vat/i18n/ko.po
+++ b/addons/base_vat/i18n/ko.po
@@ -20,9 +20,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/lt.po b/addons/base_vat/i18n/lt.po
index 538a650caa4..bbe3b078db2 100644
--- a/addons/base_vat/i18n/lt.po
+++ b/addons/base_vat/i18n/lt.po
@@ -19,9 +19,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/lv.po b/addons/base_vat/i18n/lv.po
index 5ad869eabd3..484f5dcb740 100644
--- a/addons/base_vat/i18n/lv.po
+++ b/addons/base_vat/i18n/lv.po
@@ -20,9 +20,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr "Liekas, ka PVN kods nav pareizs. Napieciešams ievadīt līdzīgi kā: %s"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/mn.po b/addons/base_vat/i18n/mn.po
index a38f38b6a36..207b90df764 100644
--- a/addons/base_vat/i18n/mn.po
+++ b/addons/base_vat/i18n/mn.po
@@ -20,9 +20,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr "НӨАТ буруу байна. Та %s-тэй ижил зүйлийг оруулах ёстой."
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/nb.po b/addons/base_vat/i18n/nb.po
index 0cc02772a83..7e41dd8e7d0 100644
--- a/addons/base_vat/i18n/nb.po
+++ b/addons/base_vat/i18n/nb.po
@@ -20,9 +20,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/nl.po b/addons/base_vat/i18n/nl.po
index da1dc269b16..acdd541bcb6 100644
--- a/addons/base_vat/i18n/nl.po
+++ b/addons/base_vat/i18n/nl.po
@@ -19,9 +19,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr "De BTW lijkt niet correct te zijn. U moet iets invullen zoals dit %s"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/nl_BE.po b/addons/base_vat/i18n/nl_BE.po
index ddf2cfbfc76..46a05ee573b 100644
--- a/addons/base_vat/i18n/nl_BE.po
+++ b/addons/base_vat/i18n/nl_BE.po
@@ -19,9 +19,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/oc.po b/addons/base_vat/i18n/oc.po
index 6b7e09a1008..73a2163bb7c 100644
--- a/addons/base_vat/i18n/oc.po
+++ b/addons/base_vat/i18n/oc.po
@@ -20,9 +20,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/pl.po b/addons/base_vat/i18n/pl.po
index 8bd18622259..ba4da7ace7f 100644
--- a/addons/base_vat/i18n/pl.po
+++ b/addons/base_vat/i18n/pl.po
@@ -19,9 +19,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 "Numer NIP wygląda na niepoprawny. Powinieneś wprowadzić coś jak: %s. "
 "Wprowadź numer bez kresek i poprzedź go znakami PL. Np. PL2343423123."
diff --git a/addons/base_vat/i18n/pt.po b/addons/base_vat/i18n/pt.po
index 7a89c9540ab..48e2ae26586 100644
--- a/addons/base_vat/i18n/pt.po
+++ b/addons/base_vat/i18n/pt.po
@@ -19,9 +19,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 "O NIF não parece estar correto. Deve indicar um número do seguinte tipo: %s"
 
diff --git a/addons/base_vat/i18n/pt_BR.po b/addons/base_vat/i18n/pt_BR.po
index 00f596864e4..9c8aeab6ca3 100644
--- a/addons/base_vat/i18n/pt_BR.po
+++ b/addons/base_vat/i18n/pt_BR.po
@@ -19,9 +19,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr "O IVA não parece estar correto. Você deveria preencher algo como %s"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/ro.po b/addons/base_vat/i18n/ro.po
index f8ce4769eff..2c858de8a4b 100644
--- a/addons/base_vat/i18n/ro.po
+++ b/addons/base_vat/i18n/ro.po
@@ -19,9 +19,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 "TVA-ul nu pare corect. Ar fi trebuit ca valoarea introdusă sa fie de forma %s"
 
diff --git a/addons/base_vat/i18n/ru.po b/addons/base_vat/i18n/ru.po
index f37fb9b17ea..dcfcbc624da 100644
--- a/addons/base_vat/i18n/ru.po
+++ b/addons/base_vat/i18n/ru.po
@@ -19,9 +19,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr "НДС не кажется верным. Вы должны ввести что-то вроде этого: %s"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/sk.po b/addons/base_vat/i18n/sk.po
index 2b648919ff3..9a855bfe9a4 100644
--- a/addons/base_vat/i18n/sk.po
+++ b/addons/base_vat/i18n/sk.po
@@ -20,9 +20,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/sl.po b/addons/base_vat/i18n/sl.po
index 58f931e6651..c755c2007fa 100644
--- a/addons/base_vat/i18n/sl.po
+++ b/addons/base_vat/i18n/sl.po
@@ -19,9 +19,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/sq.po b/addons/base_vat/i18n/sq.po
index 8086e4061c5..15303748207 100644
--- a/addons/base_vat/i18n/sq.po
+++ b/addons/base_vat/i18n/sq.po
@@ -20,9 +20,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/sr.po b/addons/base_vat/i18n/sr.po
index f055e3e1bc7..1234bb2d21d 100644
--- a/addons/base_vat/i18n/sr.po
+++ b/addons/base_vat/i18n/sr.po
@@ -20,9 +20,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr "PDV izgleda da nije korektan. Trebas upisati nesto kao %s"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/sr@latin.po b/addons/base_vat/i18n/sr@latin.po
index bdf5881ecac..15192358664 100644
--- a/addons/base_vat/i18n/sr@latin.po
+++ b/addons/base_vat/i18n/sr@latin.po
@@ -20,9 +20,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr "PDV izgleda da nije korektan. Trebas upisati nesto kao %s"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/sv.po b/addons/base_vat/i18n/sv.po
index e2f6f2c78cf..2e76ce1eec9 100644
--- a/addons/base_vat/i18n/sv.po
+++ b/addons/base_vat/i18n/sv.po
@@ -19,9 +19,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 "Momskod verkar inte vara korrekt. Den måste vara inskriven i formatet %s"
 
diff --git a/addons/base_vat/i18n/th.po b/addons/base_vat/i18n/th.po
index 382d2ebbfb3..287908441c4 100644
--- a/addons/base_vat/i18n/th.po
+++ b/addons/base_vat/i18n/th.po
@@ -20,9 +20,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr "ภาษีไม่น่าจะถูกต้อง คุณควรจะป้อนบางสิ่งบางอย่างเช่นนี้ % s"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/tlh.po b/addons/base_vat/i18n/tlh.po
index 6adef683478..9492a62701f 100644
--- a/addons/base_vat/i18n/tlh.po
+++ b/addons/base_vat/i18n/tlh.po
@@ -19,9 +19,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/tr.po b/addons/base_vat/i18n/tr.po
index 8a6d601a8ad..b45c46d14a4 100644
--- a/addons/base_vat/i18n/tr.po
+++ b/addons/base_vat/i18n/tr.po
@@ -19,9 +19,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/uk.po b/addons/base_vat/i18n/uk.po
index a106d46f929..1b9d72766e6 100644
--- a/addons/base_vat/i18n/uk.po
+++ b/addons/base_vat/i18n/uk.po
@@ -19,9 +19,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/vi.po b/addons/base_vat/i18n/vi.po
index 49c1f057371..7bab4067409 100644
--- a/addons/base_vat/i18n/vi.po
+++ b/addons/base_vat/i18n/vi.po
@@ -20,9 +20,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/zh_CN.po b/addons/base_vat/i18n/zh_CN.po
index 06b1ebfc805..c5606c22990 100644
--- a/addons/base_vat/i18n/zh_CN.po
+++ b/addons/base_vat/i18n/zh_CN.po
@@ -19,9 +19,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr "增值税似乎不正确。您的输入应类似于此：%s"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/zh_TW.po b/addons/base_vat/i18n/zh_TW.po
index 3abeaca5233..d7f59ee0138 100644
--- a/addons/base_vat/i18n/zh_TW.po
+++ b/addons/base_vat/i18n/zh_TW.po
@@ -19,9 +19,7 @@ msgstr ""
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87
 #, python-format
-msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
+msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
 
 #. module: base_vat

From bf9943488e422b2cad93f582bc1cbe30d44fb0a1 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Fri, 11 Feb 2011 17:06:49 +0530
Subject: [PATCH 42/73] [FIX, IMP] hr_holidays: manager user not get hr request
 send by employee(Improve my last commit)

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

bzr revid: psi@tinyerp.co.in-20110211113649-nt4yqs57agralwjr
---
 addons/hr_holidays/security/ir_rule.xml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/addons/hr_holidays/security/ir_rule.xml b/addons/hr_holidays/security/ir_rule.xml
index a184ac072ab..285fb381602 100644
--- a/addons/hr_holidays/security/ir_rule.xml
+++ b/addons/hr_holidays/security/ir_rule.xml
@@ -5,7 +5,7 @@
     <record id="property_rule_holidays" model="ir.rule">
         <field name="name">Employee Holidays</field>
         <field model="ir.model" name="model_id" ref="model_hr_holidays"/>
-        <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
+        <field name="domain_force">['|', ('employee_id.user_id','=',user.id), ('department_id.manager_id.user_id', '=', user.id)]</field>
         <field name="groups" eval="[(6,0,[ref('base.group_hr_user')])]"/>
     </record>
     <record id="property_rule_holidays_manager" model="ir.rule">
@@ -20,12 +20,6 @@
         <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
         <field name="groups" eval="[(4,ref('base.group_user'))]"/>
     </record>
-    <record id="property_rule_holidays_department" model="ir.rule">
-        <field name="name">Department Holidays</field>
-        <field model="ir.model" name="model_id" ref="model_hr_holidays"/>
-        <field name="domain_force">[('department_id.manager_id.user_id','=',user.id)]</field>
-        <field name="groups" eval="[(6,0,[ref('base.group_hr_manager')])]"/>
-    </record>
 
   </data>
 </openerp>

From 544b7294862d6580392613fe1db5712cbd655217 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Fri, 11 Feb 2011 18:03:29 +0530
Subject: [PATCH 43/73] [IMP] account:corrected the code for bug fixed
 lp:716300

bzr revid: mtr@mtr-20110211123329-zomdcx0hftcaol4d
---
 addons/account/account_move_line.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index eb3c253d4f2..7143c2be0cf 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -684,7 +684,7 @@ class account_move_line(osv.osv):
             if context.get('state', False) and context['state'] == 'posted':
                 args.append(('state', '=', 'valid')) 
             if context.get('fiscalyear', False):
-                args.append(('period_id.fiscalyear_id.id', '=', context['fiscalyear'])) 
+                args.append(('period_id.fiscalyear_id', '=', context['fiscalyear'])) 
         if context and context.get('next_partner_only', False):
             if not context.get('partner_id', False):
                 partner = self.get_next_partner_only(cr, uid, offset, context)

From 0ac1558542a1a27a699b12e57c3aa65bcf31ec0e Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Mon, 14 Feb 2011 12:50:45 +0530
Subject: [PATCH 44/73] [FIX] account_voucher:changed the string 'Cr/Dr' to
 'Dr/Cr'

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

bzr revid: mtr@mtr-20110214072045-oy523b802rfa7mvc
---
 addons/account_voucher/account_voucher.py       | 2 +-
 addons/account_voucher/i18n/account_voucher.pot | 2 +-
 addons/account_voucher/i18n/ar.po               | 2 +-
 addons/account_voucher/i18n/bg.po               | 2 +-
 addons/account_voucher/i18n/bs.po               | 2 +-
 addons/account_voucher/i18n/ca.po               | 6 +++---
 addons/account_voucher/i18n/cs.po               | 2 +-
 addons/account_voucher/i18n/de.po               | 4 ++--
 addons/account_voucher/i18n/el.po               | 6 +++---
 addons/account_voucher/i18n/es.po               | 8 ++++----
 addons/account_voucher/i18n/es_AR.po            | 2 +-
 addons/account_voucher/i18n/es_EC.po            | 8 ++++----
 addons/account_voucher/i18n/et.po               | 2 +-
 addons/account_voucher/i18n/fr.po               | 4 ++--
 addons/account_voucher/i18n/hi.po               | 2 +-
 addons/account_voucher/i18n/hr.po               | 2 +-
 addons/account_voucher/i18n/hu.po               | 4 ++--
 addons/account_voucher/i18n/id.po               | 2 +-
 addons/account_voucher/i18n/it.po               | 6 +++---
 addons/account_voucher/i18n/ko.po               | 2 +-
 addons/account_voucher/i18n/lt.po               | 6 +++---
 addons/account_voucher/i18n/mn.po               | 2 +-
 addons/account_voucher/i18n/nl.po               | 2 +-
 addons/account_voucher/i18n/nl_BE.po            | 2 +-
 addons/account_voucher/i18n/oc.po               | 2 +-
 addons/account_voucher/i18n/pl.po               | 4 ++--
 addons/account_voucher/i18n/pt.po               | 6 +++---
 addons/account_voucher/i18n/pt_BR.po            | 4 ++--
 addons/account_voucher/i18n/ro.po               | 6 +++---
 addons/account_voucher/i18n/ru.po               | 2 +-
 addons/account_voucher/i18n/sl.po               | 2 +-
 addons/account_voucher/i18n/sq.po               | 2 +-
 addons/account_voucher/i18n/sr.po               | 4 ++--
 addons/account_voucher/i18n/sr@latin.po         | 4 ++--
 addons/account_voucher/i18n/sv.po               | 2 +-
 addons/account_voucher/i18n/tlh.po              | 2 +-
 addons/account_voucher/i18n/tr.po               | 6 +++---
 addons/account_voucher/i18n/uk.po               | 2 +-
 addons/account_voucher/i18n/vi.po               | 2 +-
 addons/account_voucher/i18n/zh_CN.po            | 6 +++---
 addons/account_voucher/i18n/zh_TW.po            | 2 +-
 41 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 5b662a960c5..57ab234fb8d 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -835,7 +835,7 @@ class account_voucher_line(osv.osv):
         'partner_id':fields.related('voucher_id', 'partner_id', type='many2one', relation='res.partner', string='Partner'),
         'untax_amount':fields.float('Untax Amount'),
         'amount':fields.float('Amount', digits_compute=dp.get_precision('Account')),
-        'type':fields.selection([('dr','Debit'),('cr','Credit')], 'Cr/Dr'),
+        'type':fields.selection([('dr','Debit'),('cr','Credit')], 'Dr/Cr'),
         'account_analytic_id':  fields.many2one('account.analytic.account', 'Analytic Account'),
         'move_line_id': fields.many2one('account.move.line', 'Journal Item'),
         'date_original': fields.related('move_line_id','date', type='date', relation='account.move.line', string='Date', readonly=1),
diff --git a/addons/account_voucher/i18n/account_voucher.pot b/addons/account_voucher/i18n/account_voucher.pot
index 127aabfba81..7b1ffefd838 100644
--- a/addons/account_voucher/i18n/account_voucher.pot
+++ b/addons/account_voucher/i18n/account_voucher.pot
@@ -586,7 +586,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
+msgid "Dr/Cr"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/ar.po b/addons/account_voucher/i18n/ar.po
index fe938249098..e129e20ea7c 100644
--- a/addons/account_voucher/i18n/ar.po
+++ b/addons/account_voucher/i18n/ar.po
@@ -608,7 +608,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
+msgid "Dr/Cr"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/bg.po b/addons/account_voucher/i18n/bg.po
index fcbf1997911..f7074bf4bc1 100644
--- a/addons/account_voucher/i18n/bg.po
+++ b/addons/account_voucher/i18n/bg.po
@@ -608,7 +608,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
+msgid "Dr/Cr"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/bs.po b/addons/account_voucher/i18n/bs.po
index 65bb3e8d853..09c412806e3 100644
--- a/addons/account_voucher/i18n/bs.po
+++ b/addons/account_voucher/i18n/bs.po
@@ -608,7 +608,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
+msgid "Dr/Cr"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/ca.po b/addons/account_voucher/i18n/ca.po
index b1864bc4e8a..020e2e877a7 100644
--- a/addons/account_voucher/i18n/ca.po
+++ b/addons/account_voucher/i18n/ca.po
@@ -608,7 +608,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
+msgid "Dr/Cr"
 msgstr ""
 
 #. module: account_voucher
@@ -1225,8 +1225,8 @@ msgstr ""
 #~ msgid "Receipt Vouchers"
 #~ msgstr "Comprovants de cobrament"
 
-#~ msgid "Voucher Report (Cr/Dr)"
-#~ msgstr "Informe de comprovants (Haver/Deure)"
+#~ msgid "Voucher Report (Dr/Cr)"
+#~ msgstr "Informe de comprovants (Deure/Haver)"
 
 #~ msgid "Bank Receipt Voucher"
 #~ msgstr "Comprovant de cobrament bancari"
diff --git a/addons/account_voucher/i18n/cs.po b/addons/account_voucher/i18n/cs.po
index d22f2314aa8..75d461207a4 100644
--- a/addons/account_voucher/i18n/cs.po
+++ b/addons/account_voucher/i18n/cs.po
@@ -608,7 +608,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
+msgid "Dr/Cr"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/de.po b/addons/account_voucher/i18n/de.po
index 95fa39d63bf..2ab2f1f46e4 100644
--- a/addons/account_voucher/i18n/de.po
+++ b/addons/account_voucher/i18n/de.po
@@ -640,7 +640,7 @@ msgstr "Juni"
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
+msgid "Dr/Cr"
 msgstr "Buchung Partner"
 
 #. module: account_voucher
@@ -1261,7 +1261,7 @@ msgstr "Summe"
 #~ msgid "Open Vouchers"
 #~ msgstr "Offene Belege"
 
-#~ msgid "Voucher Report (Cr/Dr)"
+#~ msgid "Voucher Report (Dr/Cr)"
 #~ msgstr "Beleg Report (S/H)"
 
 #~ msgid "Voucher Type"
diff --git a/addons/account_voucher/i18n/el.po b/addons/account_voucher/i18n/el.po
index 9497fcdc4a4..78db5dbceff 100644
--- a/addons/account_voucher/i18n/el.po
+++ b/addons/account_voucher/i18n/el.po
@@ -609,7 +609,7 @@ msgstr "Ιούνιος"
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
+msgid "Dr/Cr"
 msgstr ""
 
 #. module: account_voucher
@@ -1224,8 +1224,8 @@ msgstr "Σύνολο"
 #~ msgid "Sub Currency"
 #~ msgstr "Υποδιαίρεση νομίσματος"
 
-#~ msgid "Voucher Report (Cr/Dr)"
-#~ msgstr "Αναφορά Παραστατικών (Cr/Dr)"
+#~ msgid "Voucher Report (Dr/Cr)"
+#~ msgstr "Αναφορά Παραστατικών (Dr/Cr)"
 
 #~ msgid "General Entries"
 #~ msgstr "Γενικές Εγγραφές"
diff --git a/addons/account_voucher/i18n/es.po b/addons/account_voucher/i18n/es.po
index 01ce9a7c82a..b6c08cce3c6 100644
--- a/addons/account_voucher/i18n/es.po
+++ b/addons/account_voucher/i18n/es.po
@@ -636,8 +636,8 @@ msgstr "Junio"
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
-msgstr "Haber/Debe"
+msgid "Dr/Cr"
+msgstr "Debe/Haber"
 
 #. module: account_voucher
 #: field:account.voucher,audit:0
@@ -1266,8 +1266,8 @@ msgstr "Total"
 #~ msgid "Receipt Vouchers"
 #~ msgstr "Comprobantes de cobro"
 
-#~ msgid "Voucher Report (Cr/Dr)"
-#~ msgstr "Informe de comprobantes (Haber/Debe)"
+#~ msgid "Voucher Report (Dr/Cr)"
+#~ msgstr "Informe de comprobantes (Debe/Haber)"
 
 #~ msgid "Cash Receipt Voucher"
 #~ msgstr "Comprobante de cobro en efectivo"
diff --git a/addons/account_voucher/i18n/es_AR.po b/addons/account_voucher/i18n/es_AR.po
index 2f6ca5839c2..e605baa2fd7 100644
--- a/addons/account_voucher/i18n/es_AR.po
+++ b/addons/account_voucher/i18n/es_AR.po
@@ -608,7 +608,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
+msgid "Dr/Cr"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/es_EC.po b/addons/account_voucher/i18n/es_EC.po
index 7273d7151f8..75dae8aea2c 100644
--- a/addons/account_voucher/i18n/es_EC.po
+++ b/addons/account_voucher/i18n/es_EC.po
@@ -635,8 +635,8 @@ msgstr "Junio"
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
-msgstr "Cr/Dr"
+msgid "Dr/Cr"
+msgstr "Dr/Cr"
 
 #. module: account_voucher
 #: field:account.voucher,audit:0
@@ -1173,8 +1173,8 @@ msgstr "Total"
 #~ msgid "Dr/Cr"
 #~ msgstr "Dr/Cr"
 
-#~ msgid "Voucher Report (Cr/Dr)"
-#~ msgstr "Informe de comprobantes (Haber/Debe)"
+#~ msgid "Voucher Report (Dr/Cr)"
+#~ msgstr "Informe de comprobantes (Debe/Haber)"
 
 #~ msgid "Voucher Type"
 #~ msgstr "Tipo de comprobante"
diff --git a/addons/account_voucher/i18n/et.po b/addons/account_voucher/i18n/et.po
index 660d949eda4..eed8141bc73 100644
--- a/addons/account_voucher/i18n/et.po
+++ b/addons/account_voucher/i18n/et.po
@@ -623,7 +623,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
+msgid "Dr/Cr"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/fr.po b/addons/account_voucher/i18n/fr.po
index 77ac7c1afa9..4249d114f89 100644
--- a/addons/account_voucher/i18n/fr.po
+++ b/addons/account_voucher/i18n/fr.po
@@ -637,8 +637,8 @@ msgstr "Juin"
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
-msgstr "Cr/Dr"
+msgid "Dr/Cr"
+msgstr "Dr/Cr"
 
 #. module: account_voucher
 #: field:account.voucher,audit:0
diff --git a/addons/account_voucher/i18n/hi.po b/addons/account_voucher/i18n/hi.po
index 8133aca4fc5..d0856e9a735 100644
--- a/addons/account_voucher/i18n/hi.po
+++ b/addons/account_voucher/i18n/hi.po
@@ -609,7 +609,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
+msgid "Dr/Cr"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/hr.po b/addons/account_voucher/i18n/hr.po
index 897e40a1e3a..2fe88b19565 100644
--- a/addons/account_voucher/i18n/hr.po
+++ b/addons/account_voucher/i18n/hr.po
@@ -608,7 +608,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
+msgid "Dr/Cr"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/hu.po b/addons/account_voucher/i18n/hu.po
index 574831dd7a5..c7347d12f90 100644
--- a/addons/account_voucher/i18n/hu.po
+++ b/addons/account_voucher/i18n/hu.po
@@ -631,8 +631,8 @@ msgstr "Június"
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
-msgstr "T/K"
+msgid "Dr/Cr"
+msgstr "K/T"
 
 #. module: account_voucher
 #: field:account.voucher,audit:0
diff --git a/addons/account_voucher/i18n/id.po b/addons/account_voucher/i18n/id.po
index 46d051523da..da68a1a914b 100644
--- a/addons/account_voucher/i18n/id.po
+++ b/addons/account_voucher/i18n/id.po
@@ -608,7 +608,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
+msgid "Dr/Cr"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/it.po b/addons/account_voucher/i18n/it.po
index fcbc1402300..79241e7052b 100644
--- a/addons/account_voucher/i18n/it.po
+++ b/addons/account_voucher/i18n/it.po
@@ -611,7 +611,7 @@ msgstr "Giugno"
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
+msgid "Dr/Cr"
 msgstr ""
 
 #. module: account_voucher
@@ -1098,8 +1098,8 @@ msgstr "Totale"
 #~ msgid "Opening Balance"
 #~ msgstr "Bilancio d'apertura"
 
-#~ msgid "Voucher Report (Cr/Dr)"
-#~ msgstr "Report Ricevuta (Credito/Debito)"
+#~ msgid "Voucher Report (Dr/Cr)"
+#~ msgstr "Report Ricevuta (Debito/Credito)"
 
 #~ msgid "Voucher Type"
 #~ msgstr "Tipo Ricevuta"
diff --git a/addons/account_voucher/i18n/ko.po b/addons/account_voucher/i18n/ko.po
index 1f3c02a3acf..b3183c04815 100644
--- a/addons/account_voucher/i18n/ko.po
+++ b/addons/account_voucher/i18n/ko.po
@@ -609,7 +609,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
+msgid "Dr/Cr"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/lt.po b/addons/account_voucher/i18n/lt.po
index d7fde0ceaa1..dd6654f86a4 100644
--- a/addons/account_voucher/i18n/lt.po
+++ b/addons/account_voucher/i18n/lt.po
@@ -608,7 +608,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
+msgid "Dr/Cr"
 msgstr ""
 
 #. module: account_voucher
@@ -1122,8 +1122,8 @@ msgstr ""
 #~ msgid "Optional Information"
 #~ msgstr "Papildoma informacija"
 
-#~ msgid "Voucher Report (Cr/Dr)"
-#~ msgstr "Kvito ataskaita (K/D)"
+#~ msgid "Voucher Report (Dr/Cr)"
+#~ msgstr "Kvito ataskaita (D/K)"
 
 #~ msgid "General Information"
 #~ msgstr "Bendra informacija"
diff --git a/addons/account_voucher/i18n/mn.po b/addons/account_voucher/i18n/mn.po
index b4d69c79549..915dce95945 100644
--- a/addons/account_voucher/i18n/mn.po
+++ b/addons/account_voucher/i18n/mn.po
@@ -609,7 +609,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
+msgid "Dr/Cr"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/nl.po b/addons/account_voucher/i18n/nl.po
index d022b2188f8..6b7b0588a54 100644
--- a/addons/account_voucher/i18n/nl.po
+++ b/addons/account_voucher/i18n/nl.po
@@ -618,7 +618,7 @@ msgstr "juni"
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
+msgid "Dr/Cr"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/nl_BE.po b/addons/account_voucher/i18n/nl_BE.po
index bf02c638dba..50b9622387f 100644
--- a/addons/account_voucher/i18n/nl_BE.po
+++ b/addons/account_voucher/i18n/nl_BE.po
@@ -608,7 +608,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
+msgid "Dr/Cr"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/oc.po b/addons/account_voucher/i18n/oc.po
index 84ff2d6cefa..f1774d43297 100644
--- a/addons/account_voucher/i18n/oc.po
+++ b/addons/account_voucher/i18n/oc.po
@@ -609,7 +609,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
+msgid "Dr/Cr"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/pl.po b/addons/account_voucher/i18n/pl.po
index 11b6793ed90..ddb12586337 100644
--- a/addons/account_voucher/i18n/pl.po
+++ b/addons/account_voucher/i18n/pl.po
@@ -616,8 +616,8 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
-msgstr "Ma/Wn"
+msgid "Dr/Cr"
+msgstr "Wn/Ma"
 
 #. module: account_voucher
 #: field:account.voucher,audit:0
diff --git a/addons/account_voucher/i18n/pt.po b/addons/account_voucher/i18n/pt.po
index 850ac7e7324..7649b35fce2 100644
--- a/addons/account_voucher/i18n/pt.po
+++ b/addons/account_voucher/i18n/pt.po
@@ -608,7 +608,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
+msgid "Dr/Cr"
 msgstr ""
 
 #. module: account_voucher
@@ -1152,8 +1152,8 @@ msgstr "Total"
 #~ msgid "General Entries"
 #~ msgstr "Movimentos Gerais"
 
-#~ msgid "Voucher Report (Cr/Dr)"
-#~ msgstr "Relatório Voucher (Cr/Dr)"
+#~ msgid "Voucher Report (Dr/Cr)"
+#~ msgstr "Relatório Voucher (Dr/Cr)"
 
 #~ msgid "Voucher Type"
 #~ msgstr "Tipo de Voucher"
diff --git a/addons/account_voucher/i18n/pt_BR.po b/addons/account_voucher/i18n/pt_BR.po
index 9a374b7094e..c72eaa3fbe5 100644
--- a/addons/account_voucher/i18n/pt_BR.po
+++ b/addons/account_voucher/i18n/pt_BR.po
@@ -616,8 +616,8 @@ msgstr "Junho"
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
-msgstr "Cr/Db"
+msgid "Dr/Cr"
+msgstr "Db/Cr"
 
 #. module: account_voucher
 #: field:account.voucher,audit:0
diff --git a/addons/account_voucher/i18n/ro.po b/addons/account_voucher/i18n/ro.po
index 894fa7d1823..0d24eacdac0 100644
--- a/addons/account_voucher/i18n/ro.po
+++ b/addons/account_voucher/i18n/ro.po
@@ -608,7 +608,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
+msgid "Dr/Cr"
 msgstr ""
 
 #. module: account_voucher
@@ -1210,8 +1210,8 @@ msgstr ""
 #~ msgid "Optional Information"
 #~ msgstr "Informații opționale"
 
-#~ msgid "Voucher Report (Cr/Dr)"
-#~ msgstr "Raport bonuri (Cr/Db)"
+#~ msgid "Voucher Report (Dr/Cr)"
+#~ msgstr "Raport bonuri (Db/Cr)"
 
 #~ msgid "General Information"
 #~ msgstr "Informaţii generale"
diff --git a/addons/account_voucher/i18n/ru.po b/addons/account_voucher/i18n/ru.po
index d3ea28a1fae..92d7e995df1 100644
--- a/addons/account_voucher/i18n/ru.po
+++ b/addons/account_voucher/i18n/ru.po
@@ -608,7 +608,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
+msgid "Dr/Cr"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/sl.po b/addons/account_voucher/i18n/sl.po
index 400ae164df9..544eec4cca9 100644
--- a/addons/account_voucher/i18n/sl.po
+++ b/addons/account_voucher/i18n/sl.po
@@ -608,7 +608,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
+msgid "Dr/Cr"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/sq.po b/addons/account_voucher/i18n/sq.po
index e2319c915ca..4a013c887ca 100644
--- a/addons/account_voucher/i18n/sq.po
+++ b/addons/account_voucher/i18n/sq.po
@@ -609,7 +609,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
+msgid "Dr/Cr"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/sr.po b/addons/account_voucher/i18n/sr.po
index 18d80b185d4..a62f4fff66c 100644
--- a/addons/account_voucher/i18n/sr.po
+++ b/addons/account_voucher/i18n/sr.po
@@ -615,8 +615,8 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
-msgstr "Cr/Dr"
+msgid "Dr/Cr"
+msgstr "Dr/Cr"
 
 #. module: account_voucher
 #: field:account.voucher,audit:0
diff --git a/addons/account_voucher/i18n/sr@latin.po b/addons/account_voucher/i18n/sr@latin.po
index c6d4f59f715..4ed3a5dc219 100644
--- a/addons/account_voucher/i18n/sr@latin.po
+++ b/addons/account_voucher/i18n/sr@latin.po
@@ -615,8 +615,8 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
-msgstr "Cr/Dr"
+msgid "Dr/Cr"
+msgstr "Dr/Cr"
 
 #. module: account_voucher
 #: field:account.voucher,audit:0
diff --git a/addons/account_voucher/i18n/sv.po b/addons/account_voucher/i18n/sv.po
index fa7db1d92e7..ec29ee58176 100644
--- a/addons/account_voucher/i18n/sv.po
+++ b/addons/account_voucher/i18n/sv.po
@@ -614,7 +614,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
+msgid "Dr/Cr"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/tlh.po b/addons/account_voucher/i18n/tlh.po
index 928a4f1a4e9..af690964f6d 100644
--- a/addons/account_voucher/i18n/tlh.po
+++ b/addons/account_voucher/i18n/tlh.po
@@ -608,7 +608,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
+msgid "Dr/Cr"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/tr.po b/addons/account_voucher/i18n/tr.po
index 24f03358450..fe87ef9a815 100644
--- a/addons/account_voucher/i18n/tr.po
+++ b/addons/account_voucher/i18n/tr.po
@@ -608,7 +608,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
+msgid "Dr/Cr"
 msgstr ""
 
 #. module: account_voucher
@@ -1107,8 +1107,8 @@ msgstr ""
 #~ msgid "Dr/Cr"
 #~ msgstr "Borç/Alacak"
 
-#~ msgid "Voucher Report (Cr/Dr)"
-#~ msgstr "Fiş Raporu (Alacak/Borç)"
+#~ msgid "Voucher Report (Dr/Cr)"
+#~ msgstr "Fiş Raporu (Borç/Alacak)"
 
 #~ msgid "Voucher Type"
 #~ msgstr "Fiş Türü"
diff --git a/addons/account_voucher/i18n/uk.po b/addons/account_voucher/i18n/uk.po
index afae7dc9a2a..9025b58e7ce 100644
--- a/addons/account_voucher/i18n/uk.po
+++ b/addons/account_voucher/i18n/uk.po
@@ -608,7 +608,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
+msgid "Dr/Cr"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/vi.po b/addons/account_voucher/i18n/vi.po
index a0211db378d..990c26b7238 100644
--- a/addons/account_voucher/i18n/vi.po
+++ b/addons/account_voucher/i18n/vi.po
@@ -609,7 +609,7 @@ msgstr "Tháng Sáu"
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
+msgid "Dr/Cr"
 msgstr ""
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/zh_CN.po b/addons/account_voucher/i18n/zh_CN.po
index d9e312a3d74..e02a12382e7 100644
--- a/addons/account_voucher/i18n/zh_CN.po
+++ b/addons/account_voucher/i18n/zh_CN.po
@@ -608,7 +608,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
+msgid "Dr/Cr"
 msgstr ""
 
 #. module: account_voucher
@@ -1168,8 +1168,8 @@ msgstr ""
 #~ msgid "Voucher Report"
 #~ msgstr "手工凭证报表"
 
-#~ msgid "Voucher Report (Cr/Dr)"
-#~ msgstr "手工凭证报表(贷/借)"
+#~ msgid "Voucher Report (Dr/Cr)"
+#~ msgstr "手工凭证报表(借/贷)"  
 
 #~ msgid "Voucher Type"
 #~ msgstr "手工凭证类型"
diff --git a/addons/account_voucher/i18n/zh_TW.po b/addons/account_voucher/i18n/zh_TW.po
index 2520aaded72..9c044bf300c 100644
--- a/addons/account_voucher/i18n/zh_TW.po
+++ b/addons/account_voucher/i18n/zh_TW.po
@@ -608,7 +608,7 @@ msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
-msgid "Cr/Dr"
+msgid "Dr/Cr"
 msgstr ""
 
 #. module: account_voucher

From b22d6086ec7181d91273833f877720ca659fd9fa Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Mon, 14 Feb 2011 17:04:13 +0530
Subject: [PATCH 45/73] [FIX]account id - domain must check for <> view and
 consolidation and matching company_id

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

bzr revid: ara@tinyerp.com-20110214113413-96kztac5t4aetdnt
---
 addons/account/account_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index e4e12f63490..38af4a3a7ad 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -582,7 +582,7 @@
                                     <field name="ref"/>
                                     <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
                                     <field name="type" on_change="onchange_type(partner_id, type)"/>
-                                    <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
+                                    <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
                                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
                                     <field name="amount"/>
                                     <field name="sequence" readonly="0"/>
@@ -1048,7 +1048,7 @@
                         <page string="Information">
                             <group col="2" colspan="2">
                                 <separator colspan="2" string="Amount"/>
-                                <field name="account_id" select="1" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                                <field name="account_id" select="1" domain="[('company_id', '=', company_id),('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                                 <field name="debit"/>
                                 <field name="credit"/>
                                 <field name="quantity"/>
@@ -1343,7 +1343,7 @@
                                         <page string="Information">
                                             <group col="2" colspan="2">
                                                 <separator colspan="2" string="Amount"/>
-                                                <field name="account_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                                                <field name="account_id" domain="[('company_id', '=', parent.company_id), ('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                                                 <field name="debit"/>
                                                 <field name="credit"/>
                                                 <field name="quantity"/>

From 7c175a6caa3c5ec8cc50592c15dff33db208b0b1 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Mon, 14 Feb 2011 18:15:21 +0530
Subject: [PATCH 46/73] [FIX] account_voucher: set attrs invisible on fields
 and buttons while being called from account bank statement

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

bzr revid: psi@tinyerp.co.in-20110214124521-ksyhai8r9tf4366i
---
 addons/account_voucher/account_voucher.py     |  2 +-
 .../voucher_payment_receipt_view.xml          | 37 ++++++++++---------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 5b662a960c5..398830705e7 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -759,7 +759,7 @@ class account_voucher(osv.osv):
                 else:
                     account_id = inv.partner_id.property_account_payable.id
                 move_line = {
-                    'name': name,
+                    'name': inv.comment and inv.comment or name,
                     'account_id': account_id,
                     'move_id': move_id,
                     'partner_id': inv.partner_id.id,
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 20c73bb9797..b62cba19d65 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -151,16 +151,17 @@
             <field name="arch" type="xml">
                 <form string="Bill Payment">
                     <group col="6" colspan="4">
-                        <field name="partner_id" domain="[('supplier','=',True)]" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)" context="{'invoice_currency':currency_id}" string="Supplier"/>
-                        <field name="amount" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"/>
+                        <field name="partner_id" domain="[('supplier','=',True)]" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)" context="{'invoice_currency':currency_id}" string="Supplier"/>
+                        <field name="amount" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"/>
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
+                            invisible="context.get('line_type', False)"
                             widget="selection" select="1"
                             on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"
                             string="Payment Method"/>
-                        <field name="date" select="1" on_change="onchange_date(partner_id, journal_id, amount, currency_id, type, date)"/>
-                        <field name="reference" select="1" string="Payment Ref"/>
-                        <field name="name" colspan="2"/>
+                        <field name="date" select="1" invisible="context.get('line_type', False)" on_change="onchange_date(partner_id, journal_id, amount, currency_id, type, date)"/>
+                        <field name="reference" select="1" invisible="context.get('line_type', False)" string="Payment Ref"/>
+                        <field name="name" colspan="2" invisible="context.get('line_type', False)"/>
                         <field name="account_id"
                             widget="selection"
                             invisible="True"/>
@@ -245,10 +246,10 @@
                     </notebook>
                     <group col="10" colspan="4">
                         <field name="state"/>
-                        <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
-                        <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/>
-                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
-                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
+                        <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel" invisible="context.get('line_type', False)"/>
+                        <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile this record ?"/>
+                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
+                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward" invisible="context.get('line_type', False)"/>
                     </group>
                 </form>
             </field>
@@ -288,18 +289,20 @@
             <field name="arch" type="xml">
                 <form string="Customer Payment">
                     <group col="6" colspan="4">
-                        <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)" string="Customer"/>
+                        <field name="partner_id" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)" string="Customer"/>
                         <field name="amount"
+                            invisible="context.get('line_type', False)"
                             string="Paid Amount"
                             on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"/>
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
+                            invisible="context.get('line_type', False)"
                             widget="selection" select="1"
                             on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"
                             string="Payment Method"/>
-                        <field name="date" select="1" on_change="onchange_date(partner_id, journal_id, amount, currency_id, type, date)"/>
-                        <field name="reference" select="1" string="Payment Ref"/>
-                        <field name="name" colspan="2"/>
+                        <field name="date" select="1" invisible="context.get('line_type', False)" on_change="onchange_date(partner_id, journal_id, amount, currency_id, type, date)"/>
+                        <field name="reference" select="1" invisible="context.get('line_type', False)" string="Payment Ref"/>
+                        <field name="name" colspan="2" invisible="context.get('line_type', False)"/>
                         <field name="account_id"
                             widget="selection"
                             invisible="True"/>
@@ -384,10 +387,10 @@
                     </notebook>
                     <group col="10" colspan="4">
                         <field name="state"/>
-                        <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
-                        <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/>
-                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
-                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
+                        <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel" invisible="context.get('line_type', False)"/>
+                        <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/>
+                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
+                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward" invisible="context.get('line_type', False)"/>
                     </group>
                 </form>
             </field>

From f935850255c0516605625f93ad3b403fd77d261d Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 15 Feb 2011 12:15:10 +0530
Subject: [PATCH 47/73] [IMP] account_voucher: Improve code of my last commit

bzr revid: psi@tinyerp.co.in-20110215064510-h10xngfhs0xvzv3b
---
 addons/account_voucher/account_voucher.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index d46e4a12cd9..f4fde5f24ae 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -710,7 +710,7 @@ class account_voucher(osv.osv):
                 move_line = {
                     'journal_id': inv.journal_id.id,
                     'period_id': inv.period_id.id,
-                    'name': line.name and line.name or '/',
+                    'name': line.name or '/',
                     'account_id': line.account_id.id,
                     'move_id': move_id,
                     'partner_id': inv.partner_id.id,
@@ -754,12 +754,13 @@ class account_voucher(osv.osv):
                 account_id = False
                 if inv.payment_option == 'with_writeoff':
                     account_id = inv.writeoff_acc_id.id
+                    name = inv.comment
                 elif inv.type in ('sale', 'receipt'):
                     account_id = inv.partner_id.property_account_receivable.id
                 else:
                     account_id = inv.partner_id.property_account_payable.id
                 move_line = {
-                    'name': inv.comment and inv.comment or name,
+                    'name': name,
                     'account_id': account_id,
                     'move_id': move_id,
                     'partner_id': inv.partner_id.id,

From 9488656005ce1007e727f9f2332acadc2272fa53 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 15 Feb 2011 12:40:01 +0530
Subject: [PATCH 48/73] [FIX] account_voucher

bzr revid: mra@mra-laptop-20110215071001-ussdmt3p6cq5yz0v
---
 addons/account_voucher/account_voucher.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index f4fde5f24ae..63c4e13e7c7 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -752,15 +752,16 @@ class account_voucher(osv.osv):
             if not currency_pool.is_zero(cr, uid, inv.currency_id, line_total):
                 diff = line_total
                 account_id = False
+                write_off_name = ''
                 if inv.payment_option == 'with_writeoff':
                     account_id = inv.writeoff_acc_id.id
-                    name = inv.comment
+                    write_off_name = inv.comment
                 elif inv.type in ('sale', 'receipt'):
                     account_id = inv.partner_id.property_account_receivable.id
                 else:
                     account_id = inv.partner_id.property_account_payable.id
                 move_line = {
-                    'name': name,
+                    'name': write_off_name or name,
                     'account_id': account_id,
                     'move_id': move_id,
                     'partner_id': inv.partner_id.id,

From c23e5e413514fd1b3a741b55365de8a1ccaad5aa Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Tue, 15 Feb 2011 15:14:10 +0530
Subject: [PATCH 49/73] [FIX]account id - domain must check for <> view and
 consolidation and matching company_id

bzr revid: ara@tinyerp.com-20110215094410-i9g2eowwutv1cr9v
---
 addons/account/account_view.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 38af4a3a7ad..43a7803fb5c 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -572,7 +572,7 @@
                                     <field name="ref"/>
                                     <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
                                     <field name="type" on_change="onchange_type(partner_id, type)"/>
-                                    <field domain="[('journal_id','=',parent.journal_id)]" name="account_id"/>
+                                    <field domain="[('journal_id','=',parent.journal_id), ('company_id', '=', parent.company_id)]" name="account_id"/>
                                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
                                     <field name="amount"/>
                                 </tree>
@@ -582,7 +582,7 @@
                                     <field name="ref"/>
                                     <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
                                     <field name="type" on_change="onchange_type(partner_id, type)"/>
-                                    <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
+                                    <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view'), ('company_id', '=', parent.company_id)]" name="account_id"/>
                                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
                                     <field name="amount"/>
                                     <field name="sequence" readonly="0"/>
@@ -1013,7 +1013,7 @@
                     <field name="invoice"/>
                     <field name="name"/>
                     <field name="partner_id" on_change="onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)"/>
-                    <field name="account_id" domain="[('journal_id','=',journal_id)]"/>
+                    <field name="account_id" domain="[('journal_id','=',journal_id), ('company_id', '=', company_id)]"/>
                     <field name="journal_id"/>
                     <field name="debit" sum="Total debit"/>
                     <field name="credit" sum="Total credit"/>
@@ -1048,7 +1048,7 @@
                         <page string="Information">
                             <group col="2" colspan="2">
                                 <separator colspan="2" string="Amount"/>
-                                <field name="account_id" select="1" domain="[('company_id', '=', company_id),('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                                <field name="account_id" select="1" domain="[('company_id', '=', company_id), ('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation')]"/>
                                 <field name="debit"/>
                                 <field name="credit"/>
                                 <field name="quantity"/>
@@ -1122,7 +1122,7 @@
                             <field name="date"/>
                             <field name="journal_id" readonly="False" select="1"/>
                             <field name="period_id" readonly="False"/>
-                            <field name="account_id" select="1" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                            <field name="account_id" select="1" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation'),('company_id', '=', company_id)]"/>
                             <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
                             <newline/>
                             <field name="debit"/>
@@ -1405,7 +1405,7 @@
                                     <field name="invoice"/>
                                     <field name="name"/>
                                     <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,parent.date,parent.journal_id)"/>
-                                    <field name="account_id" domain="[('journal_id','=',parent.journal_id)]"/>
+                                    <field name="account_id" domain="[('journal_id','=',parent.journal_id),('company_id', '=', parent.company_id)]"/>
                                     <field name="date_maturity"/>
                                     <field name="debit" sum="Total Debit"/>
                                     <field name="credit" sum="Total Credit"/>
@@ -2576,7 +2576,7 @@ action = self.pool.get('res.config').next(cr, uid, [], context)
                                     <field name="ref"/>
                                     <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
                                     <field name="type" on_change="onchange_type(partner_id, type)"/>
-                                    <field domain="[('journal_id','=',parent.journal_id)]" name="account_id"/>
+                                    <field domain="[('journal_id','=',parent.journal_id), ('company_id', '=', parent.company_id)]" name="account_id"/>
                                     <field name="analytic_account_id" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]" groups="analytic.group_analytic_accounting" />
                                     <field name="amount"/>
                                 </tree>
@@ -2586,7 +2586,7 @@ action = self.pool.get('res.config').next(cr, uid, [], context)
                                     <field name="ref"/>
                                     <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
                                     <field name="type" on_change="onchange_type(partner_id, type)"/>
-                                    <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
+                                    <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view'), ('company_id', '=', parent.company_id)]" name="account_id"/>
                                     <field name="analytic_account_id" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]" groups="analytic.group_analytic_accounting" />
                                     <field name="amount"/>
                                     <field name="sequence"/>

From 349556743b46ab7974433d31e8c2580cc77bce39 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Wed, 16 Feb 2011 16:17:15 +0530
Subject: [PATCH 50/73] [FIX] hr_*: new user - much too many access rights

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

bzr revid: psi@tinyerp.co.in-20110216104715-ak6h09kyel4imt7e
---
 addons/hr/security/hr_security.xml          | 8 ++++++++
 addons/hr_evaluation/hr_evaluation_demo.xml | 8 +++++++-
 addons/hr_expense/security/ir_rule.xml      | 2 +-
 addons/hr_payroll/security/hr_security.xml  | 6 ++++++
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index 61aa5a93b12..caecf869ce6 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -9,5 +9,13 @@
     <record id="base.group_hr_user" model="res.groups">
         <field name="name">Human Resources / User</field>
     </record>
+
+     <record id="property_rule_employee" model="ir.rule">
+        <field name="name">Employee</field>
+        <field model="ir.model" name="model_id" ref="model_hr_employee"/>
+        <field name="domain_force">[('user_id','=',user.id)]</field>
+        <field name="groups" eval="[(4,ref('base.group_user'))]"/>
+    </record>
+
 </data>
 </openerp>
diff --git a/addons/hr_evaluation/hr_evaluation_demo.xml b/addons/hr_evaluation/hr_evaluation_demo.xml
index 59396717d49..682452a196b 100644
--- a/addons/hr_evaluation/hr_evaluation_demo.xml
+++ b/addons/hr_evaluation/hr_evaluation_demo.xml
@@ -1624,6 +1624,12 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="domain_force">['|',('employee_id.user_id','=',user.id),('employee_id.parent_id.user_id','=',user.id )]</field>
             <field name="groups" eval="[(4,ref('base.group_hr_manager'))]"/>
         </record>
-         </data>
+        <record id="property_rule_employee_evaluation" model="ir.rule">
+            <field name="name">Employee Evaluation</field>
+            <field model="ir.model" name="model_id" ref="model_hr_evaluation_evaluation"/>
+            <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
+            <field name="groups" eval="[(4,ref('base.group_user'))]"/>
+        </record>
+        </data>
 
 </openerp>
diff --git a/addons/hr_expense/security/ir_rule.xml b/addons/hr_expense/security/ir_rule.xml
index 292db38bf5e..d2686d2157c 100644
--- a/addons/hr_expense/security/ir_rule.xml
+++ b/addons/hr_expense/security/ir_rule.xml
@@ -17,7 +17,7 @@
         <record id="property_rule_expense_employee" model="ir.rule">
             <field name="name">Employee Expense</field>
             <field model="ir.model" name="model_id" ref="model_hr_expense_expense"/>
-            <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
+            <field name="domain_force">['|', ('employee_id.user_id','=',user.id), ('department_id.manager_id.user_id','=',user.id)]</field>
             <field name="groups" eval="[(4,ref('base.group_user'))]"/>
         </record>
 
diff --git a/addons/hr_payroll/security/hr_security.xml b/addons/hr_payroll/security/hr_security.xml
index 339fb1961b9..b9352e203e4 100644
--- a/addons/hr_payroll/security/hr_security.xml
+++ b/addons/hr_payroll/security/hr_security.xml
@@ -5,6 +5,12 @@
 <!--    <record id="group_hr_payroll" model="res.groups">-->
 <!--        <field name="name">Human Resources / Payroll</field>-->
 <!--    </record>-->
+     <record id="property_rule_employee_payroll" model="ir.rule">
+        <field name="name">Employee Payroll</field>
+        <field model="ir.model" name="model_id" ref="model_hr_payslip"/>
+        <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
+        <field name="groups" eval="[(4,ref('base.group_user'))]"/>
+    </record>
 
 </data>
 </openerp>
\ No newline at end of file

From efaeed6332e3c2e7a86494759d990b36ad49d12a Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Wed, 16 Feb 2011 16:53:43 +0530
Subject: [PATCH 51/73] [FIX]Human Resources : employee form view : Mobile
 field

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

bzr revid: ara@tinyerp.com-20110216112343-41ufqgkdkwv2f7jt
---
 addons/hr/hr.py            | 4 ++--
 addons/hr/i18n/ar.po       | 2 +-
 addons/hr/i18n/bg.po       | 2 +-
 addons/hr/i18n/bs.po       | 2 +-
 addons/hr/i18n/ca.po       | 2 +-
 addons/hr/i18n/cs.po       | 2 +-
 addons/hr/i18n/de.po       | 2 +-
 addons/hr/i18n/el.po       | 2 +-
 addons/hr/i18n/es.po       | 2 +-
 addons/hr/i18n/es_AR.po    | 2 +-
 addons/hr/i18n/es_CL.po    | 2 +-
 addons/hr/i18n/es_EC.po    | 2 +-
 addons/hr/i18n/et.po       | 2 +-
 addons/hr/i18n/fi.po       | 2 +-
 addons/hr/i18n/fr.po       | 2 +-
 addons/hr/i18n/fr_BE.po    | 2 +-
 addons/hr/i18n/gl.po       | 2 +-
 addons/hr/i18n/hi.po       | 2 +-
 addons/hr/i18n/hr.po       | 2 +-
 addons/hr/i18n/hu.po       | 2 +-
 addons/hr/i18n/id.po       | 2 +-
 addons/hr/i18n/it.po       | 2 +-
 addons/hr/i18n/ko.po       | 2 +-
 addons/hr/i18n/lo.po       | 2 +-
 addons/hr/i18n/lt.po       | 2 +-
 addons/hr/i18n/lv.po       | 2 +-
 addons/hr/i18n/mn.po       | 2 +-
 addons/hr/i18n/nl.po       | 2 +-
 addons/hr/i18n/nl_BE.po    | 2 +-
 addons/hr/i18n/pl.po       | 2 +-
 addons/hr/i18n/pt.po       | 2 +-
 addons/hr/i18n/pt_BR.po    | 2 +-
 addons/hr/i18n/ro.po       | 2 +-
 addons/hr/i18n/ru.po       | 2 +-
 addons/hr/i18n/sk.po       | 2 +-
 addons/hr/i18n/sl.po       | 2 +-
 addons/hr/i18n/sq.po       | 2 +-
 addons/hr/i18n/sr.po       | 2 +-
 addons/hr/i18n/sr@latin.po | 2 +-
 addons/hr/i18n/sv.po       | 2 +-
 addons/hr/i18n/th.po       | 2 +-
 addons/hr/i18n/th_TH.po    | 5 +++++
 addons/hr/i18n/tlh.po      | 2 +-
 addons/hr/i18n/tr.po       | 2 +-
 addons/hr/i18n/uk.po       | 2 +-
 addons/hr/i18n/vi.po       | 2 +-
 addons/hr/i18n/zh_CN.po    | 2 +-
 addons/hr/i18n/zh_TW.po    | 2 +-
 48 files changed, 53 insertions(+), 48 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 90605e1a745..cda35e4a029 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -150,7 +150,7 @@ class hr_employee(osv.osv):
         'partner_id': fields.related('address_home_id', 'partner_id', type='many2one', relation='res.partner', readonly=True, help="Partner that is related to the current employee. Accounting transaction will be written on this partner belongs to employee."),
         'bank_account_id':fields.many2one('res.partner.bank', 'Bank Account', domain="[('partner_id','=',partner_id)]", help="Employee bank salary account"),
         'work_phone': fields.char('Work Phone', size=32, readonly=False),
-        'mobile_phone': fields.char('Mobile', size=32, readonly=False),
+        'mobile_phone': fields.char('Work Mobile', size=32, readonly=False),
         'work_email': fields.char('Work E-mail', size=240),
         'work_location': fields.char('Office Location', size=32),
         'notes': fields.text('Notes'),
@@ -167,7 +167,7 @@ class hr_employee(osv.osv):
     def onchange_address_id(self, cr, uid, ids, address, context=None):
         if address:
             address = self.pool.get('res.partner.address').browse(cr, uid, address, context=context)
-            return {'value': {'work_email': address.email, 'work_phone': address.phone}}
+            return {'value': {'work_email': address.email, 'work_phone': address.phone, 'mobile_phone': address.mobile}}
         return {'value': {}}
 
     def onchange_company(self, cr, uid, ids, company, context=None):
diff --git a/addons/hr/i18n/ar.po b/addons/hr/i18n/ar.po
index 196f9c15942..065d50c5a36 100644
--- a/addons/hr/i18n/ar.po
+++ b/addons/hr/i18n/ar.po
@@ -701,7 +701,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/bg.po b/addons/hr/i18n/bg.po
index cd420496154..7d173e52ca8 100644
--- a/addons/hr/i18n/bg.po
+++ b/addons/hr/i18n/bg.po
@@ -702,7 +702,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/bs.po b/addons/hr/i18n/bs.po
index 6b1a0f96263..ab92286a09f 100644
--- a/addons/hr/i18n/bs.po
+++ b/addons/hr/i18n/bs.po
@@ -701,7 +701,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/ca.po b/addons/hr/i18n/ca.po
index 7b8024d4755..fd3a640a3f9 100644
--- a/addons/hr/i18n/ca.po
+++ b/addons/hr/i18n/ca.po
@@ -701,7 +701,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/cs.po b/addons/hr/i18n/cs.po
index 11686aeacbf..4f3205462ef 100644
--- a/addons/hr/i18n/cs.po
+++ b/addons/hr/i18n/cs.po
@@ -701,7 +701,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/de.po b/addons/hr/i18n/de.po
index 3733fef2805..971ad6ac67c 100644
--- a/addons/hr/i18n/de.po
+++ b/addons/hr/i18n/de.po
@@ -752,7 +752,7 @@ msgstr "Stelle ist besetzt"
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr "Mobiltelefon"
 
 #. module: hr
diff --git a/addons/hr/i18n/el.po b/addons/hr/i18n/el.po
index 4279acc20b1..cb92e786a4b 100644
--- a/addons/hr/i18n/el.po
+++ b/addons/hr/i18n/el.po
@@ -704,7 +704,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/es.po b/addons/hr/i18n/es.po
index 1dcb709e154..29bfd7dbae1 100644
--- a/addons/hr/i18n/es.po
+++ b/addons/hr/i18n/es.po
@@ -752,7 +752,7 @@ msgstr "Ocupado"
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr "Móvil"
 
 #. module: hr
diff --git a/addons/hr/i18n/es_AR.po b/addons/hr/i18n/es_AR.po
index 8f6f78b5e4c..24c2b6692f3 100644
--- a/addons/hr/i18n/es_AR.po
+++ b/addons/hr/i18n/es_AR.po
@@ -701,7 +701,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/es_CL.po b/addons/hr/i18n/es_CL.po
index 97f6508de2f..36b89a79ffd 100644
--- a/addons/hr/i18n/es_CL.po
+++ b/addons/hr/i18n/es_CL.po
@@ -733,7 +733,7 @@ msgstr "Na poziciji"
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr "Mobitel"
 
 #. module: hr
diff --git a/addons/hr/i18n/es_EC.po b/addons/hr/i18n/es_EC.po
index deb0e9505c3..94db5378efa 100644
--- a/addons/hr/i18n/es_EC.po
+++ b/addons/hr/i18n/es_EC.po
@@ -702,7 +702,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/et.po b/addons/hr/i18n/et.po
index 372f1eff5e6..a6061b13304 100644
--- a/addons/hr/i18n/et.po
+++ b/addons/hr/i18n/et.po
@@ -701,7 +701,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/fi.po b/addons/hr/i18n/fi.po
index 3aac668f24b..f17c2d0a541 100644
--- a/addons/hr/i18n/fi.po
+++ b/addons/hr/i18n/fi.po
@@ -704,7 +704,7 @@ msgstr "Asemassa"
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr "Matkapuhelin"
 
 #. module: hr
diff --git a/addons/hr/i18n/fr.po b/addons/hr/i18n/fr.po
index 4d36ec58547..430d33c1812 100644
--- a/addons/hr/i18n/fr.po
+++ b/addons/hr/i18n/fr.po
@@ -746,7 +746,7 @@ msgstr "En poste"
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr "Tél. portable"
 
 #. module: hr
diff --git a/addons/hr/i18n/fr_BE.po b/addons/hr/i18n/fr_BE.po
index 26773bcb5e4..38353787a22 100644
--- a/addons/hr/i18n/fr_BE.po
+++ b/addons/hr/i18n/fr_BE.po
@@ -702,7 +702,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/gl.po b/addons/hr/i18n/gl.po
index 3bdc8f14dea..9bea5775dbc 100644
--- a/addons/hr/i18n/gl.po
+++ b/addons/hr/i18n/gl.po
@@ -702,7 +702,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/hi.po b/addons/hr/i18n/hi.po
index 5c0de38af7a..7cc38f0b4e9 100644
--- a/addons/hr/i18n/hi.po
+++ b/addons/hr/i18n/hi.po
@@ -702,7 +702,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/hr.po b/addons/hr/i18n/hr.po
index 97f6508de2f..36b89a79ffd 100644
--- a/addons/hr/i18n/hr.po
+++ b/addons/hr/i18n/hr.po
@@ -733,7 +733,7 @@ msgstr "Na poziciji"
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr "Mobitel"
 
 #. module: hr
diff --git a/addons/hr/i18n/hu.po b/addons/hr/i18n/hu.po
index aec3a5e5089..b2b08aa4521 100644
--- a/addons/hr/i18n/hu.po
+++ b/addons/hr/i18n/hu.po
@@ -727,7 +727,7 @@ msgstr "Pozícióban"
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr "Mobilszám"
 
 #. module: hr
diff --git a/addons/hr/i18n/id.po b/addons/hr/i18n/id.po
index ebbb39eda3b..32033376c7a 100644
--- a/addons/hr/i18n/id.po
+++ b/addons/hr/i18n/id.po
@@ -748,7 +748,7 @@ msgstr "Dalam Posisi"
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr "Ponsel"
 
 #. module: hr
diff --git a/addons/hr/i18n/it.po b/addons/hr/i18n/it.po
index 20ecc22d697..71cddc425c6 100644
--- a/addons/hr/i18n/it.po
+++ b/addons/hr/i18n/it.po
@@ -747,7 +747,7 @@ msgstr "Assunzioni effettuate"
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr "Cellulare"
 
 #. module: hr
diff --git a/addons/hr/i18n/ko.po b/addons/hr/i18n/ko.po
index 8a811e541ad..3635d3443e9 100644
--- a/addons/hr/i18n/ko.po
+++ b/addons/hr/i18n/ko.po
@@ -702,7 +702,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/lo.po b/addons/hr/i18n/lo.po
index aa39e941a68..34b79e8a5d6 100644
--- a/addons/hr/i18n/lo.po
+++ b/addons/hr/i18n/lo.po
@@ -702,7 +702,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/lt.po b/addons/hr/i18n/lt.po
index 4d6a020bd97..f0dd89387c5 100644
--- a/addons/hr/i18n/lt.po
+++ b/addons/hr/i18n/lt.po
@@ -701,7 +701,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/lv.po b/addons/hr/i18n/lv.po
index 530c4af5bb3..f3f5fd4e973 100644
--- a/addons/hr/i18n/lv.po
+++ b/addons/hr/i18n/lv.po
@@ -702,7 +702,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/mn.po b/addons/hr/i18n/mn.po
index cb254753c2e..5558b46b5d9 100644
--- a/addons/hr/i18n/mn.po
+++ b/addons/hr/i18n/mn.po
@@ -736,7 +736,7 @@ msgstr "Нээлттэй"
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/nl.po b/addons/hr/i18n/nl.po
index 3e74b36971a..9d87a764d86 100644
--- a/addons/hr/i18n/nl.po
+++ b/addons/hr/i18n/nl.po
@@ -741,7 +741,7 @@ msgstr "Is vervuld"
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr "Mobiel"
 
 #. module: hr
diff --git a/addons/hr/i18n/nl_BE.po b/addons/hr/i18n/nl_BE.po
index f766489aef9..54f877799e5 100644
--- a/addons/hr/i18n/nl_BE.po
+++ b/addons/hr/i18n/nl_BE.po
@@ -701,7 +701,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/pl.po b/addons/hr/i18n/pl.po
index ebe45d8acab..81b88f4f92c 100644
--- a/addons/hr/i18n/pl.po
+++ b/addons/hr/i18n/pl.po
@@ -705,7 +705,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/pt.po b/addons/hr/i18n/pt.po
index 20106629839..c104e95bbf7 100644
--- a/addons/hr/i18n/pt.po
+++ b/addons/hr/i18n/pt.po
@@ -727,7 +727,7 @@ msgstr "Em Posição"
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/pt_BR.po b/addons/hr/i18n/pt_BR.po
index ca757a290ef..bee434c9091 100644
--- a/addons/hr/i18n/pt_BR.po
+++ b/addons/hr/i18n/pt_BR.po
@@ -715,7 +715,7 @@ msgstr "Em Posição"
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr "Celular:"
 
 #. module: hr
diff --git a/addons/hr/i18n/ro.po b/addons/hr/i18n/ro.po
index 601d0500616..04e1c740f9a 100644
--- a/addons/hr/i18n/ro.po
+++ b/addons/hr/i18n/ro.po
@@ -701,7 +701,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/ru.po b/addons/hr/i18n/ru.po
index c7d05cc2b3b..5681497a73c 100644
--- a/addons/hr/i18n/ru.po
+++ b/addons/hr/i18n/ru.po
@@ -701,7 +701,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr "Мобильный телефон"
 
 #. module: hr
diff --git a/addons/hr/i18n/sk.po b/addons/hr/i18n/sk.po
index ad4c7c20229..591301fd04c 100644
--- a/addons/hr/i18n/sk.po
+++ b/addons/hr/i18n/sk.po
@@ -702,7 +702,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/sl.po b/addons/hr/i18n/sl.po
index cb4018426bc..5b6a5ae74c7 100644
--- a/addons/hr/i18n/sl.po
+++ b/addons/hr/i18n/sl.po
@@ -701,7 +701,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/sq.po b/addons/hr/i18n/sq.po
index a25053c4155..2981dc85e10 100644
--- a/addons/hr/i18n/sq.po
+++ b/addons/hr/i18n/sq.po
@@ -702,7 +702,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/sr.po b/addons/hr/i18n/sr.po
index 33590a797a9..33939862d12 100644
--- a/addons/hr/i18n/sr.po
+++ b/addons/hr/i18n/sr.po
@@ -716,7 +716,7 @@ msgstr "Na Poziciji"
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/sr@latin.po b/addons/hr/i18n/sr@latin.po
index 4db9f7b7391..99a80ca7a98 100644
--- a/addons/hr/i18n/sr@latin.po
+++ b/addons/hr/i18n/sr@latin.po
@@ -735,7 +735,7 @@ msgstr "Na Poziciji"
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr "Mobilni"
 
 #. module: hr
diff --git a/addons/hr/i18n/sv.po b/addons/hr/i18n/sv.po
index 74354db37a0..df9cd58951e 100644
--- a/addons/hr/i18n/sv.po
+++ b/addons/hr/i18n/sv.po
@@ -701,7 +701,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/th.po b/addons/hr/i18n/th.po
index b57368a1b04..916501903e2 100644
--- a/addons/hr/i18n/th.po
+++ b/addons/hr/i18n/th.po
@@ -702,7 +702,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr "โทรศัพท์มือถือ"
 
 #. module: hr
diff --git a/addons/hr/i18n/th_TH.po b/addons/hr/i18n/th_TH.po
index 62732e8bc76..b691871f4f9 100644
--- a/addons/hr/i18n/th_TH.po
+++ b/addons/hr/i18n/th_TH.po
@@ -149,6 +149,11 @@ msgstr ""
 msgid "Work Phone"
 msgstr ""
 
+#. module: hr
+#: field:hr.employee,mobile_phone:0
+msgid "Work Mobile"
+msgstr ""
+
 #. module: hr
 #: field:hr.employee.category,child_ids:0
 msgid "Child Categories"
diff --git a/addons/hr/i18n/tlh.po b/addons/hr/i18n/tlh.po
index 36a4d566c8b..82d32697171 100644
--- a/addons/hr/i18n/tlh.po
+++ b/addons/hr/i18n/tlh.po
@@ -701,7 +701,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/tr.po b/addons/hr/i18n/tr.po
index 050cb8de88c..74f58da3bd7 100644
--- a/addons/hr/i18n/tr.po
+++ b/addons/hr/i18n/tr.po
@@ -701,7 +701,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/uk.po b/addons/hr/i18n/uk.po
index 61ea2114b86..eaf1d7b9ad8 100644
--- a/addons/hr/i18n/uk.po
+++ b/addons/hr/i18n/uk.po
@@ -701,7 +701,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/vi.po b/addons/hr/i18n/vi.po
index fbc4449126b..d7a3d337e5c 100644
--- a/addons/hr/i18n/vi.po
+++ b/addons/hr/i18n/vi.po
@@ -707,7 +707,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po
index ec49b2a9828..828eef75cb7 100644
--- a/addons/hr/i18n/zh_CN.po
+++ b/addons/hr/i18n/zh_CN.po
@@ -707,7 +707,7 @@ msgstr "在职"
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr "手机"
 
 #. module: hr
diff --git a/addons/hr/i18n/zh_TW.po b/addons/hr/i18n/zh_TW.po
index 36bc0246da4..85004b2cbdc 100644
--- a/addons/hr/i18n/zh_TW.po
+++ b/addons/hr/i18n/zh_TW.po
@@ -701,7 +701,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
-msgid "Mobile"
+msgid "Work Mobile"
 msgstr ""
 
 #. module: hr

From 2167c599783f3e47791d31173e7f39cde152e5d0 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Wed, 16 Feb 2011 17:11:31 +0530
Subject: [PATCH 52/73] [IMP] hr_expense: small modification in access rule
 domain

bzr revid: psi@tinyerp.co.in-20110216114131-xcnhnq3s1pjxp9bc
---
 addons/hr_expense/security/ir_rule.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_expense/security/ir_rule.xml b/addons/hr_expense/security/ir_rule.xml
index d2686d2157c..292db38bf5e 100644
--- a/addons/hr_expense/security/ir_rule.xml
+++ b/addons/hr_expense/security/ir_rule.xml
@@ -17,7 +17,7 @@
         <record id="property_rule_expense_employee" model="ir.rule">
             <field name="name">Employee Expense</field>
             <field model="ir.model" name="model_id" ref="model_hr_expense_expense"/>
-            <field name="domain_force">['|', ('employee_id.user_id','=',user.id), ('department_id.manager_id.user_id','=',user.id)]</field>
+            <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
             <field name="groups" eval="[(4,ref('base.group_user'))]"/>
         </record>
 

From 6cc5d61e15ada94fd5120b065f1d23a208a8c636 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Wed, 16 Feb 2011 17:30:13 +0530
Subject: [PATCH 53/73] [IMP] hr_expense: small modification in access rule
 domain

bzr revid: psi@tinyerp.co.in-20110216120013-36760ok9u8x35qr2
---
 addons/hr_expense/security/ir_rule.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_expense/security/ir_rule.xml b/addons/hr_expense/security/ir_rule.xml
index 292db38bf5e..8e310f7f24b 100644
--- a/addons/hr_expense/security/ir_rule.xml
+++ b/addons/hr_expense/security/ir_rule.xml
@@ -5,7 +5,7 @@
         <record id="property_rule_expense" model="ir.rule">
             <field name="name">Employee Expense</field>
             <field model="ir.model" name="model_id" ref="model_hr_expense_expense"/>
-            <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
+            <field name="domain_force">['|', ('employee_id.user_id','=',user.id), ('department_id.manager_id.user_id','=',user.id)]</field>
             <field name="groups" eval="[(4,ref('base.group_hr_user'))]"/>
         </record>
         <record id="property_rule_expense_manager" model="ir.rule">

From d6c8860db575e28b0f7d80c9bad09601dc06937c Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Wed, 16 Feb 2011 18:08:45 +0530
Subject: [PATCH 54/73] [FIX]Human Resources : employee form view : Mobile
 field

bzr revid: ara@tinyerp.com-20110216123845-ltf990dqca9qfedq
---
 addons/hr/i18n/es.po       | 2 +-
 addons/hr/i18n/es_CL.po    | 2 +-
 addons/hr/i18n/fi.po       | 2 +-
 addons/hr/i18n/fr.po       | 2 +-
 addons/hr/i18n/hr.po       | 2 +-
 addons/hr/i18n/hu.po       | 2 +-
 addons/hr/i18n/id.po       | 2 +-
 addons/hr/i18n/it.po       | 2 +-
 addons/hr/i18n/nl.po       | 2 +-
 addons/hr/i18n/pt_BR.po    | 2 +-
 addons/hr/i18n/ru.po       | 2 +-
 addons/hr/i18n/sr@latin.po | 2 +-
 addons/hr/i18n/th.po       | 2 +-
 addons/hr/i18n/zh_CN.po    | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/addons/hr/i18n/es.po b/addons/hr/i18n/es.po
index 29bfd7dbae1..eb7ddd92a38 100644
--- a/addons/hr/i18n/es.po
+++ b/addons/hr/i18n/es.po
@@ -753,7 +753,7 @@ msgstr "Ocupado"
 #. module: hr
 #: field:hr.employee,mobile_phone:0
 msgid "Work Mobile"
-msgstr "Móvil"
+msgstr "Móvil trabajo"
 
 #. module: hr
 #: view:hr.department:0
diff --git a/addons/hr/i18n/es_CL.po b/addons/hr/i18n/es_CL.po
index 36b89a79ffd..aa3cfe52975 100644
--- a/addons/hr/i18n/es_CL.po
+++ b/addons/hr/i18n/es_CL.po
@@ -734,7 +734,7 @@ msgstr "Na poziciji"
 #. module: hr
 #: field:hr.employee,mobile_phone:0
 msgid "Work Mobile"
-msgstr "Mobitel"
+msgstr "Poslovni Mobitel"
 
 #. module: hr
 #: view:hr.department:0
diff --git a/addons/hr/i18n/fi.po b/addons/hr/i18n/fi.po
index f17c2d0a541..84ced3b1c26 100644
--- a/addons/hr/i18n/fi.po
+++ b/addons/hr/i18n/fi.po
@@ -705,7 +705,7 @@ msgstr "Asemassa"
 #. module: hr
 #: field:hr.employee,mobile_phone:0
 msgid "Work Mobile"
-msgstr "Matkapuhelin"
+msgstr "Työ Matkapuhelin"
 
 #. module: hr
 #: view:hr.department:0
diff --git a/addons/hr/i18n/fr.po b/addons/hr/i18n/fr.po
index 430d33c1812..22745446433 100644
--- a/addons/hr/i18n/fr.po
+++ b/addons/hr/i18n/fr.po
@@ -747,7 +747,7 @@ msgstr "En poste"
 #. module: hr
 #: field:hr.employee,mobile_phone:0
 msgid "Work Mobile"
-msgstr "Tél. portable"
+msgstr "Travail Tél. portable"
 
 #. module: hr
 #: view:hr.department:0
diff --git a/addons/hr/i18n/hr.po b/addons/hr/i18n/hr.po
index 36b89a79ffd..aa3cfe52975 100644
--- a/addons/hr/i18n/hr.po
+++ b/addons/hr/i18n/hr.po
@@ -734,7 +734,7 @@ msgstr "Na poziciji"
 #. module: hr
 #: field:hr.employee,mobile_phone:0
 msgid "Work Mobile"
-msgstr "Mobitel"
+msgstr "Poslovni Mobitel"
 
 #. module: hr
 #: view:hr.department:0
diff --git a/addons/hr/i18n/hu.po b/addons/hr/i18n/hu.po
index b2b08aa4521..b063ff9e1ff 100644
--- a/addons/hr/i18n/hu.po
+++ b/addons/hr/i18n/hu.po
@@ -728,7 +728,7 @@ msgstr "Pozícióban"
 #. module: hr
 #: field:hr.employee,mobile_phone:0
 msgid "Work Mobile"
-msgstr "Mobilszám"
+msgstr "Munkahelyi Mobilszám"
 
 #. module: hr
 #: view:hr.department:0
diff --git a/addons/hr/i18n/id.po b/addons/hr/i18n/id.po
index 32033376c7a..0246e6c4def 100644
--- a/addons/hr/i18n/id.po
+++ b/addons/hr/i18n/id.po
@@ -749,7 +749,7 @@ msgstr "Dalam Posisi"
 #. module: hr
 #: field:hr.employee,mobile_phone:0
 msgid "Work Mobile"
-msgstr "Ponsel"
+msgstr "Ponsel Kantor"
 
 #. module: hr
 #: view:hr.department:0
diff --git a/addons/hr/i18n/it.po b/addons/hr/i18n/it.po
index 71cddc425c6..b7ed3773069 100644
--- a/addons/hr/i18n/it.po
+++ b/addons/hr/i18n/it.po
@@ -748,7 +748,7 @@ msgstr "Assunzioni effettuate"
 #. module: hr
 #: field:hr.employee,mobile_phone:0
 msgid "Work Mobile"
-msgstr "Cellulare"
+msgstr "Cellulare Ufficio"
 
 #. module: hr
 #: view:hr.department:0
diff --git a/addons/hr/i18n/nl.po b/addons/hr/i18n/nl.po
index 9d87a764d86..8fe3e6f3952 100644
--- a/addons/hr/i18n/nl.po
+++ b/addons/hr/i18n/nl.po
@@ -742,7 +742,7 @@ msgstr "Is vervuld"
 #. module: hr
 #: field:hr.employee,mobile_phone:0
 msgid "Work Mobile"
-msgstr "Mobiel"
+msgstr "Mobiel werk"
 
 #. module: hr
 #: view:hr.department:0
diff --git a/addons/hr/i18n/pt_BR.po b/addons/hr/i18n/pt_BR.po
index bee434c9091..dbec16938cd 100644
--- a/addons/hr/i18n/pt_BR.po
+++ b/addons/hr/i18n/pt_BR.po
@@ -716,7 +716,7 @@ msgstr "Em Posição"
 #. module: hr
 #: field:hr.employee,mobile_phone:0
 msgid "Work Mobile"
-msgstr "Celular:"
+msgstr "Celular comercial"
 
 #. module: hr
 #: view:hr.department:0
diff --git a/addons/hr/i18n/ru.po b/addons/hr/i18n/ru.po
index 5681497a73c..83f0a533523 100644
--- a/addons/hr/i18n/ru.po
+++ b/addons/hr/i18n/ru.po
@@ -702,7 +702,7 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,mobile_phone:0
 msgid "Work Mobile"
-msgstr "Мобильный телефон"
+msgstr "Раб. Мобильный телефон"
 
 #. module: hr
 #: view:hr.department:0
diff --git a/addons/hr/i18n/sr@latin.po b/addons/hr/i18n/sr@latin.po
index 99a80ca7a98..25c331b8de8 100644
--- a/addons/hr/i18n/sr@latin.po
+++ b/addons/hr/i18n/sr@latin.po
@@ -736,7 +736,7 @@ msgstr "Na Poziciji"
 #. module: hr
 #: field:hr.employee,mobile_phone:0
 msgid "Work Mobile"
-msgstr "Mobilni"
+msgstr "Poslovni Mobilni"
 
 #. module: hr
 #: view:hr.department:0
diff --git a/addons/hr/i18n/th.po b/addons/hr/i18n/th.po
index 916501903e2..42381101810 100644
--- a/addons/hr/i18n/th.po
+++ b/addons/hr/i18n/th.po
@@ -703,7 +703,7 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,mobile_phone:0
 msgid "Work Mobile"
-msgstr "โทรศัพท์มือถือ"
+msgstr "โทรศัพท์มือถืองาน"
 
 #. module: hr
 #: view:hr.department:0
diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po
index 828eef75cb7..82aa8855cec 100644
--- a/addons/hr/i18n/zh_CN.po
+++ b/addons/hr/i18n/zh_CN.po
@@ -708,7 +708,7 @@ msgstr "在职"
 #. module: hr
 #: field:hr.employee,mobile_phone:0
 msgid "Work Mobile"
-msgstr "手机"
+msgstr "办公手机"
 
 #. module: hr
 #: view:hr.department:0

From f60f00afaf6859344828513a0954a7eb006ca175 Mon Sep 17 00:00:00 2001
From: "Matvaya Gajjar(Openerp)" <>
Date: Thu, 17 Feb 2011 10:37:14 +0530
Subject: [PATCH 55/73] [FIX] l10n_in: Receivable and payble account with
 reconcile boolean set to true

bzr revid: mra@mra-laptop-20110217050714-e3haxmuezetyd97w
---
 addons/l10n_in/l10n_in_chart.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/l10n_in/l10n_in_chart.xml b/addons/l10n_in/l10n_in_chart.xml
index f1b6a8a3b0c..f6851050604 100644
--- a/addons/l10n_in/l10n_in_chart.xml
+++ b/addons/l10n_in/l10n_in_chart.xml
@@ -155,7 +155,7 @@
             <field name="code">IA_AC01161</field>
             <field name="type">receivable</field>
             <field name="user_type" ref="account_type_asset1"/>
-            <field name="reconcile" eval="False"/>
+            <field name="reconcile" eval="True"/>
             <field name="parent_id" ref="IA_AC0116"/>
         </record>
 
@@ -232,11 +232,11 @@
         </record>
 
         <record model="account.account.template" id="IA_AC02131">
-            <field name="name">Sundry Creditors</field>
+            <field name="name">Sundry Creditors Account</field>
             <field name="code">IA_AC02131</field>
             <field name="type">payable</field>
             <field name="user_type" ref="account_type_liability1"/>
-            <field name="reconcile" eval="False"/>
+            <field name="reconcile" eval="True"/>
             <field name="parent_id" ref="IA_AC0213"/>
         </record>
 

From 0cecde1d2ec79ed6eba9583a340a5f8219f706c3 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Thu, 17 Feb 2011 10:48:59 +0530
Subject: [PATCH 56/73] [FIX]Human Resources : Job position : Survey

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

bzr revid: ara@tinyerp.com-20110217051859-g6ee2xpz3afuwjtf
---
 addons/hr_recruitment/hr_recruitment.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 02643a3e90e..d6956ab84ba 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -437,7 +437,7 @@ class hr_job(osv.osv):
     _inherit = "hr.job"
     _name = "hr.job"
     _columns = {
-        'survey_id': fields.many2one('survey', 'Survey'),
+        'survey_id': fields.many2one('survey', 'Survey', help="Select survey for the current job"),
     }
 hr_job()
 

From 8ffac40122e60587b3645c933fc1e779eb828a8d Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 17 Feb 2011 10:56:05 +0530
Subject: [PATCH 57/73] [FIX] hr_evaluation: add draft button on evaluation
 form when it got canceled

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

bzr revid: mra@mra-laptop-20110217052605-v6ni6uqw50xkguh9
---
 addons/hr_evaluation/hr_evaluation.py       |  4 +++
 addons/hr_evaluation/hr_evaluation_view.xml | 34 +++++++++++----------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 4a9a46920f5..0b0ebb92261 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -251,6 +251,10 @@ class hr_evaluation(osv.osv):
         self.write(cr, uid, ids,{'state':'cancel'}, context=context)
         return True
 
+    def button_draft(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids,{'state': 'draft'}, context=context)
+        return True
+
     def write(self, cr, uid, ids, vals, context=None):
         if 'date' in vals:
             new_vals = {'date_deadline': vals.get('date')}
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 99f34f7cc7b..ac3f723ceb3 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -200,16 +200,18 @@
                         </page>
                     </notebook>
                     <newline/>
-                    <group col="6" colspan="4">
-                    <field name="state"/>
-                    <button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object"
-                            icon="gtk-cancel"/>
-                    <button name="button_plan_in_progress" string="Start Evaluation" states="draft" type="object"
-                            icon="gtk-execute"/>
-                    <button name="button_done" string="Done" states="progress" type="object"
-                            icon="gtk-jump-to"/>
-                    <button name="button_final_validation" string="Validate Evaluation" states="wait" type="object"
-                            icon="gtk-go-forward"/>
+                    <group col="8" colspan="4">
+	                    <field name="state"/>
+	                    <button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object"
+	                            icon="gtk-cancel"/>
+	                    <button name="button_plan_in_progress" string="Start Evaluation" states="draft" type="object"
+	                            icon="gtk-execute"/>
+	                    <button name="button_done" string="Done" states="progress" type="object"
+	                            icon="gtk-jump-to"/>
+	                    <button name="button_draft" string="Reset to Draft" states="cancel" type="object"
+	                            icon="terp-stock_effects-object-colorize"/>
+	                    <button name="button_final_validation" string="Validate Evaluation" states="wait" type="object"
+	                            icon="gtk-go-forward"/>
                     </group>
               </form>
             </field>
@@ -250,12 +252,12 @@
             <field name="arch" type="xml">
                 <search string="Search Evaluation">
                    <group col='10' colspan='4'>
-                    <filter icon="terp-check" string="Current" domain="[('state','=','wait'))]" help="Evaluations that are in waiting state"/>                                       
+                    <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"/> 
+                    <separator orientation="vertical"/>
                     <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
                         help="Evaluations that overpassed the deadline" domain="[('date','&lt;=',(datetime.date.today()).strftime('%%Y-%%m-%%d'))]" />
                     <separator orientation="vertical"/>
@@ -405,11 +407,11 @@
            action="action_hr_evaluation_send_mail" sequence="45" groups="base.group_hr_manager"/>
 
       <!-- Evaluation Interviews Button on Employee Form -->
-      <act_window 
+      <act_window
       context="{'search_default_user_to_review_id': [active_id]}"
-      id="act_hr_employee_2_hr__evaluation_interview" 
-      name="Evaluation Interviews" 
-      res_model="hr.evaluation.interview" 
+      id="act_hr_employee_2_hr__evaluation_interview"
+      name="Evaluation Interviews"
+      res_model="hr.evaluation.interview"
       src_model="hr.employee"/>
 
     </data>

From 3f10138dd221b87acd1aa2ca4c87013231f137ba Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Thu, 17 Feb 2011 11:19:53 +0530
Subject: [PATCH 58/73] [FIX]Hr recucruitment

bzr revid: ara@tinyerp.com-20110217054953-ylugmhwxrb1kohcb
---
 addons/hr_recruitment/i18n/hr_recruitment.pot | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/hr_recruitment/i18n/hr_recruitment.pot b/addons/hr_recruitment/i18n/hr_recruitment.pot
index 971f27ddbc2..adabdc6e5fb 100644
--- a/addons/hr_recruitment/i18n/hr_recruitment.pot
+++ b/addons/hr_recruitment/i18n/hr_recruitment.pot
@@ -20,6 +20,11 @@ msgstr ""
 msgid "If the active field is set to false, it will allow you to hide the case without removing it."
 msgstr ""
 
+#. module: hr_recruitment
+#: help:hr.job,survey_id:0
+msgid "Select survey for the current job"
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.recruitment.stage:0
 #: field:hr.recruitment.stage,requirements:0

From 59a5219269e600ba2f725a5d0755e8ef6f95d34c Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 17 Feb 2011 14:47:54 +0530
Subject: [PATCH 59/73] [FIX] Holidays - Department field is not relevant if we
 assign holidays or allocation by Employee's Category

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

bzr revid: mra@mra-laptop-20110217091754-ow18gxcbx2h2l3lg
---
 addons/hr_holidays/hr_holidays_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index e207c2caf7d..845b5c00e8f 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -81,7 +81,7 @@
                     <notebook colspan="4">
                         <page string="General">
                             <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}" />
-                            <field name="department_id"/>
+                            <field name="department_id" attrs="{'invisible':[('holiday_type','=','category')]}" />
                             <field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1"/>
                             <field name="date_to" on_change="onchange_date_from(date_to, date_from)" required="1"/>
                             <field name="number_of_days_temp"/>
@@ -125,7 +125,7 @@
                 <notebook colspan="4">
                     <page string="General">
                         <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}" />
-                        <field name="department_id"/>
+                        <field name="department_id" attrs="{'invisible':[('holiday_type','=','category')]}" />
                         <field name="number_of_days_temp"/>
                         <newline/>
                         <field name="manager_id"/>
@@ -414,7 +414,7 @@
         </record>
 
         <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Holidays"/>
-        
+
         <menuitem name="Leave Type"
             action="open_view_holiday_status"
             id="menu_open_view_holiday_status"

From 966c8c4475e9e708b5c556c6b2cce76929726118 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 17 Feb 2011 15:07:38 +0530
Subject: [PATCH 60/73] [FIX] hr_recruitment: Remove data for sales team => hr
 departements

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

bzr revid: mra@mra-laptop-20110217093738-ktrmz0rmzfnq6z24
---
 addons/hr_recruitment/hr_recruitment_data.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index aaa386356c5..7985ddb42f0 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -66,10 +66,5 @@
         <field name="object_id" search="[('model','=','hr.applicant')]" model="ir.model"/>
     </record>
 
-    <!--  Department(section_id)    -->
-    <record model="crm.case.section" id="section_hr_department">
-            <field name="name">HR Department</field>
-            <field name="code">HR</field>
-    </record>
 </data>
 </openerp>

From 990befd610cd6951a04f88a2967eaa2c936e2da7 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Thu, 17 Feb 2011 16:47:20 +0530
Subject: [PATCH 61/73] [FIX]Holiday Request - Two different fields with same
 labels

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

bzr revid: ara@tinyerp.com-20110217111720-nbqov0u17qqgxvjq
---
 addons/hr_holidays/hr_holidays_view.xml |  6 +++---
 addons/hr_holidays/i18n/ar.po           |  8 +++++++-
 addons/hr_holidays/i18n/bg.po           |  9 ++++++++-
 addons/hr_holidays/i18n/bs.po           |  9 ++++++++-
 addons/hr_holidays/i18n/ca.po           |  9 ++++++++-
 addons/hr_holidays/i18n/cs.po           |  8 +++++++-
 addons/hr_holidays/i18n/de.po           | 11 +++++++++--
 addons/hr_holidays/i18n/el.po           |  9 ++++++++-
 addons/hr_holidays/i18n/es.po           | 11 +++++++++--
 addons/hr_holidays/i18n/es_AR.po        |  9 ++++++++-
 addons/hr_holidays/i18n/es_EC.po        |  9 ++++++++-
 addons/hr_holidays/i18n/et.po           |  9 ++++++++-
 addons/hr_holidays/i18n/fi.po           |  9 ++++++++-
 addons/hr_holidays/i18n/fr.po           | 11 +++++++++--
 addons/hr_holidays/i18n/hi.po           |  9 ++++++++-
 addons/hr_holidays/i18n/hr.po           |  8 +++++++-
 addons/hr_holidays/i18n/hr_holidays.pot |  8 +++++++-
 addons/hr_holidays/i18n/hu.po           | 10 ++++++++--
 addons/hr_holidays/i18n/id.po           | 10 ++++++++--
 addons/hr_holidays/i18n/it.po           | 10 ++++++++--
 addons/hr_holidays/i18n/ko.po           |  8 +++++++-
 addons/hr_holidays/i18n/lt.po           |  8 +++++++-
 addons/hr_holidays/i18n/lv.po           |  8 +++++++-
 addons/hr_holidays/i18n/mn.po           | 10 ++++++++--
 addons/hr_holidays/i18n/nl.po           | 10 ++++++++--
 addons/hr_holidays/i18n/nl_BE.po        |  8 +++++++-
 addons/hr_holidays/i18n/pl.po           |  8 +++++++-
 addons/hr_holidays/i18n/pt.po           | 11 +++++++++++
 addons/hr_holidays/i18n/pt_BR.po        |  8 +++++++-
 addons/hr_holidays/i18n/ro.po           |  8 +++++++-
 addons/hr_holidays/i18n/ru.po           |  8 +++++++-
 addons/hr_holidays/i18n/sl.po           |  8 +++++++-
 addons/hr_holidays/i18n/sq.po           |  8 +++++++-
 addons/hr_holidays/i18n/sr.po           |  8 +++++++-
 addons/hr_holidays/i18n/sr@latin.po     |  8 +++++++-
 addons/hr_holidays/i18n/sv.po           |  8 +++++++-
 addons/hr_holidays/i18n/th.po           |  8 +++++++-
 addons/hr_holidays/i18n/tlh.po          |  8 +++++++-
 addons/hr_holidays/i18n/tr.po           |  8 +++++++-
 addons/hr_holidays/i18n/uk.po           |  8 +++++++-
 addons/hr_holidays/i18n/vi.po           |  8 +++++++-
 addons/hr_holidays/i18n/zh_CN.po        |  8 +++++++-
 addons/hr_holidays/i18n/zh_TW.po        |  8 +++++++-
 43 files changed, 321 insertions(+), 52 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index e207c2caf7d..161809d2255 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -70,7 +70,7 @@
                 <form string="Leave Request">
                     <group col="8" colspan="4">
                     <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}" />
-                    <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" groups="base.group_hr_manager, base.group_extended" string="Leave Type"/>
+                    <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" groups="base.group_hr_manager, base.group_extended" string="Leave Category"/>
                     <group attrs="{'invisible':[('holiday_type','=','employee')]}">
                         <field name="category_id"  attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')]}"/>
                         </group>
@@ -114,7 +114,7 @@
             <form string="Allocation Request">
                 <group col="8" colspan="4">
                     <field name="name" />
-                    <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Type" groups="base.group_hr_manager, base.group_extended"/>
+                    <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Category" groups="base.group_hr_manager, base.group_extended"/>
                         <group attrs="{'invisible':[('holiday_type','=','category')]}">
                         <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')]}"/>
                         </group>
@@ -414,7 +414,7 @@
         </record>
 
         <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Holidays"/>
-        
+
         <menuitem name="Leave Type"
             action="open_view_holiday_status"
             id="menu_open_view_holiday_status"
diff --git a/addons/hr_holidays/i18n/ar.po b/addons/hr_holidays/i18n/ar.po
index d3d1492b416..ef8c4c6929e 100644
--- a/addons/hr_holidays/i18n/ar.po
+++ b/addons/hr_holidays/i18n/ar.po
@@ -24,7 +24,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
+msgid "Allocation Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/bg.po b/addons/hr_holidays/i18n/bg.po
index 713ac7dff6e..25da5db4ea8 100644
--- a/addons/hr_holidays/i18n/bg.po
+++ b/addons/hr_holidays/i18n/bg.po
@@ -24,9 +24,16 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
+msgid "Allocation Category"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
+msgstr ""
+
+
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
diff --git a/addons/hr_holidays/i18n/bs.po b/addons/hr_holidays/i18n/bs.po
index 0629e5aa025..5b9d7317a7f 100644
--- a/addons/hr_holidays/i18n/bs.po
+++ b/addons/hr_holidays/i18n/bs.po
@@ -24,9 +24,16 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
+msgid "Allocation Category"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
+msgstr ""
+
+
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
diff --git a/addons/hr_holidays/i18n/ca.po b/addons/hr_holidays/i18n/ca.po
index 5ca278b36ca..30dca6e0ffd 100644
--- a/addons/hr_holidays/i18n/ca.po
+++ b/addons/hr_holidays/i18n/ca.po
@@ -24,9 +24,16 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
+msgid "Allocation Category"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
+msgstr ""
+
+
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
diff --git a/addons/hr_holidays/i18n/cs.po b/addons/hr_holidays/i18n/cs.po
index 4d375eb9fe7..1e90a8d43e7 100644
--- a/addons/hr_holidays/i18n/cs.po
+++ b/addons/hr_holidays/i18n/cs.po
@@ -24,7 +24,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
+msgid "Allocation Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/de.po b/addons/hr_holidays/i18n/de.po
index e2226d1f750..c751f30d0ba 100644
--- a/addons/hr_holidays/i18n/de.po
+++ b/addons/hr_holidays/i18n/de.po
@@ -25,8 +25,15 @@ msgstr "Blau"
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
-msgstr "Typ Anspruch"
+msgid "Allocation Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
+msgstr ""
+
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
diff --git a/addons/hr_holidays/i18n/el.po b/addons/hr_holidays/i18n/el.po
index 7ff02156d80..3be10143fca 100644
--- a/addons/hr_holidays/i18n/el.po
+++ b/addons/hr_holidays/i18n/el.po
@@ -27,9 +27,16 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
+msgid "Allocation Category"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
+msgstr ""
+
+
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
diff --git a/addons/hr_holidays/i18n/es.po b/addons/hr_holidays/i18n/es.po
index 211d15bbf07..e501b036f3a 100644
--- a/addons/hr_holidays/i18n/es.po
+++ b/addons/hr_holidays/i18n/es.po
@@ -24,8 +24,15 @@ msgstr "Azul"
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
-msgstr "Tipo de asignación"
+msgid "Allocation Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
+msgstr ""
+
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
diff --git a/addons/hr_holidays/i18n/es_AR.po b/addons/hr_holidays/i18n/es_AR.po
index 743f3feb0f9..438a7466a80 100644
--- a/addons/hr_holidays/i18n/es_AR.po
+++ b/addons/hr_holidays/i18n/es_AR.po
@@ -25,9 +25,16 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
+msgid "Allocation Category"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
+msgstr ""
+
+
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
diff --git a/addons/hr_holidays/i18n/es_EC.po b/addons/hr_holidays/i18n/es_EC.po
index 65b38f91f62..8eb77d8447f 100644
--- a/addons/hr_holidays/i18n/es_EC.po
+++ b/addons/hr_holidays/i18n/es_EC.po
@@ -25,9 +25,16 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
+msgid "Allocation Category"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
+msgstr ""
+
+
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
diff --git a/addons/hr_holidays/i18n/et.po b/addons/hr_holidays/i18n/et.po
index 24c248c5272..f778bd0f826 100644
--- a/addons/hr_holidays/i18n/et.po
+++ b/addons/hr_holidays/i18n/et.po
@@ -24,9 +24,16 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
+msgid "Allocation Category"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
+msgstr ""
+
+
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
diff --git a/addons/hr_holidays/i18n/fi.po b/addons/hr_holidays/i18n/fi.po
index 0cc884fa651..7d8f6a51c72 100644
--- a/addons/hr_holidays/i18n/fi.po
+++ b/addons/hr_holidays/i18n/fi.po
@@ -25,9 +25,16 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
+msgid "Allocation Category"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
+msgstr ""
+
+
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
diff --git a/addons/hr_holidays/i18n/fr.po b/addons/hr_holidays/i18n/fr.po
index ece0d58a6da..0ce243bbaa6 100644
--- a/addons/hr_holidays/i18n/fr.po
+++ b/addons/hr_holidays/i18n/fr.po
@@ -25,8 +25,15 @@ msgstr "Bleu"
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
-msgstr "Type d'attribution"
+msgid "Allocation Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
+msgstr ""
+
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
diff --git a/addons/hr_holidays/i18n/hi.po b/addons/hr_holidays/i18n/hi.po
index 97993da8fa9..a0c5463bde9 100644
--- a/addons/hr_holidays/i18n/hi.po
+++ b/addons/hr_holidays/i18n/hi.po
@@ -25,9 +25,16 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
+msgid "Allocation Category"
 msgstr ""
 
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
+msgstr ""
+
+
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
diff --git a/addons/hr_holidays/i18n/hr.po b/addons/hr_holidays/i18n/hr.po
index 909caed3e3e..7b404692f8a 100644
--- a/addons/hr_holidays/i18n/hr.po
+++ b/addons/hr_holidays/i18n/hr.po
@@ -24,7 +24,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
+msgid "Allocation Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/hr_holidays.pot b/addons/hr_holidays/i18n/hr_holidays.pot
index 4ace6903ad9..1438aa38695 100644
--- a/addons/hr_holidays/i18n/hr_holidays.pot
+++ b/addons/hr_holidays/i18n/hr_holidays.pot
@@ -23,7 +23,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
+msgid "Allocation Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/hu.po b/addons/hr_holidays/i18n/hu.po
index 8566378b0bd..51ffbaf8503 100644
--- a/addons/hr_holidays/i18n/hu.po
+++ b/addons/hr_holidays/i18n/hu.po
@@ -24,8 +24,14 @@ msgstr "Kék"
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
-msgstr "Juttatás típusa"
+msgid "Allocation Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
+msgstr ""
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
diff --git a/addons/hr_holidays/i18n/id.po b/addons/hr_holidays/i18n/id.po
index 1ee4823b40b..a8758439ef2 100644
--- a/addons/hr_holidays/i18n/id.po
+++ b/addons/hr_holidays/i18n/id.po
@@ -24,8 +24,14 @@ msgstr "Biru"
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
-msgstr "Jenis Alokasi"
+msgid "Allocation Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
+msgstr ""
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
diff --git a/addons/hr_holidays/i18n/it.po b/addons/hr_holidays/i18n/it.po
index af39487cc63..a77de852a1e 100644
--- a/addons/hr_holidays/i18n/it.po
+++ b/addons/hr_holidays/i18n/it.po
@@ -24,8 +24,14 @@ msgstr "Blu"
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
-msgstr "Tipo assegnazione"
+msgid "Allocation Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
+msgstr ""
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
diff --git a/addons/hr_holidays/i18n/ko.po b/addons/hr_holidays/i18n/ko.po
index a1564ac83db..9e4cb958685 100644
--- a/addons/hr_holidays/i18n/ko.po
+++ b/addons/hr_holidays/i18n/ko.po
@@ -25,7 +25,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
+msgid "Allocation Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/lt.po b/addons/hr_holidays/i18n/lt.po
index 16454400fdd..fdc4aa503b8 100644
--- a/addons/hr_holidays/i18n/lt.po
+++ b/addons/hr_holidays/i18n/lt.po
@@ -24,7 +24,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
+msgid "Allocation Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/lv.po b/addons/hr_holidays/i18n/lv.po
index c45923d3871..0f249841849 100644
--- a/addons/hr_holidays/i18n/lv.po
+++ b/addons/hr_holidays/i18n/lv.po
@@ -25,7 +25,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
+msgid "Allocation Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/mn.po b/addons/hr_holidays/i18n/mn.po
index f78e606afd6..184a663c4c6 100644
--- a/addons/hr_holidays/i18n/mn.po
+++ b/addons/hr_holidays/i18n/mn.po
@@ -24,8 +24,14 @@ msgstr "Цэнхэр"
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
-msgstr "Хуваарилах төрөл"
+msgid "Allocation Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
+msgstr ""
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
diff --git a/addons/hr_holidays/i18n/nl.po b/addons/hr_holidays/i18n/nl.po
index 59cba6b6426..8d533f581d1 100644
--- a/addons/hr_holidays/i18n/nl.po
+++ b/addons/hr_holidays/i18n/nl.po
@@ -24,8 +24,14 @@ msgstr "Blauw"
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
-msgstr "Soort reservering"
+msgid "Allocation Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
+msgstr ""
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
diff --git a/addons/hr_holidays/i18n/nl_BE.po b/addons/hr_holidays/i18n/nl_BE.po
index f3e95e3a872..cc093693f6c 100644
--- a/addons/hr_holidays/i18n/nl_BE.po
+++ b/addons/hr_holidays/i18n/nl_BE.po
@@ -25,7 +25,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
+msgid "Allocation Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/pl.po b/addons/hr_holidays/i18n/pl.po
index d0918b839e9..f196fcada7f 100644
--- a/addons/hr_holidays/i18n/pl.po
+++ b/addons/hr_holidays/i18n/pl.po
@@ -24,7 +24,13 @@ msgstr "Niebieski"
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
+msgid "Allocation Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/pt.po b/addons/hr_holidays/i18n/pt.po
index f6f96f9cfe9..c87a6094b48 100644
--- a/addons/hr_holidays/i18n/pt.po
+++ b/addons/hr_holidays/i18n/pt.po
@@ -21,6 +21,17 @@ msgstr ""
 msgid "Blue"
 msgstr "Azul"
 
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Allocation Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
+msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
diff --git a/addons/hr_holidays/i18n/pt_BR.po b/addons/hr_holidays/i18n/pt_BR.po
index f5096104e50..630b190f9ae 100644
--- a/addons/hr_holidays/i18n/pt_BR.po
+++ b/addons/hr_holidays/i18n/pt_BR.po
@@ -25,7 +25,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
+msgid "Allocation Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/ro.po b/addons/hr_holidays/i18n/ro.po
index d89b8b06155..d4b7fb3d903 100644
--- a/addons/hr_holidays/i18n/ro.po
+++ b/addons/hr_holidays/i18n/ro.po
@@ -24,7 +24,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
+msgid "Allocation Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/ru.po b/addons/hr_holidays/i18n/ru.po
index d7dc77af908..58b20e02796 100644
--- a/addons/hr_holidays/i18n/ru.po
+++ b/addons/hr_holidays/i18n/ru.po
@@ -25,7 +25,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
+msgid "Allocation Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/sl.po b/addons/hr_holidays/i18n/sl.po
index 6a47f1b4d57..39d92972844 100644
--- a/addons/hr_holidays/i18n/sl.po
+++ b/addons/hr_holidays/i18n/sl.po
@@ -24,7 +24,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
+msgid "Allocation Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/sq.po b/addons/hr_holidays/i18n/sq.po
index 7af3fa105a3..7978ee405c1 100644
--- a/addons/hr_holidays/i18n/sq.po
+++ b/addons/hr_holidays/i18n/sq.po
@@ -25,7 +25,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
+msgid "Allocation Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/sr.po b/addons/hr_holidays/i18n/sr.po
index 0e7c5b05894..4033286f8c0 100644
--- a/addons/hr_holidays/i18n/sr.po
+++ b/addons/hr_holidays/i18n/sr.po
@@ -25,7 +25,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
+msgid "Allocation Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/sr@latin.po b/addons/hr_holidays/i18n/sr@latin.po
index 12682b39c71..f8323211a26 100644
--- a/addons/hr_holidays/i18n/sr@latin.po
+++ b/addons/hr_holidays/i18n/sr@latin.po
@@ -25,7 +25,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
+msgid "Allocation Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/sv.po b/addons/hr_holidays/i18n/sv.po
index 41bccec8e22..3eb6cf3e092 100644
--- a/addons/hr_holidays/i18n/sv.po
+++ b/addons/hr_holidays/i18n/sv.po
@@ -24,7 +24,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
+msgid "Allocation Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/th.po b/addons/hr_holidays/i18n/th.po
index 8efbe2f7973..56410e8b335 100644
--- a/addons/hr_holidays/i18n/th.po
+++ b/addons/hr_holidays/i18n/th.po
@@ -25,7 +25,13 @@ msgstr "สีน้ำเงิน"
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
+msgid "Allocation Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/tlh.po b/addons/hr_holidays/i18n/tlh.po
index d27b557b798..abc9fc139bc 100644
--- a/addons/hr_holidays/i18n/tlh.po
+++ b/addons/hr_holidays/i18n/tlh.po
@@ -25,7 +25,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
+msgid "Allocation Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/tr.po b/addons/hr_holidays/i18n/tr.po
index 64cf159ca7f..f574bfa8ed5 100644
--- a/addons/hr_holidays/i18n/tr.po
+++ b/addons/hr_holidays/i18n/tr.po
@@ -24,7 +24,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
+msgid "Allocation Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/uk.po b/addons/hr_holidays/i18n/uk.po
index 1d52b150202..892e28c98fb 100644
--- a/addons/hr_holidays/i18n/uk.po
+++ b/addons/hr_holidays/i18n/uk.po
@@ -25,7 +25,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
+msgid "Allocation Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/vi.po b/addons/hr_holidays/i18n/vi.po
index 471e55b87b6..7eea46fe053 100644
--- a/addons/hr_holidays/i18n/vi.po
+++ b/addons/hr_holidays/i18n/vi.po
@@ -25,7 +25,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
+msgid "Allocation Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/zh_CN.po b/addons/hr_holidays/i18n/zh_CN.po
index ee76e86d3b3..ab4bfc362e8 100644
--- a/addons/hr_holidays/i18n/zh_CN.po
+++ b/addons/hr_holidays/i18n/zh_CN.po
@@ -24,7 +24,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
+msgid "Allocation Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/zh_TW.po b/addons/hr_holidays/i18n/zh_TW.po
index 7d2d362bfd7..f16a8c4660e 100644
--- a/addons/hr_holidays/i18n/zh_TW.po
+++ b/addons/hr_holidays/i18n/zh_TW.po
@@ -24,7 +24,13 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,holiday_type:0
-msgid "Allocation Type"
+msgid "Allocation Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,holiday_type:0
+msgid "Leave Category"
 msgstr ""
 
 #. module: hr_holidays

From 9c489006aafc94940ef4bee57d51ad607f57e89b Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Thu, 17 Feb 2011 18:30:52 +0530
Subject: [PATCH 62/73] [FIX]Accounting / Invoice + Partner Manager unable to
 create new partner

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

bzr revid: ara@tinyerp.com-20110217130052-y53j9ea6oj3vifrw
---
 addons/account/partner_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 890e477a726..13ae352ab08 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -76,13 +76,13 @@
                 <page string="Accounting">
                     <group col="2" colspan="2">
                         <separator string="Customer Accounting Properties" colspan="2"/>
-                        <field name="property_account_receivable" groups="base.group_extended" />
+                        <field name="property_account_receivable" groups="account.group_account_invoice" />
                         <field name="property_account_position" widget="selection"/>
                         <field name="property_payment_term" widget="selection"/>
                     </group>
                     <group col="2" colspan="2">
                         <separator string="Supplier Accounting Properties" colspan="2"/>
-                        <field name="property_account_payable" groups="base.group_extended"/>
+                        <field name="property_account_payable" groups="account.group_account_invoice"/>
                     </group>
                     <group col="2" colspan="2">
                         <separator string="Customer Credit" colspan="2"/>

From 4c53bf60120ae4032249ef0ba70969d8308ae2a3 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Fri, 18 Feb 2011 17:53:44 +0530
Subject: [PATCH 63/73] [REVERT] hr_*: securty rules reverted

bzr revid: mra@mra-laptop-20110218122344-lb7tj7llxngkbj0p
---
 addons/hr/security/hr_security.xml          | 8 --------
 addons/hr_evaluation/hr_evaluation_demo.xml | 8 +-------
 addons/hr_expense/security/ir_rule.xml      | 2 +-
 addons/hr_payroll/security/hr_security.xml  | 6 ------
 4 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index caecf869ce6..61aa5a93b12 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -9,13 +9,5 @@
     <record id="base.group_hr_user" model="res.groups">
         <field name="name">Human Resources / User</field>
     </record>
-
-     <record id="property_rule_employee" model="ir.rule">
-        <field name="name">Employee</field>
-        <field model="ir.model" name="model_id" ref="model_hr_employee"/>
-        <field name="domain_force">[('user_id','=',user.id)]</field>
-        <field name="groups" eval="[(4,ref('base.group_user'))]"/>
-    </record>
-
 </data>
 </openerp>
diff --git a/addons/hr_evaluation/hr_evaluation_demo.xml b/addons/hr_evaluation/hr_evaluation_demo.xml
index 682452a196b..59396717d49 100644
--- a/addons/hr_evaluation/hr_evaluation_demo.xml
+++ b/addons/hr_evaluation/hr_evaluation_demo.xml
@@ -1624,12 +1624,6 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="domain_force">['|',('employee_id.user_id','=',user.id),('employee_id.parent_id.user_id','=',user.id )]</field>
             <field name="groups" eval="[(4,ref('base.group_hr_manager'))]"/>
         </record>
-        <record id="property_rule_employee_evaluation" model="ir.rule">
-            <field name="name">Employee Evaluation</field>
-            <field model="ir.model" name="model_id" ref="model_hr_evaluation_evaluation"/>
-            <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
-            <field name="groups" eval="[(4,ref('base.group_user'))]"/>
-        </record>
-        </data>
+         </data>
 
 </openerp>
diff --git a/addons/hr_expense/security/ir_rule.xml b/addons/hr_expense/security/ir_rule.xml
index 8e310f7f24b..292db38bf5e 100644
--- a/addons/hr_expense/security/ir_rule.xml
+++ b/addons/hr_expense/security/ir_rule.xml
@@ -5,7 +5,7 @@
         <record id="property_rule_expense" model="ir.rule">
             <field name="name">Employee Expense</field>
             <field model="ir.model" name="model_id" ref="model_hr_expense_expense"/>
-            <field name="domain_force">['|', ('employee_id.user_id','=',user.id), ('department_id.manager_id.user_id','=',user.id)]</field>
+            <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
             <field name="groups" eval="[(4,ref('base.group_hr_user'))]"/>
         </record>
         <record id="property_rule_expense_manager" model="ir.rule">
diff --git a/addons/hr_payroll/security/hr_security.xml b/addons/hr_payroll/security/hr_security.xml
index b9352e203e4..339fb1961b9 100644
--- a/addons/hr_payroll/security/hr_security.xml
+++ b/addons/hr_payroll/security/hr_security.xml
@@ -5,12 +5,6 @@
 <!--    <record id="group_hr_payroll" model="res.groups">-->
 <!--        <field name="name">Human Resources / Payroll</field>-->
 <!--    </record>-->
-     <record id="property_rule_employee_payroll" model="ir.rule">
-        <field name="name">Employee Payroll</field>
-        <field model="ir.model" name="model_id" ref="model_hr_payslip"/>
-        <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
-        <field name="groups" eval="[(4,ref('base.group_user'))]"/>
-    </record>
 
 </data>
 </openerp>
\ No newline at end of file

From 6c53e0e2ace29eca6973a80a44772a98e60f0647 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Wed, 23 Feb 2011 16:13:22 +0530
Subject: [PATCH 64/73] [REVERT] sale_margin:
 https://bugs.launchpad.net/openobject-addons/+bug/715470 => sale margin
 module : wrong computation (Revert the changes and reoprnt the bug)

bzr revid: mra@mra-laptop-20110223104322-a3ody4zjog2gxwj6
---
 addons/sale_margin/sale_margin.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/addons/sale_margin/sale_margin.py b/addons/sale_margin/sale_margin.py
index d5bc0128fa2..f7bbf41e5d3 100644
--- a/addons/sale_margin/sale_margin.py
+++ b/addons/sale_margin/sale_margin.py
@@ -60,13 +60,8 @@ class sale_order(osv.osv):
 
     def _product_margin(self, cr, uid, ids, field_name, arg, context=None):
         result = {}
-        obj_line = self.pool.get('sale.order.line')
         for sale in self.browse(cr, uid, ids, context=context):
             result[sale.id] = 0.0
-            line_ids = []
-            if sale.order_line:
-                map(lambda x: line_ids.append(x.id), sale.order_line)
-                obj_line.write(cr, uid, line_ids, {})
             for line in sale.order_line:
                 result[sale.id] += line.margin or 0.0
         return result

From cfced6254773bdeca47f5f1c358aa3c7358cf167 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 23 Feb 2011 15:34:55 +0100
Subject: [PATCH 65/73] [FIX] point_of_sale: use the pricelist on the pos order
 instead of the one from the partner (by default it will be the same)

bzr revid: qdp-launchpad@openerp.com-20110223143455-8vf1ve68gn3t9wrr
---
 addons/point_of_sale/point_of_sale.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 58e83a7e89e..a2123cb287c 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -648,7 +648,7 @@ class pos_order(osv.osv):
                 'reference': order.name,
                 'partner_id': order.partner_id.id,
                 'comment': order.note or '',
-                'currency_id': order.partner_id.property_product_pricelist.currency_id.id, # considering partner's sale pricelist's currency
+                'currency_id': order.pricelist_id.currency_id.id, # considering partner's sale pricelist's currency
             }
             inv.update(inv_ref.onchange_partner_id(cr, uid, [], 'out_invoice', order.partner_id.id)['value'])
             if not inv.get('account_id', None):

From e4a7ae62369e514a4df5e60d439ebae4ecf34dda Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 23 Feb 2011 15:36:37 +0100
Subject: [PATCH 66/73] [IMP] hr_holidays: set department_id as readonly
 instead of invisible on attrs

bzr revid: qdp-launchpad@openerp.com-20110223143637-n8nesmli4d0w9cs7
---
 addons/hr_holidays/hr_holidays_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 67d993353ca..d8b38f81e73 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -81,7 +81,7 @@
                     <notebook colspan="4">
                         <page string="General">
                             <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}" />
-                            <field name="department_id" attrs="{'invisible':[('holiday_type','=','category')]}" />
+                            <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" />
                             <field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1"/>
                             <field name="date_to" on_change="onchange_date_from(date_to, date_from)" required="1"/>
                             <field name="number_of_days_temp"/>
@@ -125,7 +125,7 @@
                 <notebook colspan="4">
                     <page string="General">
                         <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}" />
-                        <field name="department_id" attrs="{'invisible':[('holiday_type','=','category')]}" />
+                        <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" />
                         <field name="number_of_days_temp"/>
                         <newline/>
                         <field name="manager_id"/>

From 63589b82928173fdc941cf3dde4cb5a01928b17c Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 23 Feb 2011 15:37:25 +0100
Subject: [PATCH 67/73] [IMP] account: analytic account view improvement

bzr revid: qdp-launchpad@openerp.com-20110223143725-vr81bat1oyetp37e
---
 addons/account/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 380db5b0291..f5b1f9ff3dd 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -68,7 +68,7 @@
                     <field name="user_id" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
                     <field name="parent_id" invisible="1"/>
-                    <field name="type"/>
+                    <field name="type" invisible="1"/>
                 </tree>
             </field>
         </record>

From 7c420c1924b6a92353b3f3c147a337d64fb65dd8 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 23 Feb 2011 15:41:28 +0100
Subject: [PATCH 68/73] [FIX] account: reverted back the bugfix of LP:713562
 because removing that boolean on demo fiscal year will cause problem when the
 user will run the config wizard

bzr revid: qdp-launchpad@openerp.com-20110223144128-g8oxzj80aie7gjuj
---
 addons/account/account_demo.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/addons/account/account_demo.xml b/addons/account/account_demo.xml
index 5e877427091..566185c70c3 100644
--- a/addons/account/account_demo.xml
+++ b/addons/account/account_demo.xml
@@ -21,6 +21,7 @@
         <record id="period_1" model="account.period">
             <field eval="'01/'+time.strftime('%Y')" name="code"/>
             <field eval="'01/'+time.strftime('%Y')" name="name"/>
+            <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-01-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-01-31'" name="date_stop"/>
@@ -29,6 +30,7 @@
         <record id="period_2" model="account.period">
             <field eval="'02/'+time.strftime('%Y')" name="code"/>
             <field eval="'02/'+time.strftime('%Y')" name="name"/>
+            <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-02-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-02-28'" name="date_stop"/>
@@ -37,6 +39,7 @@
         <record id="period_3" model="account.period">
             <field eval="'03/'+time.strftime('%Y')" name="code"/>
             <field eval="'03/'+time.strftime('%Y')" name="name"/>
+            <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-03-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-03-31'" name="date_stop"/>
@@ -45,6 +48,7 @@
         <record id="period_4" model="account.period">
             <field eval="'04/'+time.strftime('%Y')" name="code"/>
             <field eval="'04/'+time.strftime('%Y')" name="name"/>
+            <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-04-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-04-30'" name="date_stop"/>
@@ -53,6 +57,7 @@
         <record id="period_5" model="account.period">
             <field eval="'05/'+time.strftime('%Y')" name="code"/>
             <field eval="'05/'+time.strftime('%Y')" name="name"/>
+            <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-05-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-05-31'" name="date_stop"/>
@@ -62,6 +67,7 @@
             <field eval="'06/'+time.strftime('%Y')" name="code"/>
             <field eval="'06/'+time.strftime('%Y')" name="name"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
+            <field eval="True" name="special"/>
             <field eval="time.strftime('%Y')+'-06-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-06-30'" name="date_stop"/>
             <field name="company_id" ref="base.main_company"/>
@@ -69,6 +75,7 @@
         <record id="period_7" model="account.period">
             <field eval="'07/'+time.strftime('%Y')" name="code"/>
             <field eval="'07/'+time.strftime('%Y')" name="name"/>
+            <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-07-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-07-31'" name="date_stop"/>
@@ -77,6 +84,7 @@
         <record id="period_8" model="account.period">
             <field eval="'08/'+time.strftime('%Y')" name="code"/>
             <field eval="'08/'+time.strftime('%Y')" name="name"/>
+            <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-08-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-08-31'" name="date_stop"/>
@@ -85,6 +93,7 @@
         <record id="period_9" model="account.period">
             <field eval="'09/'+time.strftime('%Y')" name="code"/>
             <field eval="'09/'+time.strftime('%Y')" name="name"/>
+            <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-09-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-09-30'" name="date_stop"/>
@@ -93,6 +102,7 @@
         <record id="period_10" model="account.period">
             <field eval="'10/'+time.strftime('%Y')" name="code"/>
             <field eval="'10/'+time.strftime('%Y')" name="name"/>
+            <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-10-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-10-31'" name="date_stop"/>
@@ -101,6 +111,7 @@
         <record id="period_11" model="account.period">
             <field eval="'11/'+time.strftime('%Y')" name="code"/>
             <field eval="'11/'+time.strftime('%Y')" name="name"/>
+            <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-11-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-11-30'" name="date_stop"/>
@@ -109,6 +120,7 @@
         <record id="period_12" model="account.period">
             <field eval="'12/'+time.strftime('%Y')" name="code"/>
             <field eval="'12/'+time.strftime('%Y')" name="name"/>
+            <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-12-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-12-31'" name="date_stop"/>

From fb1912cea68801d4ff800603258fc48f99f2af7d Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 23 Feb 2011 15:41:49 +0100
Subject: [PATCH 69/73] [IMP] account: improved translatability

bzr revid: qdp-launchpad@openerp.com-20110223144149-xxqro7smnlbdm550
---
 addons/account/account.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 11eaf5f3c68..4c8eb0ef91d 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -810,10 +810,10 @@ class account_fiscalyear(osv.osv):
         for fy in self.browse(cr, uid, ids, context=context):
             ds = datetime.strptime(fy.date_start, '%Y-%m-%d')
             period_obj.create(cr, uid, {
-                    'name': 'Opening Period',
+                    'name': _('Opening Period'),
                     'code': ds.strftime('00/%Y'),
-                    'date_start': ds + relativedelta(years=-1, days=-1),
-                    'date_stop': ds + relativedelta(years=-1),
+                    'date_start': ds,
+                    'date_stop': ds,
                     'special': True,
                     'fiscalyear_id': fy.id,
                 })
@@ -2638,9 +2638,9 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         return False
 
     def _get_default_accounts(self, cr, uid, context=None):
-        return [{'acc_name':'Current','account_type':'bank'},
-                    {'acc_name':'Deposit','account_type':'bank'},
-                    {'acc_name':'Cash','account_type':'cash'}]
+        return [{'acc_name': _('Current'),'account_type':'bank'},
+                    {'acc_name': _('Deposit'),'account_type':'bank'},
+                    {'acc_name': _('Cash'),'account_type':'cash'}]
 
     _defaults = {
         'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, [uid], c)[0].company_id.id,
@@ -3201,4 +3201,4 @@ class account_bank_accounts_wizard(osv.osv_memory):
 
 account_bank_accounts_wizard()
 
-# 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 e98d215d49bc65a5003fd74d26c26723bbc14c24 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 24 Feb 2011 15:16:21 +0530
Subject: [PATCH 70/73] [REVERT] account: chart of account
 https://bugs.launchpad.net/openobject-addons/+bug/716300

bzr revid: mra@mra-laptop-20110224094621-7xeasbtw25194cfv
---
 addons/account/account_move_line.py          | 7 -------
 addons/account/wizard/account_chart_view.xml | 1 -
 2 files changed, 8 deletions(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index fb409b28d07..85207cf5cb2 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -678,13 +678,6 @@ class account_move_line(osv.osv):
     def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
         if context is None:
             context = {}
-        if context and context.get('chart_of_account', False):
-            if context.get('periods', False):
-                args.append(('period_id', 'in', context['periods']))
-            if context.get('state', False) and context['state'] == 'posted':
-                args.append(('state', '=', 'valid'))
-            if context.get('fiscalyear', False):
-                args.append(('period_id.fiscalyear_id', '=', context['fiscalyear']))
         if context and context.get('next_partner_only', False):
             if not context.get('partner_id', False):
                 partner = self.get_next_partner_only(cr, uid, offset, context)
diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index 22e823cd686..f2e278b06ce 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -31,7 +31,6 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_account_chart"/>
             <field name="target">new</field>
-            <field name="context">{'chart_of_account': 1}</field>
             <field name="help">Display your company chart of accounts per fiscal year and filter by period. Have a complete tree view of all journal items per account code by clicking on an account.</field>
         </record>
 

From b53a9ab0cd43eef904105ca57784a9629104302a Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Fri, 25 Feb 2011 19:14:24 +0530
Subject: [PATCH 71/73] [FIX] account: char templates installation refactor
 code

bzr revid: mra@mra-laptop-20110225134424-dwvllabvr1zt106v
---
 addons/account/account.py   |  15 +++-
 addons/account/installer.py | 139 +++++++++++++-----------------------
 2 files changed, 61 insertions(+), 93 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 4c8eb0ef91d..3ff224eec94 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2609,6 +2609,8 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                                           , "=", chart_template_id), ('type_tax_use', 'in', ('sale','all'))], order="sequence")
             purchase_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id"
                                           , "=", chart_template_id), ('type_tax_use', 'in', ('purchase','all'))], order="sequence")
+
+            #  To be fix: If generic chart of account is selected and sale/purchase tax given so here it take [0] first tax of tax templates
             res['value']["sale_tax"] = sale_tax_ids and sale_tax_ids[0] or False
             res['value']["purchase_tax"] = purchase_tax_ids and purchase_tax_ids[0] or False
         return res
@@ -2686,6 +2688,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         obj_tax_code_template = self.pool.get('account.tax.code.template')
         obj_acc_journal_view = self.pool.get('account.journal.view')
         ir_values = self.pool.get('ir.values')
+        obj_product = self.pool.get('product.product')
         # Creating Account
         obj_acc_root = obj_multi.chart_template_id.account_root_id
         tax_code_root_id = obj_multi.chart_template_id.tax_code_root_id.id
@@ -2701,7 +2704,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         children_tax_code_template = obj_tax_code_template.search(cr, uid, [('parent_id','child_of',[tax_code_root_id])], order='id')
         children_tax_code_template.sort()
         for tax_code_template in obj_tax_code_template.browse(cr, uid, children_tax_code_template, context=context):
-            vals={
+            vals = {
                 'name': (tax_code_root_id == tax_code_template.id) and obj_multi.company_id.name or tax_code_template.name,
                 'code': tax_code_template.code,
                 'info': tax_code_template.info,
@@ -2751,7 +2754,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                 'account_paid_id': tax.account_paid_id and tax.account_paid_id.id or False,
             }
             tax_template_ref[tax.id] = new_tax
-
         #deactivate the parent_store functionnality on account_account for rapidity purpose
         ctx = context and context.copy() or {}
         ctx['defer_parent_store_computation'] = True
@@ -2858,7 +2860,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                     else:
                         type = check_type_id
                         seq_padding = None
-
                     vals_bnk = {
                         'name': val.acc_name or '',
                         'currency_id': val.currency_id.id or False,
@@ -3179,6 +3180,14 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                         'position_id': new_fp,
                     }
                     obj_ac_fp.create(cr, uid, vals_acc)
+        if obj_multi.chart_template_id.name == 'Configurable Account Chart Template':
+            tax_val = {}
+            if obj_multi.sale_tax:
+                tax_val.update({'taxes_id': [(6, 0, [tax_template_to_tax[obj_multi.sale_tax.id]])]})
+            if obj_multi.purchase_tax:
+                tax_val.update({'supplier_taxes_id': [(6 ,0, [tax_template_to_tax[obj_multi.purchase_tax.id]])]})
+            product_ids = obj_product.search(cr, uid, [], context=context)
+            obj_product.write(cr, uid, product_ids, tax_val, context=context)
 
         if obj_multi.sale_tax:
             ir_values.set(cr, uid, key='default', key2=False, name="taxes_id", company=obj_multi.company_id.id,
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 10bee0af3f6..5bdf7a62865 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -123,12 +123,12 @@ class account_installer(osv.osv_memory):
         super(account_installer, self).execute(cr, uid, ids, context=context)
         fy_obj = self.pool.get('account.fiscalyear')
         mod_obj = self.pool.get('ir.model.data')
-        obj_acc = self.pool.get('account.account')
-        obj_tax_code = self.pool.get('account.tax.code')
-        obj_temp_tax_code = self.pool.get('account.tax.code.template')
-        obj_tax = self.pool.get('account.tax')
+        obj_acc_temp = self.pool.get('account.account.template')
+        obj_tax_code_temp = self.pool.get('account.tax.code.template')
+        obj_tax_temp = self.pool.get('account.tax.template')
         obj_product = self.pool.get('product.product')
         ir_values = self.pool.get('ir.values')
+        obj_acc_chart_temp = self.pool.get('account.chart.template')
         record = self.browse(cr, uid, ids, context=context)[0]
         company_id = record.company_id
         for res in self.read(cr, uid, ids, context=context):
@@ -138,126 +138,85 @@ class account_installer(osv.osv_memory):
                 fp.close()
                 s_tax = (res.get('sale_tax', 0.0))/100
                 p_tax = (res.get('purchase_tax', 0.0))/100
-                tax_val = {}
-                default_tax = []
-
                 pur_temp_tax = mod_obj.get_object_reference(cr, uid, 'account', 'tax_code_base_purchases')
                 pur_temp_tax_id = pur_temp_tax and pur_temp_tax[1] or False
 
-                pur_temp_tax_names = obj_temp_tax_code.read(cr, uid, [pur_temp_tax_id], ['name'], context=context)
-                pur_tax_parent_name = pur_temp_tax_names and pur_temp_tax_names[0]['name'] or False
-                pur_taxcode_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', pur_tax_parent_name)], context=context)
-                if pur_taxcode_parent_id:
-                    pur_taxcode_parent_id = pur_taxcode_parent_id[0]
-                else:
-                    pur_taxcode_parent_id = False
                 pur_temp_tax_paid = mod_obj.get_object_reference(cr, uid, 'account', 'tax_code_input')
                 pur_temp_tax_paid_id = pur_temp_tax_paid and pur_temp_tax_paid[1] or False
-                pur_temp_tax_paid_names = obj_temp_tax_code.read(cr, uid, [pur_temp_tax_paid_id], ['name'], context=context)
-                pur_tax_paid_parent_name = pur_temp_tax_names and pur_temp_tax_paid_names[0]['name'] or False
-                pur_taxcode_paid_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', pur_tax_paid_parent_name)], context=context)
-                if pur_taxcode_paid_parent_id:
-                    pur_taxcode_paid_parent_id = pur_taxcode_paid_parent_id[0]
-                else:
-                    pur_taxcode_paid_parent_id = False
 
                 sale_temp_tax = mod_obj.get_object_reference(cr, uid, 'account', 'tax_code_base_sales')
                 sale_temp_tax_id = sale_temp_tax and sale_temp_tax[1] or False
-                sale_temp_tax_names = obj_temp_tax_code.read(cr, uid, [sale_temp_tax_id], ['name'], context=context)
-                sale_tax_parent_name = sale_temp_tax_names and sale_temp_tax_names[0]['name'] or False
-                sale_taxcode_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', sale_tax_parent_name)], context=context)
-                if sale_taxcode_parent_id:
-                    sale_taxcode_parent_id = sale_taxcode_parent_id[0]
-                else:
-                    sale_taxcode_parent_id = False
 
                 sale_temp_tax_paid = mod_obj.get_object_reference(cr, uid, 'account', 'tax_code_output')
                 sale_temp_tax_paid_id = sale_temp_tax_paid and sale_temp_tax_paid[1] or False
-                sale_temp_tax_paid_names = obj_temp_tax_code.read(cr, uid, [sale_temp_tax_paid_id], ['name'], context=context)
-                sale_tax_paid_parent_name = sale_temp_tax_paid_names and sale_temp_tax_paid_names[0]['name'] or False
-                sale_taxcode_paid_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', sale_tax_paid_parent_name)], context=context)
-                if sale_taxcode_paid_parent_id:
-                    sale_taxcode_paid_parent_id = sale_taxcode_paid_parent_id[0]
-                else:
-                    sale_taxcode_paid_parent_id = False
 
+                chart_temp_ids = obj_acc_chart_temp.search(cr, uid, [('name','=','Configurable Account Chart Template')], context=context)
+                chart_temp_id = chart_temp_ids and chart_temp_ids[0] or False
                 if s_tax*100 > 0.0:
-                    tax_account_ids = obj_acc.search(cr, uid, [('name', '=', 'Tax Received')], context=context)
+                    tax_account_ids = obj_acc_temp.search(cr, uid, [('name', '=', 'Tax Received')], context=context)
                     sales_tax_account_id = tax_account_ids and tax_account_ids[0] or False
-                    vals_tax_code = {
+                    vals_tax_code_temp = {
                         'name': 'TAX%s%%'%(s_tax*100),
                         'code': 'TAX%s%%'%(s_tax*100),
-                        'company_id': company_id.id,
-                        'sign': 1,
-                        'parent_id': sale_taxcode_parent_id
+                        'parent_id': sale_temp_tax_id
                     }
-                    new_tax_code = obj_tax_code.create(cr, uid, vals_tax_code, context=context)
-
-
-                    vals_paid_tax_code = {
+                    new_tax_code_temp = obj_tax_code_temp.create(cr, uid, vals_tax_code_temp, context=context)
+                    vals_paid_tax_code_temp = {
                         'name': 'TAX Received %s%%'%(s_tax*100),
                         'code': 'TAX Received %s%%'%(s_tax*100),
-                        'company_id': company_id.id,
-                        'sign': 1,
-                        'parent_id': sale_taxcode_paid_parent_id
-                        }
-                    new_paid_tax_code = obj_tax_code.create(cr, uid, vals_paid_tax_code, context=context)
-
-                    sales_tax = obj_tax.create(cr, uid,
-                                           {'name': 'TAX %s%%'%(s_tax*100),
+                        'parent_id': sale_temp_tax_paid_id
+                    }
+                    new_paid_tax_code_temp = obj_tax_code_temp.create(cr, uid, vals_paid_tax_code_temp, context=context)
+                    sales_tax_temp = obj_tax_temp.create(cr, uid, {
+                                            'name': 'TAX %s%%'%(s_tax*100),
                                             'amount': s_tax,
-                                            'base_code_id': new_tax_code,
-                                            'tax_code_id': new_paid_tax_code,
+                                            'base_code_id': new_tax_code_temp,
+                                            'tax_code_id': new_paid_tax_code_temp,
+                                            'ref_base_code_id': new_tax_code_temp,
+                                            'ref_tax_code_id': new_paid_tax_code_temp,
                                             'type_tax_use': 'sale',
+                                            'type': 'percent',
+                                            'sequence': 1,
                                             'account_collected_id': sales_tax_account_id,
-                                            'account_paid_id': sales_tax_account_id
-                                            }, context=context)
-                    default_account_ids = obj_acc.search(cr, uid, [('name', '=', 'Product Sales')], context=context)
+                                            'account_paid_id': sales_tax_account_id,
+                                            'chart_template_id': chart_temp_id,
+                                }, context=context)
+                    default_account_ids = obj_acc_temp.search(cr, uid, [('name', '=', 'Product Sales')], context=context)
                     if default_account_ids:
-                        obj_acc.write(cr, uid, default_account_ids, {'tax_ids': [(6, 0, [sales_tax])]}, context=context)
-                    tax_val.update({'taxes_id': [(6, 0, [sales_tax])]})
-                    default_tax.append(('taxes_id', sales_tax))
+                        obj_acc_temp.write(cr, uid, default_account_ids, {'tax_ids': [(6, 0, [sales_tax_temp])]}, context=context)
                 if p_tax*100 > 0.0:
-                    tax_account_ids = obj_acc.search(cr, uid, [('name', '=', 'Tax Paid')], context=context)
+                    tax_account_ids = obj_acc_temp.search(cr, uid, [('name', '=', 'Tax Paid')], context=context)
                     purchase_tax_account_id = tax_account_ids and tax_account_ids[0] or False
-                    vals_tax_code = {
+                    vals_tax_code_temp = {
                         'name': 'TAX%s%%'%(p_tax*100),
                         'code': 'TAX%s%%'%(p_tax*100),
-                        'company_id': company_id.id,
-                        'sign': 1,
-                        'parent_id': pur_taxcode_parent_id
+                        'parent_id': pur_temp_tax_id
                     }
-                    new_tax_code = obj_tax_code.create(cr, uid, vals_tax_code, context=context)
-                    vals_paid_tax_code = {
+                    new_tax_code_temp = obj_tax_code_temp.create(cr, uid, vals_tax_code_temp, context=context)
+                    vals_paid_tax_code_temp = {
                         'name': 'TAX Paid %s%%'%(p_tax*100),
                         'code': 'TAX Paid %s%%'%(p_tax*100),
-                        'company_id': company_id.id,
-                        'sign': 1,
-                        'parent_id': pur_taxcode_paid_parent_id
+                        'parent_id': pur_temp_tax_paid_id
                     }
-                    new_paid_tax_code = obj_tax_code.create(cr, uid, vals_paid_tax_code, context=context)
-
-                    purchase_tax = obj_tax.create(cr, uid,
-                                            {'name': 'TAX%s%%'%(p_tax*100),
+                    new_paid_tax_code_temp = obj_tax_code_temp.create(cr, uid, vals_paid_tax_code_temp, context=context)
+                    purchase_tax_temp = obj_tax_temp.create(cr, uid, {
+                                             'name': 'TAX%s%%'%(p_tax*100),
                                              'description': 'TAX%s%%'%(p_tax*100),
                                              'amount': p_tax,
-                                             'base_code_id': new_tax_code,
-                                            'tax_code_id': new_paid_tax_code,
-                                            'type_tax_use': 'purchase',
-                                            'account_collected_id': purchase_tax_account_id,
-                                            'account_paid_id': purchase_tax_account_id
-                                             }, context=context)
-                    default_account_ids = obj_acc.search(cr, uid, [('name', '=', 'Expenses')], context=context)
+                                             'base_code_id': new_tax_code_temp,
+                                             'tax_code_id': new_paid_tax_code_temp,
+                                             'ref_base_code_id': new_tax_code_temp,
+                                             'ref_tax_code_id': new_paid_tax_code_temp,
+                                             'type_tax_use': 'purchase',
+                                             'type': 'percent',
+                                             'sequence': 1,
+                                             'account_collected_id': purchase_tax_account_id,
+                                             'account_paid_id': purchase_tax_account_id,
+                                             'chart_template_id': chart_temp_id,
+                                    }, context=context)
+                    default_account_ids = obj_acc_temp.search(cr, uid, [('name', '=', 'Expenses')], context=context)
                     if default_account_ids:
-                        obj_acc.write(cr, uid, default_account_ids, {'tax_ids': [(6, 0, [purchase_tax])]}, context=context)
-                    tax_val.update({'supplier_taxes_id': [(6 ,0, [purchase_tax])]})
-                    default_tax.append(('supplier_taxes_id', purchase_tax))
-                if tax_val:
-                    product_ids = obj_product.search(cr, uid, [], context=context)
-                    for product in obj_product.browse(cr, uid, product_ids, context=context):
-                        obj_product.write(cr, uid, product.id, tax_val, context=context)
-                    for name, value in default_tax:
-                        ir_values.set(cr, uid, key='default', key2=False, name=name, models =[('product.product', False)], value=[value])
+                        obj_acc_temp.write(cr, uid, default_account_ids, {'tax_ids': [(6, 0, [purchase_tax_temp])]}, context=context)
 
             if 'date_start' in res and 'date_stop' in res:
                 f_ids = fy_obj.search(cr, uid, [('date_start', '<=', res['date_start']), ('date_stop', '>=', res['date_stop']), ('company_id', '=', res['company_id'])], context=context)

From e147c06bc3c619a322021f9a64bf4296a722c8e8 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 3 Mar 2011 15:52:56 +0100
Subject: [PATCH 72/73] [FIX] account: in the wizard for creating the opening
 entries, restricted the view on opening periods

bzr revid: qdp-launchpad@openerp.com-20110303145256-nuhwuv15u87sgyw8
---
 addons/account/wizard/account_fiscalyear_close_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/wizard/account_fiscalyear_close_view.xml b/addons/account/wizard/account_fiscalyear_close_view.xml
index 06b206741c2..d4dfab7876c 100644
--- a/addons/account/wizard/account_fiscalyear_close_view.xml
+++ b/addons/account/wizard/account_fiscalyear_close_view.xml
@@ -13,7 +13,7 @@
 	                <field name="fy_id" domain = "[('state','=','draft')]"/>
 	                <field name="fy2_id" domain = "[('state','=','draft')]"/>
 	                <field name="journal_id"/>
-	                <field name="period_id" domain ="[('fiscalyear_id','=',fy2_id)]" />
+	                <field name="period_id" domain ="[('fiscalyear_id','=',fy2_id),('special','=', True)]" />
 	                <field name="report_name" colspan="4"/>
 	                <separator colspan="4"/>
 	                <group colspan="4" col="6">

From a90aeb8c4a4ec04a127c368bc2eef50396280ff1 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 3 Mar 2011 15:59:00 +0100
Subject: [PATCH 73/73] [REF] account: refactored the creation of journals in
 the generation from templates wizard, removed old deprecated boolean
 'refund_journal' on account.journal (use the type field instead)

bzr revid: qdp-launchpad@openerp.com-20110303145900-8ghspjidwb540mhp
---
 addons/account/account.py                   | 315 +++++---------------
 addons/account/account_move_line.py         |   2 +-
 addons/account/demo/account_minimal.xml     |   2 -
 addons/account/installer.py                 |  40 ++-
 addons/multi_company/multi_company_demo.xml |   6 -
 5 files changed, 93 insertions(+), 272 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 3ff224eec94..999bd01d90c 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -606,7 +606,6 @@ class account_journal(osv.osv):
                                  " Select 'Cash' to be used at the time of making payment."\
                                  " Select 'General' for miscellaneous operations."\
                                  " Select 'Opening/Closing Situation' to be used at the time of new fiscal year creation or end of year entries generation."),
-        'refund_journal': fields.boolean('Refund Journal', help='Fill this if the journal is to be used for refunds of invoices.'),
         'type_control_ids': fields.many2many('account.account.type', 'account_journal_type_rel', 'journal_id','type_id', 'Type Controls', domain=[('code','<>','view'), ('code', '<>', 'closed')]),
         'account_control_ids': fields.many2many('account.account', 'account_account_type_rel', 'journal_id','account_id', 'Account', domain=[('type','<>','view'), ('type', '<>', 'closed')]),
         'view_id': fields.many2one('account.journal.view', 'Display Mode', required=True, help="Gives the view used when writing or browsing entries in this journal. The view tells OpenERP which fields should be visible, required or readonly and in which order. You can create your own view for a faster encoding in each journal."),
@@ -2605,12 +2604,12 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         res['value']["sale_tax"] = False
         res['value']["purchase_tax"] = False
         if chart_template_id:
+            # default tax is given by the lowesst sequence. For same sequence we will take the latest created as it will be the case for tax created while isntalling the generic chart of account
             sale_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id"
-                                          , "=", chart_template_id), ('type_tax_use', 'in', ('sale','all'))], order="sequence")
+                                          , "=", chart_template_id), ('type_tax_use', 'in', ('sale','all'))], order="sequence, id desc")
             purchase_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id"
-                                          , "=", chart_template_id), ('type_tax_use', 'in', ('purchase','all'))], order="sequence")
+                                          , "=", chart_template_id), ('type_tax_use', 'in', ('purchase','all'))], order="sequence, id desc")
 
-            #  To be fix: If generic chart of account is selected and sale/purchase tax given so here it take [0] first tax of tax templates
             res['value']["sale_tax"] = sale_tax_ids and sale_tax_ids[0] or False
             res['value']["purchase_tax"] = purchase_tax_ids and purchase_tax_ids[0] or False
         return res
@@ -2787,120 +2786,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             new_account = obj_acc.create(cr, uid, vals, context=ctx)
             acc_template_ref[account_template.id] = new_account
 
-            ### Configure Bank Journal for generic chart of account
-            if account_template.name == 'Bank Current Account' and obj_multi.chart_template_id.name == 'Configurable Account Chart Template':
-                b_vals = {
-                    'name': 'Bank Accounts',
-                    'code': '110500',
-                    'type': 'view',
-                    'user_type': account_template.parent_id.user_type and account_template.user_type.id or False,
-                    'shortcut': account_template.shortcut,
-                    'note': account_template.note,
-                    'parent_id': account_template.parent_id and ((account_template.parent_id.id in acc_template_ref) and acc_template_ref[account_template.parent_id.id]) or False,
-                    'tax_ids': [(6,0,tax_ids)],
-                    'company_id': company_id,
-                }
-                bank_account = obj_acc.create(cr, uid, b_vals, context=ctx)
-
-                view_id_cash = obj_acc_journal_view.search(cr, uid, [('name', '=', 'Bank/Cash Journal View')], context=context)[0] #why fixed name here?
-                view_id_cur = obj_acc_journal_view.search(cr, uid, [('name', '=', 'Bank/Cash Journal (Multi-Currency) View')], context=context)[0] #Why Fixed name here?
-
-                cash_result = obj_data.get_object_reference(cr, uid, 'account', 'conf_account_type_cash')
-                cash_type_id = cash_result and cash_result[1] or False
-
-                bank_result = obj_data.get_object_reference(cr, uid, 'account', 'conf_account_type_bnk')
-                bank_type_id = bank_result and bank_result[1] or False
-
-                check_result = obj_data.get_object_reference(cr, uid, 'account', 'conf_account_type_chk')
-                check_type_id = check_result and check_result[1] or False
-
-#                record = self.browse(cr, uid, ids, context=context)[0]
-                code_cnt = 1
-                vals_seq = {
-                    'name': _('Bank Journal '),
-                    'code': 'account.journal',
-                    'prefix': 'BNK/%(year)s/',
-                    'company_id': company_id,
-                    'padding': 5
-                }
-                seq_id = obj_sequence.create(cr, uid, vals_seq, context=context)
-
-                #create the bank journals
-                analitical_bank_ids = analytic_journal_obj.search(cr, uid, [('type', '=', 'situation')], context=context)
-                analitical_journal_bank = analitical_bank_ids and analitical_bank_ids[0] or False
-                vals_journal = {
-                    'name': _('Bank Journal '),
-                    'code': _('BNK'),
-                    'sequence_id': seq_id,
-                    'type': 'bank',
-                    'company_id': company_id,
-                    'analytic_journal_id': analitical_journal_bank
-                }
-                if vals.get('currency_id', False):
-                    vals_journal.update({
-                        'view_id': view_id_cur,
-                        'currency': vals.get('currency_id', False)
-                    })
-                else:
-                    vals_journal.update({'view_id': view_id_cash})
-                vals_journal.update({
-                    'default_credit_account_id': new_account,
-                    'default_debit_account_id': new_account,
-                })
-                obj_journal.create(cr, uid, vals_journal, context=context)
-
-                for val in obj_multi.bank_accounts_id:
-                    seq_padding = 5
-                    if val.account_type == 'cash':
-                        type = cash_type_id
-                    elif val.account_type == 'bank':
-                        type = bank_type_id
-                    elif val.account_type == 'check':
-                        type = check_type_id
-                    else:
-                        type = check_type_id
-                        seq_padding = None
-                    vals_bnk = {
-                        'name': val.acc_name or '',
-                        'currency_id': val.currency_id.id or False,
-                        'code': str(110500 + code_cnt),
-                        'type': 'liquidity',
-                        'user_type': type,
-                        'parent_id': bank_account,
-                        'company_id': company_id
-                    }
-                    child_bnk_acc = obj_acc.create(cr, uid, vals_bnk, context=ctx)
-                    vals_seq_child = {
-                        'name': _(vals_bnk['name'] + ' ' + 'Journal'),
-                        'code': 'account.journal',
-                        'prefix': _((vals_bnk['name'][:3].upper()) + '/%(year)s/'),
-                        'padding': seq_padding
-                    }
-                    seq_id = obj_sequence.create(cr, uid, vals_seq_child, context=context)
-
-                    #create the bank journal
-                    vals_journal = {}
-                    vals_journal = {
-                        'name': vals_bnk['name'] + _(' Journal'),
-                        'code': _(vals_bnk['name'][:3]).upper(),
-                        'sequence_id': seq_id,
-                        'type': 'cash',
-                        'company_id': company_id
-                    }
-                    if vals.get('currency_id', False):
-                        vals_journal.update({
-                                'view_id': view_id_cur,
-                                'currency': vals_bnk.get('currency_id', False),
-                        })
-                    else:
-                        vals_journal.update({'view_id': view_id_cash})
-                    vals_journal.update({
-                        'default_credit_account_id': child_bnk_acc,
-                        'default_debit_account_id': child_bnk_acc,
-                        'analytic_journal_id': analitical_journal_bank
-                    })
-                    obj_journal.create(cr, uid, vals_journal, context=context)
-                    code_cnt += 1
 
         #reactivate the parent_store functionnality on account_account
         obj_acc._parent_store_compute(cr)
@@ -2912,49 +2797,23 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                     'account_paid_id': acc_template_ref.get(value['account_paid_id'], False),
                 })
 
-        # Creating Journals Sales and Purchase
-        vals_journal={}
+        # Creating Journals
         data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_sp_journal_view')])
         data = obj_data.browse(cr, uid, data_id[0], context=context)
         view_id = data.res_id
 
-        seq_id = obj_sequence.search(cr, uid, [('name','=','Account Journal')])[0]
-
-        if obj_multi.seq_journal:
-            seq_id_sale = obj_sequence.search(cr, uid, [('name','=','Sale Journal')])[0]
-            seq_id_purchase = obj_sequence.search(cr, uid, [('name','=','Purchase Journal')])[0]
-            seq_id_sale_refund = obj_sequence.search(cr, uid, [('name','=','Sales Refund Journal')])
-            if seq_id_sale_refund:
-                seq_id_sale_refund = seq_id_sale_refund[0]
-            seq_id_purchase_refund = obj_sequence.search(cr, uid, [('name','=','Purchase Refund Journal')])
-            if seq_id_purchase_refund:
-                seq_id_purchase_refund = seq_id_purchase_refund[0]
-            seq_id_opening = obj_sequence.search(cr, uid, [('name','=','Opening Entries Journal')])
-            if seq_id_opening:
-                seq_id_opening = seq_id_opening[0]
-            seq_id_miscellaneous = obj_sequence.search(cr, uid, [('name','=','Miscellaneous Journal')])
-            if seq_id_miscellaneous:
-                seq_id_miscellaneous = seq_id_miscellaneous[0]
-        else:
-            seq_id_sale = seq_id
-            seq_id_purchase = seq_id
-            seq_id_sale_refund = seq_id
-            seq_id_purchase_refund = seq_id
-            seq_id_opening = seq_id
-            seq_id_miscellaneous = seq_id
-
-        vals_journal['view_id'] = view_id
-
         #Sales Journal
-        analitical_sale_ids = analytic_journal_obj.search(cr,uid,[('type','=','sale')])
-        analitical_journal_sale = analitical_sale_ids and analitical_sale_ids[0] or False
+        analytical_sale_ids = analytic_journal_obj.search(cr,uid,[('type','=','sale')])
+        analytical_journal_sale = analytical_sale_ids and analytical_sale_ids[0] or False
 
-        vals_journal['name'] = _('Sales Journal')
-        vals_journal['type'] = 'sale'
-        vals_journal['code'] = _('SAJ')
-        vals_journal['sequence_id'] = seq_id_sale
-        vals_journal['company_id'] =  company_id
-        vals_journal['analytic_journal_id'] = analitical_journal_sale
+        vals_journal = {
+            'name': _('Sales Journal'),
+            'type': 'sale',
+            'code': _('SAJ'),
+            'view_id': view_id,
+            'company_id': company_id,
+            'analytic_journal_id': analytical_journal_sale,
+        }
 
         if obj_multi.chart_template_id.property_account_receivable:
             vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_income_categ.id]
@@ -2963,38 +2822,35 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         obj_journal.create(cr,uid,vals_journal)
 
         # Purchase Journal
-        analitical_purchase_ids = analytic_journal_obj.search(cr,uid,[('type','=','purchase')])
-        analitical_journal_purchase = analitical_purchase_ids and analitical_purchase_ids[0] or False
+        analytical_purchase_ids = analytic_journal_obj.search(cr,uid,[('type','=','purchase')])
+        analytical_journal_purchase = analytical_purchase_ids and analytical_purchase_ids[0] or False
 
-        vals_journal['name'] = _('Purchase Journal')
-        vals_journal['type'] = 'purchase'
-        vals_journal['code'] = _('EXJ')
-        vals_journal['sequence_id'] = seq_id_purchase
-        vals_journal['view_id'] = view_id
-        vals_journal['company_id'] =  company_id
-        vals_journal['analytic_journal_id'] = analitical_journal_purchase
+        vals_journal = {
+            'name': _('Purchase Journal'),
+            'type': 'purchase',
+            'code': _('EXJ'),
+            'view_id': view_id,
+            'company_id':  company_id,
+            'analytic_journal_id': analytical_journal_purchase,
+        }
 
         if obj_multi.chart_template_id.property_account_payable:
             vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_expense_categ.id]
             vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_expense_categ.id]
-
         obj_journal.create(cr,uid,vals_journal)
 
         # Creating Journals Sales Refund and Purchase Refund
-        vals_journal = {}
         data_id = obj_data.search(cr, uid, [('model', '=', 'account.journal.view'), ('name', '=', 'account_sp_refund_journal_view')], context=context)
         data = obj_data.browse(cr, uid, data_id[0], context=context)
         view_id = data.res_id
 
         #Sales Refund Journal
         vals_journal = {
-            'view_id': view_id,
             'name': _('Sales Refund Journal'),
             'type': 'sale_refund',
-            'refund_journal': True,
             'code': _('SCNJ'),
-            'sequence_id': seq_id_sale_refund,
-            'analytic_journal_id': analitical_journal_sale,
+            'view_id': view_id,
+            'analytic_journal_id': analytical_journal_sale,
             'company_id': company_id
         }
 
@@ -3006,13 +2862,11 @@ class wizard_multi_charts_accounts(osv.osv_memory):
 
         # Purchase Refund Journal
         vals_journal = {
-            'view_id': view_id,
             'name': _('Purchase Refund Journal'),
             'type': 'purchase_refund',
-            'refund_journal': True,
             'code': _('ECNJ'),
-            'sequence_id': seq_id_purchase_refund,
-            'analytic_journal_id': analitical_journal_purchase,
+            'view_id': view_id,
+            'analytic_journal_id': analytical_journal_purchase,
             'company_id': company_id
         }
 
@@ -3027,16 +2881,15 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         data = obj_data.browse(cr, uid, data_id[0], context=context)
         view_id = data.res_id
 
-        analitical_miscellaneous_ids = analytic_journal_obj.search(cr, uid, [('type', '=', 'situation')], context=context)
-        analitical_journal_miscellaneous = analitical_miscellaneous_ids and analitical_miscellaneous_ids[0] or False
+        analytical_miscellaneous_ids = analytic_journal_obj.search(cr, uid, [('type', '=', 'situation')], context=context)
+        analytical_journal_miscellaneous = analytical_miscellaneous_ids and analytical_miscellaneous_ids[0] or False
 
         vals_journal = {
-            'view_id': view_id,
             'name': _('Miscellaneous Journal'),
             'type': 'general',
             'code': _('MISC'),
-            'sequence_id': seq_id_miscellaneous,
-            'analytic_journal_id': analitical_journal_miscellaneous,
+            'view_id': view_id,
+            'analytic_journal_id': analytical_journal_miscellaneous,
             'company_id': company_id
         }
 
@@ -3045,11 +2898,10 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         # Opening Entries Journal
         if obj_multi.chart_template_id.property_account_income_opening and obj_multi.chart_template_id.property_account_expense_opening:
             vals_journal = {
-                'view_id': view_id,
                 'name': _('Opening Entries Journal'),
                 'type': 'situation',
                 'code': _('OPEJ'),
-                'sequence_id': seq_id_opening,
+                'view_id': view_id,
                 'company_id': company_id,
                 'centralisation': True,
                 'default_credit_account_id': acc_template_ref[obj_multi.chart_template_id.property_account_income_opening.id],
@@ -3057,7 +2909,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                 }
             obj_journal.create(cr, uid, vals_journal, context=context)
 
-
         # Bank Journals
         data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view')])
         data = obj_data.browse(cr, uid, data_id[0], context=context)
@@ -3068,56 +2919,48 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         view_id_cur = data.res_id
         ref_acc_bank = obj_multi.chart_template_id.bank_account_view_id
 
-        if obj_multi.chart_template_id.name != 'Configurable Account Chart Template':
-            current_num = 1
-            for line in obj_multi.bank_accounts_id:
-                #create the account_account for this bank journal
-                tmp = line.acc_name
-                dig = obj_multi.code_digits
-                if ref_acc_bank.code:
-                    try:
-                        new_code = str(int(ref_acc_bank.code.ljust(dig,'0')) + current_num)
-                    except:
-                        new_code = str(ref_acc_bank.code.ljust(dig-len(str(current_num)),'0')) + str(current_num)
-                vals = {
-                    'name': tmp,
-                    'currency_id': line.currency_id and line.currency_id.id or False,
-                    'code': new_code,
-                    'type': 'liquidity',
-                    'user_type': account_template.user_type and account_template.user_type.id or False,
-                    'reconcile': True,
-                    'parent_id': acc_template_ref[ref_acc_bank.id] or False,
-                    'company_id': company_id,
-                }
-                acc_cash_id  = obj_acc.create(cr,uid,vals)
+        current_num = 1
+        for line in obj_multi.bank_accounts_id:
+            #create the account_account for this bank journal
+            tmp = line.acc_name
+            dig = obj_multi.code_digits
+            if ref_acc_bank.code:
+                try:
+                    new_code = str(int(ref_acc_bank.code.ljust(dig,'0')) + current_num)
+                except:
+                    new_code = str(ref_acc_bank.code.ljust(dig-len(str(current_num)),'0')) + str(current_num)
+            vals = {
+                'name': tmp,
+                'currency_id': line.currency_id and line.currency_id.id or False,
+                'code': new_code,
+                'type': 'liquidity',
+                'user_type': account_template.user_type and account_template.user_type.id or False,
+                'reconcile': True,
+                'parent_id': acc_template_ref[ref_acc_bank.id] or False,
+                'company_id': company_id,
+            }
+            acc_cash_id  = obj_acc.create(cr,uid,vals)
 
-                if obj_multi.seq_journal:
-                    vals_seq={
-                        'name': _('Bank Journal ') + vals['name'],
-                        'code': 'account.journal',
-                    }
-                    seq_id = obj_sequence.create(cr,uid,vals_seq)
-
-                #create the bank journal
-                analitical_bank_ids = analytic_journal_obj.search(cr,uid,[('type','=','situation')])
-                analitical_journal_bank = analitical_bank_ids and analitical_bank_ids[0] or False
-
-                vals_journal['name']= vals['name']
-                vals_journal['code']= _('BNK') + str(current_num)
-                vals_journal['sequence_id'] = seq_id
-                vals_journal['type'] = line.account_type == 'cash' and 'cash' or 'bank'
-                vals_journal['company_id'] =  company_id
-                vals_journal['analytic_journal_id'] = analitical_journal_bank
-
-                if line.currency_id:
-                    vals_journal['view_id'] = view_id_cur
-                    vals_journal['currency'] = line.currency_id.id
-                else:
-                    vals_journal['view_id'] = view_id_cash
-                vals_journal['default_credit_account_id'] = acc_cash_id
-                vals_journal['default_debit_account_id'] = acc_cash_id
-                obj_journal.create(cr, uid, vals_journal)
-                current_num += 1
+            #create the bank journal
+            analytical_bank_ids = analytic_journal_obj.search(cr,uid,[('type','=','situation')])
+            analytical_journal_bank = analytical_bank_ids and analytical_bank_ids[0] or False
+            vals_journal = {
+                'name': vals['name'],
+                'code': _('BNK') + str(current_num),
+                'type': line.account_type == 'cash' and 'cash' or 'bank',
+                'company_id': company_id,
+                'analytic_journal_id': False,
+                'currency_id': False,
+            }
+            if line.currency_id:
+                vals_journal['view_id'] = view_id_cur
+                vals_journal['currency'] = line.currency_id.id
+            else:
+                vals_journal['view_id'] = view_id_cash
+            vals_journal['default_credit_account_id'] = acc_cash_id
+            vals_journal['default_debit_account_id'] = acc_cash_id
+            obj_journal.create(cr, uid, vals_journal)
+            current_num += 1
 
         #create the properties
         property_obj = self.pool.get('ir.property')
@@ -3180,14 +3023,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                         'position_id': new_fp,
                     }
                     obj_ac_fp.create(cr, uid, vals_acc)
-        if obj_multi.chart_template_id.name == 'Configurable Account Chart Template':
-            tax_val = {}
-            if obj_multi.sale_tax:
-                tax_val.update({'taxes_id': [(6, 0, [tax_template_to_tax[obj_multi.sale_tax.id]])]})
-            if obj_multi.purchase_tax:
-                tax_val.update({'supplier_taxes_id': [(6 ,0, [tax_template_to_tax[obj_multi.purchase_tax.id]])]})
-            product_ids = obj_product.search(cr, uid, [], context=context)
-            obj_product.write(cr, uid, product_ids, tax_val, context=context)
 
         if obj_multi.sale_tax:
             ir_values.set(cr, uid, key='default', key2=False, name="taxes_id", company=obj_multi.company_id.id,
@@ -3203,7 +3038,7 @@ class account_bank_accounts_wizard(osv.osv_memory):
 
     _columns = {
         'acc_name': fields.char('Account Name.', size=64, required=True),
-        'bank_account_id': fields.many2one('account.installer', 'Bank Account', required=True),
+        'bank_account_id': fields.many2one('wizard.multi.charts.accounts', 'Bank Account', required=True),
         'currency_id': fields.many2one('res.currency', 'Secondary Currency', help="Forces all moves for this account to have this secondary currency."),
         'account_type': fields.selection([('cash','Cash'), ('check','Check'), ('bank','Bank')], 'Account Type', size=32),
     }
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 85207cf5cb2..faf6b1cd897 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -1297,7 +1297,7 @@ class account_move_line(osv.osv):
         if vals.get('account_tax_id', False):
             tax_id = tax_obj.browse(cr, uid, vals['account_tax_id'])
             total = vals['debit'] - vals['credit']
-            if journal.refund_journal:
+            if journal.type in ('purchase_refund', 'sale_refund'):
                 base_code = 'ref_base_code_id'
                 tax_code = 'ref_tax_code_id'
                 account_id = 'account_paid_id'
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index a4d1510d54d..cadd590eb2d 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -371,7 +371,6 @@
             <field name="name">Sales Credit Note Journal - (test)</field>
             <field name="code">TSCNJ</field>
             <field name="type">sale_refund</field>
-            <field eval="True" name="refund_journal"/>
             <field name="view_id" ref="account_sp_refund_journal_view"/>
             <field name="sequence_id" ref="sequence_refund_sales_journal"/>
             <field model="account.account" name="default_credit_account_id" ref="a_sale"/>
@@ -395,7 +394,6 @@
             <field name="name">Expenses Credit Notes Journal - (test)</field>
             <field name="code">TECNJ</field>
             <field name="type">purchase_refund</field>
-            <field eval="True" name="refund_journal"/>
             <field name="view_id" ref="account_sp_refund_journal_view"/>
             <field name="sequence_id" ref="sequence_refund_purchase_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="a_expense"/>
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 5bdf7a62865..264557ad82c 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -141,34 +141,34 @@ class account_installer(osv.osv_memory):
                 pur_temp_tax = mod_obj.get_object_reference(cr, uid, 'account', 'tax_code_base_purchases')
                 pur_temp_tax_id = pur_temp_tax and pur_temp_tax[1] or False
 
-                pur_temp_tax_paid = mod_obj.get_object_reference(cr, uid, 'account', 'tax_code_input')
+                pur_temp_tax_paid = mod_obj.get_object_reference(cr, uid, 'account', 'tax_code_output')
                 pur_temp_tax_paid_id = pur_temp_tax_paid and pur_temp_tax_paid[1] or False
 
                 sale_temp_tax = mod_obj.get_object_reference(cr, uid, 'account', 'tax_code_base_sales')
                 sale_temp_tax_id = sale_temp_tax and sale_temp_tax[1] or False
 
-                sale_temp_tax_paid = mod_obj.get_object_reference(cr, uid, 'account', 'tax_code_output')
+                sale_temp_tax_paid = mod_obj.get_object_reference(cr, uid, 'account', 'tax_code_input')
                 sale_temp_tax_paid_id = sale_temp_tax_paid and sale_temp_tax_paid[1] or False
 
                 chart_temp_ids = obj_acc_chart_temp.search(cr, uid, [('name','=','Configurable Account Chart Template')], context=context)
                 chart_temp_id = chart_temp_ids and chart_temp_ids[0] or False
-                if s_tax*100 > 0.0:
+                if s_tax * 100 > 0.0:
                     tax_account_ids = obj_acc_temp.search(cr, uid, [('name', '=', 'Tax Received')], context=context)
                     sales_tax_account_id = tax_account_ids and tax_account_ids[0] or False
                     vals_tax_code_temp = {
-                        'name': 'TAX%s%%'%(s_tax*100),
-                        'code': 'TAX%s%%'%(s_tax*100),
+                        'name': _('TAX %s%%') % (s_tax*100),
+                        'code': _('TAX %s%%') % (s_tax*100),
                         'parent_id': sale_temp_tax_id
                     }
                     new_tax_code_temp = obj_tax_code_temp.create(cr, uid, vals_tax_code_temp, context=context)
                     vals_paid_tax_code_temp = {
-                        'name': 'TAX Received %s%%'%(s_tax*100),
-                        'code': 'TAX Received %s%%'%(s_tax*100),
+                        'name': _('TAX Received %s%%') % (s_tax*100),
+                        'code': _('TAX Received %s%%') % (s_tax*100),
                         'parent_id': sale_temp_tax_paid_id
                     }
                     new_paid_tax_code_temp = obj_tax_code_temp.create(cr, uid, vals_paid_tax_code_temp, context=context)
                     sales_tax_temp = obj_tax_temp.create(cr, uid, {
-                                            'name': 'TAX %s%%'%(s_tax*100),
+                                            'name': _('TAX %s%%') % (s_tax*100),
                                             'amount': s_tax,
                                             'base_code_id': new_tax_code_temp,
                                             'tax_code_id': new_paid_tax_code_temp,
@@ -176,32 +176,29 @@ class account_installer(osv.osv_memory):
                                             'ref_tax_code_id': new_paid_tax_code_temp,
                                             'type_tax_use': 'sale',
                                             'type': 'percent',
-                                            'sequence': 1,
+                                            'sequence': 0,
                                             'account_collected_id': sales_tax_account_id,
                                             'account_paid_id': sales_tax_account_id,
                                             'chart_template_id': chart_temp_id,
                                 }, context=context)
-                    default_account_ids = obj_acc_temp.search(cr, uid, [('name', '=', 'Product Sales')], context=context)
-                    if default_account_ids:
-                        obj_acc_temp.write(cr, uid, default_account_ids, {'tax_ids': [(6, 0, [sales_tax_temp])]}, context=context)
-                if p_tax*100 > 0.0:
+                if p_tax * 100 > 0.0:
                     tax_account_ids = obj_acc_temp.search(cr, uid, [('name', '=', 'Tax Paid')], context=context)
                     purchase_tax_account_id = tax_account_ids and tax_account_ids[0] or False
                     vals_tax_code_temp = {
-                        'name': 'TAX%s%%'%(p_tax*100),
-                        'code': 'TAX%s%%'%(p_tax*100),
+                        'name': _('TAX %s%%') % (p_tax*100),
+                        'code': _('TAX %s%%') % (p_tax*100),
                         'parent_id': pur_temp_tax_id
                     }
                     new_tax_code_temp = obj_tax_code_temp.create(cr, uid, vals_tax_code_temp, context=context)
                     vals_paid_tax_code_temp = {
-                        'name': 'TAX Paid %s%%'%(p_tax*100),
-                        'code': 'TAX Paid %s%%'%(p_tax*100),
+                        'name': _('TAX Paid %s%%') % (p_tax*100),
+                        'code': _('TAX Paid %s%%') % (p_tax*100),
                         'parent_id': pur_temp_tax_paid_id
                     }
                     new_paid_tax_code_temp = obj_tax_code_temp.create(cr, uid, vals_paid_tax_code_temp, context=context)
                     purchase_tax_temp = obj_tax_temp.create(cr, uid, {
-                                             'name': 'TAX%s%%'%(p_tax*100),
-                                             'description': 'TAX%s%%'%(p_tax*100),
+                                             'name': _('TAX %s%%') % (p_tax*100),
+                                             'description': _('TAX %s%%') % (p_tax*100),
                                              'amount': p_tax,
                                              'base_code_id': new_tax_code_temp,
                                              'tax_code_id': new_paid_tax_code_temp,
@@ -209,14 +206,11 @@ class account_installer(osv.osv_memory):
                                              'ref_tax_code_id': new_paid_tax_code_temp,
                                              'type_tax_use': 'purchase',
                                              'type': 'percent',
-                                             'sequence': 1,
+                                             'sequence': 0,
                                              'account_collected_id': purchase_tax_account_id,
                                              'account_paid_id': purchase_tax_account_id,
                                              'chart_template_id': chart_temp_id,
                                     }, context=context)
-                    default_account_ids = obj_acc_temp.search(cr, uid, [('name', '=', 'Expenses')], context=context)
-                    if default_account_ids:
-                        obj_acc_temp.write(cr, uid, default_account_ids, {'tax_ids': [(6, 0, [purchase_tax_temp])]}, context=context)
 
             if 'date_start' in res and 'date_stop' in res:
                 f_ids = fy_obj.search(cr, uid, [('date_start', '<=', res['date_start']), ('date_stop', '>=', res['date_stop']), ('company_id', '=', res['company_id'])], context=context)
diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml
index d2fb9c54646..d3b46e6d112 100644
--- a/addons/multi_company/multi_company_demo.xml
+++ b/addons/multi_company/multi_company_demo.xml
@@ -246,7 +246,6 @@
             <field name="name">Sales Credit Note Journal - (OpenERP IN)</field>
             <field name="code">SCNJ-OpenERP IN</field>
             <field name="type">sale_refund</field>
-            <field eval="True" name="refund_journal"/>
             <field name="view_id" ref="account.account_sp_refund_journal_view"/>
             <field name="sequence_id" ref="account.sequence_refund_sales_journal"/>
             <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
@@ -273,7 +272,6 @@
             <field name="name">Expenses Credit Notes Journal - (OpenERP IN)</field>
             <field name="code">ECNJ-OpenERP IN</field>
             <field name="type">purchase_refund</field>
-            <field eval="True" name="refund_journal"/>
             <field name="view_id" ref="account.account_sp_refund_journal_view"/>
             <field name="sequence_id" ref="account.sequence_refund_purchase_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
@@ -340,7 +338,6 @@
             <field name="name">Sales Credit Note Journal - (OpenERP US)</field>
             <field name="code">SCNJ-OpenERP US</field>
             <field name="type">sale_refund</field>
-            <field eval="True" name="refund_journal"/>
             <field name="view_id" ref="account.account_sp_refund_journal_view"/>
             <field name="sequence_id" ref="account.sequence_refund_sales_journal"/>
             <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
@@ -367,7 +364,6 @@
             <field name="name">Expenses Credit Notes Journal - (OpenERP US)</field>
             <field name="code">ECNJ-OpenERP US</field>
             <field name="type">purchase_refund</field>
-            <field eval="True" name="refund_journal"/>
             <field name="view_id" ref="account.account_sp_refund_journal_view"/>
             <field name="sequence_id" ref="account.sequence_refund_purchase_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
@@ -435,7 +431,6 @@
             <field name="name">Sales Credit Note Journal - (OpenERP BE)</field>
             <field name="code">SCNJ-OpenERP BE</field>
             <field name="type">sale_refund</field>
-            <field eval="True" name="refund_journal"/>
             <field name="view_id" ref="account.account_sp_refund_journal_view"/>
             <field name="sequence_id" ref="account.sequence_refund_sales_journal"/>
             <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
@@ -462,7 +457,6 @@
             <field name="name">Expenses Credit Notes Journal - (OpenERP BE)</field>
             <field name="code">ECNJ-OpenERP BE</field>
             <field name="type">purchase_refund</field>
-            <field eval="True" name="refund_journal"/>
             <field name="view_id" ref="account.account_sp_refund_journal_view"/>
             <field name="sequence_id" ref="account.sequence_refund_purchase_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>