From 744be1085532e5fdd1a988b2140ad0ca55c3f611 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Mon, 7 Jun 2010 16:01:35 +0530 Subject: [PATCH 01/27] Task-ID:919 merge board_account bzr revid: sbh@tinyerp.com-20100607103135-mr8hl56jthtqvdju --- addons/account/__openerp__.py | 6 +- .../board_account_demo.xml | 0 .../board_account_view.xml | 19 -- addons/account_report/__openerp__.py | 1 + .../board_account_report_view.xml | 17 ++ addons/board_account/__init__.py | 24 --- addons/board_account/__openerp__.py | 49 ----- addons/board_account/i18n/ar.po | 95 --------- addons/board_account/i18n/bg.po | 95 --------- addons/board_account/i18n/board_account.pot | 95 --------- addons/board_account/i18n/bs.po | 95 --------- addons/board_account/i18n/ca.po | 96 --------- addons/board_account/i18n/cs.po | 95 --------- addons/board_account/i18n/de.po | 95 --------- addons/board_account/i18n/el.po | 98 --------- addons/board_account/i18n/es.po | 95 --------- addons/board_account/i18n/es_AR.po | 95 --------- addons/board_account/i18n/et.po | 95 --------- addons/board_account/i18n/fr.po | 95 --------- addons/board_account/i18n/hr.po | 95 --------- addons/board_account/i18n/hu.po | 95 --------- addons/board_account/i18n/id.po | 95 --------- addons/board_account/i18n/it.po | 95 --------- addons/board_account/i18n/ko.po | 96 --------- addons/board_account/i18n/lt.po | 95 --------- addons/board_account/i18n/nl.po | 95 --------- addons/board_account/i18n/nl_BE.po | 95 --------- addons/board_account/i18n/pl.po | 95 --------- addons/board_account/i18n/pt.po | 95 --------- addons/board_account/i18n/pt_BR.po | 95 --------- addons/board_account/i18n/ro.po | 95 --------- addons/board_account/i18n/ru.po | 95 --------- addons/board_account/i18n/sk.po | 96 --------- addons/board_account/i18n/sl.po | 95 --------- addons/board_account/i18n/sq.po | 190 ------------------ addons/board_account/i18n/sv.po | 95 --------- addons/board_account/i18n/tlh.po | 95 --------- addons/board_account/i18n/tr.po | 95 --------- addons/board_account/i18n/uk.po | 95 --------- addons/board_account/i18n/vi.po | 190 ------------------ addons/board_account/i18n/zh_CN.po | 115 ----------- addons/board_account/i18n/zh_TW.po | 95 --------- addons/hr_timesheet_invoice/__openerp__.py | 1 + .../board_hr_timesheet_invoice.xml | 41 ++++ 44 files changed, 64 insertions(+), 3635 deletions(-) rename addons/{board_account => account}/board_account_demo.xml (100%) rename addons/{board_account => account}/board_account_view.xml (68%) create mode 100644 addons/account_report/board_account_report_view.xml delete mode 100644 addons/board_account/__init__.py delete mode 100644 addons/board_account/__openerp__.py delete mode 100644 addons/board_account/i18n/ar.po delete mode 100644 addons/board_account/i18n/bg.po delete mode 100644 addons/board_account/i18n/board_account.pot delete mode 100644 addons/board_account/i18n/bs.po delete mode 100644 addons/board_account/i18n/ca.po delete mode 100644 addons/board_account/i18n/cs.po delete mode 100644 addons/board_account/i18n/de.po delete mode 100644 addons/board_account/i18n/el.po delete mode 100644 addons/board_account/i18n/es.po delete mode 100644 addons/board_account/i18n/es_AR.po delete mode 100644 addons/board_account/i18n/et.po delete mode 100644 addons/board_account/i18n/fr.po delete mode 100644 addons/board_account/i18n/hr.po delete mode 100644 addons/board_account/i18n/hu.po delete mode 100644 addons/board_account/i18n/id.po delete mode 100644 addons/board_account/i18n/it.po delete mode 100644 addons/board_account/i18n/ko.po delete mode 100644 addons/board_account/i18n/lt.po delete mode 100644 addons/board_account/i18n/nl.po delete mode 100644 addons/board_account/i18n/nl_BE.po delete mode 100644 addons/board_account/i18n/pl.po delete mode 100644 addons/board_account/i18n/pt.po delete mode 100644 addons/board_account/i18n/pt_BR.po delete mode 100644 addons/board_account/i18n/ro.po delete mode 100644 addons/board_account/i18n/ru.po delete mode 100644 addons/board_account/i18n/sk.po delete mode 100644 addons/board_account/i18n/sl.po delete mode 100644 addons/board_account/i18n/sq.po delete mode 100644 addons/board_account/i18n/sv.po delete mode 100644 addons/board_account/i18n/tlh.po delete mode 100644 addons/board_account/i18n/tr.po delete mode 100644 addons/board_account/i18n/uk.po delete mode 100644 addons/board_account/i18n/vi.po delete mode 100644 addons/board_account/i18n/zh_CN.po delete mode 100644 addons/board_account/i18n/zh_TW.po create mode 100644 addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index 51724f47d33..a48927a5a78 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -23,7 +23,7 @@ { "name" : "Accounting and Financial Management", "version" : "1.1", - "depends" : ["product", "analytic", "process"], + "depends" : ["product", "analytic", "process","board"], "author" : "Tiny", "category": 'Generic Modules/Accounting', "description": """Financial and accounting module that covers: @@ -111,7 +111,8 @@ module named account_voucherss 'report/account_report_view.xml', 'report/account_analytic_report_view.xml', 'report/account_account_report_view.xml', - 'report/account_analytic_entries_report_view.xml' + 'report/account_analytic_entries_report_view.xml', + 'board_account_view.xml', ], 'demo_xml': [ #'demo/price_accuracy00.yml', @@ -120,6 +121,7 @@ module named account_voucherss 'project/analytic_account_demo.xml', 'demo/account_minimal.xml', 'account_unit_test.xml', + 'board_account_demo.xml', ], 'test': [ 'test/account_customer_invoice.yml', diff --git a/addons/board_account/board_account_demo.xml b/addons/account/board_account_demo.xml similarity index 100% rename from addons/board_account/board_account_demo.xml rename to addons/account/board_account_demo.xml diff --git a/addons/board_account/board_account_view.xml b/addons/account/board_account_view.xml similarity index 68% rename from addons/board_account/board_account_view.xml rename to addons/account/board_account_view.xml index 2beb9899cb6..cf3b09c21e8 100644 --- a/addons/board_account/board_account_view.xml +++ b/addons/account/board_account_view.xml @@ -6,12 +6,6 @@ Accountants - - Costs to invoice - report.account.analytic.line.to.invoice - form - graph,tree - Receivable Accounts @@ -29,7 +23,6 @@ - board.account.form @@ -40,23 +33,11 @@ - - - - - - -