← Back to branch summary

~gs.clearcorp/openerp-ccorp-addons/7.0_project_gdrive

~gs.clearcorp/openerp-ccorp-addons/7.0_project_gdrive

Viewing all changes in revision 799.

Committer: Glen Sojo
Date: 2014-01-14 17:23:27 UTC
mfrom: (797.1.3 7.0)
Revision ID: glen.sojo@clearcorp.co.cr-20140114172327-9qgylioq7v4w0ybi

[MRG] Merged diverged changes

files added:
account_asset_extended_ccorp/security

account_asset_extended_ccorp/security/ir.model.access.csv

account_general_ledger_report/report/account_general_ledger_report.ods

account_general_ledger_report/report/account_general_ledger_report.odt

account_journal_period_report/report/account_journal_period_report.ods

account_journal_period_report/report/account_journal_period_report.odt

account_journal_period_report/report_menus.xml

account_overdraft

account_overdraft/__init__.py

account_overdraft/__openerp__.py

account_overdraft/account_move_inherit.py

account_overdraft/account_overdraft.py

account_overdraft/account_overdraft_view.xml

account_overdraft/data

account_overdraft/data/data.xml

account_overdraft/i18n

account_overdraft/i18n/es_CR.po

cash_flow_report/report/cash_flow_report.ods

cash_flow_report/report/cash_flow_report.odt

files removed:
account_general_ledger_report/report/account_general_ledger_report.mako

account_journal_period_report/report/account_journal_period_report.mako

files modified:
account_asset_extended_ccorp/__openerp__.py

account_general_ledger_report/__openerp__.py

account_general_ledger_report/i18n/es_CR.po

account_general_ledger_report/report/account_general_ledger_report.py

account_general_ledger_report/report/report.xml

account_general_ledger_report/wizard/account_general_ledger_report_wizard.py

account_general_ledger_report/wizard/account_general_ledger_report_wizard.xml

account_journal_period_report/__openerp__.py

account_journal_period_report/i18n/es_CR.po

account_journal_period_report/report/account_journal_period_report.py

account_journal_period_report/report/report.xml

account_journal_period_report/wizard/account_journal_period_report_wizard.py

account_journal_period_report/wizard/account_journal_period_report_wizard_view.xml

account_report_lib/__openerp__.py

account_report_lib/account_common_library.py

account_report_lib/account_report_base.py

account_report_lib/i18n/es_CR.po

account_report_lib/wizard/account_report_wizard.py

account_report_lib/wizard/account_report_wizard.xml

cash_flow_report/__openerp__.py

cash_flow_report/i18n/es_CR.po

cash_flow_report/report/cash_flow_report.py

cash_flow_report/report/report.xml

cash_flow_report/wizard/cash_flow_report_wizard.py

cash_flow_report/wizard/cash_flow_report_wizard.xml

Show diffs side-by-side

added added

removed removed

account_asset_extended_ccorp/__openerp__.py

account_asset_extended_ccorp/security/

account_asset_extended_ccorp/security/ir.model.access.csv

account_general_ledger_report/__openerp__.py

account_general_ledger_report/i18n/es_CR.po

account_general_ledger_report/report/account_general_ledger_report.mako

account_general_ledger_report/report/account_general_ledger_report.ods

account_general_ledger_report/report/account_general_ledger_report.odt

account_general_ledger_report/report/account_general_ledger_report.py

account_general_ledger_report/report/report.xml

account_general_ledger_report/wizard/account_general_ledger_report_wizard.py

account_general_ledger_report/wizard/account_general_ledger_report_wizard.xml

account_journal_period_report/__openerp__.py

account_journal_period_report/i18n/es_CR.po

account_journal_period_report/report/account_journal_period_report.mako

account_journal_period_report/report/account_journal_period_report.ods

account_journal_period_report/report/account_journal_period_report.odt

account_journal_period_report/report/account_journal_period_report.py

account_journal_period_report/report/report.xml

account_journal_period_report/report_menus.xml

account_journal_period_report/wizard/account_journal_period_report_wizard.py

account_journal_period_report/wizard/account_journal_period_report_wizard_view.xml

account_overdraft/

account_overdraft/__init__.py

account_overdraft/__openerp__.py

account_overdraft/account_move_inherit.py

account_overdraft/account_overdraft.py

account_overdraft/account_overdraft_view.xml

account_overdraft/data/

account_overdraft/data/data.xml

account_overdraft/i18n/

account_overdraft/i18n/es_CR.po

account_report_lib/__openerp__.py

account_report_lib/account_common_library.py

account_report_lib/account_report_base.py

account_report_lib/i18n/es_CR.po

account_report_lib/wizard/account_report_wizard.py

account_report_lib/wizard/account_report_wizard.xml

cash_flow_report/__openerp__.py

cash_flow_report/i18n/es_CR.po

cash_flow_report/report/cash_flow_report.ods

cash_flow_report/report/cash_flow_report.odt

cash_flow_report/report/cash_flow_report.py

cash_flow_report/report/report.xml

cash_flow_report/wizard/cash_flow_report_wizard.py

cash_flow_report/wizard/cash_flow_report_wizard.xml

Older »