[MERGE] merged with trunk-development-branch

bzr revid: hmo@tinyerp.com-20111214122924-izzibrz1yz67rt7g

6 files changed, 50 insertions, 47 deletions

diff --git a/addons/auction/__openerp__.py b/addons/auction/__openerp__.py
index 3f6c6c35e31..c3cba1d7255 100644
--- a/addons/auction/__openerp__.py
+++ b/addons/auction/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Auction Management',
+    'name': 'Auction Houses',
     'version': '1.0',
     'category': 'Specific Industry Applications',
     'complexity': "normal",
@@ -68,6 +68,7 @@ The dashboard for auction includes:
              ],
 
     'installable': True,
+    'auction': True,
     'active': False,
     'certificate': '0039333102717',
     'images': ['images/auction1.jpeg','images/auction2.jpeg','images/auction3.jpeg'],
diff --git a/addons/auction/report/buyer_form_report.rml b/addons/auction/report/buyer_form_report.rml
index c917a931fd3..3421bf27d12 100644
--- a/addons/auction/report/buyer_form_report.rml
+++ b/addons/auction/report/buyer_form_report.rml
@@ -99,9 +99,7 @@
         </td>
         <td>
           <para style="Addressee">[[ o['partner'] and o['partner'].name or False]]</para>
-          <para style="Addressee">[[o['partner'] and o['partner'].address[0].street or False]]</para>
-          <para style="Addressee">[[o['partner'] and o['partner'].address[0].zip or False]][[o['partner'] and o['partner'].address[0].city or False]]</para>
-          <para style="Addressee">[[o['partner'] and o['partner'].address[0].country_id.name or False]]</para>
+          <para style="Addressee">[[o['partner'] and o['partner'].address and display_address(o['partner'].address[0]) ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/auction/report/deposit_seller.rml b/addons/auction/report/deposit_seller.rml
index 3adc1152067..518f1f441df 100644
--- a/addons/auction/report/deposit_seller.rml
+++ b/addons/auction/report/deposit_seller.rml
@@ -84,9 +84,7 @@
           </para>
           <para style="P5">[[o.bord_vnd_id.partner_id.title]]</para>
           <para style="P5">[[o.bord_vnd_id.partner_id.name]]</para>
-          <para style="P5">[[o.bord_vnd_id.partner_id.address[0].street]]</para>
-          <para style="P5">[[o.bord_vnd_id.partner_id.address[0].zip]],[[o.bord_vnd_id.partner_id.address[0].city]]</para>
-          <para style="P5">[[o.bord_vnd_id.partner_id.address[0].country_id.name]]</para>
+          <para style="P5">[[o.bord_vnd_id.partner_id.address and display_address(o.bord_vnd_id.partner_id.address[0]) ]] </para>
           <para style="P6">
             <font color="white"> </font>
           </para>
diff --git a/addons/auction/report/seller_form_report.rml b/addons/auction/report/seller_form_report.rml
index c2d724eb259..d9cc1adaadf 100644
--- a/addons/auction/report/seller_form_report.rml
+++ b/addons/auction/report/seller_form_report.rml
@@ -74,9 +74,7 @@
         </td>
         <td>
           <para style="Addressee">[[ o['partner'] and o['partner'].name or False]]</para>
-          <para style="Addressee">[[o['partner'] and o['partner'].address[0].street or False]]</para>
-          <para style="Addressee">[[o['partner'] and o['partner'].address[0].zip or False]][[o['partner'] and o['partner'].address[0].city or False]]</para>
-          <para style="P11">[[o['partner'] and o['partner'].address[0].country_id.name or False]]</para>
+          <para style="Addressee">[[ o['partner'] and o['partner'].address and display_address(o['partner'].address[0]) </para>
           <para style="P4">
             <font color="white"> </font>
           </para>
diff --git a/addons/auction/security/auction_security.xml b/addons/auction/security/auction_security.xml
index 3caf93a2430..087151cb6ea 100644
--- a/addons/auction/security/auction_security.xml
+++ b/addons/auction/security/auction_security.xml
@@ -2,11 +2,19 @@
 <openerp>
 <data noupdate="0">
 
+    <record model="ir.module.category" id="module_category_auction">
+        <field name="name">Auction</field>
+        <field name="parent_id" ref="base.module_category_specific_industry_applications"/>
+        <field name="sequence">26</field>
+    </record>
+
     <record id="group_auction_user" model="res.groups">
-        <field name="name">Auction / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="module_category_auction"/>
     </record>
     <record id="group_auction_manager" model="res.groups">
-        <field name="name">Auction / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="module_category_auction"/>
         <field name="implied_ids" eval="[(4, ref('group_auction_user'))]"/>
     </record>
 
diff --git a/addons/auction/security/ir.model.access.csv b/addons/auction/security/ir.model.access.csv
index 94c9c1f83aa..351ca866f6d 100644
--- a/addons/auction/security/ir.model.access.csv
+++ b/addons/auction/security/ir.model.access.csv
@@ -1,35 +1,35 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_auction_artists","auction.artists","model_auction_artists","group_auction_manager",1,1,1,1
-"access_auction_dates_user","auction.dates user","model_auction_dates","group_auction_user",1,0,0,0
-"access_auction_dates_manager","auction.dates manager","model_auction_dates","group_auction_manager",1,1,1,1
-"access_auction_deposit_manager","auction.deposit manager","model_auction_deposit","group_auction_manager",1,1,1,1
-"access_auction_deposit_user","auction.deposit user","model_auction_deposit","group_auction_user",1,0,0,0
-"access_auction_deposit_cost","auction.deposit.cost","model_auction_deposit_cost","group_auction_manager",1,1,1,1
-"access_auction_lot_category","auction.lot.category","model_auction_lot_category","group_auction_user",1,0,0,0
-"access_auction_lot_category_manager","auction.lot.category manager","model_auction_lot_category","group_auction_manager",1,1,1,1
-"access_auction_lots","auction.lots","model_auction_lots","group_auction_user",1,1,1,0
-"access_auction_lots_manager","auction.lots manager","model_auction_lots","group_auction_manager",1,0,0,0
-"access_auction_bid","auction.bid","model_auction_bid","group_auction_user",1,1,1,1
-"access_auction_bid_manager","auction.bid manager","model_auction_bid","group_auction_manager",1,0,0,0
-"access_auction_bid_line","auction.bid.line","model_auction_bid_line","group_auction_user",1,1,1,1
-"access_auction_bid_line_manager","auction.bid.line manager","model_auction_bid_line","group_auction_manager",1,0,0,0
-"access_auction_lot_history","auction.lot.history","model_auction_lot_history","group_auction_user",1,1,1,1
-"access_auction_lot_history_manager","auction.lot.history manager","model_auction_lot_history","group_auction_manager",1,0,0,0
-"access_report_auction","report.auction","model_report_auction","group_auction_manager",1,1,1,1
-"access_report_auction_object_date","report.auction.object.date","model_report_auction_object_date","group_auction_manager",1,1,1,1
-"access_report_auction_adjudication","report.auction.adjudication","model_report_auction_adjudication","group_auction_manager",1,1,1,1
-"access_report_object_encoded","report.object.encoded","model_report_object_encoded","group_auction_manager",1,1,1,1
-"access_aie_category","aie.category","model_aie_category","group_auction_manager",1,1,1,1
-"access_auction_account_tax_user","account.tax user","account.model_account_tax","group_auction_user",1,0,0,0
-"access_auction_account_tax","account.tax manager","account.model_account_tax","group_auction_manager",1,1,1,0
-"access_auction_account_fiscalyear","account.fiscalyear manager","account.model_account_fiscalyear","group_auction_manager",1,1,1,0
-"access_auction_account_journal","account.journal manager","account.model_account_journal","group_auction_manager",1,1,1,0
-"access_auction_account_invoice","account.invoice manager","account.model_account_invoice","group_auction_manager",1,1,1,0
-"access_auction_account_invoice_line","account.invoice.line manager","account.model_account_invoice_line","group_auction_manager",1,1,1,0
-"access_auction_account_invoice_tax","account.invoice.tax manager","account.model_account_invoice_tax","group_auction_manager",1,1,1,0
-"access_auction_account_analytic_journal","account.analytic.journal manager","account.model_account_analytic_journal","group_auction_manager",1,1,1,0
-"access_auction_account_period","account.period manager","account.model_account_period","group_auction_manager",1,1,1,0
-"access_auction_account_move","account.move manager","account.model_account_move","group_auction_manager",1,1,1,0
-"access_auction_account_move_line","account.move.line manager","account.model_account_move_line","group_auction_manager",1,1,1,0
-"access_auction_account_journal_period","account.journal.period manager","account.model_account_journal_period","group_auction_manager",1,1,1,0
-"access_auction_account_analytic_line","account.analytic.line manager","account.model_account_analytic_line","group_auction_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_auction_artists,auction.artists,model_auction_artists,group_auction_manager,1,1,1,1

+access_auction_dates_user,auction.dates user,model_auction_dates,group_auction_user,1,0,0,0

+access_auction_dates_manager,auction.dates manager,model_auction_dates,group_auction_manager,1,1,1,1

+access_auction_deposit_manager,auction.deposit manager,model_auction_deposit,group_auction_manager,1,1,1,1

+access_auction_deposit_user,auction.deposit user,model_auction_deposit,group_auction_user,1,0,0,0

+access_auction_deposit_cost,auction.deposit.cost,model_auction_deposit_cost,group_auction_manager,1,1,1,1

+access_auction_lot_category,auction.lot.category,model_auction_lot_category,group_auction_user,1,0,0,0

+access_auction_lot_category_manager,auction.lot.category manager,model_auction_lot_category,group_auction_manager,1,1,1,1

+access_auction_lots,auction.lots,model_auction_lots,group_auction_user,1,1,1,0

+access_auction_lots_manager,auction.lots manager,model_auction_lots,group_auction_manager,1,0,0,0

+access_auction_bid,auction.bid,model_auction_bid,group_auction_user,1,1,1,1

+access_auction_bid_manager,auction.bid manager,model_auction_bid,group_auction_manager,1,0,0,0

+access_auction_bid_line,auction.bid.line,model_auction_bid_line,group_auction_user,1,1,1,1

+access_auction_bid_line_manager,auction.bid.line manager,model_auction_bid_line,group_auction_manager,1,0,0,0

+access_auction_lot_history,auction.lot.history,model_auction_lot_history,group_auction_user,1,1,1,1

+access_auction_lot_history_manager,auction.lot.history manager,model_auction_lot_history,group_auction_manager,1,0,0,0

+access_report_auction,report.auction,model_report_auction,group_auction_manager,1,1,1,1

+access_report_auction_object_date,report.auction.object.date,model_report_auction_object_date,group_auction_manager,1,1,1,1

+access_report_auction_adjudication,report.auction.adjudication,model_report_auction_adjudication,group_auction_manager,1,1,1,1

+access_report_object_encoded,report.object.encoded,model_report_object_encoded,group_auction_manager,1,1,1,1

+access_aie_category,aie.category,model_aie_category,group_auction_manager,1,1,1,1

+access_auction_account_tax_user,account.tax user,account.model_account_tax,group_auction_user,1,0,0,0

+access_auction_account_tax,account.tax manager,account.model_account_tax,group_auction_manager,1,1,1,0

+access_auction_account_fiscalyear,account.fiscalyear manager,account.model_account_fiscalyear,group_auction_manager,1,1,1,0

+access_auction_account_journal,account.journal manager,account.model_account_journal,group_auction_manager,1,1,1,0

+access_auction_account_invoice,account.invoice manager,account.model_account_invoice,group_auction_manager,1,1,1,0

+access_auction_account_invoice_line,account.invoice.line manager,account.model_account_invoice_line,group_auction_manager,1,1,1,0

+access_auction_account_invoice_tax,account.invoice.tax manager,account.model_account_invoice_tax,group_auction_manager,1,1,1,0

+access_auction_account_analytic_journal,account.analytic.journal manager,account.model_account_analytic_journal,group_auction_manager,1,1,1,0

+access_auction_account_period,account.period manager,account.model_account_period,group_auction_manager,1,1,1,0

+access_auction_account_move,account.move manager,account.model_account_move,group_auction_manager,1,1,1,0

+access_auction_account_move_line,account.move.line manager,account.model_account_move_line,group_auction_manager,1,1,1,0

+access_auction_account_journal_period,account.journal.period manager,account.model_account_journal_period,group_auction_manager,1,1,1,0

+access_auction_account_analytic_line,account.analytic.line manager,account.model_account_analytic_line,group_auction_manager,1,1,1,1