git.inspyration.org Git - odoo/odoo.git/commit

author	Christophe Simonis <chs@openerp.com>
	Thu, 13 Jun 2013 18:15:03 +0000 (20:15 +0200)
committer	Christophe Simonis <chs@openerp.com>
	Thu, 13 Jun 2013 18:15:03 +0000 (20:15 +0200)
commit	6a9adbca62aa27e5d8303a5e6458c1aec802613e
tree	cbd623709234ceb4d10253ea44ba41ccc83939cb	tree \| snapshot
parent	448e19e550bae03a0c05e42228cdf5c4fbc6dddc	commit \| diff
parent	67fabd1c480ab037db617d4f64eec21b162a5ad8	commit \| diff

[MERGE] forward port of branch 7.0 up to revid 9236 mat@openerp.com-20130613160953-itt79mu5xrl7suv4

bzr revid: chs@openerp.com-20130613181503-82234mo34wxb0oap

54 files changed:

addons/account/account.py	diff1 \|	diff2 \|	blob \| history
addons/account/account_bank_statement.py	diff1 \|	diff2 \|	blob \| history
addons/account/account_cash_statement.py	diff1 \|	diff2 \|	blob \| history
addons/account/account_invoice.py	diff1 \|	diff2 \|	blob \| history
addons/account/account_move_line.py	diff1 \|	diff2 \|	blob \| history
addons/account/account_view.xml	diff1 \|	diff2 \|	blob \| history
addons/account/installer.py	diff1 \|	diff2 \|	blob \| history
addons/account/project/project_view.xml	diff1 \|	diff2 \|	blob \| history
addons/account/wizard/account_fiscalyear_close.py	diff1 \|	diff2 \|	blob \| history
addons/account/wizard/account_validate_account_move.py	diff1 \|	diff2 \|	blob \| history
addons/account_analytic_default/account_analytic_default.py	diff1 \|	diff2 \|	blob \| history
addons/account_analytic_plans/account_analytic_plans.py	diff1 \|	diff2 \|	blob \| history
addons/account_payment/wizard/account_payment_order.py	diff1 \|	diff2 \|	blob \| history
addons/account_voucher/account_voucher.py	diff1 \|	diff2 \|	blob \| history
addons/anonymization/anonymization.py	diff1 \|	diff2 \|	blob \| history
addons/base_report_designer/static/base-report-designer-plugin/openerp_report_designer.zip	diff1 \|	\|	blob \| history
addons/delivery/sale.py	diff1 \|	diff2 \|	blob \| history
addons/edi/models/edi.py	diff1 \|	diff2 \|	blob \| history
addons/hr_attendance/wizard/hr_attendance_error.py	diff1 \|	diff2 \|	blob \| history
addons/hr_expense/hr_expense_view.xml	diff1 \|	diff2 \|	blob \| history
addons/hr_holidays/hr_holidays_view.xml	diff1 \|	diff2 \|	blob \| history
addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py	diff1 \|	diff2 \|	blob \| history
addons/hr_timesheet_invoice/hr_timesheet_invoice.py	diff1 \|	diff2 \|	blob \| history
addons/l10n_be/wizard/l10n_be_account_vat_declaration.py	diff1 \|	diff2 \|	blob \| history
addons/l10n_be/wizard/l10n_be_partner_vat_listing.py	diff1 \|	diff2 \|	blob \| history
addons/l10n_be/wizard/l10n_be_vat_intra.py	diff1 \|	diff2 \|	blob \| history
addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py	diff1 \|	diff2 \|	blob \| history
addons/l10n_lu/wizard/print_vat.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_thread.py	diff1 \|	diff2 \|	blob \| history
addons/mail/static/src/js/mail.js	diff1 \|	diff2 \|	blob \| history
addons/mrp_operations/mrp_operations.py	diff1 \|	diff2 \|	blob \| history
addons/mrp_repair/mrp_repair.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/wizard/pos_open_statement.py	diff1 \|	diff2 \|	blob \| history
addons/portal/wizard/portal_wizard.py	diff1 \|	diff2 \|	blob \| history
addons/procurement/procurement.py	diff1 \|	diff2 \|	blob \| history
addons/procurement/procurement_view.xml	diff1 \|	diff2 \|	blob \| history
addons/product_visible_discount/product_visible_discount.py	diff1 \|	diff2 \|	blob \| history
addons/project/project.py	diff1 \|	diff2 \|	blob \| history
addons/project/res_partner.py	diff1 \|	diff2 \|	blob \| history
addons/project_gtd/wizard/project_gtd_empty.py	diff1 \|	diff2 \|	blob \| history
addons/project_timesheet/project_timesheet.py	diff1 \|	diff2 \|	blob \| history
addons/purchase/stock_view.xml	diff1 \|	diff2 \|	blob \| history
addons/report_webkit/webkit_report.py	diff1 \|	diff2 \|	blob \| history
addons/sale/sale.py	diff1 \|	diff2 \|	blob \| history
addons/sale_crm/wizard/crm_make_sale.py	diff1 \|	diff2 \|	blob \| history
addons/sale_stock/sale_stock.py	diff1 \|	diff2 \|	blob \| history
addons/share/wizard/share_wizard.py	diff1 \|	diff2 \|	blob \| history
addons/stock/stock.py	diff1 \|	diff2 \|	blob \| history
addons/stock/wizard/stock_return_picking.py	diff1 \|	diff2 \|	blob \| history
addons/subscription/subscription.py	diff1 \|	diff2 \|	blob \| history
addons/survey/survey.py	diff1 \|	diff2 \|	blob \| history
addons/survey/wizard/survey_answer.py	diff1 \|	diff2 \|	blob \| history
addons/warning/warning.py	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

