OLD lp2git merge of lp:ocb server 7.0

Introduction

During the lifetime of lp:ocb-server/7.0, at one point someone accidentally pushed a heavily modified branch to this location, overwriting the history. The original code was restored, but not the original history. Therefore, it does not seem feasible to atomically commit ocb-specific changes to a git branch of Odoo. Instead, I'm simply taking a diff between OCB and OpenERP on Launchpad.

# Diff of lp:ocb-server/7.0, revno 5345 against lp:openobject-server/7.0, revno 5308    
diff -u8 -x .bzr openobject-server ocb-server -r > server-diff  

This was committed as 409000dc23d385ddae874b5eb04b2d37deeef4e7

Diff output

I've annotated the output below to clarify how the three conflicts were dealt with.

patching file openerp/addons/base/ir/ir_attachment.py
patching file openerp/addons/base/ir/ir_cron.py
Reversed (or previously applied) patch detected! Assume -R? [n] n
Apply anyway? [n] y
Hunk #1 FAILED at 211.
1 out of 1 hunk FAILED -- saving rejects to file openerp/addons/base/ir/ir_cron.py.rej ** <- Same as Odoo revision 6788edcdd0d515da0e562bd37215c0a05723ba90, so left it**
patching file openerp/addons/base/res/res_bank.py
patching file openerp/addons/base/res/res_bank_view.xml
patching file openerp/addons/base/res/res_country_data.xml
patching file openerp/addons/base/res/res_lang.py
patching file openerp/addons/base/res/res_partner.py
patching file openerp/modules/loading.py
Hunk #1 FAILED at 192.
1 out of 1 hunk FAILED -- saving rejects to file openerp/modules/loading.py.rej ** <- the loading.py part from ocb-server revno. 5294. Resolved manually Could not actually find a clear conflict.**
patching file openerp/osv/fields.py
Hunk #1 FAILED at 459.
1 out of 1 hunk FAILED -- saving rejects to file openerp/osv/fields.py.rej** <- ocb server revno 4861, conflicts with Odoo 86acc1a62ffd1bdbbf79a6d315287baf5a5cea2b. Seems equivalent, so left it.**
patching file openerp/osv/orm.py
patching file openerp/report/render/rml2pdf/trml2pdf.py
Hunk #1 succeeded at 761 (offset 4 lines).
patching file openerp/report/render/rml2pdf/utils.py
patching file openerp/report/report_sxw.py
Hunk #1 succeeded at 317 (offset 2 lines).
patching file openerp/service/workers.py
patching file openerp/service/wsgi_server.py
patching file openerp/tools/assertion_report.py
patching file openerp/tools/config.py
patching file openerp/tools/convert.py
patching file openerp/tools/translate.py
patching file openerp/tools/yaml_import.py