odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

put parent_id=False domain for account.tax object on partner and auction modules object 

bzr revid: mra@tinyerp.com-20081003115932-b4ndxy7j4dsvsea6
This commit is contained in:
Mustufa Rangwala 2008-10-03 17:29:32 +05:30
parent ed25f0694f
commit 14818a0c0f
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/account/partner.py
View File

@ -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',

44
addons/auction/auction_view.xml
View File

@ -103,8 +103,8 @@ Auction Management/Auction Dates/New Auction Dates
<field name="auction1" select="1"/>
<field name="auction2" select="1"/>
<separator string="Commissions" colspan="4"/>
<field name="seller_costs" domain="[('domain','=','auction')]"/>
<field name="buyer_costs" domain="[('domain','=','auction')]"/>
<field name="seller_costs" domain="[('parent_id','=',False),('domain','=','auction')]"/>
<field name="buyer_costs" domain="[('parent_id','=',False),('domain','=','auction')]"/>
<separator string="Accounting" colspan="4"/>
<field name="acc_expense"/>
<field name="acc_income"/>
@ -126,7 +126,7 @@ Auction Management/Auction Dates/New Auction Dates
<field name="domain">[('state','=','draft')]</field>
<field name="view_id" eval="False"/>
</record>
<menuitem name="Auction Dates" parent="auction_menu_root" id="auction_date_menu"/>
<menuitem name="Next Auction Dates" parent="auction_date_menu" id="menu_auction_dates_next1" action="action_auction_dates_next"/>
=======================================================
@ -208,7 +208,7 @@ Auction Management/Auction Dates/Reporting
<field name="vnd_lim"/>
<field name="vnd_lim_net"/>
<field name="lot_est1"/>
<field name="author_right" domain="[('domain','=','sabam')]"/>
<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False)]"/>
<field name="lot_est2"/>
<field name="product_id"/>
<field name="state" readonly="1"/>
@ -319,7 +319,7 @@ Auction Management/Auction Dates/Reporting
<field name="obj_comm" select="2"/>
<field name="obj_ret"/>
<field name="ach_emp"/>
<field name="author_right" domain="[('domain','=','sabam')]"/>
<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False)]"/>
<field name="buyer_price"/>
<field name="seller_price"/>
<field name="gross_revenue"/>
@ -370,10 +370,10 @@ Auction Management/Auction Dates/Reporting
<field name="view_type">form</field>
<field name="domain">[('state','=','sold')]</field>
</record>
<menuitem name="Objects" parent="auction_menu_root" id="auction_objects_menu"/>
<menuitem name="All objects" action="action_all_objects" parent="auction_objects_menu" id="auction_all_objects_menu"/>
<menuitem name="Sold Objects" parent="auction_all_objects_menu" action="action_all_objects_sold" id="menu_all_objects_sold1"/>
<record model="ir.actions.act_window" id="action_all_objects_to_sell">
@ -430,7 +430,7 @@ Auction Management/Auction Dates/Reporting
<field name="name" readonly="1" select="1"/>
<field name="name2" readonly="2" select="1"/>
<field name="artist_id" readonly="1"/>
<field name="author_right" domain="[('domain','=','sabam')]"/>
<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False)]"/>
<newline/>
<field name="buyer_price"/>
<field name="is_ok" select="1"/>
@ -510,7 +510,7 @@ Auction Management/Auction Dates/Reporting
<field name="partner_id" select="1" on_change="partner_id_change(partner_id)"/>
<field name="method"/>
<newline/>
<field name="tax_id" domain="[('domain','=','auction')]"/>
<field name="tax_id" domain="[('domain','=','auction'),('parent_id','=',False)]"/>
<field name="transfer"/>
<newline/>
<field name="lot_id" colspan="4" mode="tree,graph" nolabel="1">
@ -545,7 +545,7 @@ Auction Management/Auction Dates/Reporting
<field name="lot_est1"/>
<field name="lot_est2"/>
<field name="author_right" domain="[('domain','=','sabam')]"/>
<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False)]"/>
<field name="product_id" domain="[('sale_ok','=',True)]"/>
<field name="state" readonly="1"/>
</page><page string="Photos">
@ -598,7 +598,7 @@ Auction Management/Auction Dates/Reporting
<field name="view_type">form</field>
<field name="view_id" ref="view_deposit_border_tree2"/>
</record>
<menuitem name="Sellers" id="auction_seller_menu" parent="auction_menu_root"/>
<menuitem name="Deposit border" parent="auction_seller_menu" action="action_deposit_border" id="menu_auction_deposit_border"/>
@ -694,7 +694,7 @@ Auction Management/Auction Dates/Reporting
<field name="res_model">auction.bid</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem name="Buyers" id="auction_buyers_menu" parent="auction_menu_root"/>
<menuitem name="Bids" parent="auction_buyers_menu" action="action_bid_open" id="menu_action_bid_open"/>
@ -743,7 +743,7 @@ Auction Management/Auction Dates/Reporting
</form>
</field>
</record>
<menuitem name="Reporting" id="auction_report_menu" parent="auction_menu_root"/>
@ -877,7 +877,7 @@ Auction Management/Auction Dates/Reporting
</record>
<menuitem name="Sellers" id="auction_report_seller_menu" parent="auction_report_menu"/>
<menuitem name="Seller's Summary" action="action_auction_reporting_all1" id="menu_seller_allmonth_view1" parent="auction_report_seller_menu"/>
<record model="ir.ui.view" id="view_auction_form2">
<field name="name">Seller's auction</field>
<field name="model">report.seller.auction2</field>
@ -969,7 +969,7 @@ Auction Management/Auction Dates/Reporting
<field name="view_mode">tree</field>
<field name="domain">[('date','ilike',time.strftime('%Y-%m'))]</field>
</record>
<record model="ir.ui.view" id="view_auction_buyer_form2">
<field name="name">Buyer's auction</field>
<field name="model">report.buyer.auction2</field>
@ -1017,16 +1017,16 @@ Auction Management/Auction Dates/Reporting
</record>
<menuitem name="Buyer" id="auction_report_buyer_menu" parent="auction_report_menu"/>
<menuitem name="Buyer's Summary" action="action_auction_buyer_reporting_all1" id="menu_buyer_allmonth_view1" parent="auction_report_buyer_menu"/>
<record model="ir.actions.act_window" id="action_auction_buyer_reporting_all2">
<field name="name">Buyer's auction for all months</field>
<field name="res_model">report.buyer.auction2</field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>
</record>
<menuitem name="Buyer's Revenues" action="action_auction_buyer_reporting_all2" id="menu_buyer_allmonth_view2" parent="auction_report_buyer_menu"/>
<!--end : creating buyer Reporting menu for the buyer by pmo-->
@ -1141,7 +1141,7 @@ estimation.adj.category
<!--=============================
sign in sign out report by user
==============================
==============================
<record model="ir.ui.view" id="view_report_auction_sign_in_out_tree">
<field name="name">report.auction.user.pointing.tree</field>
@ -1240,7 +1240,7 @@ My Latest Objects
<field name="view_mode">tree,form</field>
<field name="domain">[('create_uid','=',uid)]</field>
</record>
<record model="ir.actions.act_window" id="action_report_latest_objects_manager_tree">
<field name="res_model">auction.lots</field>
<field name="view_type">form</field>
@ -1385,7 +1385,7 @@ Objects per Day
<field name="view_type">tree</field>
<field name="domain">[('state','=', 'draft')]</field>
</record>
<menuitem name="Objects by Auction"
<menuitem name="Objects by Auction"
parent="auction_objects_menu"
id="menu_auction_dates_next_by_auction"
action="action_report_object_by_auction" sequence="11"/>