addons/account/account.py	diff1 \|	diff2 \|	blob \| history
addons/account/account_bank_statement.py	diff1 \|	diff2 \|	blob \| history
addons/account/account_cash_statement.py	diff1 \|	diff2 \|	blob \| history
addons/account/account_invoice.py	diff1 \|	diff2 \|	blob \| history
addons/account/account_move_line.py	diff1 \|	diff2 \|	blob \| history
addons/account/account_view.xml	diff1 \|	diff2 \|	blob \| history
addons/account/installer.py	diff1 \|	diff2 \|	blob \| history
addons/account/project/project_view.xml	diff1 \|	diff2 \|	blob \| history
addons/account/wizard/account_fiscalyear_close.py	diff1 \|	diff2 \|	blob \| history
addons/account/wizard/account_validate_account_move.py	diff1 \|	diff2 \|	blob \| history
addons/account_analytic_default/account_analytic_default.py	diff1 \|	diff2 \|	blob \| history
addons/account_analytic_plans/account_analytic_plans.py	diff1 \|	diff2 \|	blob \| history
addons/account_payment/wizard/account_payment_order.py	diff1 \|	diff2 \|	blob \| history
addons/account_voucher/account_voucher.py	diff1 \|	diff2 \|	blob \| history
addons/anonymization/anonymization.py	diff1 \|	diff2 \|	blob \| history
addons/base_report_designer/static/base-report-designer-plugin/openerp_report_designer.zip	diff1 \|	\|	blob \| history
addons/delivery/sale.py	diff1 \|	diff2 \|	blob \| history
addons/edi/models/edi.py	diff1 \|	diff2 \|	blob \| history
addons/hr_attendance/wizard/hr_attendance_error.py	diff1 \|	diff2 \|	blob \| history
addons/hr_expense/hr_expense_view.xml	diff1 \|	diff2 \|	blob \| history
addons/hr_holidays/hr_holidays_view.xml	diff1 \|	diff2 \|	blob \| history
addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py	diff1 \|	diff2 \|	blob \| history
addons/hr_timesheet_invoice/hr_timesheet_invoice.py	diff1 \|	diff2 \|	blob \| history
addons/l10n_be/wizard/l10n_be_account_vat_declaration.py	diff1 \|	diff2 \|	blob \| history
addons/l10n_be/wizard/l10n_be_partner_vat_listing.py	diff1 \|	diff2 \|	blob \| history
addons/l10n_be/wizard/l10n_be_vat_intra.py	diff1 \|	diff2 \|	blob \| history
addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py	diff1 \|	diff2 \|	blob \| history
addons/l10n_lu/wizard/print_vat.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_thread.py	diff1 \|	diff2 \|	blob \| history
addons/mail/static/src/js/mail.js	diff1 \|	diff2 \|	blob \| history
addons/mrp_operations/mrp_operations.py	diff1 \|	diff2 \|	blob \| history
addons/mrp_repair/mrp_repair.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/wizard/pos_open_statement.py	diff1 \|	diff2 \|	blob \| history
addons/portal/wizard/portal_wizard.py	diff1 \|	diff2 \|	blob \| history
addons/procurement/procurement.py	diff1 \|	diff2 \|	blob \| history
addons/procurement/procurement_view.xml	diff1 \|	diff2 \|	blob \| history
addons/product_visible_discount/product_visible_discount.py	diff1 \|	diff2 \|	blob \| history
addons/project/project.py	diff1 \|	diff2 \|	blob \| history
addons/project/res_partner.py	diff1 \|	diff2 \|	blob \| history
addons/project_gtd/wizard/project_gtd_empty.py	diff1 \|	diff2 \|	blob \| history
addons/project_timesheet/project_timesheet.py	diff1 \|	diff2 \|	blob \| history
addons/purchase/stock_view.xml	diff1 \|	diff2 \|	blob \| history
addons/report_webkit/webkit_report.py	diff1 \|	diff2 \|	blob \| history
addons/sale/sale.py	diff1 \|	diff2 \|	blob \| history
addons/sale_crm/wizard/crm_make_sale.py	diff1 \|	diff2 \|	blob \| history
addons/sale_stock/sale_stock.py	diff1 \|	diff2 \|	blob \| history
addons/share/wizard/share_wizard.py	diff1 \|	diff2 \|	blob \| history
addons/stock/stock.py	diff1 \|	diff2 \|	blob \| history
addons/stock/wizard/stock_return_picking.py	diff1 \|	diff2 \|	blob \| history
addons/subscription/subscription.py	diff1 \|	diff2 \|	blob \| history
addons/survey/survey.py	diff1 \|	diff2 \|	blob \| history
addons/survey/wizard/survey_answer.py	diff1 \|	diff2 \|	blob \| history
addons/warning/warning.py	diff1 \|	diff2 \|	blob \| history