« back to all changes in this revision
Viewing changes to product_do_merge/__init__.py
- Committer: Moises Lopez
- Date: 2014-10-09 21:30:17 UTC
- mfrom: (879.1.7 trunk-addons-vauxoo)
- Revision ID: moylop260@vauxoo.com-20141009213017-u3jicyg8xery3r8c
[MERGE] upforward 7.0
-Fix unused import
-Fix relative import
-Fix full path import
-Fix trailing whitespace pylint error C0303
-Fix autopep8 ignoring E501 & E128
-Fix reimported
-Fix __openerp__.py files
-Translate update
-Fix unused import
-Fix relative import
-Fix full path import
-Fix trailing whitespace pylint error C0303
-Fix autopep8 ignoring E501 & E128
-Fix reimported
-Fix __openerp__.py files
-Translate update
- files added:
- account_asset_move_check/__init__.py
- account_model_plans
- account_model_plans/data
- account_model_plans/demo
- account_model_plans/doc
- account_model_plans/doc/images
- account_model_plans/i18n
- account_model_plans/model
- account_model_plans/report
- account_model_plans/security
- account_model_plans/static
- account_model_plans/static/description
- account_model_plans/static/src
- account_model_plans/static/src/css
- account_model_plans/static/src/img
- account_model_plans/static/src/js
- account_model_plans/static/src/xml
- account_model_plans/test
- account_model_plans/view
- account_model_plans/wizard
- account_model_plans/workflow
- account_voucher_draft
- account_voucher_draft/data
- account_voucher_draft/demo
- account_voucher_draft/doc
- account_voucher_draft/doc/images
- account_voucher_draft/i18n
- account_voucher_draft/model
- account_voucher_draft/report
- account_voucher_draft/security
- account_voucher_draft/static
- account_voucher_draft/static/description
- account_voucher_draft/static/src
- account_voucher_draft/static/src/css
- account_voucher_draft/static/src/img
- account_voucher_draft/static/src/js
- account_voucher_draft/static/src/xml
- account_voucher_draft/test
- account_voucher_draft/view
- account_voucher_draft/wizard
- account_voucher_draft/workflow
- analytic_entry_line_journal
- analytic_entry_line_journal/data
- analytic_entry_line_journal/demo
- analytic_entry_line_journal/doc
- analytic_entry_line_journal/doc/images
- analytic_entry_line_journal/i18n
- analytic_entry_line_journal/model
- analytic_entry_line_journal/report
- analytic_entry_line_journal/security
- analytic_entry_line_journal/static
- analytic_entry_line_journal/static/description
- analytic_entry_line_journal/static/src
- analytic_entry_line_journal/static/src/css
- analytic_entry_line_journal/static/src/img
- analytic_entry_line_journal/static/src/js
- analytic_entry_line_journal/static/src/xml
- analytic_entry_line_journal/test
- analytic_entry_line_journal/view
- analytic_entry_line_journal/wizard
- analytic_entry_line_journal/workflow
- analytic_entry_line_move
- analytic_entry_line_move/data
- analytic_entry_line_move/demo
- analytic_entry_line_move/doc
- analytic_entry_line_move/doc/images
- analytic_entry_line_move/i18n
- analytic_entry_line_move/model
- analytic_entry_line_move/report
- analytic_entry_line_move/security
- analytic_entry_line_move/static
- analytic_entry_line_move/static/description
- analytic_entry_line_move/static/src
- analytic_entry_line_move/static/src/css
- analytic_entry_line_move/static/src/img
- analytic_entry_line_move/static/src/js
- analytic_entry_line_move/static/src/xml
- analytic_entry_line_move/test
- analytic_entry_line_move/view
- analytic_entry_line_move/wizard
- analytic_entry_line_move/workflow
- analytic_entry_line_period
- analytic_entry_line_period/data
- analytic_entry_line_period/demo
- analytic_entry_line_period/doc
- analytic_entry_line_period/doc/images
- analytic_entry_line_period/i18n
- analytic_entry_line_period/model
- analytic_entry_line_period/report
- analytic_entry_line_period/security
- analytic_entry_line_period/static
- analytic_entry_line_period/static/description
- analytic_entry_line_period/static/src
- analytic_entry_line_period/static/src/css
- analytic_entry_line_period/static/src/img
- analytic_entry_line_period/static/src/js
- analytic_entry_line_period/static/src/xml
- analytic_entry_line_period/test
- analytic_entry_line_period/view
- analytic_entry_line_period/wizard
- analytic_entry_line_period/workflow
- hr_job_positions_extended
- hr_job_positions_extended/data
- hr_job_positions_extended/demo
- hr_job_positions_extended/doc
- hr_job_positions_extended/doc/images
- hr_job_positions_extended/i18n
- hr_job_positions_extended/model
- hr_job_positions_extended/report
- hr_job_positions_extended/security
- hr_job_positions_extended/static
- hr_job_positions_extended/static/description
- hr_job_positions_extended/static/src
- hr_job_positions_extended/static/src/css
- hr_job_positions_extended/static/src/img
- hr_job_positions_extended/static/src/js
- hr_job_positions_extended/static/src/xml
- hr_job_positions_extended/test
- hr_job_positions_extended/view
- hr_job_positions_extended/wizard
- hr_job_positions_extended/workflow
- invoice_discount
- invoice_discount/i18n
- invoice_discount/model
- invoice_discount/view
- files renamed:
- account_asset_move_check/__init__.py => account_asset_move_check/__init__.py.moved
- account_asset_move_check/__openerp__.py => account_asset_move_check/__openerp__.py.moved
- account_asset_move_check/model/__init__.py => account_asset_move_check/model/__init__.py.moved
- files modified:
- account_advance_payment/__init__.py
added
removed
product_do_merge/__init__.py
