From 3e1a035f67cb4b4717dfff174ea09e272caee6ff Mon Sep 17 00:00:00 2001
From: "apa (OpenERP)" <apa@tinyerp.com>
Date: Thu, 23 Dec 2010 14:56:39 +0530
Subject: [PATCH 01/10] [IMP]:base -remove all personal tweets available  in
 widget list (odo, stephane, ...), keep only "OpenERP Favorites". -the openerp
 favorites widget should be deletable by default (by a user => in demo data,
 demo user should be able to remove this widget from his homepage)

bzr revid: apa@tinyerp.com-20101223092639-6495v63r1acp4ewn
---
 bin/addons/base/res/res_widget_data.xml      | 4 ++--
 bin/addons/base/res/res_widget_demo.xml      | 4 ++--
 bin/addons/base/security/ir.model.access.csv | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/addons/base/res/res_widget_data.xml b/bin/addons/base/res/res_widget_data.xml
index 1e64955da1a..a0c8d6b3c5a 100644
--- a/bin/addons/base/res/res_widget_data.xml
+++ b/bin/addons/base/res/res_widget_data.xml
@@ -39,7 +39,7 @@ new TWTR.Widget({
 </script>]]> </field>
     </record>
 
-    <record id="odony_twitter_widget" model="res.widget">
+    <!--record id="odony_twitter_widget" model="res.widget">
       <field name="title">Olivier Dony's tweets</field>
       <field name="content"><![CDATA[<script src="http://widgets.twimg.com/j/2/widget.js"></script>
 <script>
@@ -222,7 +222,7 @@ new TWTR.Widget({
   }
 }).render().setUser('nhomar').start();
 </script>]]></field>
-    </record>
+    </record-->
 
     <record id="openerp_favorites" model="res.widget.user">
         <field name="widget_id" ref="openerp_favorites_twitter_widget"/>
diff --git a/bin/addons/base/res/res_widget_demo.xml b/bin/addons/base/res/res_widget_demo.xml
index 6ffe9bfb182..2818ad0054b 100644
--- a/bin/addons/base/res/res_widget_demo.xml
+++ b/bin/addons/base/res/res_widget_demo.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
   <data>
-    <record id="openerp_admin_widgets" model="res.widget.user">
+    <!--record id="openerp_admin_widgets" model="res.widget.user">
         <field name="widget_id" ref="odony_twitter_widget"/>
         <field name="user_id" ref="base.user_root"/>
     </record>
     <record id="openerp_demo_widgets" model="res.widget.user">
         <field name="widget_id" ref="albertnan_twitter_widget"/>
         <field name="user_id" ref="base.user_demo"/>
-    </record>
+    </record-->
   </data>
 </openerp>
diff --git a/bin/addons/base/security/ir.model.access.csv b/bin/addons/base/security/ir.model.access.csv
index b83d858d4e8..dec890bf7cb 100644
--- a/bin/addons/base/security/ir.model.access.csv
+++ b/bin/addons/base/security/ir.model.access.csv
@@ -1,5 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_res_widget_user_all","res_widget_user all","model_res_widget_user",,1,0,0,0
+"access_res_widget_user_all","res_widget_user all","model_res_widget_user",,1,1,1,1
 "access_res_widget_user_group_user","res_widget_user group_user","model_res_widget_user","group_user",1,1,1,1
 "access_ir_attachment_all","ir_attachment all","model_ir_attachment",,1,0,0,0
 "access_ir_attachment_group_user","ir_attachment group_user","model_ir_attachment","group_user",1,1,1,1

From d778f3f93b73fb40c78268d9b8618467c9c541e4 Mon Sep 17 00:00:00 2001
From: "apa (OpenERP)" <apa@tinyerp.com>
Date: Thu, 23 Dec 2010 17:49:53 +0530
Subject: [PATCH 02/10] [IMP]:base:for widgets
 http://pad.openerp.com/widgets-homepage

bzr revid: apa@tinyerp.com-20101223121953-dtd53kwsv6hqkc1h
---
 bin/addons/base/res/res_widget.py       |  23 ++-
 bin/addons/base/res/res_widget_data.xml | 192 +++---------------------
 bin/addons/base/res/res_widget_demo.xml |  10 +-
 bin/addons/base/res/res_widget_view.xml |   2 +-
 4 files changed, 43 insertions(+), 184 deletions(-)

diff --git a/bin/addons/base/res/res_widget.py b/bin/addons/base/res/res_widget.py
index 608c9c6d773..81be708a331 100644
--- a/bin/addons/base/res/res_widget.py
+++ b/bin/addons/base/res/res_widget.py
@@ -52,14 +52,23 @@ class res_widget_user(osv.osv):
 
 res_widget_user()
 
-
 class res_widget_wizard(osv.osv_memory):
     _name = "res.widget.wizard"
     _description = "Add a widget for User"
+    
+    def widgets_list_get(self, cr, uid,context=None):
+        widget_obj=self.pool.get('res.widget')
+        ids=widget_obj.search(cr, uid,[],context=context)
+        if not len(ids):
+            return []
+        reads = widget_obj.read(cr, uid, ids, ['title'], context=context)
+        res = []
+        for record in reads:
+            res.append((record['id'], record['title']))
+        return res
+
     _columns = {
-        'widget_id': fields.many2many("res.widget",
-                                      "res_widget_user_rel", "uid", "wid",
-                                      "Widget"),
+        'widgets_list': fields.selection(widgets_list_get,string='Widget',required=True),
     }
 
     def action_get(self, cr, uid, context=None):
@@ -67,10 +76,10 @@ class res_widget_wizard(osv.osv_memory):
             cr, uid, 'base', 'action_res_widget_wizard', context=context)
 
     def res_widget_add(self, cr, uid, ids, context=None):
-        wizard = self.read(cr, uid, ids, context=context)[0]
-        for wiz_id in wizard['widget_id']:
+        widget_id = self.read(cr, uid, ids, context=context)[0]
+        if widget_id.has_key('widgets_list') and widget_id['widgets_list']:
             self.pool.get('res.widget.user').create(
-                cr, uid, {'user_id':uid, 'widget_id':wiz_id}, context=context)
+                cr, uid, {'user_id':uid, 'widget_id':widget_id['widgets_list']}, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
 res_widget_wizard()
diff --git a/bin/addons/base/res/res_widget_data.xml b/bin/addons/base/res/res_widget_data.xml
index a0c8d6b3c5a..34fa3341e1e 100644
--- a/bin/addons/base/res/res_widget_data.xml
+++ b/bin/addons/base/res/res_widget_data.xml
@@ -39,190 +39,40 @@ new TWTR.Widget({
 </script>]]> </field>
     </record>
 
-    <!--record id="odony_twitter_widget" model="res.widget">
-      <field name="title">Olivier Dony's tweets</field>
+    <record id="events_widget" model="res.widget">
+      <field name="title">Events</field>
       <field name="content"><![CDATA[<script src="http://widgets.twimg.com/j/2/widget.js"></script>
-<script>
-new TWTR.Widget({
-  version: 2,
-  type: 'profile',
-  rpp: 10,
-  interval: 6000,
-  title: '',
-  subject: '',
-  width: 'auto',
-  height: 300,
-  theme: {
-    shell: {
-      background: '#F0EEEE',
-      color: '#444444'
-    },
-    tweets: {
-      background: '#F0EEEE',
-      color: '#444444',
-      links: '#9A0404'
-    }
-  },
-  features: {
-    scrollbar: false,
-    loop: false,
-    live: true,
-    hashtags: true,
-    timestamp: true,
-    avatars: false,
-    behavior: 'all'
-  }
-}).render().setUser('odony').start();
-</script>]]></field>
+<div style="width:195px; text-align:center;" ><iframe  src="http://www.eventbrite.com/calendar-widget?eid=852573069" frameborder="0" height="406" width="220" marginheight="0" marginwidth="0" scrolling="no" ></iframe><div style="font-family:Helvetica, Arial; font-size:10px; padding:5px 0 5px; margin:2px; width:195px; text-align:center;" ><a style="color:#ddd; text-decoration:none;" target="_blank" href="http://www.eventbrite.com/features?ref=ecal" >Online Ticketing</a><span style="color:#ddd;" > powered by </span><a style="color:#ddd; text-decoration:none;" target="_blank" href="http://www.eventbrite.com?ref=ecal" >Eventbrite</a></div>]]></field>
     </record>
 
-    <record id="matrixise_twitter_widget" model="res.widget">
-      <field name="title">Stéphane Wirtel's tweets</field>
+    <record id="facebook_widget" model="res.widget">
+      <field name="title">Facebook</field>
       <field name="content"><![CDATA[<script src="http://widgets.twimg.com/j/2/widget.js"></script>
-<script>
-new TWTR.Widget({
-  version: 2,
-  type: 'profile',
-  rpp: 10,
-  interval: 6000,
-  title: '',
-  subject: '',
-  width: 'auto',
-  height: 300,
-  theme: {
-    shell: {
-      background: '#F0EEEE',
-      color: '#444444'
-    },
-    tweets: {
-      background: '#F0EEEE',
-      color: '#444444',
-      links: '#9A0404'
-    }
-  },
-  features: {
-    scrollbar: false,
-    loop: false,
-    live: true,
-    hashtags: true,
-    timestamp: true,
-    avatars: false,
-    behavior: 'all'
-  }
-}).render().setUser('matrixise').start();
-</script>]]></field>
+        <iframe src="http://www.facebook.com/plugins/activity.php?site=www.facebook.com%2FOpenERP&amp;width=300&amp;height=300&amp;header=true&amp;colorscheme=light&amp;recommendations=true" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:300px; height:300px;" allowTransparency="true"></iframe>]]></field>
     </record>
 
-    <record id="rvalyi_twitter_widget" model="res.widget">
-      <field name="title">Raphaël Valyi's tweets</field>
+    <record id="note_widget" model="res.widget">
+      <field name="title">Notes</field>
       <field name="content"><![CDATA[<script src="http://widgets.twimg.com/j/2/widget.js"></script>
-<script>
-new TWTR.Widget({
-  version: 2,
-  type: 'profile',
-  rpp: 10,
-  interval: 6000,
-  title: '',
-  subject: '',
-  width: 'auto',
-  height: 300,
-  theme: {
-    shell: {
-      background: '#F0EEEE',
-      color: '#444444'
-    },
-    tweets: {
-      background: '#F0EEEE',
-      color: '#444444',
-      links: '#9A0404'
-    }
-  },
-  features: {
-    scrollbar: false,
-    loop: false,
-    live: true,
-    hashtags: true,
-    timestamp: true,
-    avatars: false,
-    behavior: 'all'
-  }
-}).render().setUser('rvalyi').start();
-</script>]]></field>
+                 <script src="http://www.gmodules.com/ig/ifr?url=http://www.google.com/ig/modules/sticky.xml&amp;up_title=Note&amp;up_bgcolor=white&amp;up_textcolor=Black&amp;up_stickydata=&amp;synd=open&amp;w=320&amp;h=200&amp;title=Notes&amp;lang=all&amp;country=ALL&amp;border=%23ffffff%7C3px%2C1px+solid+%23999999&amp;output=js"></script>]]></field>
     </record>
 
