Viewing all changes in revision 5585.
- Committer: mark doukidis
- Date: 2012-01-13 02:41:54 UTC
- mfrom: (5580.1.79 extra-6.0)
- Revision ID: mark@cgbs.com.au-20120113024154-o5b3yqtu2ewhpetm
Merge from 6.0 stable
- files added:
- account_asset/i18n/es_AR.po
- asterisk_click2dial_crm
- asterisk_click2dial_crm/i18n
- ingram
- ingram/doc
- ingram/i18n
- ingram/security
- ingram/settings
- ingram/temp
- l10n_fr_rib
- l10n_fr_rib/i18n
- mrp_operations_extension
- nan_file_format
- nan_file_format/i18n
- product_gs1_128
- product_gs1_128/data
- product_gs1_128/i18n
- product_gs1_128/security
- product_minimal_stock_rule
- product_minimal_stock_rule/test
- project_task_delegate_state
- project_task_delegate_state/i18n
- project_task_delegate_state/tests
- server_migration
- server_migration/security
- server_migration/wizard
- files removed:
- account_banking
- account_banking/i18n
- account_banking/parsers
- account_banking/sepa
- account_banking/wizard
- account_banking_nl_clieop
- account_banking_nl_clieop/data
- account_banking_nl_clieop/i18n
- account_banking_nl_clieop/wizard
- account_banking_nl_multibank
- account_banking_nl_multibank/i18n
- files renamed:
- asterisk/__terp__.py => asterisk/__openerp__.py
- fleet_maintenance/__terp__.py => fleet_maintenance/__openerp__.py
- hr_holidays_request/__terp__.py => hr_holidays_request/__openerp__.py
- hr_skill/__terp__.py => hr_skill/__openerp__.py
- label/__terp__.py => label/__openerp__.py
- product_variant_configurator/__terp__.py => product_variant_configurator/__openerp__.py
- reminder/__terp__.py => reminder/__openerp__.py
- sale_product_multistep_configurator/__terp__.py => sale_product_multistep_configurator/__openerp__.py
- files modified:
- .bzrignore *
expand all
collapse all
added
removed
ingram/doc/ingram.png
