Bugfixes:account and auction module

bzr revid: jvo@tinyerp.com-20080904083417-0bmgzycodjz91mbm

diff --git a/addons/account/account.py b/addons/account/account.py
index 6b4f647..1b72e3b 100644 (file)
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1731,10 +1731,12 @@ class account_tax_code_template(osv.osv):
         if user.company_id:
             return user.company_id.id
         return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
+
     _defaults = {
         'company_id': _default_company,
         'sign': lambda *args: 1.0,
     }
+
     def _check_recursion(self, cr, uid, ids):
         level = 100
         while len(ids):
@@ -1746,7 +1748,7 @@ class account_tax_code_template(osv.osv):
         return True
 
     _constraints = [
-        (_check_recursion, 'Error ! You can not create recursive accounts.', ['parent_id'])
+        (_check_recursion, 'Error ! You can not create recursive Tax Codes.', ['parent_id'])
     ]
     _order = 'code,name'
 account_tax_code_template()
@@ -1832,7 +1834,7 @@ class account_tax_template(osv.osv):
     _defaults = {
         'python_compute': lambda *a: '''# price_unit\n# address : res.partner.address object or False\n# product : product.product object or None\n# partner : res.partner object or None\n\nresult = price_unit * 0.10''',
         'python_compute_inv': lambda *a: '''# price_unit\n# address : res.partner.address object or False\n# product : product.product object or False\n\nresult = price_unit * 0.10''',
-       'applicable_type': lambda *a: 'true',
+        'applicable_type': lambda *a: 'true',
         'type': lambda *a: 'percent',
         'amount': lambda *a: 0,
         'sequence': lambda *a: 1,
@@ -1936,7 +1938,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             tax_template_ref[tax.id] = new_tax
 
 
-        #desactivate the parent_store functionnality on account_account for rapidity purpose
+        #deactivate the parent_store functionnality on account_account for rapidity purpose
         self.pool._init = True
         children_acc_template = obj_acc_template.search(cr, uid, [('parent_id','child_of',[obj_acc_root.id])])
         for account_template in obj_acc_template.browse(cr, uid, children_acc_template):
@@ -2044,7 +2046,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         fields_obj = self.pool.get('ir.model.fields')
 
         todo_list = [
-            ('property_account_receivable','res.partner','account.account'), 
+            ('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'),

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 32213fd..9782dc9 100644 (file)
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1570,7 +1570,7 @@
             <field name="arch" type="xml">
                 <form string="Account Tax Template">
                     <field name="name" select="1"/>
-                    <field name="company_id"/>
+                    <!--<field name="company_id"/>-->
                     <newline/>
                     <field name="description" select="1" colspan="4"/>
                     <field name="tax_group" />

diff --git a/addons/auction/__terp__.py b/addons/auction/__terp__.py
index fd2d729..ed3a6ec 100644 (file)
--- a/addons/auction/__terp__.py
+++ b/addons/auction/__terp__.py
@@ -4,7 +4,7 @@
     "version" : "1.0",
     "depends" : ["base","account","l10n_be","hr"],
     "update_xml" : [
-        "security/ir.model.access.csv"
+        "security/ir.model.access.csv",
         "auction_view.xml", "auction_report.xml", "auction_wizard.xml"
     ],
     "demo_xml" : [

diff --git a/addons/auction/security/ir.model.access.csv b/addons/auction/security/ir.model.access.csv
index e7dfa6f..12683d6 100644 (file)
--- a/addons/auction/security/ir.model.access.csv
+++ b/addons/auction/security/ir.model.access.csv
@@ -1,20 +1,20 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_auction_artists,auction.artists,model_auction_artists,auction.group_user,1,1,1,1
-access_auction_dates,auction.dates,model_auction_dates,auction.group_user,1,1,1,1
-access_auction_deposit,auction.deposit,model_auction_deposit,auction.group_user,1,1,1,1
-access_auction_deposit_cost,auction.deposit.cost,model_auction_deposit_cost,auction.group_user,1,1,1,1
-access_auction_lot_category,auction.lot.category,model_auction_lot_category,auction.group_user,1,1,1,1
-access_auction_lots,auction.lots,model_auction_lots,auction.group_user,1,1,1,1
-access_auction_bid,auction.bid,model_auction_bid,auction.group_user,1,1,1,1
-access_auction_lot_history,auction.lot.history,model_auction_lot_history,auction.group_user,1,1,1,1
-access_report_buyer_auction,report.buyer.auction,model_report_buyer_auction,auction.group_user,1,1,1,1
-access_report_seller_auction,report.seller.auction,model_report_seller_auction,auction.group_user,1,1,1,1
-access_report_auction_view,report.auction.view,model_report_auction_view,auction.group_user,1,1,1,1
-access_report_auction_object_date,report.auction.object.date,model_report_auction_object_date,auction.group_user,1,1,1,1
-access_report_auction_estimation_adj_category,report.auction.estimation.adj.category,model_report_auction_estimation_adj_category,auction.group_user,1,1,1,1
-access_report_auction_adjudication,report.auction.adjudication,model_report_auction_adjudication,auction.group_user,1,1,1,1
-access_report_attendance,report.attendance,model_report_attendance,auction.group_user,1,1,1,1
-access_report_deposit_border,report.deposit.border,model_report_deposit_border,auction.group_user,1,1,1,1
-access_report_object_encoded,report.object.encoded,model_report_object_encoded,auction.group_user,1,1,1,1
-access_report_object_encoded_manager,report.object.encoded.manager,model_report_object_encoded_manager,auction.group_user,1,1,1,1
-access_report_unclassified_objects,report.unclassified.objects,model_report_unclassified_objects,auction.group_user,1,1,1,1
+access_auction_artists,auction.artists,model_auction_artists,base.group_user,1,1,1,1
+access_auction_dates,auction.dates,model_auction_dates,base.group_user,1,1,1,1
+access_auction_deposit,auction.deposit,model_auction_deposit,base.group_user,1,1,1,1
+access_auction_deposit_cost,auction.deposit.cost,model_auction_deposit_cost,base.group_user,1,1,1,1
+access_auction_lot_category,auction.lot.category,model_auction_lot_category,base.group_user,1,1,1,1
+access_auction_lots,auction.lots,model_auction_lots,base.group_user,1,1,1,1
+access_auction_bid,auction.bid,model_auction_bid,base.group_user,1,1,1,1
+access_auction_lot_history,auction.lot.history,model_auction_lot_history,base.group_user,1,1,1,1
+access_report_buyer_auction,report.buyer.auction,model_report_buyer_auction,base.group_user,1,1,1,1
+access_report_seller_auction,report.seller.auction,model_report_seller_auction,base.group_user,1,1,1,1
+access_report_auction_view,report.auction.view,model_report_auction_view,base.group_user,1,1,1,1
+access_report_auction_object_date,report.auction.object.date,model_report_auction_object_date,base.group_user,1,1,1,1
+access_report_auction_estimation_adj_category,report.auction.estimation.adj.category,model_report_auction_estimation_adj_category,base.group_user,1,1,1,1
+access_report_auction_adjudication,report.auction.adjudication,model_report_auction_adjudication,base.group_user,1,1,1,1
+access_report_attendance,report.attendance,model_report_attendance,base.group_user,1,1,1,1
+access_report_deposit_border,report.deposit.border,model_report_deposit_border,base.group_user,1,1,1,1
+access_report_object_encoded,report.object.encoded,model_report_object_encoded,base.group_user,1,1,1,1
+access_report_object_encoded_manager,report.object.encoded.manager,model_report_object_encoded_manager,base.group_user,1,1,1,1
+access_report_unclassified_objects,report.unclassified.objects,model_report_unclassified_objects,base.group_user,1,1,1,1