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

author	Vo Minh Thu <vmt@openerp.com>
	Mon, 10 Dec 2012 11:16:54 +0000 (12:16 +0100)
committer	Vo Minh Thu <vmt@openerp.com>
	Mon, 10 Dec 2012 11:16:54 +0000 (12:16 +0100)
commit	6072fd11afb076b1781e23096a8c8794df3a00c7
tree	86dc0d9ab3ce793dcc6c3805a1ed5b54a89c33c1	tree \| snapshot
parent	ca89ae8f7195f752bfa6f2effd57e11f1d498558	commit \| diff
parent	590add54d41062e2638d751b52a46e626b8e368c	commit \| diff

[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20121210111654-0pm3pupnqqeip52n

63 files changed:

addons/account/account.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/partner.py	diff1 \|	diff2 \|	blob \| history
addons/account/report/account_financial_report.py	diff1 \|	diff2 \|	blob \| history
addons/account/report/account_report.py	diff1 \|	diff2 \|	blob \| history
addons/account/wizard/account_invoice_refund.py	diff1 \|	diff2 \|	blob \| history
addons/account/wizard/account_report_common.py	diff1 \|	diff2 \|	blob \| history
addons/account_asset/account_asset.py	diff1 \|	diff2 \|	blob \| history
addons/account_followup/account_followup.py	diff1 \|	diff2 \|	blob \| history
addons/account_followup/report/account_followup_print.py	diff1 \|	diff2 \|	blob \| history
addons/account_followup/tests/test_account_followup.py	diff1 \|	diff2 \|	blob \| history
addons/account_followup/wizard/account_followup_print.py	diff1 \|	diff2 \|	blob \| history
addons/anonymization/anonymization.py	diff1 \|	diff2 \|	blob \| history
addons/audittrail/audittrail.py	diff1 \|	diff2 \|	blob \| history
addons/base_report_designer/wizard/base_report_designer_modify.py	diff1 \|	diff2 \|	blob \| history
addons/base_setup/res_config.py	diff1 \|	diff2 \|	blob \| history
addons/crm/crm.py	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_lead.py	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_phonecall.py	diff1 \|	diff2 \|	blob \| history
addons/crm/res_partner.py	diff1 \|	diff2 \|	blob \| history
addons/crm/wizard/crm_lead_to_opportunity.py	diff1 \|	diff2 \|	blob \| history
addons/crm/wizard/crm_merge_opportunities.py	diff1 \|	diff2 \|	blob \| history
addons/crm/wizard/crm_partner_binding.py	\|	diff2 \|	blob \| history
addons/delivery/sale.py	diff1 \|	diff2 \|	blob \| history
addons/document/document_directory.py	diff1 \|	diff2 \|	blob \| history
addons/document/document_storage.py	diff1 \|	diff2 \|	blob \| history
addons/event_sale/event_sale.py	diff1 \|	diff2 \|	blob \| history
addons/fetchmail/fetchmail.py	diff1 \|	diff2 \|	blob \| history
addons/fleet/fleet.py	diff1 \|	diff2 \|	blob \| history
addons/google_docs/google_docs.py	diff1 \|	diff2 \|	blob \| history
addons/hr/hr.py	diff1 \|	diff2 \|	blob \| history
addons/hr_attendance/hr_attendance.py	diff1 \|	diff2 \|	blob \| history
addons/hr_evaluation/hr_evaluation.py	diff1 \|	diff2 \|	blob \| history
addons/hr_holidays/hr_holidays.py	diff1 \|	diff2 \|	blob \| history
addons/hr_timesheet_invoice/hr_timesheet_invoice.py	diff1 \|	diff2 \|	blob \| history
addons/hr_timesheet_sheet/hr_timesheet_sheet.py	diff1 \|	diff2 \|	blob \| history
addons/l10n_be/wizard/l10n_be_vat_intra.py	diff1 \|	diff2 \|	blob \| history
addons/l10n_be_coda/l10n_be_coda.py	diff1 \|	diff2 \|	blob \| history
addons/l10n_be_coda/wizard/account_coda_import.py	diff1 \|	diff2 \|	blob \| history
addons/l10n_ch/report/report_webkit_html.py	diff1 \|	diff2 \|	blob \| history
addons/mail/wizard/invite.py	diff1 \|	diff2 \|	blob \| history
addons/membership/membership.py	diff1 \|	diff2 \|	blob \| history
addons/mrp_byproduct/mrp_byproduct.py	diff1 \|	diff2 \|	blob \| history
addons/portal/wizard/portal_wizard.py	diff1 \|	diff2 \|	blob \| history
addons/portal_hr_employees/hr_employee.py	diff1 \|	diff2 \|	blob \| history
addons/portal_sale/sale.py	diff1 \|	diff2 \|	blob \| history
addons/product/product.py	diff1 \|	diff2 \|	blob \| history
addons/product_margin/product_margin.py	diff1 \|	diff2 \|	blob \| history
addons/project/project.py	diff1 \|	diff2 \|	blob \| history
addons/project_issue/project_issue.py	diff1 \|	diff2 \|	blob \| history
addons/project_issue/report/project_issue_report.py	diff1 \|	diff2 \|	blob \| history
addons/purchase/purchase.py	diff1 \|	diff2 \|	blob \| history
addons/purchase_double_validation/purchase_double_validation_installer.py	diff1 \|	diff2 \|	blob \| history
addons/report_webkit/webkit_report.py	diff1 \|	diff2 \|	blob \| history
addons/resource/resource.py	diff1 \|	diff2 \|	blob \| history
addons/sale/sale.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_partial_picking.py	diff1 \|	diff2 \|	blob \| history
addons/stock_location/stock_location.py	diff1 \|	diff2 \|	blob \| history
addons/survey/report/survey_form.py	diff1 \|	diff2 \|	blob \| history
addons/survey/wizard/survey_answer.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_invoice.py	diff1 \|	diff2 \|	blob \| history
addons/account/account_move_line.py	diff1 \|	diff2 \|	blob \| history
addons/account/partner.py	diff1 \|	diff2 \|	blob \| history
addons/account/report/account_financial_report.py	diff1 \|	diff2 \|	blob \| history
addons/account/report/account_report.py	diff1 \|	diff2 \|	blob \| history
addons/account/wizard/account_invoice_refund.py	diff1 \|	diff2 \|	blob \| history
addons/account/wizard/account_report_common.py	diff1 \|	diff2 \|	blob \| history
addons/account_asset/account_asset.py	diff1 \|	diff2 \|	blob \| history
addons/account_followup/account_followup.py	diff1 \|	diff2 \|	blob \| history
addons/account_followup/report/account_followup_print.py	diff1 \|	diff2 \|	blob \| history
addons/account_followup/tests/test_account_followup.py	diff1 \|	diff2 \|	blob \| history
addons/account_followup/wizard/account_followup_print.py	diff1 \|	diff2 \|	blob \| history
addons/anonymization/anonymization.py	diff1 \|	diff2 \|	blob \| history
addons/audittrail/audittrail.py	diff1 \|	diff2 \|	blob \| history
addons/base_report_designer/wizard/base_report_designer_modify.py	diff1 \|	diff2 \|	blob \| history
addons/base_setup/res_config.py	diff1 \|	diff2 \|	blob \| history
addons/crm/crm.py	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_lead.py	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_phonecall.py	diff1 \|	diff2 \|	blob \| history
addons/crm/res_partner.py	diff1 \|	diff2 \|	blob \| history
addons/crm/wizard/crm_lead_to_opportunity.py	diff1 \|	diff2 \|	blob \| history
addons/crm/wizard/crm_merge_opportunities.py	diff1 \|	diff2 \|	blob \| history
addons/crm/wizard/crm_partner_binding.py	\|	diff2 \|	blob \| history
addons/delivery/sale.py	diff1 \|	diff2 \|	blob \| history
addons/document/document_directory.py	diff1 \|	diff2 \|	blob \| history
addons/document/document_storage.py	diff1 \|	diff2 \|	blob \| history
addons/event_sale/event_sale.py	diff1 \|	diff2 \|	blob \| history
addons/fetchmail/fetchmail.py	diff1 \|	diff2 \|	blob \| history
addons/fleet/fleet.py	diff1 \|	diff2 \|	blob \| history
addons/google_docs/google_docs.py	diff1 \|	diff2 \|	blob \| history
addons/hr/hr.py	diff1 \|	diff2 \|	blob \| history
addons/hr_attendance/hr_attendance.py	diff1 \|	diff2 \|	blob \| history
addons/hr_evaluation/hr_evaluation.py	diff1 \|	diff2 \|	blob \| history
addons/hr_holidays/hr_holidays.py	diff1 \|	diff2 \|	blob \| history
addons/hr_timesheet_invoice/hr_timesheet_invoice.py	diff1 \|	diff2 \|	blob \| history
addons/hr_timesheet_sheet/hr_timesheet_sheet.py	diff1 \|	diff2 \|	blob \| history
addons/l10n_be/wizard/l10n_be_vat_intra.py	diff1 \|	diff2 \|	blob \| history
addons/l10n_be_coda/l10n_be_coda.py	diff1 \|	diff2 \|	blob \| history
addons/l10n_be_coda/wizard/account_coda_import.py	diff1 \|	diff2 \|	blob \| history
addons/l10n_ch/report/report_webkit_html.py	diff1 \|	diff2 \|	blob \| history
addons/mail/wizard/invite.py	diff1 \|	diff2 \|	blob \| history
addons/membership/membership.py	diff1 \|	diff2 \|	blob \| history
addons/mrp_byproduct/mrp_byproduct.py	diff1 \|	diff2 \|	blob \| history
addons/portal/wizard/portal_wizard.py	diff1 \|	diff2 \|	blob \| history
addons/portal_hr_employees/hr_employee.py	diff1 \|	diff2 \|	blob \| history
addons/portal_sale/sale.py	diff1 \|	diff2 \|	blob \| history
addons/product/product.py	diff1 \|	diff2 \|	blob \| history
addons/product_margin/product_margin.py	diff1 \|	diff2 \|	blob \| history
addons/project/project.py	diff1 \|	diff2 \|	blob \| history
addons/project_issue/project_issue.py	diff1 \|	diff2 \|	blob \| history
addons/project_issue/report/project_issue_report.py	diff1 \|	diff2 \|	blob \| history
addons/purchase/purchase.py	diff1 \|	diff2 \|	blob \| history
addons/purchase_double_validation/purchase_double_validation_installer.py	diff1 \|	diff2 \|	blob \| history
addons/report_webkit/webkit_report.py	diff1 \|	diff2 \|	blob \| history
addons/resource/resource.py	diff1 \|	diff2 \|	blob \| history
addons/sale/sale.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_partial_picking.py	diff1 \|	diff2 \|	blob \| history
addons/stock_location/stock_location.py	diff1 \|	diff2 \|	blob \| history
addons/survey/report/survey_form.py	diff1 \|	diff2 \|	blob \| history
addons/survey/wizard/survey_answer.py	diff1 \|	diff2 \|	blob \| history