diff --git a/addons/account/account.py b/addons/account/account.py index 7cce45ad006..45474178977 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -2533,8 +2533,8 @@ class wizard_multi_charts_accounts(osv.osv_memory): 'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Bank Accounts', required=True), 'code_digits':fields.integer('# of Digits', required=True, help="No. of Digits to use for account code"), 'seq_journal':fields.boolean('Separated Journal Sequences', help="Check this box if you want to use a different sequence for each created journal. Otherwise, all will use the same sequence."), - "sale_tax": fields.many2one("account.tax.template", "Sale Tax"), - "purchase_tax": fields.many2one("account.tax.template", "Purchase Tax"), + "sale_tax": fields.many2one("account.tax.template", "Default Sale Tax"), + "purchase_tax": fields.many2one("account.tax.template", "Default Purchase Tax"), } def onchange_chart_template_id(self, cr, uid, ids, chart_template_id=False, context=None): res = {} @@ -2542,12 +2542,12 @@ class wizard_multi_charts_accounts(osv.osv_memory): res['value']["sale_tax"] = False res['value']["purchase_tax"] = False if chart_template_id: - ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id" - , "=", chart_template_id)], order="sequence") - if len(ids) > 0: - id=ids[0] - res['value']["sale_tax"] = id - res['value']["purchase_tax"] = id + sale_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id" + , "=", chart_template_id), ('type_tax_use', 'in', ('sale','all'))], order="sequence") + purchase_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id" + , "=", chart_template_id), ('type_tax_use', 'in', ('purchase','all'))], order="sequence") + res['value']["sale_tax"] = sale_tax_ids and sale_tax_ids[0] or False + res['value']["purchase_tax"] = purchase_tax_ids and purchase_tax_ids[0] or False return res def _get_chart(self, cr, uid, context={}): diff --git a/addons/account/account_end_fy.xml b/addons/account/account_end_fy.xml index d0c966898d6..5f4ed44adfe 100644 --- a/addons/account/account_end_fy.xml +++ b/addons/account/account_end_fy.xml @@ -8,7 +8,7 @@ form {'search_default_draft': 1} - After closing a period, you will no longer be able to post entries to the period once it has been closed. + A period is a fiscal period of time during which accounting entries should be recorded for accounting related activities. Monthly period is the norm but depending on your countries or company needs, you could also have quarterly periods. Closing a period will make it impossible to record new accounting entries, all new entries should then be made on the following open period. Close a period when you do not want to record new entries and want to lock this period for tax related calculation. form tree,form + A recurring entry is a payment related entry that occurs on a recurrent basis from a specific date corresponding to the signature of a contract or an agreement with a customer or a supplier. With Define Recurring Entries, you can create them in the system in order to automate their entries in the system. - - + +
@@ -2466,7 +2467,7 @@ action = self.pool.get('res.config').next(cr, uid, [], context) New Company Financial Setting - STOCK_JUSTIFY_FILL + STOCK_EXECUTE diff --git a/addons/account/wizard/account_fiscalyear_close_state.xml b/addons/account/wizard/account_fiscalyear_close_state.xml index c8210dfbdf1..a4200d69c2d 100644 --- a/addons/account/wizard/account_fiscalyear_close_state.xml +++ b/addons/account/wizard/account_fiscalyear_close_state.xml @@ -26,6 +26,7 @@ tree,form new + If no additional entries should be recorded on a fiscal year, you can close it from here. It will close all opened periods in this year that will make impossible any new entry record. Close a fiscal year when you need to finalize your end of year results definitive. {'record_id' : active_id} new + This wizard will validate all journal entries of a particular journal and period. Once journal entries are validated, you can not update them anymore. diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml index 414c4cbfde1..3915463d8a2 100644 --- a/addons/account_budget/account_budget_view.xml +++ b/addons/account_budget/account_budget_view.xml @@ -192,6 +192,7 @@ tree,form + A budget is a forecast of your company's income and expenses expected for a period in the future. With a budget, a company is able to carefully look at how much money they are taking in during a given period, and figure out the best way to divide it among various categories. By keeping track of where your money goes, you may be less likely to overspend, and more likely to meet your financial goals. Forecast a budget by detailing the expected revenue per analytic account and monitor its evolution based on the actuals realised during that period. form tree,form + A payment order is a payment request that your company does in order to pay a supplier invoice or a customer credit note. Here you can register all payment orders that should be done, keep track of all payment orders and mention the invoice reference and the partner the payment should be done for. diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml index 1d0cf21be08..7f751f7c5a2 100644 --- a/addons/fetchmail/fetchmail_view.xml +++ b/addons/fetchmail/fetchmail_view.xml @@ -128,8 +128,8 @@ form tree,form - {'type':'imap'} - [('type','=','imap')] + {'server_type':'imap'} + [('server_type','=','imap')] form tree,form - {'type':'pop'} - [('type','=','pop')] + {'server_type':'pop'} + [('server_type','=','pop')] - - - htmlform - html.view - form - - - -

This is Test Html Page

- - - - - - - -
- Name : - - - - Company : - - -
- - - - - - - Html Test - ir.actions.act_window - html.view - form - - - + + + htmlform + html.view + form + +
+ +

This is Test Html Page

+ + + + + + + +
+ Name : + + + + Company : + + +
+ + + +
+ + + Html Test + ir.actions.act_window + html.view + form + + + \ No newline at end of file diff --git a/addons/pad/__openerp__.py b/addons/pad/__openerp__.py index 4b5e3ca959e..01d2e3f0c1c 100644 --- a/addons/pad/__openerp__.py +++ b/addons/pad/__openerp__.py @@ -11,7 +11,7 @@ company customize which Pad installation should be used to link to new pads 'author': 'OpenERP SA', 'website': 'http://openerp.com', 'depends': ['base'], - 'update_xml': [ + 'data': [ 'company_pad.xml' ], 'installable': True, diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 3145979d7b0..5291df7d258 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -297,10 +297,10 @@ class purchase_order(osv.osv): managers.append(manager.id) for manager_id in managers: request.create(cr, uid,{ - 'name' : "Purchase amount over the limit", + 'name' : _("Purchase amount over the limit"), 'act_from' : uid, 'act_to' : manager_id, - 'body': 'Somebody has just confirmed a purchase with an amount over the defined limit', + 'body': _('Somebody has just confirmed a purchase with an amount over the defined limit'), 'ref_partner_id': po.partner_id.id, 'ref_doc1': 'purchase.order,%d' % (po.id,), }) diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 18317f2cff1..fbb05024c29 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -41,7 +41,7 @@ parent="base.menu_purchase_root" sequence="4"/> + groups="base.group_extended"/> @@ -147,8 +147,7 @@