From 7c1415e2742e7743d3e4ab23fb2675fae2faf6f3 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 3 Dec 2013 16:42:28 +0100
Subject: [PATCH 1/4] [FIX] base_setup: adapt to new api for font

bzr revid: mat@openerp.com-20131203154228-35dw4o874zncbvtv
---
 addons/base_setup/res_config.py       | 2 +-
 addons/base_setup/res_config_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index 06c57f2df5a..9cff696e9d6 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -76,7 +76,7 @@ class base_config_settings(osv.osv_memory):
         return {}
 
     def act_discover_fonts(self, cr, uid, ids, context=None):
-        return self.pool.get("res.font").discover_fonts(cr, uid, ids, context)
+        return self.pool.get("res.font").init_scan(cr, uid, context)
 
 # Preferences wizard for Sales & CRM.
 # It is defined here because it is inherited independently in modules sale, crm,
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index fab2f48e8ab..2df45f2d317 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -94,7 +94,7 @@
                         <label for="font" />
                         <div>
                             <div>
-                                <field name="font" class="oe_inline"/>
+                                <field name="font" class="oe_inline"  domain="[('mode', 'in', ('normal', 'regular', 'all'))]" />
                                 <button string="(reload fonts)" name="act_discover_fonts" type="object" class="oe_link"/>
                             </div>
                         </div>

From 4bc2fa3e9b3b97c61f315c90665473f7d1d3dcd2 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 9 Dec 2013 12:08:50 +0100
Subject: [PATCH 2/4] [FIX] base_setup: adapt api

bzr revid: mat@openerp.com-20131209110850-f1asm1ow6isfdtqa
---
 addons/base_setup/res_config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index 9cff696e9d6..0780339782f 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -76,7 +76,7 @@ class base_config_settings(osv.osv_memory):
         return {}
 
     def act_discover_fonts(self, cr, uid, ids, context=None):
-        return self.pool.get("res.font").init_scan(cr, uid, context)
+        return self.pool.get("res.font").font_scan(cr, uid, context)
 
 # Preferences wizard for Sales & CRM.
 # It is defined here because it is inherited independently in modules sale, crm,

From 34beeaeba79b80a873b07d69e3cce7cf65a73544 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 9 Dec 2013 14:21:32 +0100
Subject: [PATCH 3/4] [FIX] font: correct call to font_scan, add book to
 displayed mode

bzr revid: mat@openerp.com-20131209132132-61qg1zsybh6zcxim
---
 addons/base_setup/res_config.py       | 6 +++---
 addons/base_setup/res_config_view.xml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index 0780339782f..a0907514985 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -68,15 +68,15 @@ class base_config_settings(osv.osv_memory):
     
     def set_base_defaults(self, cr, uid, ids, context=None):
         ir_model_data = self.pool.get('ir.model.data')
-        wizard = self.browse(cr, uid, ids)[0]
+        wizard = self.browse(cr, uid, ids, context)[0]
         if wizard.font:
             user = self.pool.get('res.users').browse(cr, uid, uid, context)
-            font_name = wizard.font.name
+            font_name = wizard.font.family
             user.company_id.write({'font': wizard.font.id,'rml_header': self._change_header(user.company_id.rml_header,font_name), 'rml_header2': self._change_header(user.company_id.rml_header2, font_name), 'rml_header3': self._change_header(user.company_id.rml_header3, font_name)})
         return {}
 
     def act_discover_fonts(self, cr, uid, ids, context=None):
-        return self.pool.get("res.font").font_scan(cr, uid, context)
+        return self.pool.get("res.font").font_scan(cr, uid, context=context)
 
 # Preferences wizard for Sales & CRM.
 # It is defined here because it is inherited independently in modules sale, crm,
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 2df45f2d317..f8f3efd8171 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -94,7 +94,7 @@
                         <label for="font" />
                         <div>
                             <div>
-                                <field name="font" class="oe_inline"  domain="[('mode', 'in', ('normal', 'regular', 'all'))]" />
+                                <field name="font" class="oe_inline"  domain="[('mode', 'in', ('normal', 'regular', 'all', 'book'))]" />
                                 <button string="(reload fonts)" name="act_discover_fonts" type="object" class="oe_link"/>
                             </div>
                         </div>

From cca8bb4d645e3b69ac3218985dd9bc623546ac7f Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 9 Dec 2013 14:34:31 +0100
Subject: [PATCH 4/4] [FIX] font: revert previous (use name and not familly in
 reportlab), fix reports using spaces

