Merge branch 'master' of git:~/gitrepos/cam-template

ext/config/odoo-server.conf

@@ -1,23 +1,24 @@
 [options]
-addons_path = /opt/odoo/odoo/addons,/opt/odoo/ext/addons
+addons_path = ~/ext/ext/custom-addons,~/ext/ext/odoo/addons
 admin_passwd = c76EVdqj
 
 db_host = False
 db_name = False
 db_password = False
 db_port = False
-db_user = odoo
+db_user = False
 
 debug_mode = False
 list_db = True
 log_level = error
 logfile = /var/log/odoo/odoo-server.log
 
-max_cron_threads = 1
-workers = 1
+#max_cron_threads = 1
+#workers = 1
 
 xmlrpc_interface = 127.0.0.1
 xmlrpc_port = 8069
+longpolling_port = 8072
 
 timezone = Europe/Brussels
 

ext/custom-addons/cam_reports/report/purchase.order.rml

@@ -230,17 +230,6 @@
 
 
     <spacer length="0.5cm"/>
-
-    <para style="normal">Mit freundlichen Grüßen,</para>
-    <spacer length="0.3cm"/>
-    <blockTable colWidths="200" style="Struktur" hAlign="LEFT">
-      <tr>
-        <td>
-          <image>[[ company.signature]]</image>
-        </td>
-      </tr>
-    </blockTable>    
-    <para style="normal">B. Neumeier</para>
     
   </story>
 </document>

ext/custom-addons/cam_reports/report/purchase.quotation.rml

@@ -173,16 +173,6 @@
 
     <spacer length="0.5cm"/>
 
-    <para style="normal">Mit freundlichen Grüßen,</para>
-    <spacer length="0.3cm"/>
-    <blockTable colWidths="200" style="Struktur" hAlign="LEFT">
-      <tr>
-        <td>
-          <image>[[ company.signature]]</image>
-        </td>
-      </tr>
-    </blockTable>    
-    <para style="normal">B. Neumeier</para>
     
   </story>
 </document>