Viewing all changes in revision 5895.
- Committer: Minh Tran
- Date: 2011-12-09 17:42:10 UTC
- mfrom: (5892.1.21 trunk)
- Revision ID: mit@openerp.com-20111209174210-9ocsu08bccr6raur
[MERGE]Â Trunk
- files added:
- account/data/data_account_type.xml
- account_accountant/static
- account_accountant/static/images
- account_accountant/static/src
- account_accountant/static/src/img
- account_voucher/static/src
- account_voucher/static/src/img
- import_sugarcrm/security
- l10n_multilang
- mrp/static/src
- outlook/static
- outlook/static/openerp-outlook-plugin
- outlook/static/openerp-outlook-plugin/OpenERPClient
- outlook/static/openerp-outlook-plugin/OpenERPClient/Properties
- outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin
- outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties
- outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources
- outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup
- profile_tools/static/src
- project/static/src
- purchase/static/src
- stock/static/src
- users_ldap/security
- files removed:
- account_accountant/static
- account_accountant/static/images
- outlook/plugin
- outlook/plugin/openerp-outlook-plugin
- outlook/plugin/openerp-outlook-plugin/dialogs
- outlook/plugin/openerp-outlook-plugin/dialogs/resources
- files renamed:
- account_voucher/static/icon.png => account_voucher/static/src/img/icon.png
- hr/test/test_hr.yml => hr/test/open2recruit2close_job.yml
- mrp/static/images/ => mrp/static/src/img/
- profile_tools/static/images/ => profile_tools/static/src/img/
- profile_tools/static/images/profile_tools.png => profile_tools/static/src/img/icon.png
- project/static/images/ => project/static/src/img/
- purchase/static/images/ => purchase/static/src/img/
- stock/static/images/ => stock/static/src/img/
- files modified:
- account/__openerp__.py
expand all
collapse all
added
removed
account_accountant/static/images/icon.png
account_accountant/static/src/img/icon.png
edi/static/src/img/knowledge.png
outlook/plugin/openerp-outlook-plugin/dialogs/resources/OpenERP_Logo.bmp
outlook/plugin/openerp-outlook-plugin/dialogs/resources/openerp_logo.png
outlook/plugin/openerp-outlook-plugin/dialogs/resources/openerp_logo1.bmp
outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/195737_152643643962_3595480_n.jpg
outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Account.png
outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Archive.png
outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Case.png
outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Contact.png
outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Create.png
outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Error.gif
outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Invoice.png
outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Move.gif
outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/MoveDown.png
outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/MoveLeft.png
outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Partner.png
outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Product.png
outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Project.png
outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Sale.png
outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Search.gif
outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Success.gif
outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Task.png
outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/developped_by.png
outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/logo.png
outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/openerp.png
outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/perform.gif
outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/settings.png