bzr revid: mat@openerp.com-20131209133431-6gjhq1zmrb2ro6eo
---
 addons/base_setup/res_config.py                   | 2 +-
 addons/hr_attendance/report/hr_custom_default.xsl | 8 ++++----
 addons/hr_holidays/report/hr_custom_default.xsl   | 8 ++++----
 addons/hr_timesheet/report/custom_default.xsl     | 8 ++++----
 addons/mrp/report/custom_default.xsl              | 8 ++++----
 addons/survey/report/survey_analysis_report.py    | 4 ++--
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index a0907514985..8ddec7df111 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -71,7 +71,7 @@ class base_config_settings(osv.osv_memory):
         wizard = self.browse(cr, uid, ids, context)[0]
         if wizard.font:
             user = self.pool.get('res.users').browse(cr, uid, uid, context)
-            font_name = wizard.font.family
+            font_name = wizard.font.name
             user.company_id.write({'font': wizard.font.id,'rml_header': self._change_header(user.company_id.rml_header,font_name), 'rml_header2': self._change_header(user.company_id.rml_header2, font_name), 'rml_header3': self._change_header(user.company_id.rml_header3, font_name)})
         return {}
 
diff --git a/addons/hr_attendance/report/hr_custom_default.xsl b/addons/hr_attendance/report/hr_custom_default.xsl
index e8b133da1b0..2eda3a08f4b 100644
--- a/addons/hr_attendance/report/hr_custom_default.xsl
+++ b/addons/hr_attendance/report/hr_custom_default.xsl
@@ -5,9 +5,9 @@
 		<!--logo-->
 		<fill color="black"/>
         <stroke color="black"/>
-        <setFont name="DejaVu Sans" size="8"/>
+        <setFont name="DejaVuSans" size="8"/>
         <drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//report/header/date"/></drawString>
-        <setFont name="DejaVu Sans Bold" size="10"/>
+        <setFont name="DejaVuSans-Bold" size="10"/>
         <drawString x="13.8cm" y="19.5cm"><xsl:value-of select="//report/header/company"/></drawString>
         <stroke color="#000000"/>
         <lines>1.3cm 19.3cm 28.5cm 19.3cm</lines>
@@ -17,9 +17,9 @@
 		<!--logo-->
 		<fill color="black"/>
         <stroke color="black"/>
-        <setFont name="DejaVu Sans" size="8"/>
+        <setFont name="DejaVuSans" size="8"/>
         <drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//report/header/date"/></drawString>
-        <setFont name="DejaVu Sans Bold" size="10"/>
+        <setFont name="DejaVuSans-Bold" size="10"/>
         <drawString x="27.8cm" y="19.5cm"><xsl:value-of select="//report/header/company"/></drawString>
         <stroke color="#000000"/>
         <lines>1.3cm 19.3cm 28.5cm 19.3cm</lines>
diff --git a/addons/hr_holidays/report/hr_custom_default.xsl b/addons/hr_holidays/report/hr_custom_default.xsl
index e8b133da1b0..2eda3a08f4b 100644
--- a/addons/hr_holidays/report/hr_custom_default.xsl
+++ b/addons/hr_holidays/report/hr_custom_default.xsl
@@ -5,9 +5,9 @@
 		<!--logo-->
 		<fill color="black"/>
         <stroke color="black"/>
-        <setFont name="DejaVu Sans" size="8"/>
+        <setFont name="DejaVuSans" size="8"/>
         <drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//report/header/date"/></drawString>
-        <setFont name="DejaVu Sans Bold" size="10"/>
+        <setFont name="DejaVuSans-Bold" size="10"/>
         <drawString x="13.8cm" y="19.5cm"><xsl:value-of select="//report/header/company"/></drawString>
         <stroke color="#000000"/>
         <lines>1.3cm 19.3cm 28.5cm 19.3cm</lines>
@@ -17,9 +17,9 @@
 		<!--logo-->
 		<fill color="black"/>
         <stroke color="black"/>
-        <setFont name="DejaVu Sans" size="8"/>
+        <setFont name="DejaVuSans" size="8"/>
         <drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//report/header/date"/></drawString>
-        <setFont name="DejaVu Sans Bold" size="10"/>
+        <setFont name="DejaVuSans-Bold" size="10"/>
         <drawString x="27.8cm" y="19.5cm"><xsl:value-of select="//report/header/company"/></drawString>
         <stroke color="#000000"/>
         <lines>1.3cm 19.3cm 28.5cm 19.3cm</lines>
