[FORWARD] Forward port of server 7.0 until revision 4988

bzr revid: tde@openerp.com-20130528102733-bsszxp6nvy8yws3t

diff --cc openerp/addons/base/ir/ir_mail_server.py
Simple merge

diff --cc openerp/addons/base/res/res_currency.py
Simple merge

diff --cc openerp/addons/base/res/res_partner.py
Simple merge

diff --cc openerp/cli/server.py
Simple merge

diff --cc openerp/netsvc.py
Simple merge

diff --cc openerp/osv/expression.py
Simple merge

diff --cc openerp/report/render/rml2pdf/customfonts.py
Simple merge

diff --cc openerp/report/render/rml2pdf/utils.py
Simple merge

diff --cc openerp/service/cron.py
Simple merge

diff --cc openerp/service/http_server.py
index 63e8ce8,03ec154..e25e75d
--- 1/openerp/service/http_server.py
--- 2/openerp/service/http_server.py
+++ b/openerp/service/http_server.py
@@@ -23,9 -23,10 +23,9 @@@
  #
  # You should have received a copy of the GNU General Public License
  # along with this program; if not, write to the Free Software
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  ###############################################################################
  
 -#.apidoc title: HTTP and XML-RPC Server
  
  """ This module offers the family of HTTP-based servers. These are not a single
      class/functionality, but a set of network stack layers, implementing

diff --cc openerp/service/websrv_lib.py
index 7767cff,bc7e37b..9aeeff3
--- 1/openerp/service/websrv_lib.py
--- 2/openerp/service/websrv_lib.py
+++ b/openerp/service/websrv_lib.py
@@@ -21,9 -21,10 +21,9 @@@
  #
  # You should have received a copy of the GNU General Public License
  # along with this program; if not, write to the Free Software
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  ###############################################################################
  
 -#.apidoc title: HTTP Layer library (websrv_lib)
  
  """ Framework for generic http servers
  

diff --cc setup.py
index 00bfa57,b53c9a4..28c78a9
mode 100755,100644..100644
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py