Viewing all changes in revision 4230.
- Committer: ssi
- Date: 2010-10-09 05:36:27 UTC
- mfrom: (4213.1.47 trunk)
- Revision ID: ssi@tinyerp.com-20101009053627-ldwwzw1xu155qrlr
Merge
- files removed:
- hr_payroll/wizard/hr_payroll_create_analytic.py
- marketing_campaign_mailchimp
- marketing_campaign_mailchimp/security
- marketing_campaign_mailchimp/wizard
- files renamed:
- account/report/invoice.py => account/report/account_print_invoice.py
- account/report/invoice.rml => account/report/account_print_invoice.rml
- account/report/invoice.sxw => account/report/account_print_invoice.sxw
- account/report/overdue.py => account/report/account_print_overdue.py
- account/report/overdue.rml => account/report/account_print_overdue.rml
- account/report/overdue.sxw => account/report/account_print_overdue.sxw
- account/report/tax_report.py => account/report/account_tax_report.py
- account/report/tax_report.rml => account/report/account_tax_report.rml
- account/report/tax_report.sxw => account/report/account_tax_report.sxw
- account/report/voucher_print.py => account/report/account_voucher_print.py
- account/report/voucher_print.rml => account/report/account_voucher_print.rml
- account/report/voucher_print.sxw => account/report/account_voucher_print.sxw
- account_budget/crossovered_budget.py => account_budget/account_budget.py
- account_budget/crossovered_budget_demo.xml => account_budget/account_budget_demo.xml
- account_budget/crossovered_budget_report.xml => account_budget/account_budget_report.xml
- account_budget/crossovered_budget_view.xml => account_budget/account_budget_view.xml
- account_budget/crossovered_budget_workflow.xml => account_budget/account_budget_workflow.xml
- files modified:
- account/__openerp__.py
expand all
collapse all
added
removed