diff --git a/addons/hr_timesheet/report/custom_default.xsl b/addons/hr_timesheet/report/custom_default.xsl
index e8b133da1b0..2eda3a08f4b 100644
--- a/addons/hr_timesheet/report/custom_default.xsl
+++ b/addons/hr_timesheet/report/custom_default.xsl
@@ -5,9 +5,9 @@
 		<!--logo-->
 		<fill color="black"/>
         <stroke color="black"/>
-        <setFont name="DejaVu Sans" size="8"/>
+        <setFont name="DejaVuSans" size="8"/>
         <drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//report/header/date"/></drawString>
-        <setFont name="DejaVu Sans Bold" size="10"/>
+        <setFont name="DejaVuSans-Bold" size="10"/>
         <drawString x="13.8cm" y="19.5cm"><xsl:value-of select="//report/header/company"/></drawString>
         <stroke color="#000000"/>
         <lines>1.3cm 19.3cm 28.5cm 19.3cm</lines>
@@ -17,9 +17,9 @@
 		<!--logo-->
 		<fill color="black"/>
         <stroke color="black"/>
-        <setFont name="DejaVu Sans" size="8"/>
+        <setFont name="DejaVuSans" size="8"/>
         <drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//report/header/date"/></drawString>
-        <setFont name="DejaVu Sans Bold" size="10"/>
+        <setFont name="DejaVuSans-Bold" size="10"/>
         <drawString x="27.8cm" y="19.5cm"><xsl:value-of select="//report/header/company"/></drawString>
         <stroke color="#000000"/>
         <lines>1.3cm 19.3cm 28.5cm 19.3cm</lines>
diff --git a/addons/mrp/report/custom_default.xsl b/addons/mrp/report/custom_default.xsl
index d98cd940942..e5503500a86 100644
--- a/addons/mrp/report/custom_default.xsl
+++ b/addons/mrp/report/custom_default.xsl
@@ -15,9 +15,9 @@
 		<!--logo-->
 		<fill color="black"/>
         <stroke color="black"/>
-        <setFont name="DejaVu Sans" size="8"/>
+        <setFont name="DejaVuSans" size="8"/>
         <drawString x="1.3cm" y="28.3cm"><xsl:value-of select="//date"/></drawString>
-        <setFont name="DejaVu Sans Bold" size="10"/>
+        <setFont name="DejaVuSans-Bold" size="10"/>
         <drawString x="9.8cm" y="28.3cm"><xsl:value-of select="//company"/></drawString>
         <stroke color="#000000"/>
         <lines>1.3cm 28.1cm 20cm 28.1cm</lines>
@@ -29,9 +29,9 @@
 		<!--logo-->
 		<fill color="black"/>
         <stroke color="black"/>
-        <setFont name="DejaVu Sans" size="8"/>
+        <setFont name="DejaVuSans" size="8"/>
         <drawString x="1.3cm" y="28.3cm"><xsl:value-of select="//date"/></drawString>
-        <setFont name="DejaVu Sans Bold" size="10"/>
+        <setFont name="DejaVuSans-Bold" size="10"/>
         <drawString x="9.8cm" y="28.3cm"><xsl:value-of select="//company"/></drawString>
         <stroke color="#000000"/>
         <lines>1.3cm 28.1cm 20cm 28.1cm</lines>
diff --git a/addons/survey/report/survey_analysis_report.py b/addons/survey/report/survey_analysis_report.py
index 9301e0d2a2b..f159fd6a983 100644
--- a/addons/survey/report/survey_analysis_report.py
+++ b/addons/survey/report/survey_analysis_report.py
@@ -43,9 +43,9 @@ class survey_analysis(report_rml):
                         <pageGraphics>
                         <fill color="black"/>
                         <stroke color="black"/>
-                        <setFont name="DejaVu Sans" size="8"/>
+                        <setFont name="DejaVuSans" size="8"/>
                         <drawString x="1.3cm" y="28.3cm"> """+to_xml(rml_obj.formatLang(time.strftime("%Y-%m-%d %H:%M:%S"),date_time=True))+"""</drawString>
-                        <setFont name="DejaVu Sans Bold" size="10"/>
+                        <setFont name="DejaVuSans-Bold" size="10"/>
                         <drawString x="9.8cm" y="28.3cm">"""+ to_xml(company.name) +"""</drawString>
                         <stroke color="#000000"/>
                         <lines>1.3cm 28.1cm 20cm 28.1cm</lines>