diff --git a/addons/account/partner.py b/addons/account/partner.py
index c1eac82b99c..a47aae0d792 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -38,7 +38,7 @@ class res_partner(osv.osv):
def _credit_debit_get(self, cr, uid, ids, field_names, arg, context):
query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
cr.execute(("""select
- l.partner_id, a.type, sum(l.debit-l.credit)
+ l.partner_id, a.type, sum(l.debit-l.credit)
from
account_move_line l
left join
@@ -116,6 +116,7 @@ class res_partner(osv.osv):
string="Default Supplier Tax",
method=True,
view_load=True,
+ domain=[('parent_id','=',False)],
help="This tax will be used, instead of the default one for supplier invoices."),
'property_account_tax': fields.property(
'account.tax',
@@ -124,6 +125,7 @@ class res_partner(osv.osv):
string="Default Tax",
method=True,
view_load=True,
+ domain=[('parent_id','=',False)],
help="This tax will be used, instead of the default one for customers."),
'property_payment_term': fields.property(
'account.payment.term',
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index 28b6b2422b6..adaa263fa86 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -103,8 +103,8 @@ Auction Management/Auction Dates/New Auction Dates
-
-
+
+
@@ -126,7 +126,7 @@ Auction Management/Auction Dates/New Auction Dates
[('state','=','draft')]
-
+
=======================================================
@@ -208,7 +208,7 @@ Auction Management/Auction Dates/Reporting
-
+
@@ -319,7 +319,7 @@ Auction Management/Auction Dates/Reporting
-
+
@@ -370,10 +370,10 @@ Auction Management/Auction Dates/Reporting
form
[('state','=','sold')]
-
+
-
+
@@ -430,7 +430,7 @@ Auction Management/Auction Dates/Reporting
-
+
@@ -510,7 +510,7 @@ Auction Management/Auction Dates/Reporting
-
+
@@ -545,7 +545,7 @@ Auction Management/Auction Dates/Reporting
-
+
@@ -598,7 +598,7 @@ Auction Management/Auction Dates/Reporting
form
-
+
@@ -694,7 +694,7 @@ Auction Management/Auction Dates/Reporting
auction.bid
tree,form
-
+
@@ -743,7 +743,7 @@ Auction Management/Auction Dates/Reporting
-
+
@@ -877,7 +877,7 @@ Auction Management/Auction Dates/Reporting
-
+
Seller's auction
report.seller.auction2
@@ -969,7 +969,7 @@ Auction Management/Auction Dates/Reporting
tree
[('date','ilike',time.strftime('%Y-%m'))]
-
+
Buyer's auction
report.buyer.auction2
@@ -1017,16 +1017,16 @@ Auction Management/Auction Dates/Reporting
-
+
Buyer's auction for all months
report.buyer.auction2
form
tree
-
-
-
+
+
+
@@ -1141,7 +1141,7 @@ estimation.adj.category