-    <record id="albertnan_twitter_widget" model="res.widget">
-      <field name="title">Albert Cervera Areny's tweets</field>
+    <record id="goosle_maps_widget" model="res.widget">
+      <field name="title">Goosle Maps</field>
       <field name="content"><![CDATA[<script src="http://widgets.twimg.com/j/2/widget.js"></script>
-<script>
-new TWTR.Widget({
-  version: 2,
-  type: 'profile',
-  rpp: 10,
-  interval: 6000,
-  title: '',
-  subject: '',
-  width: 'auto',
-  height: 300,
-  theme: {
-    shell: {
-      background: '#F0EEEE',
-      color: '#444444'
-    },
-    tweets: {
-      background: '#F0EEEE',
-      color: '#444444',
-      links: '#9A0404'
-    }
-  },
-  features: {
-    scrollbar: false,
-    loop: false,
-    live: true,
-    hashtags: true,
-    timestamp: true,
-    avatars: false,
-    behavior: 'all'
-  }
-}).render().setUser('albertnan').start();
-</script>]]></field>
+                     <script src="http://www.gmodules.com/ig/ifr?url=http://www.google.com/uds/modules/elements/localsearch/localsearch.xml&amp;up_location=Ramillies&amp;up_largeMapMode=1&amp;up_kml=1&amp;up_traffic=&amp;up_locationCacheString=&amp;up_locationCacheLat=&amp;up_locationCacheLng=&amp;up_mapType=m&amp;up_idleZoom=11&amp;up_transitionQuery=&amp;up_rawquery=&amp;up_selectedtext=&amp;synd=open&amp;w=320&amp;h=350&amp;title=Map&amp;lang=all&amp;country=ALL&amp;border=%23ffffff%7C3px%2C1px+solid+%23999999&amp;output=js"></script>]]></field>
     </record>
 
-    <record id="nhomar_twitter_widget" model="res.widget">
-      <field name="title">Nhomar Hernandez's tweets</field>
+    <record id="currency_converter_widget" model="res.widget">
+      <field name="title">Currency Converter</field>
       <field name="content"><![CDATA[<script src="http://widgets.twimg.com/j/2/widget.js"></script>
-<script>
-new TWTR.Widget({
-  version: 2,
-  type: 'profile',
-  rpp: 10,
-  interval: 6000,
-  title: '',
-  subject: '',
-  width: 'auto',
-  height: 300,
-  theme: {
-    shell: {
-      background: '#F0EEEE',
-      color: '#444444'
-    },
-    tweets: {
-      background: '#F0EEEE',
-      color: '#444444',
-      links: '#9A0404'
-    }
-  },
-  features: {
-    scrollbar: false,
-    loop: false,
-    live: true,
-    hashtags: true,
-    timestamp: true,
-    avatars: false,
-    behavior: 'all'
-  }
-}).render().setUser('nhomar').start();
-</script>]]></field>
-    </record-->
+                         <script src="http://www.gmodules.com/ig/ifr?url=http://www.pixelmedia.nl/gmodules/ucc.xml&amp;up_fromcur=USD&amp;up_tocur=EUR&amp;synd=open&amp;w=320&amp;h=110&amp;title=Currency+Converter&amp;lang=all&amp;country=ALL&amp;border=%23ffffff%7C3px%2C1px+solid+%23999999&amp;output=js"></script>
+
+    *
+
+
+]]></field>
+    </record>
 
     <record id="openerp_favorites" model="res.widget.user">
         <field name="widget_id" ref="openerp_favorites_twitter_widget"/>
diff --git a/bin/addons/base/res/res_widget_demo.xml b/bin/addons/base/res/res_widget_demo.xml
index 2818ad0054b..3ce98e9ae2d 100644
--- a/bin/addons/base/res/res_widget_demo.xml
+++ b/bin/addons/base/res/res_widget_demo.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
   <data>
-    <!--record id="openerp_admin_widgets" model="res.widget.user">
-        <field name="widget_id" ref="odony_twitter_widget"/>
+    <record id="events_admin_widgets" model="res.widget.user">
+        <field name="widget_id" ref="events_widget"/>
         <field name="user_id" ref="base.user_root"/>
     </record>
-    <record id="openerp_demo_widgets" model="res.widget.user">
-        <field name="widget_id" ref="albertnan_twitter_widget"/>
+    <record id="events_demo_widgets" model="res.widget.user">
+        <field name="widget_id" ref="events_widget"/>
         <field name="user_id" ref="base.user_demo"/>
-    </record-->
+    </record>
   </data>
 </openerp>
diff --git a/bin/addons/base/res/res_widget_view.xml b/bin/addons/base/res/res_widget_view.xml
index 91b108257dc..90bde7a22b5 100644
--- a/bin/addons/base/res/res_widget_view.xml
+++ b/bin/addons/base/res/res_widget_view.xml
@@ -81,7 +81,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Widget Wizard" col="4">
-                <field name="widget_id"/>
+                <field name="widgets_list" colspan="4"/>
                 <newline/>
                 <separator string="" colspan="6"/>
                 <group colspan="6" col="4" >

From 54f1eb857b9c301ae5a362502ef0f01216d710e1 Mon Sep 17 00:00:00 2001
From: "apa (OpenERP)" <apa@tinyerp.com>
Date: Fri, 24 Dec 2010 10:48:38 +0530
Subject: [PATCH 03/10] [IMP]:typo

bzr revid: apa@tinyerp.com-20101224051838-buzyrt3v78rq1fe4
---
 bin/addons/base/res/res_widget_data.xml | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/bin/addons/base/res/res_widget_data.xml b/bin/addons/base/res/res_widget_data.xml
index 34fa3341e1e..bb8b0cf892a 100644
--- a/bin/addons/base/res/res_widget_data.xml
+++ b/bin/addons/base/res/res_widget_data.xml
@@ -57,8 +57,8 @@ new TWTR.Widget({
                  <script src="http://www.gmodules.com/ig/ifr?url=http://www.google.com/ig/modules/sticky.xml&amp;up_title=Note&amp;up_bgcolor=white&amp;up_textcolor=Black&amp;up_stickydata=&amp;synd=open&amp;w=320&amp;h=200&amp;title=Notes&amp;lang=all&amp;country=ALL&amp;border=%23ffffff%7C3px%2C1px+solid+%23999999&amp;output=js"></script>]]></field>
     </record>
 
-    <record id="goosle_maps_widget" model="res.widget">
-      <field name="title">Goosle Maps</field>
+    <record id="google_maps_widget" model="res.widget">
+      <field name="title">Google Maps</field>
       <field name="content"><![CDATA[<script src="http://widgets.twimg.com/j/2/widget.js"></script>
                      <script src="http://www.gmodules.com/ig/ifr?url=http://www.google.com/uds/modules/elements/localsearch/localsearch.xml&amp;up_location=Ramillies&amp;up_largeMapMode=1&amp;up_kml=1&amp;up_traffic=&amp;up_locationCacheString=&amp;up_locationCacheLat=&amp;up_locationCacheLng=&amp;up_mapType=m&amp;up_idleZoom=11&amp;up_transitionQuery=&amp;up_rawquery=&amp;up_selectedtext=&amp;synd=open&amp;w=320&amp;h=350&amp;title=Map&amp;lang=all&amp;country=ALL&amp;border=%23ffffff%7C3px%2C1px+solid+%23999999&amp;output=js"></script>]]></field>
     </record>
@@ -66,12 +66,7 @@ new TWTR.Widget({
     <record id="currency_converter_widget" model="res.widget">
       <field name="title">Currency Converter</field>
       <field name="content"><![CDATA[<script src="http://widgets.twimg.com/j/2/widget.js"></script>
-                         <script src="http://www.gmodules.com/ig/ifr?url=http://www.pixelmedia.nl/gmodules/ucc.xml&amp;up_fromcur=USD&amp;up_tocur=EUR&amp;synd=open&amp;w=320&amp;h=110&amp;title=Currency+Converter&amp;lang=all&amp;country=ALL&amp;border=%23ffffff%7C3px%2C1px+solid+%23999999&amp;output=js"></script>
-
-    *
-
-
-]]></field>
+                         <script src="http://www.gmodules.com/ig/ifr?url=http://www.pixelmedia.nl/gmodules/ucc.xml&amp;up_fromcur=USD&amp;up_tocur=EUR&amp;synd=open&amp;w=320&amp;h=110&amp;title=Currency+Converter&amp;lang=all&amp;country=ALL&amp;border=%23ffffff%7C3px%2C1px+solid+%23999999&amp;output=js"></script>]]></field>
     </record>
 
     <record id="openerp_favorites" model="res.widget.user">

From 96fcf28f194675a81243429630025c6324f0ffeb Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Mon, 27 Dec 2010 15:30:00 +0530
Subject: [PATCH 04/10] [FIX] crm: typo

bzr revid: hmo@tinyerp.com-20101227100000-glr05umryqisghdh
---
 addons/crm/res_partner_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index e4b228e0bb9..b0a2ba01e4e 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -74,7 +74,7 @@
                     <field name="date" required="1"/>
                     <field name="user_id"/>
                     <field name="section_id" colspan="1" widget="selection" />
-                    <button string="aaaaaaaaaConvert to Opportunity"
+                    <button string="Convert to Opportunity"
                         name="%(phonecall2opportunity_act)d"
                         icon="gtk-index" type="action"
                         attrs="{'invisible':[('opportunity_id','!=',False)]}" />

From 8c9840b230ea6bea3fe4b25b6ab9d341dd274d73 Mon Sep 17 00:00:00 2001
From: Antony <antony@openerp-laptop>
Date: Mon, 27 Dec 2010 16:42:52 +0100
Subject: [PATCH 05/10] [FIX] jay account_voucher typo

bzr revid: antony@openerp-laptop-20101227154252-1wo75j02luv0siaq
---
 addons/account_voucher/account_voucher.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index e4b76cc8770..0c6ffbb49d3 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -847,7 +847,7 @@ class account_voucher_line(osv.osv):
         'move_line_id': fields.many2one('account.move.line', 'Journal Item'),
         'date_original': fields.related('move_line_id','date', type='date', relation='account.move.line', string='Date', readonly=1),
         'date_due': fields.related('move_line_id','date_maturity', type='date', relation='account.move.line', string='Due Date', readonly=1),
-        'amount_original': fields.function(_compute_balance, method=True, multi='dc', type='float', string='Originial Amount', store=True),
+        'amount_original': fields.function(_compute_balance, method=True, multi='dc', type='float', string='Original Amount', store=True),
         'amount_unreconciled': fields.function(_compute_balance, method=True, multi='dc', type='float', string='Open Balance', store=True),
         'company_id': fields.related('voucher_id','company_id', relation='res.company', type='many2one', string='Company', store=True),
     }

