diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po index 391db02e8d6..c06407ce158 100644 --- a/addons/account/i18n/es.po +++ b/addons/account/i18n/es.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-30 03:34+0000\n" +"X-Launchpad-Export-Date: 2010-07-01 03:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/product.py b/addons/account/product.py index ce91b9b0743..188c3260dff 100644 --- a/addons/account/product.py +++ b/addons/account/product.py @@ -33,7 +33,7 @@ class product_category(osv.osv): string="Income Account", method=True, view_load=True, - help="This account will be used to value incoming stock(i.e. credit of incoming goods) for the current product category"), + help="This account will be used for invoices to value sales for the current product category"), 'property_account_expense_categ': fields.property( 'account.account', type='many2one', @@ -41,7 +41,7 @@ class product_category(osv.osv): string="Expense Account", method=True, view_load=True, - help="This account will be used to value outgoing stock(i.e. debit of outgoing goods) for the current product category"), + help="This account will be used for invoices to value expenses for the current product category"), } product_category() @@ -64,7 +64,7 @@ class product_template(osv.osv): string="Income Account", method=True, view_load=True, - help="This account will be used instead of the default one to value incoming stock for the current product"), + help="This account will be used for invoices instead of the default one to value sales for the current product"), 'property_account_expense': fields.property( 'account.account', type='many2one', @@ -72,7 +72,7 @@ class product_template(osv.osv): string="Expense Account", method=True, view_load=True, - help="This account will be used instead of the default one to value outgoing stock for the current product"), + help="This account will be used for invoices instead of the default one to value expenses for the current product"), } product_template() diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml index 6eda0241eea..a15ec5df775 100644 --- a/addons/account_analytic_default/account_analytic_default_view.xml +++ b/addons/account_analytic_default/account_analytic_default_view.xml @@ -6,7 +6,7 @@ account.analytic.default tree - + @@ -18,17 +18,18 @@ + account.analytic.default.form account.analytic.default form
- + - - + + @@ -36,11 +37,27 @@
+ + + account.analytic.default.search + account.analytic.default + search + + + + + + + + + + Analytic Defaults account.analytic.default form tree,form + @@ -48,7 +65,12 @@ + name="Entries" + id="act_account_acount_move_line_open" + res_model="account.move.line" + src_model="account.account" + domain="[('account_id', '=', active_id)]"/> + + + - + @@ -192,7 +192,7 @@ form tree,form - + + action="account_analytic_plan_form_action"/> account.analytic.plan.line.form diff --git a/addons/account_budget/crossovered_budget_view.xml b/addons/account_budget/crossovered_budget_view.xml index a99ce35d3b2..81c5e67f961 100644 --- a/addons/account_budget/crossovered_budget_view.xml +++ b/addons/account_budget/crossovered_budget_view.xml @@ -75,11 +75,6 @@ - -