</page>
<page string="Accounting" >
<separator string="Accounting" colspan="4"/>
- <field name="acc_expense"/>
- <field name="acc_income"/>
+ <field name="acc_expense" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
+ <field name="acc_income" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
<separator string="Analytic" colspan="4"/>
<field name="journal_id"/>
<field name="journal_seller_id"/>
<menuitem name="Next Auction Dates" parent="auction_date_menu" id="menu_auction_dates_next1" action="action_auction_dates_next"/>
- <!-- Auction Management/Auction Dates/Reporting -->
-
- <!-- tree1 form1 for NEW object in the deposit border -->
-
-<!-- <record model="ir.ui.view" id="v5">-->
-<!-- <field name="name">Auction lots</field>-->
-<!-- <field name="model">auction.lots</field>-->
-<!-- <field name="type">tree</field>-->
-<!-- <field name="arch" type="xml">-->
-<!-- <tree string="Auction Objects">-->
-<!-- <field name="lot_num"/>-->
-<!-- <field name="obj_num"/>-->
-<!-- <field name="name"/>-->
-<!-- <field name="auction_id"/>-->
-<!-- <field name="vnd_lim"/>-->
-<!-- <field name="lot_est1"/>-->
-<!-- <field name="lot_est2"/>-->
-<!-- <field name="buyer_price"/>-->
-<!-- <field name="is_ok"/>-->
-<!-- <field name="seller_price"/>-->
-<!-- <field name="gross_revenue"/>-->
-<!-- <field name="net_revenue"/>-->
-<!-- <field name="gross_margin"/>-->
-<!-- <field name="net_margin"/>-->
-<!-- <field name="costs"/>-->
-<!-- <field name="obj_price_l"/>-->
-<!-- </tree>-->
-<!-- </field>-->
-<!-- </record>-->
-<!-- -->
-<!-- <record model="ir.ui.view" id="auction_lot_simplified">-->
-<!-- <field name="name">Auction lots</field>-->
-<!-- <field name="model">auction.lots</field>-->
-<!-- <field name="type">form</field>-->
-<!-- <field name="arch" type="xml">-->
-<!-- <form string="All Objects">-->
-<!-- <field name="auction_id"/>-->
-<!-- <field name="obj_num"/>-->
-<!-- <field name="bord_vnd_id"/>-->
-<!-- <field name="lot_num"/>-->
-<!-- <field name="buyer_price"/>-->
-<!-- <field name="seller_price"/>-->
-<!-- <field name="gross_revenue"/>-->
-<!-- <field name="net_revenue"/>-->
-<!-- <field name="gross_margin"/>-->
-<!-- <field name="net_margin"/>-->
-<!-- <field name="costs"/>-->
-<!-- <newline/>-->
-<!-- <field name="name"/>-->
-<!-- <field name="lot_type" select="1"/>-->
-<!-- <field name="name2"/>-->
-<!-- <newline/>-->
-<!-- <field name="artist_id"/>-->
-<!-- <field name="artist2_id"/>-->
-<!-- <field name="obj_desc" colspan="4"/>-->
-<!-- <field name="vnd_lim"/>-->
-<!-- <field name="vnd_lim_net"/>-->
-<!-- <field name="lot_est1"/>-->
-<!-- <field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False),('type_tax_use','<>','sale')]"/>-->
-<!-- <field name="lot_est2"/>-->
-<!-- <field name="product_id"/>-->
-<!-- <field name="state" readonly="1"/>-->
-<!-- </form>-->
-<!-- </field>-->
-<!-- </record>-->
-
-
- <!-- tree2 form2 for Catalog, All object and Unclassified objects -->
- <record model="ir.ui.view" id="v7">
+
+ <record model="ir.ui.view" id="view_auction_lot_tree">
<field name="name">Auction lots</field>
<field name="model">auction.lots</field>
<field name="type">tree</field>
<field name="priority" eval="1"/>
<field name="arch" type="xml">
- <tree colors="blue:state in ('unsold','draft');black:state in ('sold','taken_away');gray:state in ('paid') " string="All Objects">
+ <tree colors="blue:state in ('unsold','draft');black:state in ('sold','taken_away');gray:state in ('paid') " string="Objects">
<field name="obj_num" string="Ref" select="1"/>
<field name="name" select="1"/>
<field name="ach_uid"/>
<field name="type">form</field>
<field name="priority" eval="8"/>
<field name="arch" type="xml">
- <form string="All Objects">
+ <form string="Objects">
<group colspan="4" col="4">
<group colspan="2" col="4">
<field colspan="2" name="name"/>
<field name="buyer_price"/>
<field name="seller_price"/>
<field name="ach_emp"/>
-<!-- <button name="auction_lots_enable" string="Unmark" type="object" icon="gtk-execute" attrs="{'invisible':[('ach_emp','=', False)]}"/>-->
<field name="gross_revenue"/>
<field name="net_revenue"/>
<field name="gross_margin"/>
</record>
<menuitem name="Objects" parent="auction_menu_root" id="auction_objects_menu" sequence="2"/>
- <menuitem name="All objects" action="action_all_objects" parent="auction_objects_menu" id="auction_all_objects_menu"/>
-
- <!-- form3: simplified form meant for during the sale (action button in dates) -->
- <!--form par defaut-->
-
-<!-- <record model="ir.ui.view" id="auction_lots_sell_form">-->
-<!-- <field name="name">auction.lots.form3</field>-->
-<!-- <field name="model">auction.lots</field>-->
-<!-- <field name="type">form</field>-->
-<!-- <field name="arch" type="xml">-->
-<!-- <form string="Auction">-->
-<!-- <notebook>-->
-<!-- <page string="Auction">-->
-<!-- <field name="obj_num" readonly="1" select="1"/>-->
-<!-- <field name="auction_id"/>-->
-<!-- <field name="obj_price" select="1"/>-->
-<!-- <field name="ach_login" select="1" comparator="="/>-->
-<!-- <field name="ach_emp"/>-->
-<!-- <field name="obj_comm"/>-->
-<!-- <field name="obj_ret" on_change="onchange_obj_ret(obj_ret)"/>-->
-<!-- <newline/>-->
-<!-- <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'),('parent_id','=',False),('type_tax_use','<>','sale')]"/>-->
-<!-- <newline/>-->
-<!-- <field name="buyer_price"/>-->
-<!-- <field name="is_ok" select="1"/>-->
-<!-- <field name="obj_desc" readonly="1" colspan="4"/>-->
-<!-- <field name="lot_est1" readonly="1"/>-->
-<!-- <field name="lot_est2" readonly="1"/>-->
-<!-- <field name="vnd_lim" readonly="1"/>-->
-<!-- <field name="vnd_lim_net"/>-->
-<!-- <field name="bid_lines" colspan="4" readonly="1">-->
-<!-- <tree string="Bids">-->
-<!-- <field name="name"/>-->
-<!-- <field name="bid_id"/>-->
-<!-- <field name="price"/>-->
-<!-- <field name="call"/>-->
-<!-- </tree>-->
-<!-- </field>-->
-<!-- <field name="state" readonly="1"/>-->
-<!-- <group colspan="2" col="4">-->
-<!-- <button name="button_bought" string="Sold" states="draft" type="object" icon="gtk-jump-to" />-->
-<!-- <button name="button_not_bought" string="Not sold" states="draft" type="object" icon="gtk-undo"/>-->
-<!-- <button name="button_draft" string="Set to draft" states="sold,unsold" type="object" icon="gtk-convert"/>-->
-<!-- <button name="button_taken_away" string="Taken away" states="sold" type="object" icon="gtk-goto-last"/>-->
-<!-- </group>-->
-<!-- </page>-->
-<!-- <page string="Statements">-->
-<!-- <field name="statement_id" domain="[('state','=','draft')]" colspan="4" nolabel="1"-->
-<!-- widget="one2many_list">-->
-<!-- <tree string="Payment's history" editable="top">-->
-<!-- <field name="name"/>-->
-<!-- <field name="amount"/>-->
-<!-- <field name="date"/>-->
-<!-- </tree>-->
-<!-- </field>-->
-<!-- </page>-->
-<!-- </notebook>-->
-<!-- </form>-->
-<!-- </field>-->
-<!-- </record>-->
-
+ <menuitem name="Objects" action="action_all_objects" parent="auction_objects_menu" id="auction_all_objects_menu"/>
<record model="ir.ui.view" id="view_deposit_border_form">
<field name="name">auction.deposit.form</field>
<field name="arch" type="xml">
<tree string="Bids">
<field name="bid_id"/>
- <!-- <field name="lot_id"/>-->
<field name="price"/>
<field name="call"/>
<field name="auction"/>
<field name="lot_id" domain="[('auction_id','=',parent['auction_id'])]" on_change="onchange_name(lot_id)" colspan="4"/>
<field name="call" colspan="4" select="1"/>
<field name="price"/>
- <!--field name="auction"/-->
</form>
</field>
</record>
</data>
</openerp>
-
\ No newline at end of file
+
projects / odoo / odoo.git / blobdiff