[MERGE] Upstream
bzr revid: stw@openerp.com-20111005142057-qshud5cor3s7j8v7
Showing
- MANIFEST.in 9 additions, 8 deletionsMANIFEST.in
- debian/openerp.postinst 3 additions, 3 deletionsdebian/openerp.postinst
- debian/po/es_CL.po 9 additions, 6 deletionsdebian/po/es_CL.po
- openerp/addons/base/__openerp__.py 1 addition, 2 deletionsopenerp/addons/base/__openerp__.py
- openerp/addons/base/base_data.xml 4 additions, 0 deletionsopenerp/addons/base/base_data.xml
- openerp/addons/base/i18n/es_CL.po 4 additions, 4 deletionsopenerp/addons/base/i18n/es_CL.po
- openerp/addons/base/i18n/sl.po 168 additions, 114 deletionsopenerp/addons/base/i18n/sl.po
- openerp/addons/base/ir/ir.xml 52 additions, 75 deletionsopenerp/addons/base/ir/ir.xml
- openerp/addons/base/ir/ir_mail_server.py 19 additions, 6 deletionsopenerp/addons/base/ir/ir_mail_server.py
- openerp/addons/base/ir/ir_values.py 378 additions, 160 deletionsopenerp/addons/base/ir/ir_values.py
- openerp/addons/base/module/module.py 4 additions, 16 deletionsopenerp/addons/base/module/module.py
- openerp/addons/base/res/res_currency.py 17 additions, 0 deletionsopenerp/addons/base/res/res_currency.py
- openerp/addons/base/res/res_partner.py 3 additions, 3 deletionsopenerp/addons/base/res/res_partner.py
- openerp/addons/base/security/base_security.xml 7 additions, 0 deletionsopenerp/addons/base/security/base_security.xml
- openerp/addons/base/security/ir.model.access.csv 1 addition, 2 deletionsopenerp/addons/base/security/ir.model.access.csv
- openerp/addons/base/test/test_ir_values.yml 51 additions, 4 deletionsopenerp/addons/base/test/test_ir_values.yml
- openerp/modules/module.py 1 addition, 1 deletionopenerp/modules/module.py
- openerp/osv/fields.py 21 additions, 0 deletionsopenerp/osv/fields.py
- openerp/osv/orm.py 159 additions, 118 deletionsopenerp/osv/orm.py
- openerp/release.py 0 additions, 1 deletionopenerp/release.py
Loading
Please register or sign in to comment