Viewing all changes in revision 674.
- Committer: ced
- Date: 2007-07-19 13:47:25 UTC
- Revision ID: ced-53d5b1eb97f770d60b281ecb4ff118898d110112
Merge branch 'master' of ssh://ced@dev.tinyerp.com//home/ced/terp
Conflicts:
server/bin/addons/hr_timesheet_invoice/report/cost_ledger.py
Conflicts:
server/bin/addons/hr_timesheet_invoice/report/cost_ledger.py
- files added:
- account_chart
- files modified:
- account/account.py
expand all
collapse all
added
removed
