← Back to branch summary

~openerp-dev/openobject-server/trunk-web-placeholder-rga

~openerp-dev/openobject-server/trunk-web-placeholder-rga

Viewing all changes in revision 4118.

Committer: Quentin (OpenERP)
Date: 2012-03-30 14:24:29 UTC
mfrom: (4070.2.48 trunk-partner-address-cleaning)
Revision ID: qdp-launchpad@openerp.com-20120330142429-bcdxfa4q6g7fsgbs

[MERGE] merged the branch that merges res.partner and res.partner.address objects

files added:
openerp/addons/base/res/company_icon.png

openerp/addons/base/res/photo.png

openerp/addons/base/security/ir.model.access-1.csv

files modified:
openerp/addons/base/__openerp__.py

openerp/addons/base/base_data.xml

openerp/addons/base/base_demo.xml

openerp/addons/base/report/corporate_defaults.xml

openerp/addons/base/report/corporate_defaults.xsl

openerp/addons/base/report/corporate_sxw_header.xml

openerp/addons/base/report/mako_header.html

openerp/addons/base/res/report/partner_address.xml

openerp/addons/base/res/report/partner_address.xsl

openerp/addons/base/res/res_bank.py

openerp/addons/base/res/res_company.py

openerp/addons/base/res/res_country.py

openerp/addons/base/res/res_partner.py

openerp/addons/base/res/res_partner_demo.xml

openerp/addons/base/res/res_partner_report.xml

openerp/addons/base/res/res_partner_view.xml

openerp/addons/base/res/wizard/partner_wizard_massmail.py

openerp/addons/base/security/ir.model.access.csv

openerp/addons/base/test/test_osv_expression.yml

openerp/osv/orm.py

openerp/report/report_sxw.py

openerp/tools/import_email.py

Show diffs side-by-side

added added

removed removed

openerp/addons/base/__openerp__.py

openerp/addons/base/base_data.xml

openerp/addons/base/base_demo.xml

openerp/addons/base/report/corporate_defaults.xml

openerp/addons/base/report/corporate_defaults.xsl

openerp/addons/base/report/corporate_sxw_header.xml

openerp/addons/base/report/mako_header.html

openerp/addons/base/res/company_icon.png

openerp/addons/base/res/photo.png

openerp/addons/base/res/report/partner_address.xml

openerp/addons/base/res/report/partner_address.xsl

openerp/addons/base/res/res_bank.py

openerp/addons/base/res/res_company.py

openerp/addons/base/res/res_country.py

openerp/addons/base/res/res_partner.py

openerp/addons/base/res/res_partner_demo.xml

openerp/addons/base/res/res_partner_report.xml

openerp/addons/base/res/res_partner_view.xml

openerp/addons/base/res/wizard/partner_wizard_massmail.py

openerp/addons/base/security/ir.model.access-1.csv

openerp/addons/base/security/ir.model.access.csv

openerp/addons/base/test/test_osv_expression.yml

openerp/osv/orm.py

openerp/report/report_sxw.py

openerp/tools/import_email.py

Older »