[IMP]: auction: usability Improvement in auction dates form ,add search view./
[IMP]: usability Improvement in objects form, and add search view. [IMP]: Remove some unnecessary wizard from objects form. [FIX]: Fix Image Path problem of catelog Flagey report. [FIX]: Fix _type_get() function argument problem for object category field. bzr revid: atp@tinyerp.co.in-20100729120616-4wohqg52atddh48b
This commit is contained in:
atp (Open ERP)
parent
059332f03f
commit
3b56d0d65b
|
|
@ -43,10 +43,8 @@
|
|||
'init_xml': ['auction_sequence.xml'],
|
||||
'update_xml': [
|
||||
'security/ir.model.access.csv',
|
||||
# 'wizard/auction_lots_cancel_view.xml',
|
||||
# 'wizard/auction_transfer_unsold_object_view.xml',
|
||||
'wizard/auction_lots_able_view.xml',
|
||||
'wizard/auction_lots_enable_view.xml',
|
||||
# 'wizard/auction_lots_able_view.xml',
|
||||
# 'wizard/auction_lots_enable_view.xml',
|
||||
'wizard/auction_lots_make_invoice_buyer_view.xml',
|
||||
'wizard/auction_lots_make_invoice_view.xml',
|
||||
'wizard/auction_taken_view.xml',
|
||||
|
|
@ -55,11 +53,7 @@
|
|||
'wizard/auction_payer_sel_view.xml',
|
||||
'wizard/auction_lots_sms_send_view.xml',
|
||||
'wizard/auction_catalog_flagey_view.xml',
|
||||
# 'wizard/auction_aie_send_view.xml',
|
||||
# 'wizard/auction_aie_send_result_view.xml',
|
||||
'wizard/auction_lots_buyer_map_view.xml',
|
||||
# 'wizard/auction_lots_numerotate_view.xml',
|
||||
|
||||
'auction_view.xml',
|
||||
'auction_report.xml',
|
||||
'auction_wizard.xml',
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -10,52 +10,52 @@
|
|||
</record>
|
||||
|
||||
<record id="res_partner_unknown_address_1" model="res.partner.address">
|
||||
<field name="city">Bruxelles1</field>
|
||||
<field name="name">Benoit Mortie1r1</field>
|
||||
<field name="zip">1030</field>
|
||||
<field name="country_id" model="res.country" search="[('name','=','Belgium')]"/>
|
||||
<field name="city">Bruxelles1</field>
|
||||
<field name="name">Benoit Mortie1r1</field>
|
||||
<field name="zip">1030</field>
|
||||
<field name="country_id" model="res.country" search="[('name','=','Belgium')]"/>
|
||||
|
||||
<field name="email">info@opensides.be</field>
|
||||
<field name="phone">(+32)2 211 34 83</field>
|
||||
<field name="street">Rue des Palais 44, bte 33</field>
|
||||
<field name="type">default</field>
|
||||
<field name="partner_id" ref="partner_record1"/>
|
||||
</record>
|
||||
|
||||
<field name="email">info@opensides.be</field>
|
||||
<field name="phone">(+32)2 211 34 83</field>
|
||||
<field name="street">Rue des Palais 44, bte 33</field>
|
||||
<field name="type">default</field>
|
||||
<field name="partner_id" ref="partner_record1"/>
|
||||
</record>
|
||||
<record id="res_partner_unknown_address_2" model="res.partner.address">
|
||||
<field name="city">Avignon CEDEX 091</field>
|
||||
<field name="name">Laurent Jacot1</field>
|
||||
<field name="zip">84911</field>
|
||||
<field name="country_id" model="res.country" search="[('name','=','France')]"/>
|
||||
<field name="email">contact@tecsas.fr</field>
|
||||
<field name="phone">(+33)4.32.74.10.57</field>
|
||||
<field name="street">85 rue du traite de Rome</field>
|
||||
<field name="type">default</field>
|
||||
<field name="partner_id" ref="partner_record1"/>
|
||||
</record>
|
||||
<record id="res_partner_unknown_address_3" model="res.partner.address">
|
||||
<field name="city">Louvain-la-Neuve</field>
|
||||
<field name="name">Thomas Passot</field>
|
||||
<field name="zip">1348</field>
|
||||
<field name="country_id" model="res.country" search="[('name','=','Belgium')]"/>
|
||||
<field name="email">info@mediapole.net</field>
|
||||
<field name="phone">(+32).10.45.17.73</field>
|
||||
<field name="street">Rue de l'Angelique, 1</field>
|
||||
<field name="partner_id" ref="partner_record1"/>
|
||||
</record>
|
||||
<record id="res_partner_unknown_address_2" model="res.partner.address">
|
||||
<field name="city">Avignon CEDEX 091</field>
|
||||
<field name="name">Laurent Jacot1</field>
|
||||
<field name="zip">84911</field>
|
||||
<field name="country_id" model="res.country" search="[('name','=','France')]"/>
|
||||
<field name="email">contact@tecsas.fr</field>
|
||||
<field name="phone">(+33)4.32.74.10.57</field>
|
||||
<field name="street">85 rue du traite de Rome</field>
|
||||
<field name="type">default</field>
|
||||
<field name="partner_id" ref="partner_record1"/>
|
||||
</record>
|
||||
<record id="res_partner_unknown_address_3" model="res.partner.address">
|
||||
<field name="city">Louvain-la-Neuve</field>
|
||||
<field name="name">Thomas Passot</field>
|
||||
<field name="zip">1348</field>
|
||||
<field name="country_id" model="res.country" search="[('name','=','Belgium')]"/>
|
||||
<field name="email">info@mediapole.net</field>
|
||||
<field name="phone">(+32).10.45.17.73</field>
|
||||
<field name="street">Rue de l'Angelique, 1</field>
|
||||
<field name="partner_id" ref="partner_record1"/>
|
||||
</record>
|
||||
|
||||
<!-- demo data for the auction_artist object-->
|
||||
|
||||
<record model="auction.artists" id="auction_art_1">
|
||||
<field name="name">Philippe Lavilier</field>
|
||||
<field name="birth_death_dates">1345-1450</field>
|
||||
</record>
|
||||
|
||||
<record model="auction.artists" id="auction_art_2">
|
||||
<field name="name">POREAU OSWALD</field>
|
||||
<field name="birth_death_dates">1877-1955</field>
|
||||
</record>
|
||||
|
||||
|
||||
|
||||
|
||||
<!-- demo data for the account tax code-->
|
||||
|
||||
<record model="account.tax.code" id="account_tax_code_id1">
|
||||
|
|
@ -98,8 +98,8 @@
|
|||
<field name="domain">sabam</field>
|
||||
<field name="base_code_id" ref="account_tax_code_id5"/>
|
||||
<field name="tax_code_id" ref="account_tax_code_id5"/>
|
||||
|
||||
</record>
|
||||
|
||||
<record id="auction_tax1" model="account.tax">
|
||||
<field name="name">TVA</field>
|
||||
<field name="amount">0.12</field>
|
||||
|
|
@ -108,14 +108,12 @@
|
|||
<field name="tax_code_id" ref="account_tax_code_id4"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="auction_tax2" model="account.tax">
|
||||
<field name="name">TVA1</field>
|
||||
<field name="amount">0.2</field>
|
||||
<field name="domain">auction</field>
|
||||
<field name="base_code_id" ref="account_tax_code_id2"/>
|
||||
<field name="tax_code_id" ref="account_tax_code_id2"/>
|
||||
|
||||
</record>
|
||||
<record id="auction_tax3" model="account.tax">
|
||||
<field name="name">Buyer Costs</field>
|
||||
|
|
@ -123,7 +121,6 @@
|
|||
<field name="domain">auction</field>
|
||||
<field name="base_code_id" ref="account_tax_code_id1"/>
|
||||
<field name="tax_code_id" ref="account_tax_code_id1"/>
|
||||
|
||||
</record>
|
||||
<record id="auction_tax4" model="account.tax">
|
||||
<field name="name">Seller Costs1</field>
|
||||
|
|
@ -131,7 +128,6 @@
|
|||
<field name="domain">auction</field>
|
||||
<field name="base_code_id" ref="account_tax_code_id1"/>
|
||||
<field name="tax_code_id" ref="account_tax_code_id1"/>
|
||||
|
||||
</record>
|
||||
<record id="auction_tax5" model="account.tax">
|
||||
<field name="name">Seller Costs</field>
|
||||
|
|
@ -141,8 +137,8 @@
|
|||
<field name="tax_code_id" ref="account_tax_code_id3"/>
|
||||
</record>
|
||||
|
||||
|
||||
<!-- example for creating a demo data for the tax with basecode and tax code-->
|
||||
|
||||
<record id="auction_tax6" model="account.tax">
|
||||
<field name="name">Frais de vente</field>
|
||||
<field name="amount">-0.15</field>
|
||||
|
|
@ -151,22 +147,20 @@
|
|||
<field name="tax_code_id" ref="account_tax_code_id1"/>
|
||||
</record>
|
||||
|
||||
<record id="auction_tax20" model="account.tax">
|
||||
<record id="auction_tax20" model="account.tax">
|
||||
<field name="name">Frais de vente</field>
|
||||
<field name="amount">0</field>
|
||||
<field name="domain">auction</field>
|
||||
<field name="base_code_id" ref="account_tax_code_id2"/>
|
||||
<field name="tax_code_id" ref="account_tax_code_id2"/>
|
||||
</record>
|
||||
|
||||
<record id="monproduit" model="product.product">
|
||||
<field name="name">Oeuvres a 21%</field>
|
||||
<field name="categ_id" ref="product.product_category_pc"/>
|
||||
</record>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<!--===========================================================================================-->
|
||||
<!-- start == demo data for the auction_lot_Category object-->
|
||||
<record model="auction.lot.category" id="auction_cat_1">
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@
|
|||
xml="auction/report/lots_list_landscape.xml"
|
||||
xsl="auction/report/lots_list_landscape.xsl"
|
||||
id="lot_list_inv"
|
||||
multi="1"/>
|
||||
multi="1"/><!--
|
||||
|
||||
|
||||
<report string="Lots List Inventory"
|
||||
|
|
@ -106,8 +106,7 @@
|
|||
multi="1"/>
|
||||
|
||||
|
||||
|
||||
<report string="Lots List"
|
||||
--><report string="Lots List"
|
||||
model="auction.lots"
|
||||
name="report.auction.lots.list"
|
||||
xml="auction/report/lots_list.xml"
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@
|
|||
<menuitem name="Configuration" parent="auction_menu_root" id="auction_config_menu" sequence="7"/>
|
||||
<menuitem name="Tools Bar Codes" id="auction_outils_menu" parent="auction_menu_root" sequence="5" />
|
||||
<menuitem name="Deliveries Management" action="action_auction_taken" id="menu_wizard_emporte" parent="auction_outils_menu"/>
|
||||
=======================================================
|
||||
Auction Management/Configuration/artist
|
||||
=======================================================
|
||||
|
||||
<!-- Auction Management/Configuration/artist -->
|
||||
|
||||
<record model="ir.ui.view" id="view_auction_artist_tree">
|
||||
<field name="name">auction.artists.tree</field>
|
||||
<field name="model">auction.artists</field>
|
||||
|
|
@ -42,9 +42,9 @@
|
|||
</record>
|
||||
<menuitem name="Define Artists" parent="auction_config_menu" action="action_auction_artist" id="menu_auction_artist"/>
|
||||
|
||||
=======================================================
|
||||
Auction Management/Configuration/objectcategories
|
||||
=======================================================
|
||||
|
||||
<!-- Auction Management/Configuration/objectcategories -->
|
||||
|
||||
<record model="ir.ui.view" id="view_auction_object_categories_tree">
|
||||
<field name="name">auction.lot.category.tree</field>
|
||||
<field name="model">auction.lot.category</field>
|
||||
|
|
@ -76,9 +76,9 @@
|
|||
<field name="view_id" ref="view_auction_object_categories_tree"/>
|
||||
</record>
|
||||
<menuitem name="Object Categories" parent="auction_config_menu" action="action_auction_object_categories" id="menu_auction_object_cat"/>
|
||||
=======================================================
|
||||
Auction Management/Auction Dates/New Auction Dates
|
||||
=======================================================
|
||||
|
||||
<!-- Auction Management/Auction Dates/New Auction Dates -->
|
||||
|
||||
<record model="ir.ui.view" id="view_auction_dates_tree">
|
||||
<field name="name">Auction dates</field>
|
||||
<field name="model">auction.dates</field>
|
||||
|
|
@ -88,9 +88,11 @@
|
|||
<field name="auction1" string="Beginning of the auction"/>
|
||||
<field name="auction2" string="End of auction"/>
|
||||
<field name="name" string="Names"/>
|
||||
<field name="state"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="view_auction_dates_form">
|
||||
<field name="name">Auction dates</field>
|
||||
<field name="model">auction.dates</field>
|
||||
|
|
@ -98,41 +100,107 @@
|
|||
<field name="arch" type="xml">
|
||||
<form string="Auctions">
|
||||
<field name="name" colspan="2" select="1"/>
|
||||
<separator string="Dates" colspan="4"/>
|
||||
<field name="expo1"/>
|
||||
<field name="expo2"/>
|
||||
<field name="auction1" select="1"/>
|
||||
<field name="auction2" select="1"/>
|
||||
<separator string="Commissions" colspan="4"/>
|
||||
<field name="seller_costs" domain="[('parent_id','=',False),('domain','=','auction'),('type_tax_use','<>','purchase')]"/>
|
||||
<field name="buyer_costs" domain="[('parent_id','=',False),('domain','=','auction'),('type_tax_use','<>','sale')]"/>
|
||||
<separator string="Accounting" colspan="4"/>
|
||||
<field name="acc_expense"/>
|
||||
<field name="acc_income"/>
|
||||
<separator string="Analytic" colspan="4"/>
|
||||
<field name="journal_id"/>
|
||||
<field name="journal_seller_id"/>
|
||||
<field name="account_analytic_id"/>
|
||||
<separator string="State" colspan="4"/>
|
||||
<field name="state"/>
|
||||
<button name="close" states="draft" string="Close + Create all invoices" type="object" colspan="2" icon="gtk-print"/>
|
||||
<notebook colspan="4">
|
||||
<page string="Auction Dates">
|
||||
<separator string="Exposition Dates" colspan="4"/>
|
||||
<field name="expo1"/>
|
||||
<field name="expo2"/>
|
||||
<separator string="Auction Dates" colspan="4"/>
|
||||
<field name="auction1" select="1"/>
|
||||
<field name="auction2" select="1"/>
|
||||
<label string="" colspan="4"/>
|
||||
<field name="state"/>
|
||||
<button name="close" states="draft" string="Create Invoices" type="object" colspan="2" icon="gtk-yes"/>
|
||||
</page>
|
||||
<page string="Accounting" >
|
||||
<separator string="Accounting" colspan="4"/>
|
||||
<field name="acc_expense"/>
|
||||
<field name="acc_income"/>
|
||||
<separator string="Analytic" colspan="4"/>
|
||||
<field name="journal_id"/>
|
||||
<field name="journal_seller_id"/>
|
||||
<field name="account_analytic_id"/>
|
||||
</page>
|
||||
<page string="Commissions">
|
||||
<group col="4" colspan="4">
|
||||
<group col="2" colspan="4">
|
||||
<separator string="Buyer Commissions" colspan="4"/>
|
||||
<field name="buyer_costs" domain="[('parent_id','=',False),('domain','=','auction'),('type_tax_use','<>','sale')]" nolabel="1" colspan="4"/>
|
||||
</group>
|
||||
<group col="2" colspan="4">
|
||||
<separator string="Seller Commissions" colspan="4"/>
|
||||
<field name="seller_costs" domain="[('parent_id','=',False),('domain','=','auction'),('type_tax_use','<>','purchase')]" nolabel="1" colspan="4"/>
|
||||
</group>
|
||||
</group>
|
||||
</page>
|
||||
</notebook>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- Auction Dates Search view -->
|
||||
|
||||
<record id="view_auction_dates_filter" model="ir.ui.view">
|
||||
<field name="name">Auction Dates search</field>
|
||||
<field name="model">auction.dates</field>
|
||||
<field name="type">search</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="Search Next Auction Dates">
|
||||
<filter icon="terp-document-new"
|
||||
string="Draft" help="Draft Auction"
|
||||
name="draft"
|
||||
domain="[('state','=', 'draft')]"/>
|
||||
<filter icon="terp-check"
|
||||
string="Invoiced" help="Invoiced Auction"
|
||||
domain="[('state','=','closed')]"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="name" string="Auction"/>
|
||||
<field name="state"/>
|
||||
<field name="auction1" string="First Auction Date"/>
|
||||
<field name="auction2" string="Last Auction Date"/>
|
||||
<newline/>
|
||||
<group expand="0" string="Group By..." colspan="16">
|
||||
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
|
||||
<separator orientation="vertical" />
|
||||
<filter string="Auction Date"
|
||||
icon="terp-go-month"
|
||||
help="Auction Date" domain="[]"
|
||||
context="{'group_by':'auction1'}" />
|
||||
</group>
|
||||
</search>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- Auction Dates Calendar View -->
|
||||
|
||||
<record model="ir.ui.view" id="auction_dates_calendar_view">
|
||||
<field name="name">Auction Dates Calendar</field>
|
||||
<field name="model">auction.dates</field>
|
||||
<field name="type">calendar</field>
|
||||
<field name="priority" eval="2"/>
|
||||
<field name="arch" type="xml">
|
||||
<calendar string="Next Auction"
|
||||
date_start="auction1" color="name">
|
||||
<field name="name" />
|
||||
<field name="auction1"/>
|
||||
</calendar>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.actions.act_window" id="action_auction_dates_next">
|
||||
<field name="name">Next Auctions</field>
|
||||
<field name="name">Next Auctions Dates</field>
|
||||
<field name="res_model">auction.dates</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="domain">[('state','=','draft')]</field>
|
||||
<field name="view_id" eval="False"/>
|
||||
<field name="view_mode">tree,form,calendar</field>
|
||||
<field name="search_view_id" ref="view_auction_dates_filter"/>
|
||||
<field name="context">{"search_default_draft": "1"}</field>
|
||||
</record>
|
||||
|
||||
<menuitem name="Auction Dates" parent="auction_menu_root" id="auction_date_menu" sequence="1"/>
|
||||
<menuitem name="Next Auction Dates" parent="auction_date_menu" id="menu_auction_dates_next1" action="action_auction_dates_next"/>
|
||||
=======================================================
|
||||
Auction Management/Auction Dates/Old Auction Dates
|
||||
=======================================================
|
||||
|
||||
<!-- Auction Management/Auction Dates/Old Auction Dates -->
|
||||
|
||||
<record model="ir.actions.act_window" id="action_auction_dates_old">
|
||||
<field name="name">Old Auctions</field>
|
||||
<field name="res_model">auction.dates</field>
|
||||
|
|
@ -142,9 +210,9 @@
|
|||
<field name="filter" eval="True"/>
|
||||
</record>
|
||||
|
||||
=======================================================
|
||||
Auction Management/Auction Dates/Reporting
|
||||
=======================================================
|
||||
|
||||
<!-- 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>
|
||||
|
|
@ -168,16 +236,16 @@
|
|||
<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="Catalog">
|
||||
<form string="All Objects">
|
||||
<field name="auction_id"/>
|
||||
<field name="obj_num"/>
|
||||
<field name="bord_vnd_id"/>
|
||||
|
|
@ -204,7 +272,6 @@
|
|||
<field name="lot_est2"/>
|
||||
<field name="product_id"/>
|
||||
<field name="state" readonly="1"/>
|
||||
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
@ -223,7 +290,6 @@
|
|||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
<!-- tree2 form2 for Catalog, All object and Unclassified objects -->
|
||||
<record model="ir.ui.view" id="v7">
|
||||
<field name="name">Auction lots</field>
|
||||
|
|
@ -231,9 +297,10 @@
|
|||
<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="Catalog">
|
||||
<tree colors="blue:state in ('unsold','draft');black:state in ('sold','taken_away');gray:state in ('paid') " string="All Objects">
|
||||
<field name="obj_num" string="Ref" select="1"/>
|
||||
<field name="name" select="1"/>
|
||||
<field name="ach_uid"/>
|
||||
<field name="ach_login"/>
|
||||
<field name="obj_price" sum="Total Adj."/>
|
||||
<field name="state" select="1"/>
|
||||
|
|
@ -254,105 +321,170 @@
|
|||
<field name="type">form</field>
|
||||
<field name="priority" eval="8"/>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Catalog">
|
||||
<notebook>
|
||||
|
||||
<page string="Object">
|
||||
<group colspan="2" col="2">
|
||||
<field name="obj_num" select="1"/>
|
||||
<field name="name" select="1"/>
|
||||
<field name="name2"/>
|
||||
<field name="artist_id"/>
|
||||
<field name="artist2_id"/>
|
||||
<field name="product_id"/>
|
||||
</group>
|
||||
<field widget="image" name="image" nolabel="1" colspan="2"/>
|
||||
<form string="All Objects">
|
||||
<group colspan="4" col="4">
|
||||
<group colspan="2" col="4">
|
||||
<field colspan="2" name="name"/>
|
||||
<field name="obj_num" select="1"/>
|
||||
<field name="lot_type"/>
|
||||
<field name="auction_id" select="1"/>
|
||||
<field name="artist_id"/>
|
||||
<field name="artist2_id"/>
|
||||
<field name="lot_est1"/>
|
||||
<field name="lot_est2"/>
|
||||
<field name="auction_id" colspan="2" select="1"/>
|
||||
<field name="lot_type"/>
|
||||
<field name="product_id"/>
|
||||
<field name="lot_local"/>
|
||||
|
||||
<field name="bord_vnd_id" select="1"/>
|
||||
<field name="lot_num"/>
|
||||
|
||||
<separator string="Description" colspan="4"/>
|
||||
<field name="obj_desc" colspan="4" nolabel="1"/>
|
||||
<field name="state" colspan="1"/>
|
||||
<group col="8" colspan="2">
|
||||
<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_taken_away" string="Taken away" states="sold" type="object" icon="gtk-goto-last"/>
|
||||
<button name="button_draft" string="Set to draft" states="sold,unsold" type="object" icon="gtk-convert"/>
|
||||
<button name="button_unpaid" string="Set to draft" states="paid" type="object" icon="gtk-convert"/>
|
||||
</group>
|
||||
</page>
|
||||
|
||||
<page string="Seller">
|
||||
<separator string="Seller information" colspan="4"/>
|
||||
|
||||
<field name="vnd_lim"/>
|
||||
<field name="vnd_lim_net"/>
|
||||
<field name="sel_inv_id"/>
|
||||
<field name="paid_vnd"/>
|
||||
<field name="history_ids" colspan="4" readonly="1">
|
||||
<tree string="History">
|
||||
<field name="name"/>
|
||||
<field name="lot_id"/>
|
||||
<field name="auction_id"/>
|
||||
<field name="price"/>
|
||||
</tree>
|
||||
</field>
|
||||
</page>
|
||||
<page string="Buyer">
|
||||
<separator string="Buyer information" colspan="4"/>
|
||||
<field name="ach_uid" />
|
||||
<field name="ach_login" select="1" />
|
||||
<field name="obj_price"/>
|
||||
<field name="obj_comm"/>
|
||||
<field name="obj_ret"/>
|
||||
<field name="ach_emp"/>
|
||||
<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False),('type_tax_use','<>','sale')]"/>
|
||||
<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="ach_inv_id"/>
|
||||
<field name="paid_ach"/>
|
||||
<field name="is_ok"/>
|
||||
<field name="statement_id" domain="[('state','=','draft')]" colspan="4" nolabel="1"
|
||||
widget="one2many_list">
|
||||
<tree string="Payment's history">
|
||||
<field name="statement_id"/>
|
||||
<field name="amount"/>
|
||||
<field name="date"/>
|
||||
</tree>
|
||||
</field>
|
||||
</page>
|
||||
<page string="Bids">
|
||||
<field name="bid_lines" colspan="4" nolabel="1" editable="top">
|
||||
<tree string="Bids" editable="top">
|
||||
<field name="bid_id"/>
|
||||
<field name="price"/>
|
||||
<field name="call"/>
|
||||
</tree>
|
||||
</field>
|
||||
</page>
|
||||
</group>
|
||||
<group colspan="2" col="1">
|
||||
<field name="image" widget='image' nolabel="1"/>
|
||||
</group>
|
||||
</group>
|
||||
<notebook colspan="4">
|
||||
<page string="Buyer">
|
||||
<separator string="Buyer information" colspan="4"/>
|
||||
<group colspan="4" col="6">
|
||||
<field name="ach_uid" />
|
||||
<field name="ach_login" select="1" />
|
||||
<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False),('type_tax_use','<>','sale')]"/>
|
||||
<field name="obj_price"/>
|
||||
<field name="obj_ret"/>
|
||||
<field name="obj_comm"/>
|
||||
<field name="buyer_price"/>
|
||||
<field name="seller_price"/>
|
||||
<group colspan="2" col="4">
|
||||
<field name="ach_emp"/>
|
||||
<button name="auction_lots_enable" string="Unmark" type="object" icon="gtk-execute" attrs="{'invisible':[('ach_emp','=', False)]}"/>
|
||||
<button name="auction_lots_able" string="Mark" type="object" icon="gtk-execute" attrs="{'invisible':[('ach_emp','=', True)]}"/>
|
||||
</group>
|
||||
<field name="gross_revenue"/>
|
||||
<field name="net_revenue"/>
|
||||
<field name="gross_margin"/>
|
||||
<field name="net_margin"/>
|
||||
<field name="costs"/>
|
||||
<newline/>
|
||||
<field name="ach_inv_id"/>
|
||||
<field name="paid_ach"/>
|
||||
<field name="is_ok"/>
|
||||
</group>
|
||||
<field name="statement_id" domain="[('state','=','draft')]" colspan="4" nolabel="1"
|
||||
widget="one2many_list">
|
||||
<tree string="Payment's history">
|
||||
<field name="statement_id"/>
|
||||
<field name="amount"/>
|
||||
<field name="date"/>
|
||||
</tree>
|
||||
<form string="Bank Statement">
|
||||
<field name="name"/>
|
||||
<field name="sequence"/>
|
||||
<field name="date"/>
|
||||
<field name="partner_id"/>
|
||||
<field name="account_id"/>
|
||||
<field name="type"/>
|
||||
<field name="statement_id"/>
|
||||
<field name="reconcile_id"/>
|
||||
<field name="amount"/>
|
||||
<field name="reconcile_amount"/>
|
||||
</form>
|
||||
</field>
|
||||
<field name="state" colspan="1"/>
|
||||
<group col="8" colspan="2">
|
||||
<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_taken_away" string="Taken away" states="sold" type="object" icon="gtk-goto-last"/>
|
||||
<button name="button_draft" string="Set to draft" states="sold,unsold" type="object" icon="gtk-convert"/>
|
||||
<button name="button_unpaid" string="Set to draft" states="paid" type="object" icon="gtk-convert"/>
|
||||
</group>
|
||||
</page>
|
||||
<page string="Seller">
|
||||
<separator string="Seller information" colspan="4"/>
|
||||
<field name="vnd_lim"/>
|
||||
<field name="vnd_lim_net"/>
|
||||
<field name="sel_inv_id"/>
|
||||
<field name="paid_vnd"/>
|
||||
<field name="history_ids" colspan="4" readonly="1" nolabel="1">
|
||||
<tree string="History">
|
||||
<field name="name"/>
|
||||
<field name="lot_id"/>
|
||||
<field name="auction_id"/>
|
||||
<field name="price"/>
|
||||
</tree>
|
||||
</field>
|
||||
</page>
|
||||
<page string="Bids">
|
||||
<field name="bid_lines" colspan="4" nolabel="1" editable="top">
|
||||
<tree string="Bids" editable="top">
|
||||
<field name="bid_id"/>
|
||||
<field name="price"/>
|
||||
<field name="call"/>
|
||||
</tree>
|
||||
<form string="Bids" >
|
||||
<field name="bid_id"/>
|
||||
<field name="lot_id" domain="[('auction_id','=',parent['auction_id'])]" on_change="onchange_name(lot_id)"/>
|
||||
<field name="price"/>
|
||||
<field name="call"/>
|
||||
</form>
|
||||
</field>
|
||||
</page>
|
||||
<page string="Note">
|
||||
<field name="obj_desc" colspan="4" nolabel="1"/>
|
||||
</page>
|
||||
</notebook>
|
||||
</form>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_auction_lots_filter" model="ir.ui.view">
|
||||
<field name="name">Auction Lots search</field>
|
||||
<field name="model">auction.lots</field>
|
||||
<field name="type">search</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="Search Auction Lots">
|
||||
<filter icon="terp-document-new"
|
||||
string="Draft" help="New Object"
|
||||
name="draft"
|
||||
domain="[('state','=', 'draft')]"/>
|
||||
<filter icon="terp-dolar_ok!"
|
||||
string="Sold" help="Buy object"
|
||||
domain="[('state','=','sold')]"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="name" string="Object Name"/>
|
||||
<field name="lot_type"/>
|
||||
<field name="state"/>
|
||||
<newline/>
|
||||
<group expand="0" string="Group By..." colspan="16">
|
||||
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
|
||||
<filter string="Type"
|
||||
icon="terp-stock_symbol-selection"
|
||||
help="Object Category" domain="[]"
|
||||
context="{'group_by':'lot_type'}"/>
|
||||
<separator orientation="vertical" />
|
||||
<filter string="Auction"
|
||||
icon="terp-purchase"
|
||||
help="Auction" domain="[]"
|
||||
context="{'group_by':'auction_id'}"/>
|
||||
<filter string="Inventory"
|
||||
icon="terp-purchase"
|
||||
help="Depositer Inventory" domain="[]"
|
||||
context="{'group_by':'bord_vnd_id'}"/>
|
||||
<separator orientation="vertical" />
|
||||
<filter string="Buyer"
|
||||
icon="terp-personal"
|
||||
help="Buyer" domain="[]"
|
||||
context="{'group_by':'ach_uid'}"/>
|
||||
</group>
|
||||
</search>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
|
||||
<record model="ir.actions.act_window" id="action_all_objects">
|
||||
<field name="res_model">auction.lots</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="search_view_id" ref="view_auction_lots_filter"/>
|
||||
<field name="context">{"search_default_draft": "1"}</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.actions.act_window" id="action_all_objects_sold">
|
||||
|
|
@ -396,6 +528,7 @@
|
|||
|
||||
<!-- 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>
|
||||
|
|
@ -1193,7 +1326,6 @@ sign in sign out report by user
|
|||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
<record model="ir.actions.act_window" id="action_report_auction_sign_in_out_member_tree1">
|
||||
<field name="res_model">report.attendance</field>
|
||||
<field name="view_type">form</field>
|
||||
|
|
@ -1230,7 +1362,6 @@ My Latest Objects
|
|||
<field name="limit" eval="80"/>
|
||||
</record>
|
||||
|
||||
|
||||
=============================
|
||||
My Latest Deposit
|
||||
==============================
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
|
||||
|
||||
<xsl:import href="../../base/report/corporate_defaults.xsl"/>
|
||||
<xsl:import href="../../base/report/rml_template.xsl"/>
|
||||
<xsl:import href="base/report/corporate_defaults.xsl"/>
|
||||
<xsl:import href="/home/atp/workspace/trunk/server/bin/addons/base/report/rml_template.xsl"/>
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,162 +1,63 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
|
||||
<xsl:stylesheet version="1.0"
|
||||
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
|
||||
xmlns:fo="http://www.w3.org/1999/XSL/Format">
|
||||
<xsl:import href="../../base/report/corporate_defaults.xsl" />
|
||||
<xsl:template match="/">
|
||||
<xsl:call-template name="rml" />
|
||||
</xsl:template>
|
||||
|
||||
<xsl:import href="../../base/report/corporate_defaults.xsl"/>
|
||||
<xsl:import href="../../base/report/rml_template.xsl"/>
|
||||
|
||||
<xsl:template match="/">
|
||||
<xsl:call-template name="rml"/>
|
||||
</xsl:template>
|
||||
<xsl:template name="rml" match="/">
|
||||
<document filename="example.pdf">
|
||||
<template>
|
||||
<pageTemplate id="first">
|
||||
<frame id="first" x1="1cm" y1="2.5cm" width="19.0cm" height="23.0cm"/>
|
||||
<pageGraphics>
|
||||
<xsl:apply-imports />
|
||||
</pageGraphics>
|
||||
</pageTemplate>
|
||||
</template>
|
||||
<stylesheet>
|
||||
<paraStyle name="normal" fontName="Times-Roman" fontSize="12" />
|
||||
<paraStyle name="title" fontName="Times-Bold" fontSize="15" alignment="center" />
|
||||
<paraStyle name="table_title" fontName="Times-Bold" fontSize="12" alignment="center" />
|
||||
<paraStyle name="product1" fontName="Times-Roman" fontSize="8" />
|
||||
<paraStyle name="categ" fontName="Times-Bold" fontSize="10" textColor="blue"/>
|
||||
<paraStyle name="price" fontName="Times-Roman" fontSize="8" alignment="right" />
|
||||
|
||||
<xsl:template name="stylesheet">
|
||||
<paraStyle name="login-title" fontName="Helvetica" fontSize="12"/>
|
||||
<paraStyle name="login" fontName="Helvetica-Bold" fontSize="16"/>
|
||||
<blockTableStyle id="main_title">
|
||||
<blockAlignment value="CENTER" />
|
||||
<lineStyle kind="GRID" colorName="black"/>
|
||||
<blockBackground colorName="#e6e6e6" />
|
||||
<blockValign value="TOP"/>
|
||||
</blockTableStyle>
|
||||
|
||||
<blockTableStyle id="objects">
|
||||
<blockFont name="Helvetica-BoldOblique" size="12" start="0,0" stop="-1,0"/>
|
||||
<blockValign value="TOP"/>
|
||||
<blockAlignment value="RIGHT" start="-1,0" stop="-1,-1"/>
|
||||
<lineStyle kind="LINEBELOW" start="0,0" stop="-1,0"/>
|
||||
</blockTableStyle>
|
||||
|
||||
<blockTableStyle id="object-totals">
|
||||
<blockValign value="TOP"/>
|
||||
<blockAlignment value="RIGHT"/>
|
||||
<lineStyle kind="LINEABOVE" start="-1,0" stop="-1,0"/>
|
||||
<lineStyle kind="LINEABOVE" start="-1,-1" stop="-1,-1"/>
|
||||
</blockTableStyle>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template name="story">
|
||||
<xsl:apply-templates select="borderform-list"/>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="borderform-list">
|
||||
<xsl:apply-templates select="borderform">
|
||||
<xsl:sort order="ascending" select="client_info/name"/>
|
||||
</xsl:apply-templates>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="client_info">
|
||||
<para>
|
||||
<b>
|
||||
<xsl:value-of select="title" />
|
||||
<xsl:text> </xsl:text>
|
||||
<xsl:value-of select="name"/>
|
||||
</b>
|
||||
</para>
|
||||
<para><xsl:value-of select="street"/></para>
|
||||
<para><xsl:value-of select="street2"/></para>
|
||||
<para>
|
||||
<xsl:value-of select="zip"/>
|
||||
<xsl:text> </xsl:text>
|
||||
<xsl:value-of select="city"/>
|
||||
</para>
|
||||
<!-- <para><xsl:value-of select="country"/></para>-->
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="borderform">
|
||||
<xsl:apply-templates select="client_info"/>
|
||||
|
||||
<setNextTemplate name="other_pages"/>
|
||||
<nextFrame/>
|
||||
|
||||
<para style="login-title" t="1">Plate Number:</para>
|
||||
<para style="login"><xsl:value-of select="login"/></para>
|
||||
|
||||
<spacer length="1cm"/>
|
||||
|
||||
<para>
|
||||
<b t="1">Document</b>: <xsl:text t="1">Buyer form</xsl:text>
|
||||
</para><para>
|
||||
<b t="1">Auction</b>: <xsl:value-of select="title"/>
|
||||
</para>
|
||||
|
||||
<xsl:if test="client_info">
|
||||
<para>
|
||||
<b t="1">Customer Contact</b>:
|
||||
<xsl:value-of select="client_info/phone"/>
|
||||
<xsl:if test="number(string-length(client_info/mobile) > 0) + number(string-length(client_info/phone) > 0) = 2">
|
||||
<xsl:text> - </xsl:text>
|
||||
</xsl:if>
|
||||
<xsl:value-of select="client_info/mobile"/>
|
||||
</para><para>
|
||||
<b t="1">Customer Reference</b>: <xsl:value-of select="client_info/ref"/>
|
||||
</para>
|
||||
</xsl:if>
|
||||
|
||||
<spacer length="1cm"/>
|
||||
|
||||
<xsl:apply-templates select="objects"/>
|
||||
|
||||
<setNextTemplate name="first_page"/>
|
||||
<pageBreak/>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="objects">
|
||||
<blockTable colWidths="3.1cm,1.8cm,9.6cm,1.5cm,2.2cm" style="objects">
|
||||
<tr>
|
||||
<td/>
|
||||
<td t="1">Cat. N.</td>
|
||||
<td t="1">Description</td>
|
||||
<td t="1">Paid</td>
|
||||
<td t="1">Adj.(EUR)</td>
|
||||
</tr>
|
||||
<xsl:apply-templates select="object"/>
|
||||
</blockTable>
|
||||
<condPageBreak height="3.2cm"/>
|
||||
<blockTable colWidths="3.1cm,1.8cm,9.6cm,1.5cm,2.2cm" style="object-totals">
|
||||
<tr>
|
||||
<td/>
|
||||
<td/>
|
||||
<td/>
|
||||
<td t="1">Subtotal:</td>
|
||||
<td><xsl:value-of select="format-number(sum(object[price != '']/price), '#,##0.00')"/></td>
|
||||
</tr>
|
||||
<xsl:apply-templates select="cost"/>
|
||||
<tr>
|
||||
<td/>
|
||||
<td/>
|
||||
<td/>
|
||||
<td t="1">Total:</td>
|
||||
<td><xsl:value-of select="format-number(sum(object[price != '']/price) + sum(cost/amount), '#,##0.00')"/></td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="cost">
|
||||
<tr>
|
||||
<td/>
|
||||
<td/>
|
||||
<td/>
|
||||
<td><xsl:value-of select="name"/>:</td>
|
||||
<td><xsl:value-of select="format-number(amount, '#,##0.00')"/></td>
|
||||
</tr>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="object">
|
||||
<tr>
|
||||
<td>
|
||||
<xsl:if test="image">
|
||||
<image width="2.5cm" height="2.2cm">
|
||||
<xsl:attribute name="name"><xsl:value-of select="image"/></xsl:attribute>
|
||||
</image>
|
||||
</xsl:if>
|
||||
</td>
|
||||
<td><xsl:value-of select="ref"/></td>
|
||||
<td>
|
||||
<para>
|
||||
<b><xsl:value-of select="title"/><xsl:text>. </xsl:text></b>
|
||||
<xsl:value-of select="desc"/>
|
||||
</para>
|
||||
</td>
|
||||
<td><xsl:if test="state='paid'"><xsl:text>X</xsl:text></xsl:if></td>
|
||||
<td>
|
||||
<xsl:if test="price!=''">
|
||||
<xsl:value-of select="format-number(price, '#,##0.00')"/>
|
||||
</xsl:if>
|
||||
</td>
|
||||
</tr>
|
||||
</xsl:template>
|
||||
|
||||
</xsl:stylesheet>
|
||||
<blockTableStyle id="product">
|
||||
<blockAlignment value="LEFT" />
|
||||
<xsl:for-each select="/report/title">
|
||||
<xsl:variable name="col" select="attribute::number" />
|
||||
<blockBackground>
|
||||
<xsl:attribute name="colorName">#e6e6e6</xsl:attribute>
|
||||
<xsl:attribute name="start">
|
||||
<xsl:value-of select="$col" />
|
||||
<xsl:text>,0</xsl:text>
|
||||
</xsl:attribute>
|
||||
<xsl:attribute name="stop">
|
||||
<xsl:value-of select="$col" />
|
||||
<xsl:text>,0</xsl:text>
|
||||
</xsl:attribute>
|
||||
</blockBackground>
|
||||
</xsl:for-each>
|
||||
<lineStyle kind="LINEABOVE" colorName="black" start="0,0" stop="-1,-1" />
|
||||
<lineStyle kind="LINEBEFORE" colorName="black" start="0,0" stop="-1,-1"/>
|
||||
<lineStyle kind="LINEAFTER" colorName="black" start="-1,0" stop="-1,-1"/>
|
||||
<lineStyle kind="LINEBELOW" colorName="black" start="0,-1" stop="-1,-1"/>
|
||||
<blockValign value="TOP"/>
|
||||
</blockTableStyle>
|
||||
</stylesheet >
|
||||
<story>
|
||||
<xsl:call-template name="story"/>
|
||||
</story>
|
||||
</document>
|
||||
</xsl:template>
|
||||
|
|
|
|||
|
|
@ -106,7 +106,6 @@ class auction_catalog(report_rml):
|
|||
|
||||
# promotion element
|
||||
promo = doc.createElement('promotion1')
|
||||
|
||||
fp = file(config['addons_path']+'/auction/report/images/flagey_logo.jpg','r')
|
||||
file_data = fp.read()
|
||||
promo.appendChild(doc.createTextNode(base64.encodestring(file_data)))
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<!-- <fill color="(0.6,0.3,0.1)"/>-->
|
||||
|
||||
<image x="7cm" y="25cm" file="addons/auction/report/images/aeko_logo.jpg"/>
|
||||
<image x="7cm" y="25cm" file="addons/auction/report/images/flagey_logo.jpg"/>
|
||||
<image x="7cm" y="25cm" file="addons/auction/report/images/flagey_logo.jpg"/>
|
||||
<lines>1cm 3.0cm 20cm 3.0cm</lines>
|
||||
<setFont name="Helvetica" size="15"/>
|
||||
<drawCentredString x="105mm" y="2.2cm">Hotel des ventes Flagey</drawCentredString>
|
||||
|
|
@ -20,7 +20,6 @@
|
|||
<drawCentredString x="105mm" y="1.6cm">Rue du Nid, 4 - B-1050 Bruxelles - Tel: 02/644.97.67</drawCentredString>
|
||||
<drawCentredString x="105mm" y="1.0cm">Web: Flagey.com - Mail: info@flagey.com - Fax: 02.646.32.35</drawCentredString>
|
||||
|
||||
|
||||
<fill color="(0.2,0.2,0.2)"/>
|
||||
<stroke color="(0.2,0.2,0.2)"/>
|
||||
|
||||
|
|
@ -30,8 +29,8 @@
|
|||
<pageTemplate id="first">
|
||||
<pageGraphics>
|
||||
<!-- <image x="1.0cm" y="27.3cm" file="/home/tiny/terp/4.2/server/bin/addons/auction/report/images/flagey_head.png"/>-->
|
||||
- <image x="1.0cm" y="27.3cm" file="addons/auction/report/images/flagey_logo.jpg"/>
|
||||
<drawRightString x="19.0cm" y="27.6cm"> Vente antiquitée le <xsl:value-of select="date:day-name(catalog/AuctionDate1)"/>  <xsl:value-of select="date:day-in-month(catalog/AuctionDate1)"/> <xsl:value-of select="date:month-name(catalog/AuctionDate1)"/>  <xsl:value-of select="date:year(catalog/AuctionDate1)"/></drawRightString>-->
|
||||
- <image x="1.0cm" y="26.1cm" file="flagey_logo.jpg"/>
|
||||
<drawRightString x="19.0cm" y="26.6cm"> Vente antiquitée le <xsl:value-of select="date:day-name(catalog/AuctionDate1)"/>  <xsl:value-of select="date:day-in-month(catalog/AuctionDate1)"/> <xsl:value-of select="date:month-name(catalog/AuctionDate1)"/>  <xsl:value-of select="date:year(catalog/AuctionDate1)"/></drawRightString>
|
||||
<lineMode width="1mm"/>
|
||||
<setFont name="Helvetica" size="26"/>
|
||||
<!-- <drawString x="10mm" y="27.8cm">Flagey.com</drawString>-->
|
||||
|
|
@ -39,7 +38,7 @@
|
|||
<stroke color="#2b24b6"/>
|
||||
<lineMode width="0.5mm"/>
|
||||
<lines>1cm 1.6cm 20cm 1.6cm</lines>
|
||||
<lines>1.0cm 27.3cm 20cm 27.3cm</lines>
|
||||
<lines>1.0cm 26.1cm 20cm 26.1cm</lines>
|
||||
|
||||
<setFont name="Helvetica" size="12"/>
|
||||
<drawString x="10mm" y="1.0cm">www.flagey.com</drawString>
|
||||
|
|
@ -47,7 +46,7 @@
|
|||
<drawRightString x="200mm" y="1.0cm">info@flagey.com</drawRightString>
|
||||
</pageGraphics>
|
||||
<frame id="column" x1="1cm" y1="1.5cm" width="9.4cm" height="25.5cm"/>
|
||||
<frame id="column" x1="10.8cm" y1="1.5cm" width="9.4cm" height="25.5cm"/>
|
||||
<frame id="column" x1="14.8cm" y1="1.5cm" width="9.4cm" height="25.5cm"/>
|
||||
</pageTemplate>
|
||||
</template>
|
||||
<stylesheet>
|
||||
|
|
@ -62,6 +61,7 @@
|
|||
<paraStyle name="homehead" fontName="Helvetica" fontSize="12" alignment="center"/>
|
||||
<paraStyle name="artist" fontName="Helvetica-Bold"/>
|
||||
<paraStyle name="prodtitle" fontName="Helvetica-BoldOblique" fontSize="8"/>
|
||||
<paraStyle name="P2" rightIndent="13.0" leftIndent="11.0" fontName="Times-Roman" alignment="RIGHT"/>
|
||||
<blockTableStyle id="infos">
|
||||
<blockValign value="TOP"/>
|
||||
<blockTopPadding value="0"/>
|
||||
|
|
@ -92,11 +92,88 @@
|
|||
<lineStyle kind="LINEBELOW" start="0,0" stop="-1,0"/>
|
||||
</blockTableStyle>
|
||||
</stylesheet>
|
||||
|
||||
<images>
|
||||
<image name="flagey_logo.jpg">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
|
||||
</image>
|
||||
</images>
|
||||
<story>
|
||||
|
||||
<para style="P2">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
<!--<setNextTemplate name="others"/>-->
|
||||
<!-- <pageBreak/>-->
|
||||
<spacer length="0.8cm"/>
|
||||
<xsl:apply-templates select="catalog/products"/>
|
||||
</story>
|
||||
</document>
|
||||
|
|
|
|||
|
|
@ -29,12 +29,8 @@ import auction_pay_buy
|
|||
import auction_payer_sel
|
||||
import auction_lots_sms_send
|
||||
import auction_catalog_flagey_report
|
||||
#import auction_lots_cancel
|
||||
#import auction_transfer_unsold_object
|
||||
#import auction_aie_send
|
||||
#import auction_aie_send_result
|
||||
import auction_lots_buyer_map
|
||||
#import auction_lots_numerotate
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
|
|
|
|||
|
|
@ -11,11 +11,13 @@
|
|||
<field name="arch" type="xml">
|
||||
<form string="Catalog Flagey Report">
|
||||
<label string="Print Auction Catalog Flagey Report..."/>
|
||||
<group col="2" colspan="4">
|
||||
<separator colspan="4" />
|
||||
<group col="4" colspan="4">
|
||||
<label string=" " colspan="2"/>
|
||||
<button icon='gtk-cancel' special="cancel"
|
||||
string="Cancel" />
|
||||
<button name="print_report" string="Ok"
|
||||
colspan="1" type="object" icon="gtk-ok" />
|
||||
<button name="print_report" string="Print"
|
||||
colspan="1" type="object" icon="gtk-print" />
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
|
|
@ -26,7 +28,7 @@
|
|||
src_model="auction.dates"
|
||||
view_mode="form"
|
||||
target="new"
|
||||
key2="client_action_multi"
|
||||
key2="client_print_multi"
|
||||
id="action_auction_catalog_flagey_wizard"/>
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
|||
|
|
@ -34,15 +34,7 @@ class auction_lots_auction_move(osv.osv_memory):
|
|||
_columns= {
|
||||
'auction_id':fields.many2one('auction.dates', 'Auction Date', required=True),
|
||||
}
|
||||
|
||||
# def _top(self, cr, uid, ids, context={}):
|
||||
# refs = self.pool.get('auction.lots')
|
||||
# rec_ids = refs.browse(cr, uid, context['active_ids'])
|
||||
# for rec in rec_ids:
|
||||
# if not rec.auction_id:
|
||||
# raise osv.except_osv('Error !', 'You can not move a lot that has no auction date')
|
||||
# return {}
|
||||
|
||||
|
||||
def auction_move_set(self, cr, uid, ids, context={}):
|
||||
"""
|
||||
This Function update auction date on auction lots to given auction date.
|
||||
|
|
@ -52,13 +44,12 @@ class auction_lots_auction_move(osv.osv_memory):
|
|||
@param uid: the current user’s ID for security checks,
|
||||
@param ids: List of auction lots auction move’s IDs.
|
||||
"""
|
||||
refs = self.pool.get('auction.lots')
|
||||
auction_bid_line_obj = self.pool.get('auction.bid_line')
|
||||
auction_lot_history_obj = self.pool.get('auction.lot.history')
|
||||
auction_lots_obj = self.pool.get('auction.lots')
|
||||
rec_ids = refs.browse(cr, uid, context['active_ids'])
|
||||
rec_ids = auction_lots_obj.browse(cr, uid, context.get('active_ids', []))
|
||||
for datas in self.read(cr, uid, ids):
|
||||
if not (datas['auction_id'] and len(context['active_ids'])) :
|
||||
if not (datas['auction_id'] and len(context.get('active_ids', []))):
|
||||
return {}
|
||||
|
||||
# line_ids = auction_bid_line_obj.search(cr, uid, [('lot_id', 'in', context['active_ids'])])
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Change Auction Date">
|
||||
<group colspan="4" >
|
||||
<label string="Warning, this will erase the object adjudication price and its buyer !" colspan="2"/>
|
||||
<newline/>
|
||||
<field name="auction_id"/>
|
||||
</group>
|
||||
<separator string="" colspan="4" />
|
||||
<group colspan="4" col="6">
|
||||
<label string="Warning, this will erase the object adjudication price and its buyer!" colspan="4"/>
|
||||
<newline/>
|
||||
<separator string="" colspan="4"/>
|
||||
<field name="auction_id"/>
|
||||
<separator string="" colspan="4" />
|
||||
<group colspan="4" col="4">
|
||||
<label string=" " colspan="2"/>
|
||||
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
|
||||
<button icon="gtk-redo" string="Move to Auction date" name="auction_move_set" type="object"/>
|
||||
</group>
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@ from osv import osv,fields
|
|||
class wiz_auc_lots_buyer_map(osv.osv_memory):
|
||||
_name = 'auction.lots.buyer_map'
|
||||
_description = 'Map Buyer'
|
||||
|
||||
_columns = {
|
||||
'ach_login': fields.char('Buyer Username', size=64, required=True),
|
||||
'ach_uid': fields.many2one('res.partner','Buyer', required=True),
|
||||
|
|
@ -42,16 +41,16 @@ class wiz_auc_lots_buyer_map(osv.osv_memory):
|
|||
@param context: A standard dictionary
|
||||
@return: A dictionary which of fields with values.
|
||||
"""
|
||||
ids = context and context.get('active_ids',False) or False
|
||||
assert ids, _('Active IDs not Found')
|
||||
res = super(wiz_auc_lots_buyer_map,self).default_get(cr, uid, fields, context)
|
||||
cr.execute('select id from auction_lots where (ach_uid is null and ach_login is not null) ')
|
||||
v_ids = [x[0] for x in cr.fetchall()]
|
||||
for rec in self.pool.get('auction.lots').browse(cr, uid, v_ids, context):
|
||||
if (not rec.ach_uid or not rec.ach_login):
|
||||
res.update(self._start(cr, uid, ids, context))
|
||||
return res
|
||||
res.update(self._start(cr, uid, ids, context))
|
||||
auction_lots_obj= self.pool.get('auction.lots')
|
||||
lots_ids = auction_lots_obj.search(cr, uid, [('ach_uid', '=', ''), ('ach_login', '!=', '')])
|
||||
for lots_id in lots_ids:
|
||||
|
||||
for rec in self.pool.get('auction.lots').browse(cr, uid, lots_id, context):
|
||||
if (not rec.ach_uid or not rec.ach_login):
|
||||
res.update(self._start(cr, uid, context.get('active_ids', []), context))
|
||||
return res
|
||||
res.update(self._start(cr, uid, context.get('active_ids', []), context))
|
||||
return res
|
||||
|
||||
def _start(self, cr, uid, ids, context):
|
||||
|
|
@ -80,16 +79,14 @@ class wiz_auc_lots_buyer_map(osv.osv_memory):
|
|||
@param uid: ID of the user currently logged in
|
||||
@param ids: List of ids
|
||||
@param context: A standard dictionary
|
||||
@return:
|
||||
"""
|
||||
rec_ids = context and context.get('active_ids',False) or False
|
||||
rec_ids = context and context.get('active_ids',[]) or []
|
||||
assert rec_ids, _('Active IDs not Found')
|
||||
datas = self.read(cr, uid, ids[0], ['ach_login','ach_uid'])
|
||||
lots_obj = self.pool.get('auction.lots')
|
||||
recs = lots_obj.browse(cr, uid, rec_ids, context)
|
||||
for rec in recs:
|
||||
if rec.ach_login==datas['ach_login']:
|
||||
lots_obj.write(cr, uid, [rec.id], {'ach_uid': datas['ach_uid']}, context=context)
|
||||
for current in self.browse(cr, uid, ids):
|
||||
for lots in lots_obj.browse(cr, uid, rec_ids, context):
|
||||
if lots.ach_login == current.ach_login:
|
||||
lots_obj.write(cr, uid, [lots.id], {'ach_uid': current.ach_uid.id}, context=context)
|
||||
return {}
|
||||
|
||||
def fields_view_get(self, cr, uid, view_id=None, view_type='form',
|
||||
|
|
@ -102,7 +99,7 @@ class wiz_auc_lots_buyer_map(osv.osv_memory):
|
|||
@param context: A standard dictionary
|
||||
@return: New arch of view.
|
||||
"""
|
||||
record_ids = context and context.get('active_ids', False) or False
|
||||
record_ids = context and context.get('active_ids', []) or []
|
||||
res = super(wiz_auc_lots_buyer_map, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
|
||||
lots_obj = self.pool.get('auction.lots')
|
||||
if record_ids:
|
||||
|
|
@ -111,9 +108,10 @@ class wiz_auc_lots_buyer_map(osv.osv_memory):
|
|||
if lots.ach_uid:
|
||||
res['arch'] = """
|
||||
<form title="Mapping Result">
|
||||
<group col="2" colspan="2">
|
||||
<group col="2" colspan="4">
|
||||
<label string="All objects are assigned to buyers !"/>
|
||||
<newline/>
|
||||
<separator string="" colspan="4"/>
|
||||
<button icon='gtk-cancel' special="cancel"
|
||||
string="Done" />
|
||||
</group>
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Buyer Map" >
|
||||
<separator string="Map " colspan="4"/>
|
||||
<field name="ach_login" colspan="4"/>
|
||||
<newline/>
|
||||
<field name="ach_uid" colspan="4"/>
|
||||
|
|
|
|||
|
|
@ -7,11 +7,7 @@
|
|||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Confirm">
|
||||
<group colspan="4" >
|
||||
<separator string="Confirmation enable taken away" colspan="4"/>
|
||||
<newline/>
|
||||
</group>
|
||||
<separator string="" colspan="4" />
|
||||
<separator string="Confirmation Enable Taken away" colspan="4"/>
|
||||
<group colspan="4" col="6">
|
||||
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
|
||||
<button icon="gtk-goto-last" string="Enable Taken away" name="confirm_enable" type="object"/>
|
||||
|
|
@ -20,7 +16,6 @@
|
|||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
<act_window name="Unmark as taken away"
|
||||
res_model="auction.lots.enable"
|
||||
src_model="auction.lots"
|
||||
|
|
@ -28,7 +23,6 @@
|
|||
target="new"
|
||||
key2="client_action_multi"
|
||||
id="action_auction_lots_enable"/>
|
||||
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
|||
|
|
@ -29,8 +29,7 @@
|
|||
view_mode="form"
|
||||
target="new"
|
||||
key2="client_action_multi"
|
||||
id="action_auction_lots_make_invoice_buyer"/>
|
||||
|
||||
|
||||
id="action_auction_lots_make_invoice_buyer"/>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<separator string="" colspan="4" />
|
||||
<group colspan="4" col="6">
|
||||
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
|
||||
<button icon="gtk-go-back" string="Send SMS" name="sms_send" type="object"/>
|
||||
<button icon="gtk-go-forward" string="Send SMS" name="sms_send" type="object"/>
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@ import tools
|
|||
class auction_pay_buy(osv.osv_memory):
|
||||
_name = "auction.pay.buy"
|
||||
_description = "Pay buy"
|
||||
|
||||
_columns= {
|
||||
'amount': fields.float('Amount paid', digits= (16, 2)),
|
||||
'buyer_id':fields.many2one('res.partner', 'Buyer'),
|
||||
|
|
@ -39,7 +38,7 @@ class auction_pay_buy(osv.osv_memory):
|
|||
'total': fields.float('Amount paid', digits = (16, 2), readonly =True),
|
||||
}
|
||||
|
||||
def default_get(self, cr, uid, fields, context):
|
||||
def default_get(self, cr, uid, fields, context=None):
|
||||
"""
|
||||
To get default values for the object.
|
||||
@param self: The object pointer.
|
||||
|
|
@ -49,8 +48,11 @@ class auction_pay_buy(osv.osv_memory):
|
|||
@param context: A standard dictionary
|
||||
@return: A dictionary which of fields with values.
|
||||
"""
|
||||
res = super(auction_pay_buy, self).default_get(cr, uid, fields, context=context)
|
||||
for lot in self.pool.get('auction.lots').browse(cr, uid, context.get('active_ids', [])):
|
||||
if not context:
|
||||
context={}
|
||||
res = super(auction_pay_buy, self).default_get(cr, uid, fields, context=context)
|
||||
auction_lots_obj= self.pool.get('auction.lots')
|
||||
for lot in auction_lots_obj.browse(cr, uid, context.get('active_ids', [])):
|
||||
if 'amount' in fields:
|
||||
res.update({'amount': lot.buyer_price})
|
||||
if 'buyer_id' in fields:
|
||||
|
|
@ -73,22 +75,20 @@ class auction_pay_buy(osv.osv_memory):
|
|||
|
||||
for datas in self.read(cr, uid, ids):
|
||||
if not abs(datas['total'] - (datas['amount'] + datas['amount2'] + datas['amount3'])) <0.01:
|
||||
rest = datas['total']-(datas['amount'] + datas['amount2'] + datas['amount3'])
|
||||
rest = datas['total'] - (datas['amount'] + datas['amount2'] + datas['amount3'])
|
||||
raise osv.except_osv('Payment aborted !', 'You should pay all the total: "%.2f" are missing to accomplish the payment.' %(round(rest, 2)))
|
||||
|
||||
lots = lot_obj.browse(cr, uid, context['active_ids'], context)
|
||||
ref_bk_s = bank_statement_line_obj
|
||||
|
||||
for lot in lots:
|
||||
if datas['buyer_id']:
|
||||
lot_obj.write(cr, uid, [lot.id], {'ach_uid':datas['buyer_id']})
|
||||
lot_obj.write(cr, uid, [lot.id], {'ach_uid': datas['buyer_id']})
|
||||
if not lot.auction_id:
|
||||
raise osv.except_osv('Error !', 'No auction date for "%s": Please set one.'%(lot.name))
|
||||
lot_obj.write(cr, uid, [lot.id], {'is_ok':True})
|
||||
|
||||
for st, stamount in [('statement_id1', 'amount'), ('statement_id2', 'amount2'), ('statement_id3', 'amount3')]:
|
||||
if datas[st]:
|
||||
new_id = ref_bk_s.create(cr, uid, {
|
||||
new_id = bank_statement_line_obj.create(cr, uid, {
|
||||
'name':'Buyer:'+ str(lot.ach_login or '')+', auction:'+ lots[0].auction_id.name,
|
||||
'date': time.strftime('%Y-%m-%d'),
|
||||
'partner_id': datas['buyer_id'] or False,
|
||||
|
|
@ -100,7 +100,6 @@ class auction_pay_buy(osv.osv_memory):
|
|||
for lot in lots:
|
||||
lot_obj.write(cr, uid, [lot.id], {'statement_id':[(4, new_id)]})
|
||||
return {}
|
||||
|
||||
auction_pay_buy()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ class auction_payer(osv.osv_memory):
|
|||
_description = "Auction payer"
|
||||
|
||||
def payer(self, cr, uid, ids, context):
|
||||
self.pool.get('auction.lots').write(cr, uid, context['active_ids'], {'is_ok':True, 'state':'paid'})
|
||||
self.pool.get('auction.lots').write(cr, uid, context.get('active_ids', []), {'is_ok':True, 'state':'paid'})
|
||||
return {}
|
||||
|
||||
auction_payer()
|
||||
|
|
|
|||
Loading…
Reference in New Issue