From 18805812e45a8a94a1f3c43242f9b23f2a423d2e Mon Sep 17 00:00:00 2001
From: eLBati <lorenzo.battistini@agilebg.com>
Date: Sat, 25 Dec 2010 19:22:44 +0100
Subject: [PATCH 06/10] FIX missing report/*

bzr revid: lorenzo.battistini@agilebg.com-20101225182244-1o8yd138wr2qm1zx
---
 addons/l10n_it/report/__init__.py           |   2 +
 addons/l10n_it/report/libroIVA_credito.py   |  79 +++
 addons/l10n_it/report/libroIVA_credito.rml  | 203 ++++++
 addons/l10n_it/report/libroIVA_debito.py    |  80 +++
 addons/l10n_it/report/libroIVA_debito.rml   | 195 ++++++
 addons/l10n_it/report/normalized_oo2rml.xsl | 696 ++++++++++++++++++++
 6 files changed, 1255 insertions(+)
 create mode 100644 addons/l10n_it/report/__init__.py
 create mode 100644 addons/l10n_it/report/libroIVA_credito.py
 create mode 100644 addons/l10n_it/report/libroIVA_credito.rml
 create mode 100644 addons/l10n_it/report/libroIVA_debito.py
 create mode 100644 addons/l10n_it/report/libroIVA_debito.rml
 create mode 100644 addons/l10n_it/report/normalized_oo2rml.xsl

diff --git a/addons/l10n_it/report/__init__.py b/addons/l10n_it/report/__init__.py
new file mode 100644
index 00000000000..be32155c675
--- /dev/null
+++ b/addons/l10n_it/report/__init__.py
@@ -0,0 +1,2 @@
+import libroIVA_credito
+import libroIVA_debito
\ No newline at end of file
diff --git a/addons/l10n_it/report/libroIVA_credito.py b/addons/l10n_it/report/libroIVA_credito.py
new file mode 100644
index 00000000000..b48c81d2475
--- /dev/null
+++ b/addons/l10n_it/report/libroIVA_credito.py
@@ -0,0 +1,79 @@
+import datetime
+import time
+from report import report_sxw
+from osv import osv
+import pooler
+            
+
+class l10n_chart_it_report_libroIVA_credito(report_sxw.rml_parse):
+	
+    def __init__(self, cr, uid, name, context):
+        super(l10n_chart_it_report_libroIVA_credito,self).__init__(cr,uid,name,context)
+        self.localcontext.update({
+            'time' : time,
+	    'get_company' : self.get_company,
+	    'get_periods' : self.get_periods,
+	    'get_lines' : self.get_lines,
+        })
+	
+	
+    def get_company(self,fiscal_year):
+	#print 'COMP = ',fiscal_year
+        return ""
+	
+    def get_periods(self,fiscal_year):
+	#print 'Fiscal year id:',fiscal_year.id
+	obj=pooler.get_pool(self.cr.dbname).get('account.fiscalyear')
+	fy=obj.browse(self.cr,self.uid,fiscal_year.id)
+	#print 'Periods = ',fy.period_ids
+	res=[rec for rec in fy.period_ids]
+	#return fy.periods  => non funziona?!? bool object !?!?
+	return res
+	
+    def get_invoices(self,period):
+	#print 'PERIOD = ',period.name
+	obj=pooler.get_pool(self.cr.dbname).get('account.invoice')
+	# Selezione tutte le fatture emesse nel periodo
+	self.cr.execute(	"""
+					SELECT id FROM account_invoice 
+					WHERE 	(state='open' OR state='paid') AND
+							period_id="""+str(period.id)+"""
+							AND (type='out_invoice' OR type='out_refund')
+					""")
+	ids=self.cr.fetchall()
+	#print 'IDS = ',
+	if ids:
+	    ids=[id[0] for id in ids ]
+	invoices=obj.browse(self.cr,self.uid,ids)
+	#print 'INVOICES = ',invoices
+	return invoices
+	
+    def get_lines(self,fiscal_year):
+	res=[]
+	obj_fy=pooler.get_pool(self.cr.dbname).get('account.fiscalyear')
+	fy=obj_fy.browse(self.cr,self.uid,fiscal_year.id)
+	for period in fy.period_ids:
+	    invoices=self.get_invoices(period)
+	    for invoice in invoices:
+		d={'periodo': period.name}
+	        d['protocollo']=invoice.number
+		#print 'PARTNER ',invoice.partner_id.name
+		causale=invoice.partner_id.name
+		#print 'CAUSALE = ',causale
+		d['causale']=causale
+		d['numero']=invoice.reference
+		d['data_doc']=invoice.date_invoice
+		for tax in invoice.tax_line:
+		    #print '\tTAX: ',tax
+		    d['aliquota']=tax.tax_code_id.name
+		    d['imponibile']=tax.base
+		    d['imposta']=tax.amount
+		    res.append(d)
+		    d={'periodo':'', 'protocollo':'', 'causale':'', 'numero':'', 'data_doc':'', }
+	return res
+
+
+        
+report_sxw.report_sxw('report.l10n_it.report.libroIVA_credito','account.report_libroiva',
+                      'l10n_it/report/libroIVA_credito.rml',
+                       parser=l10n_chart_it_report_libroIVA_credito,header=False)
diff --git a/addons/l10n_it/report/libroIVA_credito.rml b/addons/l10n_it/report/libroIVA_credito.rml
new file mode 100644
index 00000000000..2b282f760b4
--- /dev/null
+++ b/addons/l10n_it/report/libroIVA_credito.rml
@@ -0,0 +1,203 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(612.0,792.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="57.0" y1="57.0" width="498" height="678"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="6,0" stop="6,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="7,0" stop="7,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="7,0" stop="7,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="4,1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="5,1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="6,1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="7,1" stop="7,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="7,1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
+      <blockBackground colorName="#ffcc99" start="0,0" stop="0,-1"/>
+      <blockBackground colorName="#ffcc99" start="1,0" stop="1,-1"/>
+      <blockBackground colorName="#ffcc99" start="2,0" stop="2,-1"/>
+      <blockBackground colorName="#ffcc99" start="3,0" stop="3,-1"/>
+      <blockBackground colorName="#ffcc99" start="4,0" stop="4,-1"/>
+      <blockBackground colorName="#ffcc99" start="5,0" stop="5,-1"/>
+      <blockBackground colorName="#ffcc99" start="6,0" stop="6,-1"/>
+      <blockBackground colorName="#ffcc99" start="7,0" stop="7,-1"/>
+      <blockBackground colorName="#ffffff" start="0,1" stop="0,-1"/>
+      <blockBackground colorName="#ffffff" start="1,1" stop="1,-1"/>
+      <blockBackground colorName="#ffffff" start="2,1" stop="2,-1"/>
+      <blockBackground colorName="#ffffff" start="3,1" stop="3,-1"/>
+      <blockBackground colorName="#ffffff" start="4,1" stop="4,-1"/>
+      <blockBackground colorName="#ffffff" start="5,1" stop="5,-1"/>
+      <blockBackground colorName="#ffffff" start="6,1" stop="6,-1"/>
+      <blockBackground colorName="#ffffff" start="7,1" stop="7,-1"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Times-Roman" alignment="RIGHT"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT"/>
+    <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="P4" fontName="Helvetica" fontSize="12.0" leading="15" alignment="CENTER"/>
+    <paraStyle name="P5" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT"/>
+    <paraStyle name="P6" rightIndent="0.0" leftIndent="71.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="RIGHT"/>
+    <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="P8" fontName="Helvetica" fontSize="12.0" leading="15" alignment="CENTER"/>
+    <paraStyle name="P9" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT"/>
+    <paraStyle name="P10" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT"/>
+    <paraStyle name="P11" fontName="Helvetica" fontSize="12.0" leading="15" alignment="CENTER"/>
+    <paraStyle name="P12" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT"/>
+    <paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="P14" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P15" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P16" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="RIGHT"/>
+    <paraStyle name="P17" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="MP1" fontName="Times-Roman" alignment="RIGHT"/>
+  </stylesheet>
+  <images/>
+  <story>
+    <para style="P2">[[ repeatIn(objects, 'o') ]]</para>
+    <blockTable colWidths="249.0,249.0" style="Table1">
+      <tr>
+        <td>
+          <para style="P10">
+            <font face="Times-Roman" size="10.0">[[ get_company(o) ]]</font>
+          </para>
+        </td>
+        <td>
+          <para style="P16">
+            <font face="Times-Roman">REGISTRO IVA </font>
+          </para>
+          <para style="P16">
+            <font face="Times-Roman">VENDITE </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <para style="P11">[[ o.name ]] </para>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="39.0,50.0,92.0,45.0,54.0,76.0,69.0,74.0" repeatRows="1" style="Table2">
+      <tr>
+        <td>
+          <para style="P7">Periodo</para>
+        </td>
+        <td>
+          <para style="P7">Protocollo</para>
+        </td>
+        <td>
+          <para style="P7">Cliente</para>
+        </td>
+        <td>
+          <para style="P7">Numero</para>
+        </td>
+        <td>
+          <para style="P7">Data fattura</para>
+        </td>
+        <td>
+          <para style="P7">Aliquota</para>
+        </td>
+        <td>
+          <para style="P7">Imponibile</para>
+        </td>
+        <td>
+          <para style="P7">Imposta</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P3">[[ repeatIn(get_lines(o), 'line') ]]</para>
+          <para style="P3">[[ line['periodo'] ]]</para>
+        </td>
+        <td>
+          <para style="P3">[[ line['protocollo'] ]]</para>
+        </td>
+        <td>
+          <para style="P3">[[ line['causale'] ]]</para>
+        </td>
+        <td>
+          <para style="P3">[[ line['numero'] ]]</para>
+        </td>
+        <td>
+          <para style="P3">[[ line['data_doc'] ]]</para>
+        </td>
+        <td>
+          <para style="P14">[[ line['aliquota'] ]]</para>
+        </td>
+        <td>
+          <para style="P15">[[ line['imponibile'] ]]</para>
+        </td>
+        <td>
+          <para style="P15">[[ line['imposta'] ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P9">
+      <font color="white"> </font>
+    </para>
+    <para style="P4">
+      <font color="white"> </font>
+    </para>
+    <para style="P4">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+
diff --git a/addons/l10n_it/report/libroIVA_debito.py b/addons/l10n_it/report/libroIVA_debito.py
new file mode 100644
index 00000000000..c7720ab69a1
--- /dev/null
+++ b/addons/l10n_it/report/libroIVA_debito.py
@@ -0,0 +1,80 @@
+import datetime
+import time
+from report import report_sxw
+from osv import osv
+import pooler
+            
+
+class l10n_chart_it_report_libroIVA_debito(report_sxw.rml_parse):
+	
+    def __init__(self, cr, uid, name, context):
+        super(l10n_chart_it_report_libroIVA_debito,self).__init__(cr,uid,name,context)
+        self.localcontext.update({
+            'time' : time,
+	    'get_company' : self.get_company,
+	    'get_periods' : self.get_periods,
+	    'get_lines' : self.get_lines,
+        })
+	
+	
+    def get_company(self,fiscal_year):
+	#print 'COMP = ',fiscal_year
+        return ""
+	
+	
+    def get_periods(self,fiscal_year):
+	#print 'Fiscal year id:',fiscal_year.id
+	obj=pooler.get_pool(self.cr.dbname).get('account.fiscalyear')
+	fy=obj.browse(self.cr,self.uid,fiscal_year.id)
+	#print 'Periods = ',fy.period_ids
+	res=[rec for rec in fy.period_ids]
+	#return fy.periods  => non funziona?!? bool object !?!?
+	return res
+	
+    def get_invoices(self,period):
+	#print 'PERIOD = ',period.name
+	obj=pooler.get_pool(self.cr.dbname).get('account.invoice')
+	# Selezione tutte le fatture emesse nel periodo
+	self.cr.execute(	"""
+					SELECT id FROM account_invoice 
+					WHERE 	(state='open' OR state='paid') AND
+							period_id="""+str(period.id)+"""
+							AND (type='in_invoice' OR type='in_refund')
+					""")
+	ids=self.cr.fetchall()
+	#print 'IDS = ',
+	if ids:
+	    ids=[id[0] for id in ids ]
+	invoices=obj.browse(self.cr,self.uid,ids)
+	#print 'INVOICES = ',invoices
+	return invoices
+	
+    def get_lines(self,fiscal_year):
+	res=[]
+	obj_fy=pooler.get_pool(self.cr.dbname).get('account.fiscalyear')
+	fy=obj_fy.browse(self.cr,self.uid,fiscal_year.id)
+	for period in fy.period_ids:
+	    invoices=self.get_invoices(period)
+	    for invoice in invoices:
+		d={'periodo': period.name}
+	        d['protocollo']=invoice.number
+		#print 'PARTNER ',invoice.partner_id.name
+		causale=invoice.partner_id.name
+		#print 'CAUSALE = ',causale
+		d['causale']=causale
+		d['numero']=invoice.reference
+		d['data_doc']=invoice.date_invoice
+		for tax in invoice.tax_line:
+		    #print '\tTAX: ',tax
+		    d['aliquota']=tax.tax_code_id.name
+		    d['imponibile']=tax.base
+		    d['imposta']=tax.amount
+		    res.append(d)
+		    d={'periodo':'', 'protocollo':'', 'causale':'', 'numero':'', 'data_doc':'', }
+	return res
+
+
+        
+report_sxw.report_sxw('report.l10n_it.report.libroIVA_debito','account.report_libroiva',
+                      'l10n_it/report/libroIVA_debito.rml',
+                       parser=l10n_chart_it_report_libroIVA_debito,header=False)
diff --git a/addons/l10n_it/report/libroIVA_debito.rml b/addons/l10n_it/report/libroIVA_debito.rml
new file mode 100644
index 00000000000..ced847722af
--- /dev/null
+++ b/addons/l10n_it/report/libroIVA_debito.rml
@@ -0,0 +1,195 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(612.0,792.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="57.0" y1="57.0" width="498" height="678"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="6,0" stop="6,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="7,0" stop="7,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="7,0" stop="7,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="4,1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="5,1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="6,1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="7,1" stop="7,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="7,1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
+      <blockBackground colorName="#ffcc99" start="0,0" stop="0,-1"/>
+      <blockBackground colorName="#ffcc99" start="1,0" stop="1,-1"/>
+      <blockBackground colorName="#ffcc99" start="2,0" stop="2,-1"/>
+      <blockBackground colorName="#ffcc99" start="3,0" stop="3,-1"/>
+      <blockBackground colorName="#ffcc99" start="4,0" stop="4,-1"/>
+      <blockBackground colorName="#ffcc99" start="5,0" stop="5,-1"/>
+      <blockBackground colorName="#ffcc99" start="6,0" stop="6,-1"/>
+      <blockBackground colorName="#ffcc99" start="7,0" stop="7,-1"/>
+      <blockBackground colorName="#ffffff" start="0,1" stop="0,-1"/>
+      <blockBackground colorName="#ffffff" start="1,1" stop="1,-1"/>
+      <blockBackground colorName="#ffffff" start="2,1" stop="2,-1"/>
+      <blockBackground colorName="#ffffff" start="3,1" stop="3,-1"/>
+      <blockBackground colorName="#ffffff" start="4,1" stop="4,-1"/>
+      <blockBackground colorName="#ffffff" start="5,1" stop="5,-1"/>
+      <blockBackground colorName="#ffffff" start="6,1" stop="6,-1"/>
+      <blockBackground colorName="#ffffff" start="7,1" stop="7,-1"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Times-Roman" alignment="RIGHT"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P4" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P5" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT"/>
+    <paraStyle name="P6" fontName="Helvetica" fontSize="12.0" leading="15" alignment="CENTER"/>
+    <paraStyle name="P7" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT"/>
+    <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="P9" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT"/>
+    <paraStyle name="P10" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT"/>
+    <paraStyle name="P11" fontName="Helvetica" fontSize="12.0" leading="15" alignment="CENTER"/>
+    <paraStyle name="P12" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="RIGHT"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="MP1" fontName="Times-Roman" alignment="RIGHT"/>
+  </stylesheet>
+  <images/>
+  <story>
+    <para style="P7">[[ repeatIn(objects, 'o') ]]</para>
+    <blockTable colWidths="249.0,249.0" style="Table2">
+      <tr>
+        <td>
+          <para style="P10">
+            <font face="Times-Roman" size="10.0">[[ get_company(o) ]]</font>
+          </para>
+        </td>
+        <td>
+          <para style="P12">
+            <font face="Times-Roman">REGISTRO IVA</font>
+          </para>
+          <para style="P12">
+            <font face="Times-Roman">ACQUISTI</font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P7">
+      <font color="white"> </font>
+    </para>
+    <para style="P11">[[ o.name ]] </para>
+    <para style="P7">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="39.0,50.0,92.0,45.0,54.0,76.0,69.0,74.0" repeatRows="1" style="Table1">
+      <tr>
+        <td>
+          <para style="P8">Periodo</para>
+        </td>
+        <td>
+          <para style="P8">Protocollo</para>
+        </td>
+        <td>
+          <para style="P8">Fornitore</para>
+        </td>
+        <td>
+          <para style="P8">Numero</para>
+        </td>
+        <td>
+          <para style="P8">Data fattura</para>
+        </td>
+        <td>
+          <para style="P8">Aliquota</para>
+        </td>
+        <td>
+          <para style="P8">Imponibile</para>
+        </td>
+        <td>
+          <para style="P8">Imposta</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P2">[[ repeatIn(get_lines(o), 'line') ]]</para>
+          <para style="P2">[[ line['periodo'] ]]</para>
+        </td>
+        <td>
+          <para style="P2">[[ line['protocollo'] ]]</para>
+        </td>
+        <td>
+          <para style="P2">[[ line['causale'] ]]</para>
+        </td>
+        <td>
+          <para style="P2">[[ line['numero'] ]]</para>
+        </td>
+        <td>
+          <para style="P2">[[ line['data_doc'] ]]</para>
+        </td>
+        <td>
+          <para style="P3">[[ line['aliquota'] ]]</para>
+        </td>
+        <td>
+          <para style="P4">[[ line['imponibile'] ]]</para>
+        </td>
+        <td>
+          <para style="P4">[[ line['imposta'] ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P5">
+      <font color="white"> </font>
+    </para>
+    <para style="P6">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+
diff --git a/addons/l10n_it/report/normalized_oo2rml.xsl b/addons/l10n_it/report/normalized_oo2rml.xsl
new file mode 100644
index 00000000000..14fcf598e54
--- /dev/null
+++ b/addons/l10n_it/report/normalized_oo2rml.xsl
@@ -0,0 +1,696 @@
+<?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"
+  xmlns:office="http://openoffice.org/2000/office"
+  xmlns:style="http://openoffice.org/2000/style"
+  xmlns:text="http://openoffice.org/2000/text"
+  xmlns:table="http://openoffice.org/2000/table"
+  xmlns:draw="http://openoffice.org/2000/drawing"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  xmlns:number="http://openoffice.org/2000/datastyle"
+  xmlns:svg="http://www.w3.org/2000/svg"
+  xmlns:chart="http://openoffice.org/2000/chart"
+  xmlns:dr3d="http://openoffice.org/2000/dr3d"
+  xmlns:math="http://www.w3.org/1998/Math/MathML"
+  xmlns:form="http://openoffice.org/2000/form"
+  xmlns:script="http://openoffice.org/2000/script"
+  office:class="text" office:version="1.0"
+  exclude-result-prefixes = "xsl fo office style text table draw xlink number svg chart dr3d math form script">
+
+  <!--TODO's: indent, picture cache (trml2pdf) -->
+
+<xsl:output method="xml" indent="yes" />
+<xsl:strip-space elements="*"/>
+
+<xsl:key name="text_style" match="style:style[@style:family='text']" use="@style:name" />
+<xsl:key name="page_break_before" match="style:style[@style:family='paragraph' and ./style:properties/@fo:break-before='page']" use="@style:name" />
+<xsl:key name="page_break_after" match="style:style[@style:family='paragraph' and ./style:properties/@fo:break-after='page']" use="@style:name" />
+<xsl:key name="table_column_style" match="style:style[@style:family='table-column']" use="@style:name" />
+<xsl:key name="table_cell_style" match="style:style[@style:family='table-cell']" use="@style:name" />
+<xsl:key name="paragraph_style" match="style:style[@style:family='paragraph']" use="@style:name" />
+
+<xsl:template match="office:document-content">
+  <document filename="test.pdf">
+    <xsl:apply-templates select="office:automatic-styles" />
+    <xsl:apply-templates select="office:body" />
+  </document>
+</xsl:template>
+
+<xsl:template name="page_size">
+  <xsl:attribute name="pageSize">
+    <xsl:text>(</xsl:text>
+    <xsl:value-of select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:page-width" />
+    <xsl:text>,</xsl:text>
+    <xsl:value-of select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:page-height" />
+    <xsl:text>)</xsl:text>
+  </xsl:attribute>
+</xsl:template>
+
+<xsl:template name="fixed_frame">
+	<xsl:for-each select="//draw:text-box">
+		<frame>
+			<xsl:attribute name="id"><xsl:value-of select="./@draw:name" /></xsl:attribute>
+			<xsl:attribute name="x1"><xsl:value-of select="./@svg:x" /></xsl:attribute>
+			<xsl:attribute name="y1">
+				<xsl:value-of
+					select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:page-height - ./@svg:y - ./@fo:min-height" />
+			</xsl:attribute>
+			<xsl:attribute name="width">
+				<xsl:value-of select="./@svg:width" />
+			</xsl:attribute>
+			<xsl:attribute name="height">
+				<xsl:value-of select="./@fo:min-height" />
+			</xsl:attribute>
+		</frame>
+	</xsl:for-each>
+</xsl:template>
+
+<xsl:template name="margin_sizes">
+  <xsl:variable name="margin_left" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:margin-left" />
+  <xsl:variable name="margin_right" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:margin-right" />
+  <xsl:variable name="margin_top" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:margin-top" />
+  <xsl:variable name="margin_bottom" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:margin-bottom" />
+  <xsl:variable name="page_width" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:page-width" />
+  <xsl:variable name="page_height" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:page-height" />
+  <xsl:attribute name="x1"><xsl:value-of select="$margin_left" /></xsl:attribute>
+  <xsl:attribute name="y1"><xsl:value-of select="$margin_bottom" /></xsl:attribute>
+  <xsl:attribute name="width"><xsl:value-of select="$page_width - $margin_left - $margin_right"/></xsl:attribute>
+  <xsl:attribute name="height"><xsl:value-of select="$page_height - $margin_bottom - $margin_top"/></xsl:attribute>
+</xsl:template>
+
+<xsl:template name="text_width">
+  <!-- You need this for the workaround to make primitive outlines-->
+  <xsl:variable name="margin_left" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:margin-left" />
+  <xsl:variable name="margin_right" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:margin-right" />
+  <xsl:variable name="page_width" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:page-width" />
+  <xsl:value-of select="$page_width - $margin_left - $margin_right - 18"/>
+</xsl:template>
+
+
+
+<xsl:template match="office:automatic-styles">
+  <!--<template pageSize="(21cm, 29.7cm)" leftMargin="1.0cm" rightMargin="2.0cm" topMargin="1.0cm" bottomMargin="1.0cm" title="Test" author="Martin Simon" allowSplitting="20">-->
+  <template pageSize="(21cm, 29.7cm)" title="Test" author="Martin Simon" allowSplitting="20">
+    <xsl:call-template name="page_size" />
+    <pageTemplate id="first">
+	  <xsl:call-template name="fixed_frame" />
+      <frame id="first" x1="2cm" y1="2cm" width="17cm" height="26cm">
+        <xsl:call-template name="margin_sizes" />
+      </frame>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <!--A table style to simulate primitive outlines -till the <addOutline> tag is implemented in trml2pdf -->
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <!--use two standard table grid styles like PyOpenOffice "Old Way": with and without a grid-->
+    <!--TODO insert table cell colors here, not within the <td> tag - otherwise
+         it will not work with flowables as cell content-->
+    <xsl:call-template name="make_blocktablestyle" />
+    <initialize>
+      <paraStyle name="all" alignment="justify" />
+    </initialize>
+    <xsl:apply-templates select="style:style" />
+  </stylesheet>
+</xsl:template>
+
+<xsl:template name="make_blocktablestyle">
+  <xsl:for-each select="//table:table">
+    <xsl:variable name="test">
+      <xsl:value-of select="./@table:name" />
+    </xsl:variable>
+    <xsl:if test="not(boolean(count(preceding-sibling::table:table[@table:name=$test])))">
+      <!--Test if this is the first table with this style, nested tables not counted-->
+      <blockTableStyle id="{@table:name}">
+	    <xsl:if test=".//draw:image">
+	      <blockTopPadding value="0"/>
+	      <blockBottomPadding value="0"/>
+	    </xsl:if>
+        <blockAlignment value="LEFT" />
+        <blockValign value="TOP" />
+        <xsl:call-template name="make_linestyle" />
+        <xsl:call-template name="make_tablebackground" />
+      </blockTableStyle>
+    </xsl:if>
+  </xsl:for-each>
+</xsl:template>
+
+<xsl:template name="make_linestyle">
+	<xsl:for-each select=".//table:table-row">
+		<xsl:variable name="row" select="position() - 1"/>
+		<xsl:for-each select=".//table:table-cell">
+			<xsl:variable name="col" select="position() - 1"/>
+			<xsl:variable name="linebefore">
+				<xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:border-left"/>
+			</xsl:variable>
+			<xsl:if test="not($linebefore='') and not($linebefore='none')">
+				<xsl:variable name="colorname">
+					<xsl:value-of select="substring-after($linebefore,'#')"/>
+				</xsl:variable>
+				<lineStyle kind="LINEBEFORE" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},-1"/>
+			</xsl:if>
+			<xsl:variable name="lineafter">
+				<xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:border-right"/>
+			</xsl:variable>
+			<xsl:if test="not($lineafter='') and not($lineafter='none')">
+				<xsl:variable name="colorname">
+					<xsl:value-of select="substring-after($lineafter,'#')"/>
+				</xsl:variable>
+				<lineStyle kind="LINEAFTER" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},-1"/>
+			</xsl:if>
+			<xsl:variable name="lineabove">
+				<xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:border-top"/>
+			</xsl:variable>
+			<xsl:if test="not($lineabove='') and not($lineabove='none')">
+				<xsl:variable name="colorname">
+					<xsl:value-of select="substring-after($lineabove,'#')"/>
+				</xsl:variable>
+				<lineStyle kind="LINEABOVE" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},{$row}"/>
+			</xsl:if>
+			<xsl:variable name="linebelow">
+				<xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:border-bottom"/>
+			</xsl:variable>
+			<xsl:if test="not($linebelow='') and not($linebelow='none')">
+				<xsl:variable name="colorname">
+					<xsl:value-of select="substring-after($linebelow,'#')"/>
+				</xsl:variable>
+				<lineStyle kind="LINEBELOW" colorName="#{$colorname}" start="{$col},{-1}" stop="{$col},{-1}"/>
+			</xsl:if>
+			<xsl:variable name="grid">
+				<xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:border"/>
+			</xsl:variable>
+			<xsl:if test="not($grid='') and not($grid='none')">
+				<xsl:variable name="colorname">
+					<xsl:value-of select="substring-after($grid,'#')"/>
+				</xsl:variable>
+				<!-- Don't use grid because we don't need a line between each rows -->
+				<lineStyle kind="LINEBEFORE" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},-1"/>
+				<lineStyle kind="LINEAFTER" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},-1"/>
+				<lineStyle kind="LINEABOVE" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},{$row}"/>
+				<lineStyle kind="LINEBELOW" colorName="#{$colorname}" start="{$col},{-1}" stop="{$col},{-1}"/>
+			</xsl:if>
+		</xsl:for-each>
+	</xsl:for-each>
+</xsl:template>
+
+<!-- Was needed to simulate bulleted lists:
+<xsl:template match="text:ordered-list|text:unordered-list">
+  <xsl:variable name = "text_width">
+    <xsl:call-template name="text_width" />
+  </xsl:variable>
+  <blockTable style="Standard_Outline" colWidths="18,{$text_width}">
+  <xsl:apply-templates match="text:list-item" />
+</blockTable>
+</xsl:template>
+
+<xsl:template match="text:list-item">
+  <tr>
+    <td><para><font face="Helvetica-Bold" size="10">*</font></para></td>
+    <td>
+      <xsl:apply-templates />
+    </td>
+  </tr>
+</xsl:template>
+
+-->
+
+
+<xsl:template match="office:body">
+  <story>
+    <xsl:apply-templates />
+	<xsl:for-each select="//draw:text-box">
+		<currentFrame>
+			<xsl:attribute name="name">
+				<xsl:value-of select="./@draw:name" />
+			</xsl:attribute>
+		</currentFrame>
+		<xsl:apply-templates>
+			<xsl:with-param name="skip_draw" select="0" />
+		</xsl:apply-templates>
+		<frameEnd />
+	</xsl:for-each>
+	<xsl:for-each select="//text:ordered-list">
+		<para><seqReset id="{//text:ordered-list/@text:style-name}"/></para>
+	</xsl:for-each>
+  </story>
+</xsl:template>
+
+<xsl:template match="table:table">
+  <blockTable>
+    <xsl:attribute name="colWidths">
+      <xsl:call-template name="make_columns" />
+    </xsl:attribute>
+    <xsl:call-template name="make_tableheaders" />
+    <xsl:attribute name="style">
+      <xsl:value-of select="@table:name" />
+    </xsl:attribute>
+    <xsl:apply-templates />
+  </blockTable>
+</xsl:template>
+
+<xsl:template name="make_tableheaders">
+  <xsl:if test="boolean(count(table:table-header-rows))">
+    <xsl:attribute name="repeatRows">1</xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="make_tablebackground">
+  <xsl:for-each select=".//table:table-row">
+    <!--Be careful when there are table:table-header-rows as
+         parent node of table:table-row -->
+    <xsl:variable name="row" select="position() - 1" />
+    <xsl:for-each select="./table:table-cell">
+      <xsl:variable name="col" select="position() - 1" />
+      <xsl:variable name="background">
+        <xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:background-color" />
+      </xsl:variable>
+      <xsl:if test="not($background='') and boolean(key('table_cell_style',@table:style-name)/style:properties/@fo:background-color) and starts-with($background,'#')">
+        <!--only RGB hexcolors are accepted -->
+		<blockBackground colorName="{$background}" start="{$col},{$row}" stop="{$col},-1" />
+      </xsl:if>
+     </xsl:for-each>
+   </xsl:for-each>
+</xsl:template>
+
+<xsl:template name="make_columns">
+  <xsl:variable name="columns" >
+    <xsl:for-each select="table:table-column">
+      <xsl:value-of select="key('table_column_style',@table:style-name)/style:properties/@style:column-width" />
+      <xsl:text>,</xsl:text>
+    </xsl:for-each>
+  </xsl:variable>
+  <xsl:value-of select="substring($columns,1,string-length($columns) - 1)" />
+  <!--strip the last comma-->
+</xsl:template>
+
+<xsl:template match="table:table-row">
+  <tr>
+    <xsl:apply-templates />
+  </tr>
+</xsl:template>
+
+<xsl:template match="table:table-cell">
+  <td>
+    <xsl:apply-templates />
+  </td>
+</xsl:template>
+
+<xsl:template match="text:section">
+  <section>
+    <xsl:apply-templates />
+  </section>
+</xsl:template>
+
+
+<xsl:template match="text:span">
+  <font>
+    <xsl:call-template name="make_fontnames_span" />
+    <xsl:call-template name="make_fontsize_span" />
+    <xsl:apply-templates />
+  </font>
+</xsl:template>
+
+<xsl:template name="make_fontsize_span">
+  <xsl:variable name ="fontsize">
+    <xsl:value-of select="key('text_style',@text:style-name)/style:properties/@fo:font-size" />
+  </xsl:variable>
+  <xsl:if test="not($fontsize='') and boolean(key('text_style',@text:style-name)/style:properties/@fo:font-size)" >
+    <xsl:attribute name="size">
+      <xsl:value-of select="$fontsize" />
+    </xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="make_fontnames_span">
+  <xsl:attribute name="face">
+    <xsl:call-template name="make_fontnames">
+      <xsl:with-param name="fontName" select="key('text_style',@text:style-name)/style:properties/@style:font-name"  />
+      <xsl:with-param name="fontWeight" select="key('text_style',@text:style-name)/style:properties/@fo:font-weight"  />
+      <xsl:with-param name="fontStyle" select="key('text_style',@text:style-name)/style:properties/@fo:font-style" />
+    </xsl:call-template>
+  </xsl:attribute>
+</xsl:template>
+
+<xsl:template name="make_image">
+  <illustration height="{.//draw:image/@svg:height}" width="{.//draw:image/@svg:width}">
+    <image x="0" y="0" file="{substring-after(.//draw:image/@xlink:href,'#Pictures/')}" height="{.//draw:image/@svg:height}" width="{.//draw:image/@svg:width}" />
+  </illustration>
+</xsl:template>
+
+<xsl:template name="empty_paragraph">
+  <xsl:if test="not(boolean(count(descendant::node())))">
+    <xsl:call-template name="distance_point">
+      <xsl:with-param name="background" select="key('paragraph_style',@text:style-name)/style:properties/@fo:background-color" />
+    </xsl:call-template>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="distance_point">
+  <xsl:param name="background" />
+  <xsl:param name="tab_stop"></xsl:param>
+  <xsl:variable name="local_back">
+    <xsl:choose>
+      <xsl:when test="not(boolean($background)) or not(contains($background,'#'))">
+        <!-- Do not accept OO colors like "transparent", only hex-colors -->
+        <xsl:text>white</xsl:text>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$background" />
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+  <font color="{$local_back}">
+    <xsl:text> </xsl:text>
+    <xsl:if test="boolean($tab_stop)">
+      <!-- simulate a tabstop with white/background-color points -->
+      <xsl:text>.........</xsl:text>
+    </xsl:if>
+  </font>
+</xsl:template>
+
+<xsl:template match="text:ordered-list">
+  <xsl:apply-templates />
+
+  <!-- Reset the counter. seqreset is not a trml2pdf tag, but a Platypus Intra Paragraph Markup,
+       so it needs a dummy paragraph to enclose it -->
+</xsl:template>
+
+<xsl:template name="make_listitem">
+  <xsl:if test="(name(..)='text:list-item')">
+    <xsl:attribute name="leftIndent">15</xsl:attribute>
+    <xsl:attribute name="bulletIndent">0</xsl:attribute>
+    <xsl:choose>
+      <xsl:when test="(name(../..)='text:unordered-list')">
+        <xsl:variable name="fontsize">
+          <xsl:value-of select="number(key('paragraph_style',@text:style-name)/style:properties/@fo:font-size)" />
+        </xsl:variable>
+        <xsl:choose>
+          <xsl:when test="$fontsize='NaN'">
+            <!-- you should exclude non-numerical values for bulletFontSize. <== Sometimes the preprocessing went wrong.-->
+            <!--use a default bullet font size-->
+            <xsl:attribute name="bulletFontSize">6</xsl:attribute>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:attribute name="bulletFontSize"><xsl:value-of select="floor(($fontsize div 2) + 1)" /></xsl:attribute>
+          </xsl:otherwise>
+        </xsl:choose>
+        <xsl:attribute name="bulletFontName">ZapfDingbats</xsl:attribute>
+        <xsl:attribute name="bulletText">l</xsl:attribute>
+      </xsl:when>
+      <xsl:otherwise>
+        <!-- Generate the numbers for an ordered list -->
+        <xsl:variable name="size">
+          <xsl:value-of select="key('paragraph_style',@text:style-name)/style:properties/@fo:font-size" />
+        </xsl:variable>
+        <!-- For ordered lists we use the bullet tag from Platypus Intra Paragraph Markup -->
+        <bullet>
+          <xsl:if test="not($size='') and boolean(key('paragraph_style',@text:style-name)/style:properties/@fo:font-size)">
+            <xsl:attribute name="size">
+              <!-- adapt the fontsize to the fontsize of the current paragraph -->
+              <xsl:value-of select="$size" />
+            </xsl:attribute>
+          </xsl:if>
+          <seq id="{../../@text:style-name}"/>.</bullet>
+
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template match="text:drop-down">
+    <xsl:value-of select="text:label[2]/@text:value" />
+</xsl:template>
+
+
+<xsl:template match="text:p|text:h">
+	<xsl:param name="skip_draw" select="1" />
+  <xsl:if test="boolean(key('page_break_before',@text:style-name))" >
+    <pageBreak />
+  </xsl:if>
+  <xsl:choose>
+    <xsl:when test="boolean(.//draw:image)">
+      <xsl:call-template name="make_image" />
+    </xsl:when>
+	<xsl:when test="boolean(name(..) = 'draw:text-box') and boolean($skip_draw)">
+	</xsl:when>
+    <xsl:otherwise>
+      <para>
+        <xsl:attribute name="style">
+          <xsl:value-of select="@text:style-name" />
+        </xsl:attribute>
+        <xsl:call-template name="make_listitem" />
+        <xsl:apply-templates />
+        <xsl:call-template name="empty_paragraph" />
+      </para>
+    </xsl:otherwise>
+  </xsl:choose>
+  <xsl:if test="boolean(key('page_break_after',@text:style-name))" >
+    <pageBreak />
+  </xsl:if>
+</xsl:template>
+
+<xsl:template match="text:p/text:tab-stop">
+  <!-- simulate a tabstop -->
+  <xsl:call-template name="distance_point">
+    <xsl:with-param name="background" select="key('paragraph_style',@text:style-name)/style:properties/@fo:background-color" />
+    <xsl:with-param name="tab_stop">yes</xsl:with-param>
+  </xsl:call-template>
+</xsl:template>
+
+<!-- experimental - switched off
+<xsl:template match="text:h">
+  <para>
+    <xsl:attribute name="style">
+      <xsl:value-of select="@text:style-name" />
+    </xsl:attribute>
+    <xsl:call-template name="make_number" />
+    <xsl:apply-templates />
+    <xsl:call-template name="empty_paragraph" />
+  </para>
+</xsl:template>
+
+<xsl:template name="make_number">
+  <xsl:choose>
+    <xsl:when test="@text:level='1'">
+      <xsl:number format="1. " />
+    </xsl:when>
+    <xsl:when test="@text:level='2'">
+      <xsl:number count="text:h[@text:level='1']|text:h[text:level='2']" level="any" format="1.1." />
+    </xsl:when>
+  </xsl:choose>
+</xsl:template>
+
+-->
+
+<xsl:template match="style:style[@style:family='paragraph']">
+  <paraStyle>
+    <xsl:attribute name="name">
+      <xsl:value-of select="@style:name" />
+    </xsl:attribute>
+    <xsl:call-template name="make_indent_paragraph" />
+    <xsl:call-template name="make_fontnames_paragraph" />
+    <xsl:call-template name="make_fontsize" />
+    <!--<xsl:call-template name="make_parent" /> not necessary -
+         parent styles processed by PyOpenOffice -->
+    <xsl:call-template name="make_alignment" />
+    <xsl:call-template name="make_background" />
+    <xsl:call-template name="make_space_beforeafter" />
+    <xsl:call-template name="make_fontcolor" />
+  </paraStyle>
+</xsl:template>
+
+<xsl:template name="make_indent_paragraph">
+  <xsl:variable name="right_indent"><xsl:value-of select="style:properties/@fo:margin-right" /></xsl:variable>
+  <xsl:variable name="left_indent"><xsl:value-of select="style:properties/@fo:margin-left" /></xsl:variable>
+  <xsl:if test="not($right_indent='') and boolean(style:properties/@fo:margin-right)">
+    <xsl:attribute name="rightIndent">
+      <xsl:value-of select="$right_indent" />
+    </xsl:attribute>
+  </xsl:if>
+  <xsl:if test="not($left_indent='') and boolean(style:properties/@fo:margin-left)">
+    <xsl:attribute name="leftIndent">
+      <xsl:value-of select="$left_indent" />
+    </xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="make_background">
+  <xsl:variable name="background">
+    <xsl:value-of select="style:properties/@fo:background-color" />
+  </xsl:variable>
+  <xsl:if test="not($background='') and boolean(style:properties/@fo:background-color) and starts-with($background,'#')" >
+    <xsl:attribute name="backColor">
+      <xsl:value-of select="$background" />
+    </xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="make_space_beforeafter">
+  <xsl:variable name="before">
+    <xsl:value-of select="style:properties/@fo:margin-top" />
+  </xsl:variable>
+  <xsl:variable name="after">
+    <xsl:value-of select="style:properties/@fo:margin-bottom" />
+  </xsl:variable>
+  <xsl:if test="not($before='') and boolean(style:properties/@fo:margin-top)" >
+    <xsl:attribute name="spaceBefore">
+      <xsl:value-of select="$before" />
+    </xsl:attribute>
+  </xsl:if>
+  <xsl:if test="not($after='') and boolean(style:properties/@fo:margin-bottom)" >
+    <xsl:attribute name="spaceAfter">
+      <xsl:value-of select="$after" />
+    </xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="make_fontsize">
+  <xsl:variable name="fontSize">
+    <xsl:value-of select="style:properties/@fo:font-size" />
+  </xsl:variable>
+  <xsl:if test="not($fontSize='') and boolean(style:properties/@fo:font-size)">
+    <xsl:attribute name="fontSize">
+      <xsl:value-of select="$fontSize" />
+    </xsl:attribute>
+    <xsl:attribute name="leading">
+      <xsl:value-of select="$fontSize + floor($fontSize div 5) + 1" />
+      <!--use a standard leading related to the font size -->
+    </xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<!--this template is not needed anymore for "normalized" sxw files -->
+<xsl:template name="make_parent">
+  <xsl:variable name="parent">
+    <xsl:value-of select="@style:parent-style-name" />
+  </xsl:variable>
+  <xsl:if test="not($parent='') and boolean(@style:parent-style-name)">
+    <xsl:attribute name="parent">
+      <xsl:value-of select="$parent" />
+    </xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="make_alignment">
+  <xsl:variable name="alignment">
+    <xsl:value-of select="style:properties/@fo:text-align" />
+  </xsl:variable>
+  <xsl:if test="not($alignment='') and boolean(style:properties/@fo:text-align)">
+    <xsl:choose>
+      <xsl:when test="$alignment='start'">
+        <xsl:attribute name="alignment">LEFT</xsl:attribute>
+      </xsl:when>
+      <xsl:when test="$alignment='center'">
+        <xsl:attribute name="alignment">CENTER</xsl:attribute>
+      </xsl:when>
+      <xsl:when test="$alignment='end'">
+        <xsl:attribute name="alignment">RIGHT</xsl:attribute>
+      </xsl:when>
+      <xsl:when test="$alignment='justify'">
+        <xsl:attribute name="alignment">JUSTIFY</xsl:attribute>
+      </xsl:when>
+    </xsl:choose>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="make_fontnames_paragraph">
+  <xsl:attribute name="fontName">
+    <xsl:call-template name="make_fontnames">
+      <xsl:with-param name="fontName" select="style:properties/@style:font-name" />
+      <xsl:with-param name="fontWeight" select="style:properties/@fo:font-weight" />
+      <xsl:with-param name="fontStyle" select="style:properties/@fo:font-style" />
+    </xsl:call-template>
+  </xsl:attribute>
+</xsl:template>
+
+<xsl:template name="make_fontnames">
+  <!--much too verbose, needs improvement-->
+<xsl:param name="fontName" />
+<xsl:param name="fontWeight" />
+<xsl:param name="fontStyle" />
+<xsl:choose>
+<xsl:when test="not($fontName='') and boolean($fontName)">
+  <xsl:choose>
+    <xsl:when test="contains($fontName,'Courier')">
+      <xsl:choose>
+        <xsl:when test="($fontWeight='bold') and ($fontStyle='italic')">
+          <xsl:text>Courier-BoldOblique</xsl:text>
+        </xsl:when>
+        <xsl:when test="($fontWeight='bold') and not ($fontStyle='italic')">
+          <xsl:text>Courier-Bold</xsl:text>
+        </xsl:when>
+        <xsl:when test="not($fontWeight='bold') and ($fontStyle='italic')">
+          <xsl:text>Courier-Oblique</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text>Courier</xsl:text>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:when>
+    <xsl:when test="contains($fontName,'Helvetica') or contains($fontName,'Arial') or contains($fontName,'Sans')">
+      <xsl:choose>
+        <xsl:when test="($fontWeight='bold') and ($fontStyle='italic')">
+          <xsl:text>Helvetica-BoldOblique</xsl:text>
+        </xsl:when>
+        <xsl:when test="($fontWeight='bold') and not ($fontStyle='italic')">
+          <xsl:text>Helvetica-Bold</xsl:text>
+        </xsl:when>
+        <xsl:when test="not($fontWeight='bold') and ($fontStyle='italic')">
+          <xsl:text>Helvetica-Oblique</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text>Helvetica</xsl:text>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:choose>
+        <xsl:when test="($fontWeight='bold') and ($fontStyle='italic')">
+          <xsl:text>Times-BoldItalic</xsl:text>
+        </xsl:when>
+        <xsl:when test="($fontWeight='bold') and not ($fontStyle='italic')">
+          <xsl:text>Times-Bold</xsl:text>
+        </xsl:when>
+        <xsl:when test="not($fontWeight='bold') and ($fontStyle='italic')">
+          <xsl:text>Times-Italic</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text>Times-Roman</xsl:text>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:when>
+<xsl:otherwise>
+  <!--Use this as default -->
+  <xsl:text>Times-Roman</xsl:text>
+</xsl:otherwise>
+</xsl:choose>
+</xsl:template>
+<xsl:template name="make_fontcolor">
+  <xsl:variable name="textColor">
+    <xsl:value-of select="style:properties/@fo:color"/>
+  </xsl:variable>
+  <xsl:if test="not($textColor='') and boolean(style:properties/@fo:color)">
+  <xsl:attribute name="textColor">
+      <xsl:value-of select="$textColor" />
+   </xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<!--
+This stylesheet is part of:
+PyOpenOffice Version 0.4
+Copyright (C) 2005: Martin Simon
+Homepage: www.bezirksreiter.de
+
+GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999
+-->
+
+</xsl:stylesheet>
+
+

From dd442961fb22ce4f457f30e5df720a3ad7325cb4 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 27 Dec 2010 17:46:21 +0100
Subject: [PATCH 07/10] [FIX] Complete recode of import_data to clean and fix
 export with import compatible.

bzr revid: fp@tinyerp.com-20101227164621-mjb6n49f9i5bkeoh
---
 bin/osv/orm.py | 417 ++++++++++++++++---------------------------------
 1 file changed, 137 insertions(+), 280 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 4255505f24b..cf6d754f8db 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -688,335 +688,192 @@ class orm_template(object):
         :rtype: tuple
 
         This method is used when importing data via client menu
-
+        Example of fields to import for a sale.order
+            .id,                         (=database_id)
+            partner_id,                  (=name_search)
+            order_line/.id,              (=database_id)
+            order_line/name,
+            order_line/product_id/id,    (=xml id)
+            order_line/price_unit,
+            order_line/product_uom_qty,
+            order_line/product_uom/id    (=xml_id)
         """
         if not context:
             context = {}
-        fields = map(lambda x: x.split('/'), fields)
+        def _replace_field(x):
+            x = re.sub('([a-z0-9A-Z_])\\.id$', '\\1/.id', x)
+            return x.replace(':id','/id').split('/')
+        fields = map(_replace_field, fields)
         logger = netsvc.Logger()
         ir_model_data_obj = self.pool.get('ir.model.data')
 
+        # mode: id (XML id) or .id (database id) or False for name_get
+        def _get_id(model_name, id, current_module=False, mode='id'):
+            if mode=='.id':
+                id = int(id)
+                obj_model = self.pool.get(model_name)
+                ids = obj_model.search(cr, uid, [('id', '=', int(id))])
+                if not len(ids):
+                    raise Exception(_("Database ID doesn't exist: %s : %s") %(model_name, id))
+            elif mode=='id':
+                if '.' in id:
+                    module, xml_id = id.rsplit('.', 1)
+                else:
+                    module, xml_id = current_module, id
+                record_id = ir_model_data_obj._get_id(cr, uid, module, xml_id)
+                ir_model_data = ir_model_data_obj.read(cr, uid, [record_id], ['res_id'])
+                if not ir_model_data:
+                    raise ValueError('No references to %s.%s' % (module, xml_id))
+                id = ir_model_data[0]['res_id']
+            else:
+                obj_model = self.pool.get(model_name)
+                ids = obj_model.name_search(cr, uid, id)
+                if not ids:
+                    raise ValueError('No record found for %s' % (id,))
+                id = ids[0][0]
+            return id
 
-
-
-
-
-        def _check_db_id(self, model_name, db_id):
-            obj_model = self.pool.get(model_name)
-            ids = obj_model.search(cr, uid, [('id', '=', int(db_id))])
-            if not len(ids):
-                raise Exception(_("Database ID doesn't exist: %s : %s") %(model_name, db_id))
-            return True
-
-        def process_liness(self, datas, prefix, current_module, model_name, fields_def, position=0):
+        # IN:
+        #   datas: a list of records, each record is defined by a list of values
+        #   prefix: a list of prefix fields ['line_ids']
+        #   position: the line to process, skip is False if it's the first line of the current record
+        # OUT:
+        #   (res, position, warning, res_id) with
+        #     res: the record for the next line to process (including it's one2many)
+        #     position: the new position for the next line
+        #     res_id: the ID of the record if it's a modification
+        def process_liness(self, datas, prefix, current_module, model_name, fields_def, position=0, skip=0):
             line = datas[position]
             row = {}
-            translate = {}
-            todo = []
             warning = []
-            data_id = False
             data_res_id = False
-            is_xml_id = False
-            is_db_id = False
-            ir_model_data_obj = self.pool.get('ir.model.data')
-            #
-            # Import normal fields
-            #
+            nbrmax = position+1
+
+            done = {}
             for i in range(len(fields)):
-                if i >= len(line):
-                    raise Exception(_('Please check that all your lines have %d columns.') % (len(fields),))
+                res = False
                 if not line[i]:
                     continue
+                if i >= len(line):
+                    raise Exception(_('Please check that all your lines have %d columns.') % (len(fields),))
 
                 field = fields[i]
-                if prefix and not prefix[0] in field:
+                if field[:len(prefix)] <> prefix:
+                    if line[i] and skip:
+                        return False
                     continue
 
-                if (len(field)==len(prefix)+1) and field[len(prefix)].endswith('.id') and (field[len(prefix)]<>'.id'):
-                    # Database ID
-                    res = False
-                    if line[i]:
-                        field_name = field[0].split('.')[0]
-                        model_rel = fields_def[field_name]['relation']
-
-                        if fields_def[field[len(prefix)][:-3]]['type'] == 'many2many':
-                            res_id = []
-                            for db_id in line[i].split(config.get('csv_internal_sep')):
-                                try:
-                                    _check_db_id(self, model_rel, db_id)
-                                    res_id.append(db_id)
-                                except Exception, e:
-                                    warning += [tools.exception_to_unicode(e)]
-                                    logger.notifyChannel("import", netsvc.LOG_ERROR,
-                                              tools.exception_to_unicode(e))
-                            if len(res_id):
-                                res = [(6, 0, res_id)]
-                        else:
-                            try:
-                                _check_db_id(self, model_rel, line[i])
-                                res = line[i]
-                            except Exception, e:
-                                warning += [tools.exception_to_unicode(e)]
-                                logger.notifyChannel("import", netsvc.LOG_ERROR,
-                                          tools.exception_to_unicode(e))
-                        row[field_name] = res or False
-                        continue
-
-                if (len(field)==len(prefix)+1) and field[len(prefix)].endswith(':id'):
-                    res_id = False
-                    if line[i]:
-                        if fields_def[field[len(prefix)][:-3]]['type'] == 'many2many':
-                            res_id = []
-                            for word in line[i].split(config.get('csv_internal_sep')):
-                                if '.' in word:
-                                    module, xml_id = word.rsplit('.', 1)
-                                else:
-                                    module, xml_id = current_module, word
-                                id = ir_model_data_obj._get_id(cr, uid, module,
-                                        xml_id)
-                                res_id2 = ir_model_data_obj.read(cr, uid, [id],
-                                        ['res_id'])[0]['res_id']
-                                if res_id2:
-                                    res_id.append(res_id2)
-                            if len(res_id):
-                                res_id = [(6, 0, res_id)]
-                        else:
-                            if '.' in line[i]:
-                                module, xml_id = line[i].rsplit('.', 1)
-                            else:
-                                module, xml_id = current_module, line[i]
-                            record_id = ir_model_data_obj._get_id(cr, uid, module, xml_id)
-                            ir_model_data = ir_model_data_obj.read(cr, uid, [record_id], ['res_id'])
-                            if ir_model_data:
-                                res_id = ir_model_data[0]['res_id']
-                            else:
-                                raise ValueError('No references to %s.%s' % (module, xml_id))
-                    row[field[-1][:-3]] = res_id or False
+                # ID of the record using a XML ID
+                if field[len(prefix)]=='id':
+                    data_res_id = _get_id(model_name, line[i], current_module, 'id')
                     continue
-                if (len(field) == len(prefix)+1) and \
-                        len(field[len(prefix)].split(':lang=')) == 2:
-                    f, lang = field[len(prefix)].split(':lang=')
-                    translate.setdefault(lang, {})[f] = line[i] or False
+
+                # ID of the record using a database ID
+                elif field[len(prefix)]=='.id':
+                    data_res_id = _get_id(model_name, line[i], current_module, '.id')
                     continue
-                if (len(field) == len(prefix)+1) and \
-                        (prefix == field[0:len(prefix)]):
-                    if field[len(prefix)] == "id":
-                        # XML ID
-                        db_id = False
-                        is_xml_id = data_id = line[i]
-                        d = data_id.split('.')
-                        module = len(d) > 1 and d[0] or ''
-                        name = len(d) > 1 and d[1] or d[0]
-                        data_ids = ir_model_data_obj.search(cr, uid, [('module', '=', module), ('model', '=', model_name), ('name', '=', name)])
-                        if len(data_ids):
-                            d = ir_model_data_obj.read(cr, uid, data_ids, ['res_id'])[0]
-                            db_id = d['res_id']
-                        if is_db_id and not db_id:
-                            data_ids = ir_model_data_obj.search(cr, uid, [('module', '=', module), ('model', '=', model_name), ('res_id', '=', is_db_id)])
-                            if not len(data_ids):
-                                ir_model_data_obj.create(cr, uid, {'module': module, 'model': model_name, 'name': name, 'res_id': is_db_id})
-                                db_id = is_db_id
-                        if is_db_id and int(db_id) != int(is_db_id):
-                            warning += [_("Id is not the same than existing one: %s") % (is_db_id)]
-                            logger.notifyChannel("import", netsvc.LOG_ERROR,
-                                    _("Id is not the same than existing one: %s") % (is_db_id))
-                        data_res_id = db_id
+
+                # recursive call for getting children and returning [(0,0,{})] or [(1,ID,{})]
+                if fields_def[field[len(prefix)]]['type']=='one2many':
+                    if field[len(prefix)] in done:
                         continue
+                    done[field[len(prefix)]] = True
+                    relation_obj = self.pool.get(fields_def[field[len(prefix)]]['relation'])
+                    newfd = relation_obj.fields_get( cr, uid, context=context )
+                    pos = position
+                    res = []
+                    first = 0
+                    while pos < len(datas):
+                        res2 = process_liness(self, datas, prefix + [field[len(prefix)]], current_module, relation_obj._name, newfd, pos, first)
+                        if not res2:
+                            break
+                        (newrow, pos, w2, data_res_id2) = res2
+                        nbrmax = max(nbrmax, pos)
+                        warning += w2
+                        first += 1
+                        if (not newrow) or not reduce(lambda x, y: x or y, newrow.values(), 0):
+                            break
+                        res.append( (data_res_id2 and 1 or 0, data_res_id2 or 0, newrow) )
 
-                    if field[len(prefix)] == ".id":
-                        # Database ID
-                        try:
-                            _check_db_id(self, model_name, line[i])
-                            data_res_id = is_db_id = int(line[i])
-                        except Exception, e:
-                            warning += [tools.exception_to_unicode(e)]
-                            logger.notifyChannel("import", netsvc.LOG_ERROR,
-                                      tools.exception_to_unicode(e))
-                            continue
-                        data_ids = ir_model_data_obj.search(cr, uid, [('model', '=', model_name), ('res_id', '=', line[i])])
-                        if len(data_ids):
-                            d = ir_model_data_obj.read(cr, uid, data_ids, ['name', 'module'])[0]
-                            data_id = d['name']
-                            if d['module']:
-                                data_id = '%s.%s' % (d['module'], d['name'])
-                            else:
-                                data_id = d['name']
-                        if is_xml_id and not data_id:
-                            data_id = is_xml_id
-                        if is_xml_id and is_xml_id != data_id:
-                            warning += [_("Id is not the same than existing one: %s") % (line[i])]
-                            logger.notifyChannel("import", netsvc.LOG_ERROR,
-                                    _("Id is not the same than existing one: %s") % (line[i]))
-
-                        continue
-                    if fields_def[field[len(prefix)]]['type'] == 'integer':
-                        res = line[i] and int(line[i])
-                    elif fields_def[field[len(prefix)]]['type'] == 'boolean':
-                        res = line[i].lower() not in ('0', 'false', 'off')
-                    elif fields_def[field[len(prefix)]]['type'] == 'float':
-                        res = line[i] and float(line[i])
-                    elif fields_def[field[len(prefix)]]['type'] == 'selection':
-                        res = False
-                        if isinstance(fields_def[field[len(prefix)]]['selection'],
-                                (tuple, list)):
-                            sel = fields_def[field[len(prefix)]]['selection']
-                        else:
-                            sel = fields_def[field[len(prefix)]]['selection'](self,
-                                    cr, uid, context)
-                        for key, val in sel:
-                            if line[i] in [tools.ustr(key), tools.ustr(val)]: #Acepting key or value for selection field
-                                res = key
-                                break
-                        if line[i] and not res:
-                            logger.notifyChannel("import", netsvc.LOG_WARNING,
-                                    _("key '%s' not found in selection field '%s'") % \
-                                            (line[i], field[len(prefix)]))
-
-                            warning += [_("Key/value '%s' not found in selection field '%s'") % (line[i], field[len(prefix)])]
-
-                    elif fields_def[field[len(prefix)]]['type'] == 'many2one':
-                        res = False
-                        if line[i]:
-                            relation = fields_def[field[len(prefix)]]['relation']
-                            res2 = self.pool.get(relation).name_search(cr, uid,
-                                    line[i], [], operator='=', context=context)
-                            res = (res2 and res2[0][0]) or False
-                            if not res:
-                                warning += [_("Relation not found: %s on '%s'") % (line[i], relation)]
-                                logger.notifyChannel("import", netsvc.LOG_WARNING,
-                                        _("Relation not found: %s on '%s'") % (line[i], relation))
-                    elif fields_def[field[len(prefix)]]['type'] == 'many2many':
-                        res = []
-                        if line[i]:
-                            relation = fields_def[field[len(prefix)]]['relation']
-                            for word in line[i].split(config.get('csv_internal_sep')):
-                                res2 = self.pool.get(relation).name_search(cr,
-                                        uid, word, [], operator='=', context=context)
-                                res3 = (res2 and res2[0][0]) or False
-                                if not res3:
-                                    warning += [_("Relation not found: %s on '%s'") % (word, relation)]
-                                    logger.notifyChannel("import",
-                                            netsvc.LOG_WARNING,
-                                            _("Relation not found: %s on '%s'") % (word, relation))
-                                else:
-                                    res.append(res3)
-                            if len(res):
-                                res = [(6, 0, res)]
+                elif fields_def[field[len(prefix)]]['type']=='many2one':
+                    relation = fields_def[field[len(prefix)]]['relation']
+                    if len(field) == len(prefix)+1:
+                        mode = False
                     else:
-                        res = line[i] or False
-                    row[field[len(prefix)]] = res
-                elif (prefix==field[0:len(prefix)]):
-                    if field[0] not in todo:
-                        todo.append(field[len(prefix)])
-            #
-            # Import one2many, many2many fields
-            #
-            nbrmax = 1
-            for field in todo:
-                relation_obj = self.pool.get(fields_def[field]['relation'])
-                newfd = relation_obj.fields_get(
-                        cr, uid, context=context)
-                res = process_liness(self, datas, prefix + [field], current_module, relation_obj._name, newfd, position)
-                (newrow, max2, w2, translate2, data_id2, data_res_id2) = res
-                nbrmax = max(nbrmax, max2)
-                warning = warning + w2
-                reduce(lambda x, y: x and y, newrow)
-                row[field] = newrow and (reduce(lambda x, y: x or y, newrow.values()) and \
-                        [(data_res_id2 and 1 or 0, data_res_id2 or 0, newrow)]) or []
-                i = max2
-                while (position+i) < len(datas):
-                    ok = True
-                    for j in range(len(fields)):
-                        field2 = fields[j]
-                        if (len(field2) <= (len(prefix)+1)) and datas[position+i][j]:
-                            ok = False
-                    if not ok:
-                        break
+                        mode = field[len(prefix)+1]
+                    res = _get_id(relation, line[i], current_module, mode)
 
-                    (newrow, max2, w2, translate2, data_id2, data_res_id2) = process_liness(
-                            self, datas, prefix+[field], current_module, relation_obj._name, newfd, position+i)
-                    warning = warning + w2
-                    if newrow and reduce(lambda x, y: x or y, newrow.values()):
-                        row[field].append((data_res_id2 and 1 or 0, data_res_id2 or 0, newrow))
-                    i += max2
-                    nbrmax = max(nbrmax, i)
+                elif fields_def[field[len(prefix)]]['type']=='many2many':
+                    relation = fields_def[field[len(prefix)]]['relation']
+                    if len(field) == len(prefix)+1:
+                        mode = False
+                    else:
+                        mode = field[len(prefix)+1]
 
-            if len(prefix) == 0:
-                for i in range(max(nbrmax, 1)):
-                    #if datas:
-                    datas.pop(0)
-            result = (row, nbrmax, warning, translate, data_id, data_res_id)
+                    # TODO: improve this by using csv.csv_reader
+                    res = []
+                    for db_id in line[i].split(config.get('csv_internal_sep')):
+                        res.append( _get_id(relation, db_id, current_module, mode) )
+                    res = [(6,0,res)]
+
+                elif fields_def[field[len(prefix)]]['type'] == 'integer':
+                    res = line[i] and int(line[i]) or 0
+                elif fields_def[field[len(prefix)]]['type'] == 'boolean':
+                    res = line[i].lower() not in ('0', 'false', 'off')
+                elif fields_def[field[len(prefix)]]['type'] == 'float':
+                    res = line[i] and float(line[i]) or 0.0
+                elif fields_def[field[len(prefix)]]['type'] == 'selection':
+                    for key, val in fields_def[field[len(prefix)]]['selection']:
+                        if line[i] in [tools.ustr(key), tools.ustr(val)]:
+                            res = key
+                            break
+                    if line[i] and not res:
+                        logger.notifyChannel("import", netsvc.LOG_WARNING,
+                                _("key '%s' not found in selection field '%s'") % \
+                                        (line[i], field[len(prefix)]))
+                        warning += [_("Key/value '%s' not found in selection field '%s'") % (line[i], field[len(prefix)])]
+                else:
+                    res = line[i]
+
+                row[field[len(prefix)]] = res or False
+
+            result = (row, nbrmax, warning, data_res_id)
             return result
 
         fields_def = self.fields_get(cr, uid, context=context)
-        done = 0
 
-        initial_size = len(datas)
         if config.get('import_partial', False) and filename:
             data = pickle.load(file(config.get('import_partial')))
             original_value = data.get(filename, 0)
-        counter = 0
-        while len(datas):
-            counter += 1
+
+        position = 0
+        while position<len(datas):
             res = {}
-            #try:
-            (res, other, warning, translate, data_id, res_id) = \
-                    process_liness(self, datas, [], current_module, self._name, fields_def)
+
+            (res, position, warning, res_id) = \
+                    process_liness(self, datas, [], current_module, self._name, fields_def, position=position)
             if len(warning):
                 cr.rollback()
-                return (-1, res, 'Line ' + str(counter) +' : ' + '!\n'.join(warning), '')
+                return (-1, res, 'Line ' + str(position) +' : ' + '!\n'.join(warning), '')
 
             try:
                 id = ir_model_data_obj._update(cr, uid, self._name,
-                     current_module, res, xml_id=data_id, mode=mode,
+                     current_module, res, mode=mode,
                      noupdate=noupdate, res_id=res_id, context=context)
             except Exception, e:
-                import psycopg2
-                import osv
-                cr.rollback()
-                if isinstance(e, psycopg2.IntegrityError):
-                    msg = _('Insertion Failed! ')
-                    for key in self.pool._sql_error.keys():
-                        if key in e[0]:
-                            msg = self.pool._sql_error[key]
-                            if hasattr(msg, '__call__'):
-                                msg = msg(cr, uid, [res_id,], context=context)
-                            else:
-                                msg = _(msg)
-                            break
-                    return (-1, res, 'Line ' + str(counter) +' : ' + msg, '')
-                if isinstance(e, osv.orm.except_orm):
-                    msg = _('Insertion Failed! ' + e[1])
-                    return (-1, res, 'Line ' + str(counter) +' : ' + msg, '')
-                #Raising Uncaught exception
-                return (-1, res, 'Line ' + str(counter) +' : ' + str(e), '')
+                return (-1, res, 'Line ' + str(position) +' : ' + str(e), '')
 
-            for lang in translate:
-                context2 = context.copy()
-                context2['lang'] = lang
-                self.write(cr, uid, [id], translate[lang], context2)
-            if config.get('import_partial', False) and filename and (not (counter%100)):
+            if config.get('import_partial', False) and filename and (not (position%100)):
                 data = pickle.load(file(config.get('import_partial')))
-                data[filename] = initial_size - len(datas) + original_value
+                data[filename] = position
                 pickle.dump(data, file(config.get('import_partial'), 'wb'))
                 if context.get('defer_parent_store_computation'):
                     self._parent_store_compute(cr)
                 cr.commit()
 
-            #except Exception, e:
-            #    logger.notifyChannel("import", netsvc.LOG_ERROR, e)
-            #    cr.rollback()
-            #    try:
-            #        return (-1, res, e[0], warning)
-            #    except:
-            #        return (-1, res, e[0], '')
-            done += 1
-        #
-        # TODO: Send a request with the result and multi-thread !
-        #
         if context.get('defer_parent_store_computation'):
             self._parent_store_compute(cr)
-        return (done, 0, 0, 0)
+        return (position, 0, 0, 0)
 
     def read(self, cr, user, ids, fields=None, context=None, load='_classic_read'):
         """

From 21b9caa46b03594f484dc2233bc0a5c93c706cf5 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 27 Dec 2010 18:00:54 +0100
Subject: [PATCH 08/10] fix

bzr revid: fp@tinyerp.com-20101227170054-ochgr9x88l4wun2x
---
 bin/osv/orm.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index cf6d754f8db..65e90922794 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -747,6 +747,7 @@ class orm_template(object):
             row = {}
             warning = []
             data_res_id = False
+            xml_id = False
             nbrmax = position+1
 
             done = {}
@@ -765,7 +766,11 @@ class orm_template(object):
 
                 # ID of the record using a XML ID
                 if field[len(prefix)]=='id':
-                    data_res_id = _get_id(model_name, line[i], current_module, 'id')
+                    try:
+                        data_res_id = _get_id(model_name, line[i], current_module, 'id')
+                    except ValueError, e:
+                        pass
+                    xml_id = line[i]
                     continue
 
                 # ID of the record using a database ID
@@ -787,7 +792,7 @@ class orm_template(object):
                         res2 = process_liness(self, datas, prefix + [field[len(prefix)]], current_module, relation_obj._name, newfd, pos, first)
                         if not res2:
                             break
-                        (newrow, pos, w2, data_res_id2) = res2
+                        (newrow, pos, w2, data_res_id2, xml_id2) = res2
                         nbrmax = max(nbrmax, pos)
                         warning += w2
                         first += 1
@@ -837,7 +842,7 @@ class orm_template(object):
 
                 row[field[len(prefix)]] = res or False
 
-            result = (row, nbrmax, warning, data_res_id)
+            result = (row, nbrmax, warning, data_res_id, xml_id)
             return result
 
         fields_def = self.fields_get(cr, uid, context=context)
@@ -850,7 +855,7 @@ class orm_template(object):
         while position<len(datas):
             res = {}
 
-            (res, position, warning, res_id) = \
+            (res, position, warning, res_id, xml_id) = \
                     process_liness(self, datas, [], current_module, self._name, fields_def, position=position)
             if len(warning):
                 cr.rollback()
@@ -858,7 +863,7 @@ class orm_template(object):
 
             try:
                 id = ir_model_data_obj._update(cr, uid, self._name,
-                     current_module, res, mode=mode,
+                     current_module, res, mode=mode, xml_id=xml_id,
                      noupdate=noupdate, res_id=res_id, context=context)
             except Exception, e:
                 return (-1, res, 'Line ' + str(position) +' : ' + str(e), '')

From 48df9efa6985d4c968be78c0b9d159b1973a1bd6 Mon Sep 17 00:00:00 2001
From: Antony <antony@openerp-laptop>
Date: Mon, 27 Dec 2010 18:14:07 +0100
Subject: [PATCH 09/10] [IMP] add marketing root menu images

bzr revid: antony@openerp-laptop-20101227171407-tc25pp157rqhp8s9
---
 addons/marketing/marketing_view.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index 8b804487e77..c6c8c6e6946 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -2,7 +2,15 @@
 <openerp>
     <data>
 
-        <menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17" groups="marketing.group_marketing_user,marketing.group_marketing_manager"/>
+        <menuitem
+            name="Marketing"
+            icon="terp-crm"
+            id="base.marketing_menu"
+            sequence="17"
+            groups="marketing.group_marketing_user,marketing.group_marketing_manager"
+            web_icon="images/marketing.png"
+            web_icon_hover="images/marketing-hover.png"/>
+
 
         <record id="view_marketing_installer" model="ir.ui.view">
             <field name="name">marketing.installer.view</field>

From 3c6006b344ce5b867052c28d52340ef8f57c79a1 Mon Sep 17 00:00:00 2001
From: Antony <antony@openerp-laptop>
Date: Mon, 27 Dec 2010 18:33:44 +0100
Subject: [PATCH 10/10] [IMP] add association root menu images

bzr revid: antony@openerp-laptop-20101227173344-0c69w3g4rg9jf8he
---
 addons/association/profile_association.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index 7b9ddb4ebc3..95e46457cca 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -53,7 +53,14 @@
             <field name="restart">always</field>
       </record>
 
-        <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9" groups="base.group_extended"/>
+        <menuitem
+            name="Association"
+            id="base.menu_association"
+            icon="terp-calendar"
+            sequence="9"
+            groups="base.group_extended"
+            web_icon="images/association.png"
+            web_icon_hover="images/association-hover.png"/>
         <menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="30" groups="base.group_extended"/>
         <menuitem name="Reporting" id="base.menu_report_association" parent="base.menu_association" sequence="20"/>
     </data>