diff options
| author | Harry (OpenERP) <hmo@tinyerp.com> | 2012-07-19 10:50:44 +0530 |
|---|---|---|
| committer | Harry (OpenERP) <hmo@tinyerp.com> | 2012-07-19 10:50:44 +0530 |
| commit | d5bb4896e7227d28f10484082c35ba06fdbc331e (patch) | |
| tree | fa9a1a2f659f7aea9669935db40f4d24d6176de7 | |
| parent | 9d189ee4e59e6c06e0938d42a41e3411c3edb109 (diff) | |
| parent | b8129fc2de94f4d469671cef00e712e682d118b0 (diff) | |
[MERGE] merged with trunk
bzr revid: hmo@tinyerp.com-20120719052044-qg0skb7tkiut2ipc
49 files changed, 1873 insertions, 429 deletions
diff --git a/addons/account/account.py b/addons/account/account.py index b6fd7232a25..fab9de5407c 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -3351,15 +3351,7 @@ class wizard_multi_charts_accounts(osv.osv_memory): # Create Bank journals self._create_bank_journals_from_o2m(cr, uid, obj_wizard, company_id, acc_template_ref, context=context) - action = { - 'type': 'ir.actions.act_window', - 'view_type': 'form', - 'view_mode': 'form', - 'res_model': 'board.board', - 'view_id': self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'board_account_form')[1], - 'menu_id': self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'menu_finance')[1] - } - return action + return {} def _prepare_bank_journal(self, cr, uid, line, current_num, default_account_id, company_id, context=None): ''' diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py index bea48528f63..927ce94db31 100644 --- a/addons/account/account_cash_statement.py +++ b/addons/account/account_cash_statement.py @@ -132,18 +132,18 @@ class account_cash_statement(osv.osv): for obj in self.browse(cr, uid, ids, context=context): if obj.state == 'draft': - self.search(cr, uid, - [('journal_id', '=', journal_id),('state', '=', 'confirm')], + statement_ids = self.search(cr, uid, + [('journal_id', '=', obj.journal_id.id),('state', '=', 'confirm')], order='create_date desc', limit=1, context=context ) if not statement_ids: - return result - - st = self.browse(cr, uid, statement_ids[0], context=context) - result[obj.id] = st.balance_end_real + continue + else: + st = self.browse(cr, uid, statement_ids[0], context=context) + result[obj.id] = st.balance_end_real return result diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 211a40f030f..c71a7d56aae 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -177,11 +177,11 @@ domain="[('supplier', '=', True)]"/> <field name="fiscal_position" widget="selection"/> <field name="origin"/> - <label for="reference_type"/> - <div> + <label for="reference_type"/> + <div> <field name="reference_type" class="oe_inline oe_edit_only"/> <field name="reference" class="oe_inline"/> - </div> + </div> </group> <group> <field name="date_invoice"/> @@ -322,11 +322,9 @@ <field name="fiscal_position" widget="selection" /> </group> <group> - <field name="date_invoice"/> <field name="journal_id" groups="account.group_account_user" on_change="onchange_journal_id(journal_id, context)" widget="selection"/> - <field domain="[('company_id', '=', company_id),('type','=', 'receivable')]" name="account_id" groups="account.group_account_user"/> @@ -342,7 +340,6 @@ </group> </group> <field name="sent" invisible="1"/> - <notebook colspan="4"> <page string="Invoice Lines"> <field name="invoice_line" nolabel="1" widget="one2many_list" context="{'type': type}"/> diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index d6650ce4999..1e1f7b91851 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -17,7 +17,6 @@ <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object" class="oe_highlight"/> <field name="state" widget="statusbar" nolabel="1" /> </header> - <sheet string="Fiscalyear" > <group> <group> <field name="name"/> @@ -38,10 +37,10 @@ <field name="date_start"/> <field name="date_stop"/> <field name="special"/> + <field name="state" invisible="1"/> </group> </form> </field> - </sheet> </form> </field> </record> @@ -99,21 +98,28 @@ <field name="type">form</field> <field name="arch" type="xml"> <form version="7.0"> - <header> - <button name="action_draft" states="done" string="Set to Draft" type="object" groups="account.group_account_manager"/> - <field name="state" widget="statusbar" nolabel="1"/> - </header> - <sheet> - <group col="4"> - <field name="name"/> - <field name="code"/> - <field name="date_start"/> - <field name="date_stop"/> - <field name="company_id" widget="selection" groups="base.group_multi_company"/> - <field name="fiscalyear_id" widget="selection"/> - <field name="special"/> - </group> - </sheet> + <header> + <button name="action_draft" states="done" string="Set to Draft" type="object" groups="account.group_account_manager"/> + <field name="state" widget="statusbar" nolabel="1"/> + </header> + <sheet> + <group> + <group> + <field name="name"/> + <field name="fiscalyear_id" widget="selection"/> + <label for="date_start" string="Duration"/> + <div> + <field name="date_start" class="oe_inline" nolabel="1"/> - + <field name="date_stop" nolabel="1" class="oe_inline"/> + </div> + </group> + <group> + <field name="code"/> + <field name="special"/> + <field name="company_id" widget="selection" groups="base.group_multi_company"/> + </group> + </group> + </sheet> </form> </field> </record> @@ -463,62 +469,59 @@ <div class="oe_title"> <label for="name" class="oe_edit_only"/> <h1><field name="name"/></h1> - <label for="type" class="oe_edit_only"/> - <h2><field name="type" on_change="onchange_type(type, currency, context)"/></h2> </div> - <notebook> - <page string="Journal Configuration"> + <group> <group> + <field name="code"/> + <field name="type" on_change="onchange_type(type, currency, context)"/> + </group> + <group> + <field name="default_debit_account_id" attrs="{'required':[('type','in', ('cash', 'bank'))]}" domain="[('type','<>','view'),('type','<>','consolidation')]"/> + <field name="default_credit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','<>','view'),('type','<>','consolidation')]"/> + <field name="currency"/> + <field name="company_id" groups="base.group_multi_company"/> + </group> + </group> + <notebook> + <page string="Advanced Settings"> <group> - <field name="code"/> - <field name="currency"/> - </group> - <group> - <field name="company_id" groups="base.group_multi_company"/> - <field name="user_id"/> - </group> - <group> - <field name="default_debit_account_id" attrs="{'required':[('type','in', ('cash', 'bank'))]}" domain="[('type','<>','view'),('type','<>','consolidation')]"/> - <field name="default_credit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','<>','view'),('type','<>','consolidation')]"/> - <field name="view_id" widget="selection"/> + <group> + <field name="user_id"/> + <field name="view_id" widget="selection"/> <field name="sequence_id" required="0"/> + </group> + <group> + <field name="centralisation"/> + <field name="entry_posted"/> + <field name="allow_date"/> + <field name="group_invoice_lines"/> + </group> </group> - <group> - <field name="centralisation"/> - <field name="entry_posted"/> - <field name="with_last_closing_balance" /> - <field name="allow_date"/> - <field name="group_invoice_lines"/> - </group> - <group> - <field name="type_control_ids" widget="many2many_tags"/> - <field name="account_control_ids" widget="many2many_tags"/> - </group> - </group> + </page> <page string="Entry Controls"> <separator colspan="4" string="Accounts Type Allowed (empty for no control)"/> <field colspan="4" name="type_control_ids" nolabel="1"/> <separator colspan="4" string="Accounts Allowed (empty for no control)"/> <field colspan="4" name="account_control_ids" nolabel="1"/> </page> - <page string="Cash"> - <group string="Profit & Loss Accounts"> - <field name="profit_account_id" /> - <field name="loss_account_id" /> - </group> - - <group string="Internal Transfer Account"> - <field name="internal_account_id" /> + <page string="Cash Registers" attrs="{'invisible':[('type', '!=', 'cash')]}"> + <group> + <group string="Accounts"> + <field name="profit_account_id"/> + <field name="loss_account_id"/> + <field name="internal_account_id"/> + </group> + <group string="Miscellaneous"> + <field name="with_last_closing_balance"/> + </group> </group> - - <separator string="Available Currencies" colspan="4" /> + <separator string="Available Coins" colspan="4" /> <field name="cashbox_line_ids" nolabel="1" string="Unit Of Currency Definition" colspan="4"> <tree string="CashBox Lines" editable="bottom"> <field name="pieces" /> </tree> </field> </page> - </page> </notebook> </form> </field> @@ -618,6 +621,13 @@ <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/> </header> <sheet> + <div class="oe_right oe_button_box" name="import_buttons"> + <!-- Put here related buttons --> + </div> + <label for="name" class="oe_edit_only" attrs="{'invisible':[('name','=','/')]}"/> + <h1> + <field name="name" attrs="{'invisible':[('name','=','/')]}"/> + </h1> <group> <group> <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" widget="selection"/> @@ -626,7 +636,6 @@ <field name="date" on_change="onchange_date(date, company_id)" class="oe_inline"/> <field name="period_id" class="oe_inline"/> </div> - <field name="name"/> <field name='company_id' widget="selection" groups="base.group_multi_company" /> </group><group> <label for="balance_start"/> @@ -1054,69 +1063,66 @@ <field eval="2" name="priority"/> <field name="arch" type="xml"> <form string="Journal Item" version="7.0"> - <group col="6"> - <field name="name"/> - <field name="ref"/> - <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/> - - <field name="journal_id"/> - <field name="period_id"/> - <field name="company_id" required="1" groups="base.group_multi_company"/> - </group> - <notebook colspan="4"> - <page string="Information"> - <group> - <group string="Amount"> - <field name="account_id" domain="[('company_id', '=', company_id), ('type','<>','view'), ('type','<>','consolidation')]"/> - <field name="debit"/> - <field name="credit"/> - <field name="quantity"/> - </group> - - <group string="Accounting Documents"> - <field name="invoice" readonly="True"/> - <field name="move_id" required="False"/> - <field name="statement_id" readonly="True"/> - </group> - - <group string="Dates"> - <field name="date"/> - <field name="date_maturity"/> - <field name="date_created" readonly="True"/> - </group> - - <group string="Taxes"> - <field name="tax_code_id"/> - <field name="tax_amount"/> - <field name="account_tax_id" domain="[('parent_id','=',False)]"/> - </group> - - <group attrs="{'readonly':[('state','=','valid')]}" string="Currency"> - <field name="currency_id"/> - <field name="amount_currency"/> - </group> - - <group string="Reconciliation"> - <field name="reconcile_id"/> - <field name="reconcile_partial_id"/> - </group> - - <group string="States"> - <field name="state"/> - <field name="blocked"/> - </group> - - <group groups="analytic.group_analytic_accounting" string="Analytic"> - <field name="analytic_account_id" domain="[('parent_id','!=',False)]"/> - </group> - </group> - <separator string="Internal Note" colspan="4"/> - <field name="narration" colspan="4" nolabel="1"/> - </page> - <page string="Analytic Lines" groups="analytic.group_analytic_accounting"> - <field name="analytic_lines" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/> - </page> - </notebook> + <sheet> + <group> + <group> + <field name="name"/> + <field name="ref"/> + <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/> + </group> + <group> + <field name="journal_id"/> + <field name="period_id"/> + <field name="company_id" required="1" groups="base.group_multi_company"/> + </group> + </group> + <notebook colspan="4"> + <page string="Information"> + <group> + <group string="Amount"> + <field name="account_id" domain="[('company_id', '=', company_id), ('type','<>','view'), ('type','<>','consolidation')]"/> + <field name="debit"/> + <field name="credit"/> + <field name="quantity"/> + </group> + <group string="Accounting Documents"> + <field name="invoice" readonly="True"/> + <field name="move_id" required="False"/> + <field name="statement_id" readonly="True"/> + </group> + <group string="Dates"> + <field name="date"/> + <field name="date_maturity"/> + <field name="date_created" readonly="True"/> + </group> + <group string="Taxes"> + <field name="tax_code_id"/> + <field name="tax_amount"/> + <field name="account_tax_id" domain="[('parent_id','=',False)]"/> + </group> + <group attrs="{'readonly':[('state','=','valid')]}" string="Currency"> + <field name="currency_id"/> + <field name="amount_currency"/> + </group> + <group string="Reconciliation"> + <field name="reconcile_id"/> + <field name="reconcile_partial_id"/> + </group> + <group string="States"> + <field name="state"/> + <field name="blocked"/> + </group> + <group groups="analytic.group_analytic_accounting" string="Analytic"> + <field name="analytic_account_id" domain="[('parent_id','!=',False)]"/> + </group> + </group> + <field name="narration" colspan="4" nolabel="1" placeholder="Add an internal note..."/> + </page> + <page string="Analytic Lines" groups="analytic.group_analytic_accounting"> + <field name="analytic_lines" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/> + </page> + </notebook> + </sheet> </form> </field> </record> @@ -1316,16 +1322,23 @@ <field name="state" widget="statusbar"/> </header> <sheet string="Journal Entries" > - <group col="4"> - <field name="name" readonly="True"/> - <field name="ref"/> - <field name="journal_id"/> - <field name="period_id"/> - <field name="to_check"/> - <field name="date"/> - <field name="company_id" required="1" groups="base.group_multi_company"/> - <field name="partner_id" invisible="1"/> - <field name="amount" invisible="1"/> + <label for="name" class="oe_edit_only" attrs="{'invisible':[('name','=','/')]}"/> + <h1> + <field name="name" readonly="True" attrs="{'invisible':[('name','=','/')]}"/> + </h1> + <group> + <group> + <field name="journal_id"/> + <field name="period_id"/> + <field name="company_id" required="1" groups="base.group_multi_company"/> + <field name="partner_id" invisible="1"/> + </group> + <group> + <field name="ref"/> + <field name="date"/> + <field name="to_check"/> + <field name="amount" invisible="1"/> + </group> </group> <notebook> <page string="Journal Items"> @@ -1417,8 +1430,7 @@ <field name="reconcile_partial_id"/> </tree> </field> - <separator string="Internal Note"/> - <field name="narration" colspan="4" nolabel="1" height="50"/> + <field name="narration" colspan="4" placeholder="Add an internal note..." nolabel="1" height="50"/> </page> </notebook> </sheet> @@ -1878,16 +1890,11 @@ <field name="model_id"/> <field name="ref"/> </group> - <newline/> - - <group string="Starts on"> + <group> <field name="date_start"/> - <field name="period_total"/> - </group> - - <group string="Valid Up to"> - <field name="period_nbr"/> <field name="period_type"/> + <field name="period_nbr"/> + <field name="period_total"/> </group> </group> <separator string="Subscription Lines"/> @@ -2590,15 +2597,22 @@ action = pool.get('res.config').next(cr, uid, [], context) <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/> </header> <sheet string="Statement"> - <group col="4"> - <field name="name"/> - <field name='company_id' widget="selection" groups="base.group_multi_company" /> - <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/> - <field name="user_id" readonly="1"/> - <field name="period_id"/> - <field name="currency" invisible="1"/> + <label for="name" class="oe_edit_only" attrs="{'invisible':[('name','=','/')]}"/> + <h1><field name="name" class="oe_inline" attrs="{'invisible':[('name','=','/')]}"/></h1> + <group> + <group> + <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/> + <field name="user_id" readonly="1" string="Responsible"/> + <field name="total_entry_encoding"/> + <field name='company_id' widget="selection" groups="base.group_multi_company" /> + </group> + <group> + <field name="date" attrs="{'readonly':[('state','!=','draft')]}" on_change="onchange_date(date, company_id)"/> + <field name="closing_date" readonly="1"/> + <field name="period_id" class="oe_inline"/> + <field name="currency" invisible="1"/> + </group> </group> - <notebook> <page string="Cash Transactions" attrs="{'invisible': [('state','=','draft')]}"> <field name="line_ids" context="{'date':date}"> diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index 041c5c4510f..8e2006b8d29 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -380,7 +380,7 @@ <field name="inherit_id" ref="account.view_account_journal_form"/> <field name="type">form</field> <field name="arch" type="xml"> - <field name="currency" position="after"> + <field name="type" position="after"> <field name="analytic_journal_id"/> </field> </field> diff --git a/addons/account/test/account_cash_statement.yml b/addons/account/test/account_cash_statement.yml index 5ead46522bd..6bff530bb54 100644 --- a/addons/account/test/account_cash_statement.yml +++ b/addons/account/test/account_cash_statement.yml @@ -1,5 +1,5 @@ - - In order to test Cash statement I create a Cash statement and confirm it and check it's move created + In order to test Cash statement I create a Cash statement and confirm it and check its move created - !record {model: account.bank.statement, id: account_bank_statement_1}: date: !eval time.strftime('%Y-%m-%d') diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml index d7820caa647..553d83fa01c 100644 --- a/addons/account/wizard/account_chart_view.xml +++ b/addons/account/wizard/account_chart_view.xml @@ -7,13 +7,18 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Account charts" version="7.0"> - <group colspan="4"> - <field name="fiscalyear" on_change="onchange_fiscalyear(fiscalyear)"/> + <group> + <label for="fiscalyear"/> + <div> + <field name="fiscalyear" on_change="onchange_fiscalyear(fiscalyear)" class="oe_inline"/> + <label align="0.7" string="(If you do not select Fiscal year it will take all open fiscal years)" class="oe_inline"/> + </div> <field name="target_move"/> - <label align="0.7" colspan="4" string="(If you do not select Fiscal year it will take all open fiscal years)"/> - <separator string="Periods" colspan="4"/> - <field name="period_from"/> - <field name="period_to"/> + <label for="period_from" string="Periods"/> + <div> + <field name="period_from" class="oe_inline"/> - + <field name="period_to" class="oe_inline"/> + </div> </group> <footer> <button string="Open Charts" name="account_chart_open_window" type="object" class="oe_highlight"/> diff --git a/addons/account/wizard/account_fiscalyear_close_state.py b/addons/account/wizard/account_fiscalyear_close_state.py index 2af649ba19f..f57684a1460 100644 --- a/addons/account/wizard/account_fiscalyear_close_state.py +++ b/addons/account/wizard/account_fiscalyear_close_state.py @@ -30,7 +30,7 @@ class account_fiscalyear_close_state(osv.osv_memory): _description = "Fiscalyear Close state" _columns = { 'fy_id': fields.many2one('account.fiscalyear', \ - 'Fiscal Year to close', required=True, help="Select a fiscal year to close"), + 'Fiscal Year to Close', required=True, help="Select a fiscal year to close"), } def data_save(self, cr, uid, ids, context=None): diff --git a/addons/account/wizard/account_fiscalyear_close_state.xml b/addons/account/wizard/account_fiscalyear_close_state.xml index b31213f4bad..a4b558ab163 100644 --- a/addons/account/wizard/account_fiscalyear_close_state.xml +++ b/addons/account/wizard/account_fiscalyear_close_state.xml @@ -7,15 +7,15 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Close states of Fiscal year and periods" version="7.0"> - <header> - <button icon="terp-locked" string="Close Fiscalyear" name="data_save" type="object" class="oe_highlight" /> - </header> - <separator string="Close states of Fiscal year and periods"/> - <label string ="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 "/> <group> <field name="fy_id" domain="[('state','=','draft')]"/> </group> - </form> + <footer> + <button icon="terp-locked" string="Close Fiscal Year" name="data_save" type="object" class="oe_highlight"/> + or + <button string="Cancel" class="oe_link" special="cancel"/> + </footer> + </form> </field> </record> diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py index ff9e456b617..66f634bd59f 100644 --- a/addons/account/wizard/account_move_journal.py +++ b/addons/account/wizard/account_move_journal.py @@ -102,12 +102,11 @@ class account_move_journal(osv.osv_memory): period = period_pool.browse(cr, uid, [period_id], ['name'])[0]['name'] period_string = _("Period: %s") % tools.ustr(period) - separator_string = _("Open Journal Items") open_string = _("Open") view = """<?xml version="1.0" encoding="utf-8"?> <form string="Standard entries" version="7.0"> - <group string="%s"> - <field name="target_move" /> + <group> + <field name="target_move"/> </group> %s: <label string="%s"/> %s: <label string="%s"/> @@ -116,7 +115,7 @@ class account_move_journal(osv.osv_memory): or <button string="Cancel" class="oe_link" special="cancel"/> </footer> - </form>""" % (separator_string, _('Journal'), journal_string, _('Period'), period_string,open_string) + </form>""" % (_('Journal'), journal_string, _('Period'), period_string, open_string) view = etree.fromstring(view.encode('utf8')) xarch, xfields = self._view_look_dom_arch(cr, uid, view, view_id, context=context) diff --git a/addons/account/wizard/account_report_account_balance_view.xml b/addons/account/wizard/account_report_account_balance_view.xml index b700ab8a736..c42e0bc38ad 100644 --- a/addons/account/wizard/account_report_account_balance_view.xml +++ b/addons/account/wizard/account_report_account_balance_view.xml @@ -13,10 +13,6 @@ <xpath expr="//field[@name='journal_ids']" position="replace"> <field name="journal_ids" colspan="4" nolabel="1" required="0" readonly="1"/> </xpath> - <xpath expr="/form/label[@string='']" position="replace"> - <separator string="Trial Balance" colspan="4"/> - <label nolabel="1" colspan="4" string="This report allows you to print or generate a pdf of your trial balance allowing you to quickly check the balance of each of your accounts in a single report"/> - </xpath> <xpath expr="//field[@name='target_move']" position="after"> <field name="display_account"/> <newline/> diff --git a/addons/account/wizard/account_report_common_view.xml b/addons/account/wizard/account_report_common_view.xml index 2711154a35e..18953270e09 100644 --- a/addons/account/wizard/account_report_common_view.xml +++ b/addons/account/wizard/account_report_common_view.xml @@ -17,16 +17,16 @@ </group> <notebook tabpos="up" colspan="4"> <page string="Filters" name="filters"> - <group col="4"> + <group> <field name="filter" on_change="onchange_filter(filter, fiscalyear_id)"/> </group> - <group string="Dates" col="4"> - <field name="date_from" attrs="{'readonly':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}" colspan="4"/> - <field name="date_to" attrs="{'readonly':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}" colspan="4"/> + <group string="Dates" attrs="{'invisible':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}"> + <field name="date_from" /> + <field name="date_to" /> </group> - <group string="Periods" col="4"> - <field name="period_from" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/> - <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/> + <group string="Periods" attrs="{'invisible':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}"> + <field name="period_from" domain="[('fiscalyear_id', '=', fiscalyear_id)]"/> + <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]"/> </group> </page> <page string="Journals" name="journal_ids"> diff --git a/addons/account/wizard/account_report_general_journal_view.xml b/addons/account/wizard/account_report_general_journal_view.xml index 96f45f9d028..93c82cd5810 100644 --- a/addons/account/wizard/account_report_general_journal_view.xml +++ b/addons/account/wizard/account_report_general_journal_view.xml @@ -9,10 +9,6 @@ <field name="inherit_id" ref="account_common_report_view" /> <field name="arch" type="xml"> <data> - <xpath expr="/form/label[@string='']" position="replace"> - <separator string="General Journals" colspan="4"/> - <label nolabel="1" colspan="4" string="This report gives you an overview of the situation of your general journals"/> - </xpath> <xpath expr="//field[@name='target_move']" position="after"> <field name="amount_currency"/> <newline/> diff --git a/addons/account/wizard/account_report_general_ledger_view.xml b/addons/account/wizard/account_report_general_ledger_view.xml index 20b6ab0f042..5078eeac88b 100644 --- a/addons/account/wizard/account_report_general_ledger_view.xml +++ b/addons/account/wizard/account_report_general_ledger_view.xml @@ -9,10 +9,6 @@ <field name="inherit_id" ref="account_common_report_view" /> <field name="arch" type="xml"> <data> - <xpath expr="/form/label[@string='']" position="replace"> - <separator string="General Ledger" colspan="4"/> - <label nolabel="1" colspan="4" string="This report allows you to print or generate a pdf of your general ledger with details of all your account journals"/> - </xpath> <xpath expr="//field[@name='target_move']" position="after"> <field name="display_account"/> <field name="sortby"/> diff --git a/addons/account/wizard/account_report_partner_balance_view.xml b/addons/account/wizard/account_report_partner_balance_view.xml index 6dbe6d7b77b..e8abd1c68a2 100644 --- a/addons/account/wizard/account_report_partner_balance_view.xml +++ b/addons/account/wizard/account_report_partner_balance_view.xml @@ -9,10 +9,6 @@ <field name="inherit_id" ref="account_common_report_view" /> <field name="arch" type="xml"> <data> - <xpath expr="/form/label[@string='']" position="replace"> - <separator string="Partner Balance" colspan="4"/> - <label nolabel="1" colspan="4" string="This report is an analysis done by a partner. It is a PDF report containing one line per partner representing the cumulative credit balance"/> - </xpath> <xpath expr="//field[@name='target_move']" position="after"> <field name="result_selection"/> <field name="display_partner"/> diff --git a/addons/account/wizard/account_report_partner_ledger_view.xml b/addons/account/wizard/account_report_partner_ledger_view.xml index c3c731c1954..1bc223a956d 100644 --- a/addons/account/wizard/account_report_partner_ledger_view.xml +++ b/addons/account/wizard/account_report_partner_ledger_view.xml @@ -9,10 +9,6 @@ <field name="inherit_id" ref="account_common_report_view" /> <field name="arch" type="xml"> <data> - <xpath expr="/form/label[@string='']" position="replace"> - <separator string="Partner Ledger" colspan="4"/> - <label nolabel="1" colspan="4" string="This report is an analysis done by a partner. It is a PDF report containing one line per partner representing the cumulative credit balance"/> - </xpath> <xpath expr="//field[@name='target_move']" position="after"> <field name="result_selection"/> <field name="amount_currency"/> diff --git a/addons/account/wizard/account_report_print_journal_view.xml b/addons/account/wizard/account_report_print_journal_view.xml index cf4eb0a0c9f..9a2ef25a1fe 100644 --- a/addons/account/wizard/account_report_print_journal_view.xml +++ b/addons/account/wizard/account_report_print_journal_view.xml @@ -9,10 +9,6 @@ <field name="inherit_id" ref="account_common_report_view" /> <field name="arch" type="xml"> <data> - <xpath expr="/form/label[@string='']" position="replace"> - <separator string="Journals" colspan="4"/> - <label nolabel="1" colspan="4" string="This report gives you an overview of the situation of a specific journal"/> - </xpath> <xpath expr="//field[@name='target_move']" position="after"> <field name="sort_selection"/> <field name="amount_currency"/> diff --git a/addons/account/wizard/account_subscription_generate.py b/addons/account/wizard/account_subscription_generate.py index 8efcd25b789..dc5209ebea0 100644 --- a/addons/account/wizard/account_subscription_generate.py +++ b/addons/account/wizard/account_subscription_generate.py @@ -28,7 +28,7 @@ class account_subscription_generate(osv.osv_memory): _name = "account.subscription.generate" _description = "Subscription Compute" _columns = { - 'date': fields.date('Date', required=True), + 'date': fields.date('Generate Entries Before', required=True), } _defaults = { 'date': lambda *a: time.strftime('%Y-%m-%d'), diff --git a/addons/account/wizard/account_subscription_generate_view.xml b/addons/account/wizard/account_subscription_generate_view.xml index 64ca3beeb11..e32439537d7 100644 --- a/addons/account/wizard/account_subscription_generate_view.xml +++ b/addons/account/wizard/account_subscription_generate_view.xml @@ -8,8 +8,6 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Subscription Compute" version="7.0"> - <separator string="Generate Entries before:"/> - <label string ="Automatically generate entries based on what has been entered in the system before a specific date."/> <group> <field name="date"/> </group> diff --git a/addons/account/wizard/account_tax_chart_view.xml b/addons/account/wizard/account_tax_chart_view.xml index ea0c68f739f..eef4401ee2f 100644 --- a/addons/account/wizard/account_tax_chart_view.xml +++ b/addons/account/wizard/account_tax_chart_view.xml @@ -9,10 +9,13 @@ <field name="arch" type="xml"> <form string="Account tax charts" version="7.0"> <group> - <field name="period_id"/> - <label colspan="4" string="(If you do not select period it will take all open periods)"/> + <label for="period_id"/> + <div> + <field name="period_id" class="oe_inline"/> + <label string="(If you do not select period it will take all open periods)" class="oe_inline"/> + </div> <field name="target_move"/> - </group> + </group> <footer> <button string="Open Charts" name="account_tax_chart_open_window" type="object" class="oe_highlight"/> or diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml index 777ab38fddf..6170ca4fe12 100644 --- a/addons/account/wizard/account_use_model_view.xml +++ b/addons/account/wizard/account_use_model_view.xml @@ -8,8 +8,6 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Create Entries From Models" version="7.0"> - <separator string="This wizard will create recurring accounting entries"/> - <label string="Create manual recurring entries in a chosen journal."/> <group> <field name="model"/> </group> diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml index abadb57c4e7..991921710a7 100644 --- a/addons/account/wizard/account_validate_move_view.xml +++ b/addons/account/wizard/account_validate_move_view.xml @@ -9,8 +9,6 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Post Journal Entries" version="7.0"> - <separator string="Post Journal Entries of a Journal"/> - <label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accounting fields anymore."/> <group> <field name="journal_id"/> <field name="period_id"/> @@ -25,7 +23,7 @@ </record> <record id="action_validate_account_move" model="ir.actions.act_window"> - <field name="name">Open Journal</field> + <field name="name">Post Journal Entries</field> <field name="res_model">validate.account.move</field> <field name="view_type">form</field> <field name="view_mode">form</field> diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index 0799a59a423..8cd73c60aa7 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -213,13 +213,13 @@ class account_asset_asset(osv.osv): _columns = { 'account_move_line_ids': fields.one2many('account.move.line', 'asset_id', 'Entries', readonly=True, states={'draft':[('readonly',False)]}), - 'name': fields.char('Asset', size=64, required=True, readonly=True, states={'draft':[('readonly',False)]}), + 'name': fields.char('Asset Name', size=64, required=True, readonly=True, states={'draft':[('readonly',False)]}), 'code': fields.char('Reference', size=32, readonly=True, states={'draft':[('readonly',False)]}), - 'purchase_value': fields.float('Gross value ', required=True, readonly=True, states={'draft':[('readonly',False)]}), + 'purchase_value': fields.float('Gross Value', required=True, readonly=True, states={'draft':[('readonly',False)]}), 'currency_id': fields.many2one('res.currency','Currency',required=True, readonly=True, states={'draft':[('readonly',False)]}), 'company_id': fields.many2one('res.company', 'Company', required=True, readonly=True, states={'draft':[('readonly',False)]}), 'note': fields.text('Note'), - 'category_id': fields.many2one('account.asset.category', 'Asset category', required=True, change_default=True, readonly=True, states={'draft':[('readonly',False)]}), + 'category_id': fields.many2one('account.asset.category', 'Asset Category', required=True, change_default=True, readonly=True, states={'draft':[('readonly',False)]}), 'parent_id': fields.many2one('account.asset.asset', 'Parent Asset', readonly=True, states={'draft':[('readonly',False)]}), 'child_ids': fields.one2many('account.asset.asset', 'parent_id', 'Children Assets'), 'purchase_date': fields.date('Purchase Date', required=True, readonly=True, states={'draft':[('readonly',False)]}), @@ -233,7 +233,7 @@ class account_asset_asset(osv.osv): " * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n" \ " * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"), 'method_number': fields.integer('Number of Depreciations', readonly=True, states={'draft':[('readonly',False)]}, help="Calculates Depreciation within specified interval"), - 'method_period': fields.integer('Period Length', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="State here the time during 2 depreciations, in months"), + 'method_period': fields.integer('Number of Months in a Period', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="State here the time during 2 depreciations, in months"), 'method_end': fields.date('Ending Date', readonly=True, states={'draft':[('readonly',False)]}), 'method_progress_factor': fields.float('Degressive Factor', readonly=True, states={'draft':[('readonly',False)]}), 'value_residual': fields.function(_amount_residual, method=True, digits_compute=dp.get_precision('Account'), string='Residual Value'), @@ -316,6 +316,19 @@ class account_asset_asset(osv.osv): asset_id = super(account_asset_asset, self).create(cr, uid, vals, context=context) self.compute_depreciation_board(cr, uid, [asset_id], context=context) return asset_id + + def open_entries(self, cr, uid, ids, context=None): + if context is None: + context = {} + context.update({'search_default_asset_id': ids, 'default_asset_id': ids}) + return { + 'view_type': 'form', + 'view_mode': 'tree,form', + 'res_model': 'account.move.line', + 'view_id': False, + 'type': 'ir.actions.act_window', + 'context': context, + } account_asset_asset() @@ -331,7 +344,7 @@ class account_asset_depreciation_line(osv.osv): _columns = { 'name': fields.char('Depreciation Name', size=64, required=True, select=1), - 'sequence': fields.integer('Sequence of the depreciation', required=True), + 'sequence': fields.integer('Sequence', required=True), 'asset_id': fields.many2one('account.asset.asset', 'Asset', required=True), 'parent_state': fields.related('asset_id', 'state', type='char', string='State of Asset'), 'amount': fields.float('Depreciation Amount', required=True), diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml index ce84c7f0352..dec5f3714d6 100644 --- a/addons/account_asset/account_asset_view.xml +++ b/addons/account_asset/account_asset_view.xml @@ -88,60 +88,87 @@ <field name="state" widget="statusbar" statusbar_visible="draft,open"/> </header> <sheet> - <label for="name"/> - <h1><field name="name"/></h1> - <label for="category_id"/> - <h2><field name="category_id" on_change="onchange_category_id(category_id)"/></h2> - <notebook colspan="4"> - <page string="General"> + <div class="oe_button_box oe_right"> + <button name="open_entries" string="Entries" type="object" class="oe_inline"/> + </div> + <div class="oe_title"> + <label for="name" class="oe_edit_only"/> + <h1> + <field name="name" class="oe_inline"/> + </h1> + </div> + <group> + <group> + <field name="category_id" on_change="onchange_category_id(category_id)"/> + <field name="code"/> + <field name="parent_id"/> + </group> <group> - <group> - <field name="code"/> - <field name="company_id" widget="selection" - groups="base.group_multi_company" on_change="onchange_company_id(company_id)"/> - </group> - <group> - <field name="purchase_value"/> - <field name="salvage_value"/> - <field name="value_residual"/> - <field name="currency_id"/> - </group> - <group> - <field name="partner_id"/> - <field name="purchase_date"/> - <field name="parent_id"/> - </group> - <group> - <field name="method_time" on_change="onchange_method_time(method_time)"/> - <field name="method_number" attrs="{'invisible':[('method_time','=','end')], 'required':[('method_time','=','number')]}"/> - <field name="method_period"/> - <field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','number')]}"/> - <button name="%(action_asset_modify)d" states="open" string="Change Duration" type="action" icon="terp-stock_effects-object-colorize" colspan="2"/> - </group> - <group> - <field name="method"/> - <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/> - <field name="prorata" attrs="{'invisible': [('method_time','=','end')]}"/> - </group> + <field name="purchase_date"/> + <field name="currency_id"/> + <field name="company_id" widget="selection" groups="base.group_multi_company" on_change="onchange_company_id(company_id)"/> </group> + </group> + <notebook colspan="4"> + <page string="General"> + <group> + <group> + <field name="purchase_value"/> + <field name="salvage_value"/> + <field name="value_residual"/> + <field name="partner_id"/> + </group> + <group> + <field name="method"/> + <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/> + <label for="method_time"/> + <div> + <field name="method_time" on_change="onchange_method_time(method_time)" class="oe_inline"/> + <button name="%(action_asset_modify)d" states="open" string="Change Duration" type="action" icon="terp-stock_effects-object-colorize" class="oe_inline" colspan="1"/> + </div> + <field name="prorata" attrs="{'invisible': [('method_time','=','end')]}"/> + <field name="method_number" attrs="{'invisible':[('method_time','=','end')], 'required':[('method_time','=','number')]}"/> + <field name="method_period"/> + <field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','number')]}"/> + </group> + </group> </page> <page string="Depreciation Board"> <field name="depreciation_line_ids" mode="tree,graph"> - <tree string="Depreciation Lines" colors="blue:(move_check == False);black:(move_check == True)"> - <field name="depreciation_date"/> - <field name="sequence" invisible="1"/> - <field name="depreciated_value" readonly="1"/> - <field name="amount"/> - <field name="remaining_value" readonly="1"/> - <field name="move_check"/> - <field name="parent_state" invisible="1"/> - <button name="create_move" attrs="{'invisible':['|',('move_check','!=',False),('parent_state','!=','open')]}" icon="gtk-execute" string="Create Move" type="object"/> - </tree> - <graph type="bar"> - <field name="name"/> - <field name="amount"/> - <field name="depreciated_value"/> - </graph> + <tree string="Depreciation Lines" colors="blue:(move_check == False);black:(move_check == True)"> + <field name="depreciation_date"/> + <field name="sequence" invisible="1"/> + <field name="depreciated_value" readonly="1"/> + <field name="amount"/> + <field name="remaining_value" readonly="1"/> + <field name="move_check"/> + <field name="parent_state" invisible="1"/> + <button name="create_move" attrs="{'invisible':['|',('move_check','!=',False),('parent_state','!=','open')]}" icon="gtk-execute" string="Create Move" type="object"/> + </tree> + <form string="Depreciation Lines"> + <group> + <group> + <field name="asset_id" invisible="1"/> + <field name="parent_state" invisible="1"/> + <field name="name"/> + <field name="amount"/> + <field name="move_id"/> + <field name="move_check"/> + <field name="parent_state" invisible="1"/> + </group> + <group> + <field name="sequence"/> + <field name="depreciation_date"/> + <field name="depreciated_value" readonly="1"/> + <field name="remaining_value" readonly="1"/> + </group> + </group> + </form> + <graph type="bar"> + <field name="name"/> + <field name="amount"/> + <field name="depreciated_value"/> + </graph> </field> <button type="object" name="compute_depreciation_board" string="Compute" icon="terp-stock_format-scientific" colspan="2" attrs="{'invisible':[('state','=','close')]}"/> </page> @@ -150,12 +177,12 @@ <field name="history_ids" readonly="1"/> </page> <page string="Notes"> - <field name="note"/> + <field name="note" placeholder="Add an internal note here..."/> </page> </notebook> - </sheet> - </form> - </field> + </sheet> + </form> + </field> </record> <record model="ir.ui.view" id="view_account_asset_asset_tree"> diff --git a/addons/account_asset/wizard/wizard_asset_compute_view.xml b/addons/account_asset/wizard/wizard_asset_compute_view.xml index 45d3aa22625..e9b64a33a25 100644 --- a/addons/account_asset/wizard/wizard_asset_compute_view.xml +++ b/addons/account_asset/wizard/wizard_asset_compute_view.xml @@ -7,8 +7,6 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Compute Asset" version="7.0"> - <separator string="Post Depreciation Lines"/> - <label string="This wizard will post the depreciation lines of running assets that belong to the selected period."/> <group> <field name="period_id"/> </group> diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml index cc231b82183..db83df9c07f 100644 --- a/addons/account_budget/account_budget_view.xml +++ b/addons/account_budget/account_budget_view.xml @@ -108,48 +108,71 @@ <field name="type">form</field> <field name="arch" type="xml"> <form version="7.0"> - <header> - <button string="Confirm" name="confirm" states="draft" type="workflow" class="oe_highlight"/> - <button string="Approve" name="validate" states="confirm" type="workflow" class="oe_highlight"/> - <button string="Done" name="done" states="validate" type="workflow" class="oe_highlight"/> - <button name="draft" states="cancel" string="Reset to Draft" type="workflow" /> - <button string="Cancel" name="cancel" states="confirm,validate" type="workflow"/> - <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/> - </header> - <sheet string="Budget"> - <group col="4"> - <field name="name" colspan="1" attrs="{'readonly':[('state','!=','draft')]}"/> - <field name="code" colspan="1" attrs="{'readonly':[('state','!=','draft')]}"/> - <field name="creating_user_id" attrs="{'readonly':[('state','!=','draft')]}"/> - <field name="validating_user_id" readonly="True" attrs="{'readonly':[('state','!=','draft')]}"/> - <field name="date_from" attrs="{'readonly':[('state','!=','draft')]}"/> - <field name="date_to" attrs="{'readonly':[('state','!=','draft')]}"/> - <field name="company_id" groups="base.group_multi_company" widget="selection"/> - <field name="crossovered_budget_line" colspan="4" nolabel="1" attrs="{'readonly':[('state','!=','draft')]}"> - <tree string="Budget Lines"> - <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/> - <field name="general_budget_id"/> - <field name="date_from"/> - <field name="date_to"/> - <field name="paid_date"/> - <field name="planned_amount" sum="Planned Amount"/> - <field name="practical_amount" sum="Practical Amount"/> - <field name="theoritical_amount" sum="Theoretical Amount"/> - <field name="percentage"/> - </tree> - <form string="Budget Lines" version="7.0"> - <group col="4"> + <header> + <button string="Confirm" name="confirm" states="draft" type="workflow" class="oe_highlight"/> + <button string="Approve" name="validate" states="confirm" type="workflow" class="oe_highlight"/> + <button string="Done" name="done" states="validate" type="workflow" class="oe_highlight"/> + <button name="draft" states="cancel" string="Reset to Draft" type="workflow" /> + <button string="Cancel" name="cancel" states="confirm,validate" type="workflow"/> + <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/> + </header> + <sheet string="Budget"> + <div class="oe_title"> + <label for="name" class="oe_edit_only"/> + <h1> + <field name="name" attrs="{'readonly':[('state','!=','draft')]}"/> + </h1> + </div> + <group> + <group> + <field name="creating_user_id" attrs="{'readonly':[('state','!=','draft')]}"/> + <field name="validating_user_id" readonly="True" attrs="{'readonly':[('state','!=','draft')]}"/> + </group> + <group> + <field name="code" attrs="{'readonly':[('state','!=','draft')]}"/> + <label for="date_from" string="Duration"/> + <div> + <field name="date_from" class="oe_inline" attrs="{'readonly':[('state','!=','draft')]}"/> - + <field name="date_to" class="oe_inline" attrs="{'readonly':[('state','!=','draft')]}" nolabel="1"/> + </div> + <field name="company_id" groups="base.group_multi_company" widget="selection"/> + </group> + </group> + <notebook> + <page string="Budget Lines"> + <field name="crossovered_budget_line" colspan="4" nolabel="1" attrs="{'readonly':[('state','!=','draft')]}"> + <tree string="Budget Lines"> <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/> <field name="general_budget_id"/> <field name="date_from"/> <field name="date_to"/> <field name="paid_date"/> - <field name="planned_amount"/> - <field name="company_id" widget="selection" groups="base.group_multi_company"/> - </group> - </form> - </field> - </group> + <field name="planned_amount" sum="Planned Amount"/> + <field name="practical_amount" sum="Practical Amount"/> + <field name="theoritical_amount" sum="Theoretical Amount"/> + <field name="percentage"/> + </tree> + <form string="Budget Lines" version="7.0"> + <group> + <group> + <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/> + <field name="general_budget_id"/> + <field name="planned_amount"/> + </group> + <group> + <label for="date_from" string="Duration"/> + <div> + <field name="date_from" class="oe_inline"/> - + <field name="date_to" class="oe_inline"/> + </div> + <field name="paid_date"/> + <field name="company_id" widget="selection" groups="base.group_multi_company"/> + </group> + </group> + </form> + </field> + </page> + </notebook> </sheet> </form> </field> diff --git a/addons/account_check_writing/account_voucher_view.xml b/addons/account_check_writing/account_voucher_view.xml index aa8fd3b8d9c..07d73188db8 100644 --- a/addons/account_check_writing/account_voucher_view.xml +++ b/addons/account_check_writing/account_voucher_view.xml @@ -2,7 +2,7 @@ <openerp> <data> - <!-- Supplier voucher view --> + <!-- Supplier write check view --> <record model="ir.ui.view" id="view_vendor_payment_check_form"> <field name="name">account.voucher.payment.check.form</field> diff --git a/addons/account_coda/account_coda_wizard.xml b/addons/account_coda/account_coda_wizard.xml index 7bb5d9eb66b..655f1afb95e 100644 --- a/addons/account_coda/account_coda_wizard.xml +++ b/addons/account_coda/account_coda_wizard.xml @@ -14,7 +14,7 @@ or <button string="Cancel" class="oe_link" special="cancel"/> </header> - <group col="2" string="Select Your File :"> + <group col="2"> <field name="coda_data" filename="coda_fname"/> <field name="coda_fname"/> </group> diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py index b4629062455..d151d2171a4 100644 --- a/addons/account_followup/wizard/account_followup_print.py +++ b/addons/account_followup/wizard/account_followup_print.py @@ -31,7 +31,7 @@ class account_followup_print(osv.osv_memory): _description = 'Print Follow-up & Send Mail to Customers' _columns = { 'date': fields.date('Follow-up Sending Date', required=True, help="This field allow you to select a forecast date to plan your follow-ups"), - 'followup_id': fields.many2one('account_followup.followup', 'Follow-up', required=True), + 'followup_id': fields.many2one('account_followup.followup', 'Follow-Up', required=True), } def _get_followup(self, cr, uid, context=None): @@ -121,10 +121,10 @@ class account_followup_print_all(osv.osv_memory): _description = 'Print Follow-up & Send Mail to Customers' _columns = { 'partner_ids': fields.many2many('account_followup.stat.by.partner', 'partner_stat_rel', 'osv_memory_id', 'partner_id', 'Partners', required=True), - 'email_conf': fields.boolean('Send email confirmation'), + 'email_conf': fields.boolean('Send Email Confirmation'), 'email_subject': fields.char('Email Subject', size=64), 'partner_lang': fields.boolean('Send Email in Partner Language', help='Do not change message text, if you want to send email in partner language, or configure from company'), - 'email_body': fields.text('Email body'), + 'email_body': fields.text('Email Body'), 'summary': fields.text('Summary', required=True, readonly=True), 'test_print': fields.boolean('Test Print', help='Check if you want to print follow-ups without changing follow-ups level.') } diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml index 084de5c2ae6..c897b283ab0 100644 --- a/addons/account_followup/wizard/account_followup_print_view.xml +++ b/addons/account_followup/wizard/account_followup_print_view.xml @@ -8,8 +8,6 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Send follow-ups" version="7.0"> - <separator string="Send Follow-ups"/> - <label string ="This feature allows you to send reminders to partners with pending invoices. You can send them the default message for unpaid invoices or manually enter a message should you need to remind them of a specific information."/> <group col="4"> <field name="followup_id"/> <field name="date"/> @@ -24,7 +22,7 @@ </record> <record id="action_account_followup_print" model="ir.actions.act_window"> - <field name="name">Send follow-ups</field> + <field name="name">Send Follow-Ups</field> <field name="type">ir.actions.act_window</field> <field name="res_model">account.followup.print</field> <field name="view_type">form</field> @@ -76,7 +74,7 @@ <field name="model">account.followup.print.all</field> <field name="type">form</field> <field name="arch" type="xml"> - <form string="Send follow-ups" version="7.0"> + <form string="Send Follow-Ups" version="7.0"> <header> <button name="do_mail" string="Send Mails" type="object" class="oe_highlight"/> <button name="do_print" string="Print Follow Ups" type="object" class="oe_highlight"/> @@ -93,7 +91,6 @@ <field name="partner_lang" colspan="4"/> <field name="test_print" colspan="4"/> <field name="email_subject" colspan="4"/> - <separator string="Email Body" colspan="4" /> <field name="email_body" colspan="4" nolabel="1"/> </group> <group string="Legend"> @@ -125,7 +122,7 @@ </record> <record id="action_account_followup_print_all" model="ir.actions.act_window"> - <field name="name">Send follow-ups</field> + <field name="name">Send Follow-Ups</field> <field name="type">ir.actions.act_window</field> <field name="res_model">account.followup.print.all</field> <field name="view_type">form</field> diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py index 80d7a5419e7..22b7fc5f6f2 100644 --- a/addons/account_payment/account_payment.py +++ b/addons/account_payment/account_payment.py @@ -87,9 +87,9 @@ class payment_order(osv.osv): return res _columns = { - 'date_scheduled': fields.date('Scheduled date if fixed', states={'done':[('readonly', True)]}, help='Select a date if you have chosen Preferred Date to be fixed.'), + 'date_scheduled': fields.date('Scheduled Date', states={'done':[('readonly', True)]}, help='Select a date if you have chosen Preferred Date to be fixed.'), 'reference': fields.char('Reference', size=128, required=1, states={'done': [('readonly', True)]}), - 'mode': fields.many2one('payment.mode', 'Payment mode', select=True, required=1, states={'done': [('readonly', True)]}, help='Select the Payment Mode to be applied.'), + 'mode': fields.many2one('payment.mode', 'Payment Mode', select=True, required=1, states={'done': [('readonly', True)]}, help='Select the Payment Mode to be applied.'), 'state': fields.selection([ ('draft', 'Draft'), ('cancel', 'Cancelled'), @@ -98,14 +98,14 @@ class payment_order(osv.osv): help='When an order is placed the state is \'Draft\'.\n Once the bank is confirmed the state is set to \'Confirmed\'.\n Then the order is paid the state is \'Done\'.'), 'line_ids': fields.one2many('payment.line', 'order_id', 'Payment lines', states={'done': [('readonly', True)]}), 'total': fields.function(_total, string="Total", type='float'), - 'user_id': fields.many2one('res.users', 'User', required=True, states={'done': [('readonly', True)]}), + 'user_id': fields.many2one('res.users', 'Responsible', required=True, states={'done': [('readonly', True)]}), 'date_prefered': fields.selection([ ('now', 'Directly'), ('due', 'Due date'), ('fixed', 'Fixed date') - ], "Preferred date", change_default=True, required=True, states={'done': [('readonly', True)]}, help="Choose an option for the Payment Order:'Fixed' stands for a date specified by you.'Directly' stands for the direct execution.'Due date' stands for the scheduled date of execution."), - 'date_created': fields.date('Creation date', readonly=True), - 'date_done': fields.date('Execution date', readonly=True), + ], "Preferred Date", change_default=True, required=True, states={'done': [('readonly', True)]}, help="Choose an option for the Payment Order:'Fixed' stands for a date specified by you.'Directly' stands for the direct execution.'Due date' stands for the scheduled date of execution."), + 'date_created': fields.date('Creation Date', readonly=True), + 'date_done': fields.date('Execution Date', readonly=True), 'company_id': fields.related('mode', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True), } diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml index cf91dcc80a2..1577d1b86bd 100644 --- a/addons/account_payment/account_payment_view.xml +++ b/addons/account_payment/account_payment_view.xml @@ -112,16 +112,25 @@ <button name="cancel" states="draft,open" string="Cancel"/> <field name="state" widget="statusbar" statusbar_visible="draft,open"/> </header> - <sheet string="Payment order" > - <group col="4"> - <field name="reference"/> - <field name="mode" widget='selection'/> - <field name="user_id"/> - <field name="date_prefered"/> - <field name="date_scheduled" attrs="{'readonly':[('date_prefered','!=','fixed')]}" /> - <field name="company_id" widget='selection' groups="base.group_multi_company"/> - <button name="%(action_create_payment_order)d" string="Select Invoices to Pay" - type="action" attrs="{'invisible':[('state','=','done')]}" icon="gtk-find"/> + <sheet string="Payment order"> + <div class="oe_button_box"> + <button name="%(action_create_payment_order)d" string="Select Invoices to Pay" + type="action" attrs="{'invisible':[('state','=','done')]}" icon="gtk-find"/> + </div> + <div class="oe_title"> + <label for="reference" class="oe_edit_only"/> + <h1><field name="reference"/></h1> + </div> + <group> + <group> + <field name="user_id"/> + <field name="mode"/> + </group> + <group> + <field name="date_prefered"/> + <field name="date_scheduled" attrs="{'readonly':[('date_prefered','!=','fixed')]}"/> + <field name="company_id" widget='selection' groups="base.group_multi_company"/> + </group> </group> <field name="line_ids" context="{'order_id': active_id or False}" > <form string="Payment Line" version="7.0"> @@ -177,8 +186,6 @@ <field name="amount" sum="Total in Company Currency" invisible="1"/> </tree> </field> - <field name="date_created"/> - <field name="date_done"/> </sheet> </form> </field> @@ -330,9 +337,9 @@ <field name="type">form</field> <field name="inherit_id" ref="account.view_bank_statement_form"/> <field name="arch" type="xml"> - <field name="journal_id" position="after"> - <button name="%(action_account_populate_statement_confirm)d" attrs="{'invisible':[('state','=','confirm')]}" string="Import payment lines" type="action" icon="gtk-execute"/> - </field> + <xpath expr="//div[@name='import_buttons']" position="inside"> + <button name="%(action_account_populate_statement_confirm)d" attrs="{'invisible':[('state','=','confirm')]}" string="Import Payment Lines" type="action" icon="gtk-execute"/> + </xpath> </field> </record> diff --git a/addons/account_sequence/account_sequence.xml b/addons/account_sequence/account_sequence.xml index ba97025bae7..3ed16cfa58e 100644 --- a/addons/account_sequence/account_sequence.xml +++ b/addons/account_sequence/account_sequence.xml @@ -8,7 +8,7 @@ <field name="type">form</field> <field name="inherit_id" ref="account.view_move_form"/> <field name="arch" type="xml"> - <field name="to_check" position="after"> + <field name="period_id" position="after"> <field name="internal_sequence_number"/> </field> </field> @@ -44,7 +44,7 @@ <field name="inherit_id" ref="account.view_account_move_filter"/> <field name="arch" type="xml"> <data> - <xpath expr="//field[@name='ref']" position="before"> + <xpath expr="//field[@name='name']" position="after"> <field name="internal_sequence_number"/> </xpath> </data> diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml index 2b6c7013af4..d1912a58d1c 100644 --- a/addons/account_voucher/account_voucher_view.xml +++ b/addons/account_voucher/account_voucher_view.xml @@ -52,6 +52,7 @@ <sheet string="Accounting Voucher"> <group col="6" colspan="4"> <field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/> + <field name="payment_rate_currency_id" invisible="1"/> <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/> <field name="journal_id" widget="selection" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/> <field name="type" required="1"/> @@ -209,11 +210,11 @@ <field name="type">form</field> <field name="inherit_id" ref="account.view_bank_statement_form"/> <field name="arch" type="xml"> - <field name="currency" invisible="1" position="after"> - <button name="%(action_view_account_statement_from_invoice_lines)d" + <xpath expr="//div[@name='import_buttons']" position="inside"> + <button name="%(action_view_account_statement_from_invoice_lines)d" string="Import Invoices" type="action" icon="gtk-execute" attrs="{'invisible':[('state','=','confirm')]}"/> - </field> + </xpath> </field> </record> diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml index e70156e4032..bf1bca54447 100644 --- a/addons/account_voucher/voucher_sales_purchase_view.xml +++ b/addons/account_voucher/voucher_sales_purchase_view.xml @@ -113,7 +113,7 @@ <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/> </tree> </field> - <group> + <group> <field name="narration" placeholder="Internal Notes" nolabel="1"/> <group class="oe_subtotal_footer oe_right"> <field name="tax_id" @@ -127,10 +127,10 @@ <button type="object" class="oe_link oe_edit_only" name="compute_tax" string="(update)" attrs="{'invisible': [('state','!=','draft')]}"/> - </div> + </div> <field name="amount" class="oe_subtotal_footer_separator" nolabel="1"/> </group> - <group> + <group> <field name="pay_now" on_change="onchange_payment(pay_now, journal_id, partner_id)" required="1"/> <field name="date_due" attrs="{'invisible':[('pay_now','=','pay_now')]}"/> <field name="account_id" @@ -139,7 +139,7 @@ <field name="reference" attrs="{'invisible':[('pay_now','!=','pay_now')]}"/> </group> - </group> + </group> </page> <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}"> <group col="4"> diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml index 29e733e2496..26c74427009 100644 --- a/addons/crm/res_partner_view.xml +++ b/addons/crm/res_partner_view.xml @@ -123,6 +123,7 @@ <field name="model">res.partner</field> <field name="type">form</field> <field name="inherit_id" ref="base.view_partner_form" /> + <field name="priority" eval="10"/> <field name="arch" type="xml"> <xpath expr="//div[@name='buttons']" position="inside"> <button type="action" diff --git a/addons/crm_todo/i18n/en_GB.po b/addons/crm_todo/i18n/en_GB.po new file mode 100644 index 00000000000..d0d736b83ae --- /dev/null +++ b/addons/crm_todo/i18n/en_GB.po @@ -0,0 +1,95 @@ +# English (United Kingdom) translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2012-02-08 00:36+0000\n" +"PO-Revision-Date: 2012-07-18 16:31+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: English (United Kingdom) <en_GB@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-07-19 04:46+0000\n" +"X-Generator: Launchpad (build 15637)\n" + +#. module: crm_todo +#: model:ir.model,name:crm_todo.model_project_task +msgid "Task" +msgstr "Task" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Timebox" +msgstr "Timebox" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "For cancelling the task" +msgstr "For cancelling the task" + +#. module: crm_todo +#: constraint:project.task:0 +msgid "Error ! Task end-date must be greater then task start-date" +msgstr "Error ! Task end-date must be greater then task start-date" + +#. module: crm_todo +#: model:ir.model,name:crm_todo.model_crm_lead +msgid "crm.lead" +msgstr "crm.lead" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Next" +msgstr "Next" + +#. module: crm_todo +#: model:ir.actions.act_window,name:crm_todo.crm_todo_action +#: model:ir.ui.menu,name:crm_todo.menu_crm_todo +msgid "My Tasks" +msgstr "My Tasks" + +#. module: crm_todo +#: view:crm.lead:0 +#: field:crm.lead,task_ids:0 +msgid "Tasks" +msgstr "Tasks" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Done" +msgstr "Done" + +#. module: crm_todo +#: constraint:project.task:0 +msgid "Error ! You cannot create recursive tasks." +msgstr "Error ! You cannot create recursive tasks." + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Cancel" +msgstr "Cancel" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Extra Info" +msgstr "Extra Info" + +#. module: crm_todo +#: field:project.task,lead_id:0 +msgid "Lead / Opportunity" +msgstr "Lead / Opportunity" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "For changing to done state" +msgstr "For changing to done state" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Previous" +msgstr "Previous" diff --git a/addons/event/i18n/mn.po b/addons/event/i18n/mn.po new file mode 100644 index 00000000000..8e47ece549f --- /dev/null +++ b/addons/event/i18n/mn.po @@ -0,0 +1,1263 @@ +# Mongolian translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2012-02-08 00:36+0000\n" +"PO-Revision-Date: 2012-07-18 08:15+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Mongolian <mn@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-07-19 04:46+0000\n" +"X-Generator: Launchpad (build 15637)\n" + +#. module: event +#: view:event.event:0 +msgid "Invoice Information" +msgstr "Нэхэмжлэлийн мэдээлэл" + +#. module: event +#: view:partner.event.registration:0 +msgid "Event Details" +msgstr "" + +#. module: event +#: field:event.event,main_speaker_id:0 +msgid "Main Speaker" +msgstr "" + +#. module: event +#: view:event.event:0 +#: view:event.registration:0 +#: view:report.event.registration:0 +msgid "Group By..." +msgstr "" + +#. module: event +#: field:event.event,register_min:0 +msgid "Minimum Registrations" +msgstr "" + +#. module: event +#: model:ir.model,name:event.model_event_confirm_registration +msgid "Confirmation for Event Registration" +msgstr "" + +#. module: event +#: field:event.registration.badge,title:0 +msgid "Title" +msgstr "" + +#. module: event +#: field:event.event,mail_registr:0 +msgid "Registration Email" +msgstr "Бүртгүүлсэн е-майл" + +#. module: event +#: model:ir.actions.act_window,name:event.action_event_confirm_registration +msgid "Make Invoices" +msgstr "" + +#. module: event +#: view:event.event:0 +#: view:event.registration:0 +msgid "Registration Date" +msgstr "Бүртгүүлсэн огноо" + +#. module: event +#: view:partner.event.registration:0 +msgid "_Close" +msgstr "" + +#. module: event +#: model:event.event,name:event.event_0 +msgid "Concert of Bon Jovi" +msgstr "" + +#. module: event +#: view:report.event.registration:0 +msgid "Invoiced Registrations only" +msgstr "" + +#. module: event +#: selection:report.event.registration,month:0 +msgid "March" +msgstr "" + +#. module: event +#: field:event.event,mail_confirm:0 +msgid "Confirmation Email" +msgstr "Батлагдсан е-майл" + +#. module: event +#: field:event.registration,nb_register:0 +msgid "Quantity" +msgstr "" + +#. module: event +#: code:addons/event/wizard/event_make_invoice.py:63 +#, python-format +msgid "Registration doesn't have any partner to invoice." +msgstr "" + +#. module: event +#: field:event.event,company_id:0 +#: field:event.registration,company_id:0 +#: view:report.event.registration:0 +#: field:report.event.registration,company_id:0 +msgid "Company" +msgstr "" + +#. module: event +#: field:event.make.invoice,invoice_date:0 +msgid "Invoice Date" +msgstr "" + +#. module: event +#: help:event.event,pricelist_id:0 +msgid "Pricelist version for current event." +msgstr "" + +#. module: event +#: code:addons/event/wizard/partner_event_registration.py:88 +#: view:event.registration:0 +#: model:ir.actions.act_window,name:event.action_partner_event_registration +#: model:ir.model,name:event.model_event_registration +#: view:partner.event.registration:0 +#, python-format +msgid "Event Registration" +msgstr "Бүртгэгдсэн үйл ажиллагаа" + +#. module: event +#: field:event.event,parent_id:0 +msgid "Parent Event" +msgstr "" + +#. module: event +#: model:ir.actions.act_window,name:event.action_make_invoices +msgid "Make Invoice" +msgstr "" + +#. module: event +#: field:event.registration,price_subtotal:0 +msgid "Subtotal" +msgstr "" + +#. module: event +#: view:report.event.registration:0 +msgid "Event on Registration" +msgstr "" + +#. module: event +#: help:event.event,reply_to:0 +msgid "The email address put in the 'Reply-To' of all emails sent by OpenERP" +msgstr "" + +#. module: event +#: view:event.registration:0 +msgid "Add Internal Note" +msgstr "" + +#. module: event +#: view:event.event:0 +msgid "Confirmed events" +msgstr "" + +#. module: event +#: view:report.event.registration:0 +msgid "Event Beginning Date" +msgstr "" + +#. module: event +#: model:ir.actions.act_window,name:event.action_report_event_registration +#: model:ir.model,name:event.model_report_event_registration +#: model:ir.ui.menu,name:event.menu_report_event_registration +#: view:report.event.registration:0 +msgid "Events Analysis" +msgstr "Үйл ажиллагааны анализ" + +#. module: event +#: field:event.registration,message_ids:0 +msgid "Messages" +msgstr "" + +#. module: event +#: model:ir.model,name:event.model_event_registration_badge +msgid "event.registration.badge" +msgstr "" + +#. module: event +#: field:event.event,mail_auto_confirm:0 +msgid "Mail Auto Confirm" +msgstr "" + +#. module: event +#: model:product.template,name:event.event_product_1_product_template +msgid "Ticket for Opera" +msgstr "" + +#. module: event +#: code:addons/event/event.py:125 +#: view:event.event:0 +#, python-format +msgid "Confirm Event" +msgstr "" + +#. module: event +#: selection:event.event,state:0 +#: selection:event.registration,state:0 +#: selection:report.event.registration,state:0 +msgid "Cancelled" +msgstr "" + +#. module: event +#: field:event.event,reply_to:0 +msgid "Reply-To" +msgstr "" + +#. module: event +#: model:ir.actions.act_window,name:event.open_board_associations_manager +#: model:ir.ui.menu,name:event.menu_board_associations_manager +msgid "Event Dashboard" +msgstr "" + +#. module: event +#: model:event.event,name:event.event_1 +msgid "Opera of Verdi" +msgstr "" + +#. module: event +#: selection:report.event.registration,month:0 +msgid "July" +msgstr "" + +#. module: event +#: help:event.event,register_prospect:0 +msgid "Total of Prospect Registrations" +msgstr "" + +#. module: event +#: help:event.event,mail_auto_confirm:0 +msgid "" +"Check this box if you want to use automatic confirmation emailing or " +"reminder." +msgstr "" + +#. module: event +#: field:event.registration,ref:0 +msgid "Reference" +msgstr "" + +#. module: event +#: help:event.event,date_end:0 +#: help:partner.event.registration,end_date:0 +msgid "Closing Date of Event" +msgstr "" + +#. module: event +#: view:event.registration:0 +msgid "Emails" +msgstr "" + +#. module: event +#: view:event.registration:0 +msgid "Extra Info" +msgstr "" + +#. module: event +#: code:addons/event/wizard/event_make_invoice.py:83 +#, python-format +msgid "Customer Invoices" +msgstr "" + +#. module: event +#: selection:event.event,state:0 +#: selection:report.event.registration,state:0 +msgid "Draft" +msgstr "" + +#. module: event +#: field:event.type,name:0 +msgid "Event type" +msgstr "" + +#. module: event +#: model:ir.model,name:event.model_event_type +msgid " Event Type " +msgstr "" + +#. module: event +#: view:event.event:0 +#: view:event.registration:0 +#: field:event.registration,event_id:0 +#: model:ir.model,name:event.model_event_event +#: field:partner.event.registration,event_id:0 +#: view:report.event.registration:0 +#: field:report.event.registration,event_id:0 +#: view:res.partner:0 +msgid "Event" +msgstr "" + +#. module: event +#: view:event.registration:0 +#: field:event.registration,badge_ids:0 +msgid "Badges" +msgstr "" + +#. module: event +#: view:event.event:0 +#: selection:event.event,state:0 +#: view:event.registration:0 +#: selection:event.registration,state:0 +#: selection:report.event.registration,state:0 +msgid "Confirmed" +msgstr "" + +#. module: event +#: view:event.confirm.registration:0 +msgid "Registration Confirmation" +msgstr "" + +#. module: event +#: view:event.event:0 +msgid "Events in New state" +msgstr "" + +#. module: event +#: view:report.event.registration:0 +msgid "Confirm" +msgstr "" + +#. module: event +#: view:event.event:0 +#: field:event.event,speaker_ids:0 +msgid "Other Speakers" +msgstr "" + +#. module: event +#: model:ir.model,name:event.model_event_make_invoice +msgid "Event Make Invoice" +msgstr "" + +#. module: event +#: help:event.registration,nb_register:0 +msgid "Number of Registrations or Tickets" +msgstr "" + +#. module: event +#: code:addons/event/wizard/event_make_invoice.py:50 +#: code:addons/event/wizard/event_make_invoice.py:54 +#: code:addons/event/wizard/event_make_invoice.py:58 +#: code:addons/event/wizard/event_make_invoice.py:62 +#, python-format +msgid "Warning !" +msgstr "" + +#. module: event +#: view:event.registration:0 +msgid "Send New Email" +msgstr "" + +#. module: event +#: help:event.event,register_min:0 +msgid "Provide Minimum Number of Registrations" +msgstr "" + +#. module: event +#: view:event.event:0 +msgid "Location" +msgstr "" + +#. module: event +#: view:event.event:0 +#: view:event.registration:0 +#: view:report.event.registration:0 +msgid "New" +msgstr "" + +#. module: event +#: field:event.event,register_current:0 +#: view:report.event.registration:0 +msgid "Confirmed Registrations" +msgstr "" + +#. module: event +#: field:event.event,mail_auto_registr:0 +msgid "Mail Auto Register" +msgstr "" + +#. module: event +#: field:event.event,type:0 +#: field:partner.event.registration,event_type:0 +msgid "Type" +msgstr "" + +#. module: event +#: field:event.registration,email_from:0 +msgid "Email" +msgstr "" + +#. module: event +#: help:event.event,mail_confirm:0 +msgid "" +"This email will be sent when the event gets confirmed or when someone " +"subscribes to a confirmed event. This is also the email sent to remind " +"someone about the event." +msgstr "" + +#. module: event +#: field:event.registration,tobe_invoiced:0 +msgid "To be Invoiced" +msgstr "" + +#. module: event +#: view:event.event:0 +msgid "My Sales Team(s)" +msgstr "" + +#. module: event +#: code:addons/event/event.py:398 +#, python-format +msgid "Error !" +msgstr "" + +#. module: event +#: field:event.event,name:0 +#: field:event.registration,name:0 +msgid "Summary" +msgstr "" + +#. module: event +#: field:event.registration,create_date:0 +msgid "Creation Date" +msgstr "" + +#. module: event +#: view:event.event:0 +#: view:event.registration:0 +#: view:res.partner:0 +msgid "Cancel Registration" +msgstr "" + +#. module: event +#: code:addons/event/event.py:399 +#, python-format +msgid "Registered partner doesn't have an address to make the invoice." +msgstr "" + +#. module: event +#: view:report.event.registration:0 +msgid "Events created in last month" +msgstr "" + +#. module: event +#: view:report.event.registration:0 +msgid "Events created in current year" +msgstr "" + +#. module: event +#: help:event.event,type:0 +msgid "Type of Event like Seminar, Exhibition, Conference, Training." +msgstr "" + +#. module: event +#: view:event.registration:0 +msgid "Confirmed registrations" +msgstr "" + +#. module: event +#: view:event.event:0 +msgid "Event Organization" +msgstr "" + +#. module: event +#: view:event.registration:0 +msgid "History Information" +msgstr "" + +#. module: event +#: view:event.registration:0 +msgid "Dates" +msgstr "" + +#. module: event +#: view:event.confirm:0 +#: view:event.confirm.registration:0 +msgid "Confirm Anyway" +msgstr "" + +#. module: event +#: code:addons/event/wizard/event_confirm_registration.py:54 +#, python-format +msgid "Warning: The Event '%s' has reached its Maximum Limit (%s)." +msgstr "" + +#. module: event +#: view:report.event.registration:0 +msgid " Month-1 " +msgstr "" + +#. module: event +#: view:event.event:0 +#: view:event.registration:0 +#: field:event.registration.badge,registration_id:0 +#: model:ir.actions.act_window,name:event.act_event_list_register_event +msgid "Registration" +msgstr "" + +#. module: event +#: field:report.event.registration,nbevent:0 +msgid "Number Of Events" +msgstr "" + +#. module: event +#: help:event.event,main_speaker_id:0 +msgid "Speaker who will be giving speech at the event." +msgstr "" + +#. module: event +#: help:event.event,state:0 +msgid "" +"If event is created, the state is 'Draft'.If event is confirmed for the " +"particular dates the state is set to 'Confirmed'. If the event is over, the " +"state is set to 'Done'.If event is cancelled the state is set to 'Cancelled'." +msgstr "" + +#. module: event +#: view:event.event:0 +msgid "Cancel Event" +msgstr "" + +#. module: event +#: view:event.event:0 +#: view:event.registration:0 +msgid "Contact" +msgstr "" + +#. module: event +#: view:event.event:0 +#: view:event.registration:0 +#: field:event.registration,partner_id:0 +#: model:ir.model,name:event.model_res_partner +msgid "Partner" +msgstr "" + +#. module: event +#: view:board.board:0 +#: model:ir.actions.act_window,name:event.act_event_reg +#: view:report.event.registration:0 +msgid "Events Filling Status" +msgstr "" + +#. module: event +#: field:event.make.invoice,grouped:0 +msgid "Group the invoices" +msgstr "" + +#. module: event +#: view:event.event:0 +msgid "Mailing" +msgstr "" + +#. module: event +#: view:report.event.registration:0 +msgid "Events States" +msgstr "" + +#. module: event +#: view:board.board:0 +#: field:event.event,register_prospect:0 +msgid "Unconfirmed Registrations" +msgstr "" + +#. module: event +#: field:event.registration,partner_invoice_id:0 +msgid "Partner Invoiced" +msgstr "" + +#. module: event +#: help:event.event,register_max:0 +msgid "Provide Maximum Number of Registrations" +msgstr "" + +#. module: event +#: field:event.registration,log_ids:0 +msgid "Logs" +msgstr "" + +#. module: event +#: view:event.event:0 +#: field:event.event,state:0 +#: view:event.registration:0 +#: field:event.registration,state:0 +#: view:report.event.registration:0 +#: field:report.event.registration,state:0 +msgid "State" +msgstr "" + +#. module: event +#: selection:report.event.registration,month:0 +msgid "September" +msgstr "" + +#. module: event +#: selection:report.event.registration,month:0 +msgid "December" +msgstr "" + +#. module: event +#: field:event.registration,event_product:0 +msgid "Invoice Name" +msgstr "" + +#. module: event +#: field:report.event.registration,draft_state:0 +msgid " # No of Draft Registrations" +msgstr "" + +#. module: event +#: view:report.event.registration:0 +#: field:report.event.registration,month:0 +msgid "Month" +msgstr "" + +#. module: event +#: view:event.event:0 +msgid "Event Done" +msgstr "" + +#. module: event +#: view:event.registration:0 +msgid "Registrations in unconfirmed state" +msgstr "" + +#. module: event +#: help:event.event,register_current:0 +msgid "Total of Open and Done Registrations" +msgstr "" + +#. module: event +#: field:event.confirm.registration,msg:0 +msgid "Message" +msgstr "" + +#. module: event +#: constraint:event.event:0 +msgid "Error ! You cannot create recursive event." +msgstr "" + +#. module: event +#: field:event.registration,ref2:0 +msgid "Reference 2" +msgstr "" + +#. module: event +#: code:addons/event/event.py:361 +#: view:report.event.registration:0 +#, python-format +msgid "Invoiced" +msgstr "" + +#. module: event +#: view:event.event:0 +#: view:report.event.registration:0 +msgid "My Events" +msgstr "" + +#. module: event +#: view:event.event:0 +msgid "Speakers" +msgstr "" + +#. module: event +#: view:event.make.invoice:0 +msgid "Create invoices" +msgstr "" + +#. module: event +#: help:event.registration,email_cc:0 +msgid "" +"These email addresses will be added to the CC field of all inbound and " +"outbound emails for this record before being sent. Separate multiple email " +"addresses with a comma" +msgstr "" + +#. module: event +#: view:event.make.invoice:0 +msgid "Do you really want to create the invoice(s) ?" +msgstr "" + +#. module: event +#: view:event.event:0 +msgid "Beginning Date" +msgstr "" + +#. module: event +#: field:event.registration,date_closed:0 +msgid "Closed" +msgstr "" + +#. module: event +#: view:report.event.registration:0 +msgid "Events which are in New state" +msgstr "" + +#. module: event +#: view:event.event:0 +#: model:ir.actions.act_window,name:event.action_event_view +#: model:ir.ui.menu,name:event.menu_event_event +#: model:ir.ui.menu,name:event.menu_event_event_assiciation +#: view:res.partner:0 +msgid "Events" +msgstr "" + +#. module: event +#: field:partner.event.registration,nb_register:0 +msgid "Number of Registration" +msgstr "" + +#. module: event +#: field:event.event,child_ids:0 +msgid "Child Events" +msgstr "" + +#. module: event +#: selection:report.event.registration,month:0 +msgid "August" +msgstr "" + +#. module: event +#: field:res.partner,event_ids:0 +#: field:res.partner,event_registration_ids:0 +msgid "unknown" +msgstr "" + +#. module: event +#: help:event.event,product_id:0 +msgid "" +"The invoices of this event registration will be created with this Product. " +"Thus it allows you to set the default label and the accounting info you want " +"by default on these invoices." +msgstr "" + +#. module: event +#: selection:report.event.registration,month:0 +msgid "June" +msgstr "" + +#. module: event +#: model:product.template,name:event.event_product_0_product_template +msgid "Ticket for Concert" +msgstr "" + +#. module: event +#: field:event.registration,write_date:0 +msgid "Write Date" +msgstr "" + +#. module: event +#: view:event.registration:0 +msgid "My Registrations" +msgstr "" + +#. module: event +#: view:event.confirm:0 +msgid "" +"Warning: This Event has not reached its Minimum Registration Limit. Are you " +"sure you want to confirm it?" +msgstr "" + +#. module: event +#: field:event.registration,active:0 +msgid "Active" +msgstr "" + +#. module: event +#: field:event.registration,date:0 +msgid "Start Date" +msgstr "" + +#. module: event +#: selection:report.event.registration,month:0 +msgid "November" +msgstr "" + +#. module: event +#: view:report.event.registration:0 +msgid "Extended Filters..." +msgstr "" + +#. module: event +#: field:partner.event.registration,start_date:0 +msgid "Start date" +msgstr "" + +#. module: event +#: selection:report.event.registration,month:0 +msgid "October" +msgstr "" + +#. module: event +#: field:event.event,language:0 +msgid "Language" +msgstr "" + +#. module: event +#: view:event.registration:0 +#: field:event.registration,email_cc:0 +msgid "CC" +msgstr "" + +#. module: event +#: selection:report.event.registration,month:0 +msgid "January" +msgstr "" + +#. module: event +#: help:event.registration,email_from:0 +msgid "These people will receive email." +msgstr "" + +#. module: event +#: view:event.event:0 +msgid "Set To Draft" +msgstr "" + +#. module: event +#: code:addons/event/event.py:499 +#: view:event.event:0 +#: view:event.registration:0 +#: view:res.partner:0 +#, python-format +msgid "Confirm Registration" +msgstr "" + +#. module: event +#: view:event.event:0 +#: view:report.event.registration:0 +#: view:res.partner:0 +msgid "Date" +msgstr "" + +#. module: event +#: view:event.event:0 +msgid "Registration Email Body" +msgstr "" + +#. module: event +#: view:event.event:0 +msgid "Confirmation Email Body" +msgstr "" + +#. module: event +#: view:report.event.registration:0 +msgid "Registrations in confirmed or done state" +msgstr "" + +#. module: event +#: view:event.registration:0 +#: view:res.partner:0 +msgid "History" +msgstr "" + +#. module: event +#: field:event.event,address_id:0 +msgid "Location Address" +msgstr "" + +#. module: event +#: model:ir.actions.act_window,name:event.action_event_type +#: model:ir.ui.menu,name:event.menu_event_type +msgid "Types of Events" +msgstr "" + +#. module: event +#: field:event.registration,contact_id:0 +msgid "Partner Contact" +msgstr "" + +#. module: event +#: field:event.event,pricelist_id:0 +msgid "Pricelist" +msgstr "" + +#. module: event +#: code:addons/event/wizard/event_make_invoice.py:59 +#, python-format +msgid "Event related doesn't have any product defined" +msgstr "" + +#. module: event +#: view:event.event:0 +msgid "Auto Confirmation Email" +msgstr "" + +#. module: event +#: view:event.registration:0 +msgid "Misc" +msgstr "" + +#. module: event +#: constraint:event.event:0 +msgid "Error ! Closing Date cannot be set before Beginning Date." +msgstr "" + +#. module: event +#: code:addons/event/event.py:446 +#: selection:event.event,state:0 +#: view:event.make.invoice:0 +#: selection:event.registration,state:0 +#: selection:report.event.registration,state:0 +#, python-format +msgid "Done" +msgstr "" + +#. module: event +#: field:event.event,date_begin:0 +msgid "Beginning date" +msgstr "" + +#. module: event +#: view:event.registration:0 +#: field:event.registration,invoice_id:0 +msgid "Invoice" +msgstr "" + +#. module: event +#: view:report.event.registration:0 +#: field:report.event.registration,year:0 +msgid "Year" +msgstr "" + +#. module: event +#: code:addons/event/event.py:465 +#, python-format +msgid "Cancel" +msgstr "" + +#. module: event +#: view:event.confirm:0 +#: view:event.confirm.registration:0 +#: view:event.make.invoice:0 +msgid "Close" +msgstr "" + +#. module: event +#: view:event.event:0 +msgid "Event by Registration" +msgstr "" + +#. module: event +#: code:addons/event/event.py:436 +#, python-format +msgid "Open" +msgstr "" + +#. module: event +#: field:event.event,user_id:0 +msgid "Responsible User" +msgstr "" + +#. module: event +#: code:addons/event/event.py:561 +#: code:addons/event/event.py:568 +#, python-format +msgid "Auto Confirmation: [%s] %s" +msgstr "" + +#. module: event +#: view:event.event:0 +#: view:event.registration:0 +#: field:event.registration,user_id:0 +#: view:report.event.registration:0 +#: field:report.event.registration,user_id:0 +msgid "Responsible" +msgstr "" + +#. module: event +#: field:event.event,unit_price:0 +#: view:event.registration:0 +#: field:partner.event.registration,unit_price:0 +msgid "Registration Cost" +msgstr "" + +#. module: event +#: field:event.registration,unit_price:0 +msgid "Unit Price" +msgstr "" + +#. module: event +#: view:report.event.registration:0 +#: field:report.event.registration,speaker_id:0 +#: field:res.partner,speaker:0 +msgid "Speaker" +msgstr "" + +#. module: event +#: model:event.event,name:event.event_2 +msgid "Conference on ERP Buisness" +msgstr "" + +#. module: event +#: view:event.registration:0 +msgid "Reply" +msgstr "" + +#. module: event +#: view:report.event.registration:0 +msgid "Events created in current month" +msgstr "" + +#. module: event +#: help:event.event,mail_auto_registr:0 +msgid "" +"Check this box if you want to use automatic emailing for new registration." +msgstr "" + +#. module: event +#: field:event.event,date_end:0 +#: field:partner.event.registration,end_date:0 +msgid "Closing date" +msgstr "" + +#. module: event +#: field:event.event,product_id:0 +#: view:report.event.registration:0 +#: field:report.event.registration,product_id:0 +msgid "Product" +msgstr "" + +#. module: event +#: view:event.event:0 +#: field:event.event,note:0 +#: view:event.registration:0 +#: field:event.registration,description:0 +msgid "Description" +msgstr "" + +#. module: event +#: field:report.event.registration,confirm_state:0 +msgid " # No of Confirmed Registrations" +msgstr "" + +#. module: event +#: model:ir.actions.act_window,name:event.act_register_event_partner +msgid "Subscribe" +msgstr "" + +#. module: event +#: selection:report.event.registration,month:0 +msgid "May" +msgstr "" + +#. module: event +#: view:res.partner:0 +msgid "Events Registration" +msgstr "" + +#. module: event +#: help:event.event,mail_registr:0 +msgid "This email will be sent when someone subscribes to the event." +msgstr "" + +#. module: event +#: model:product.template,name:event.event_product_2_product_template +msgid "Ticket for Conference" +msgstr "" + +#. module: event +#: model:ir.ui.menu,name:event.menu_event_type_association +msgid "Events Type" +msgstr "" + +#. module: event +#: field:event.registration.badge,address_id:0 +msgid "Address" +msgstr "" + +#. module: event +#: view:board.board:0 +#: model:ir.actions.act_window,name:event.act_event_view +msgid "Next Events" +msgstr "" + +#. module: event +#: view:partner.event.registration:0 +msgid "_Subcribe" +msgstr "" + +#. module: event +#: model:ir.model,name:event.model_partner_event_registration +msgid " event Registration " +msgstr "" + +#. module: event +#: help:event.event,date_begin:0 +#: help:partner.event.registration,start_date:0 +msgid "Beginning Date of Event" +msgstr "" + +#. module: event +#: selection:event.registration,state:0 +msgid "Unconfirmed" +msgstr "" + +#. module: event +#: code:addons/event/event.py:565 +#, python-format +msgid "Auto Registration: [%s] %s" +msgstr "" + +#. module: event +#: field:event.registration,date_deadline:0 +msgid "End Date" +msgstr "" + +#. module: event +#: selection:report.event.registration,month:0 +msgid "February" +msgstr "" + +#. module: event +#: view:board.board:0 +msgid "Association Dashboard" +msgstr "" + +#. module: event +#: view:event.event:0 +#: field:event.registration.badge,name:0 +msgid "Name" +msgstr "" + +#. module: event +#: field:event.event,section_id:0 +#: field:event.registration,section_id:0 +#: view:report.event.registration:0 +#: field:report.event.registration,section_id:0 +msgid "Sale Team" +msgstr "" + +#. module: event +#: field:event.event,country_id:0 +msgid "Country" +msgstr "" + +#. module: event +#: code:addons/event/wizard/event_make_invoice.py:55 +#, python-format +msgid "Registration is set as Cannot be invoiced" +msgstr "" + +#. module: event +#: code:addons/event/event.py:527 +#: view:event.event:0 +#: view:event.registration:0 +#: view:res.partner:0 +#, python-format +msgid "Close Registration" +msgstr "" + +#. module: event +#: selection:report.event.registration,month:0 +msgid "April" +msgstr "" + +#. module: event +#: help:event.event,unit_price:0 +msgid "" +"This will be the default price used as registration cost when invoicing this " +"event. Note that you can specify a specific amount for each registration." +msgstr "" + +#. module: event +#: view:report.event.registration:0 +msgid "Events which are in confirm state" +msgstr "" + +#. module: event +#: view:event.event:0 +#: view:event.type:0 +#: view:report.event.registration:0 +#: field:report.event.registration,type:0 +msgid "Event Type" +msgstr "" + +#. module: event +#: view:event.event:0 +#: field:event.event,registration_ids:0 +#: model:ir.actions.act_window,name:event.action_registration +#: model:ir.ui.menu,name:event.menu_action_registration +#: model:ir.ui.menu,name:event.menu_action_registration_association +msgid "Registrations" +msgstr "" + +#. module: event +#: field:event.registration,id:0 +msgid "ID" +msgstr "" + +#. module: event +#: field:event.event,register_max:0 +#: field:report.event.registration,register_max:0 +msgid "Maximum Registrations" +msgstr "" + +#. module: event +#: constraint:res.partner:0 +msgid "Error ! You cannot create recursive associated members." +msgstr "" + +#. module: event +#: field:report.event.registration,date:0 +msgid "Event Start Date" +msgstr "" + +#. module: event +#: view:partner.event.registration:0 +msgid "Event For Registration" +msgstr "" + +#. module: event +#: code:addons/event/wizard/event_make_invoice.py:51 +#, python-format +msgid "Invoice cannot be created if the registration is in %s state." +msgstr "" + +#. module: event +#: view:event.confirm:0 +#: model:ir.actions.act_window,name:event.action_event_confirm +#: model:ir.model,name:event.model_event_confirm +msgid "Event Confirmation" +msgstr "" + +#. module: event +#: view:event.event:0 +msgid "Auto Registration Email" +msgstr "" + +#. module: event +#: view:event.registration:0 +#: view:report.event.registration:0 +#: field:report.event.registration,total:0 +msgid "Total" +msgstr "" + +#. module: event +#: field:event.event,speaker_confirmed:0 +msgid "Speaker Confirmed" +msgstr "" + +#. module: event +#: model:ir.actions.act_window,help:event.action_event_view +msgid "" +"Event is the low level object used by meeting and others documents that " +"should be synchronized with mobile devices or calendar applications through " +"caldav. Most of the users should work in the Calendar menu, and not in the " +"list of events." +msgstr "" diff --git a/addons/l10n_be_invoice_bba/account_invoice_view.xml b/addons/l10n_be_invoice_bba/account_invoice_view.xml index 51c39a4b3be..bf1cf96f537 100644 --- a/addons/l10n_be_invoice_bba/account_invoice_view.xml +++ b/addons/l10n_be_invoice_bba/account_invoice_view.xml @@ -12,7 +12,7 @@ <field name="payment_term" position="after"> <group col="4" colspan="2"> <field name="reference_type" nolabel="1" size="0" attrs="{'readonly':[('state','!=','draft')]}" - on_change="generate_bbacomm(type,reference_type,algorithm,partner_id,reference)" colspan="1"/> + on_change="generate_bbacomm(type,reference_type, partner_id,reference, context)" colspan="1"/> <field name="reference" nolabel="1" colspan="3" attrs="{'readonly':[('state','!=','draft')]}"/> </group> </field> diff --git a/addons/l10n_be_invoice_bba/invoice.py b/addons/l10n_be_invoice_bba/invoice.py index 4cdbca84c0a..bb03e4d6d02 100644 --- a/addons/l10n_be_invoice_bba/invoice.py +++ b/addons/l10n_be_invoice_bba/invoice.py @@ -44,7 +44,7 @@ class account_invoice(osv.osv): #l_logger.warning('reference_type = %s' %res )
return res
- def check_bbacomm(self, val):
+ def check_bbacomm(self, val): supported_chars = '0-9+*/ '
pattern = re.compile('[^' + supported_chars + ']')
if pattern.findall(val or ''):
@@ -75,10 +75,7 @@ class account_invoice(osv.osv): if (type == 'out_invoice'):
reference_type = self.pool.get('res.partner').browse(cr, uid, partner_id).out_inv_comm_type
if reference_type:
- algorithm = self.pool.get('res.partner').browse(cr, uid, partner_id).out_inv_comm_algorithm
- if not algorithm:
- algorithm = 'random'
- reference = self.generate_bbacomm(cr, uid, ids, type, reference_type, algorithm, partner_id, '')['value']['reference']
+ reference = self.generate_bbacomm(cr, uid, ids, type, reference_type, partner_id, '', context={})['value']['reference']
res_update = {
'reference_type': reference_type or 'none',
'reference': reference,
@@ -86,17 +83,15 @@ class account_invoice(osv.osv): result['value'].update(res_update)
return result
- def generate_bbacomm(self, cr, uid, ids, type, reference_type, algorithm, partner_id, reference):
+ def generate_bbacomm(self, cr, uid, ids, type, reference_type, partner_id, reference, context=None):
partner_obj = self.pool.get('res.partner')
- reference = reference or ''
+ reference = reference or '' + algorithm = False + if partner_id:
+ algorithm = partner_obj.browse(cr, uid, partner_id, context=context).out_inv_comm_algorithm
+ algorithm = algorithm or 'random'
if (type == 'out_invoice'):
if reference_type == 'bba':
- if not algorithm:
- if partner_id:
- algorithm = partner_obj.browse(cr, uid, partner_id).out_inv_comm_algorithm
- if not algorithm:
- if not algorithm:
- algorithm = 'random'
if algorithm == 'date':
if not self.check_bbacomm(reference):
doy = time.strftime('%j')
diff --git a/addons/l10n_ch/wizard/bvr_import_view.xml b/addons/l10n_ch/wizard/bvr_import_view.xml index 222aad3b6b9..18ee44efcf9 100644 --- a/addons/l10n_ch/wizard/bvr_import_view.xml +++ b/addons/l10n_ch/wizard/bvr_import_view.xml @@ -30,15 +30,15 @@ <field name="target">new</field> </record> - <record model="ir.ui.view" id="view_bank_statement_form"> + <record model="ir.ui.view" id="view_bank_statement_form_bvr"> <field name="name">account.bank.statement.form.inherit</field> <field name="model">account.bank.statement</field> <field name="type">form</field> <field name="inherit_id" ref="account.view_bank_statement_form"/> <field name="arch" type="xml"> - <field name="balance_end_real" position="after"> - <button name="%(wizard_bvr_import)d" icon="gtk-execute" string="Import BVR" type="action" colspan="2"/> - </field> + <xpath expr="//div[@name='import_buttons']" position="inside"> + <button name="%(wizard_bvr_import)d" icon="gtk-execute" string="Import BVR" type="action"/> + </xpath> </field> </record> </data> diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml index b8a9129cad2..052b49c5294 100644 --- a/addons/plugin_outlook/plugin_outlook.xml +++ b/addons/plugin_outlook/plugin_outlook.xml @@ -11,8 +11,7 @@ <form position="attributes"> <attribute name="string">Install Outlook Plug-In</attribute> </form> - <xpath expr="//button[@string='Install Modules']" position="replace"/> - <xpath expr="//button[@string='Cancel']" position="replace"/> + <xpath expr="//footer" position="replace"/> <xpath expr="//separator[@string='title']" position="after" version="7.0"> <group> <field name="plugin32" widget="url"/> diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml index ba235b850fd..8433824c268 100644 --- a/addons/plugin_thunderbird/plugin_thunderbird.xml +++ b/addons/plugin_thunderbird/plugin_thunderbird.xml @@ -11,8 +11,7 @@ <form position="attributes"> <attribute name="string">Install Thunderbird Plug-In</attribute> </form> - <xpath expr="//button[@string='Install Modules']" position="replace"/> - <xpath expr="//button[@string='Cancel']" position="replace"/> + <xpath expr="//footer" position="replace"/> <xpath expr="//separator[@string='title']" position="after"> <group> <field name="thunderbird" invisible="1"/> diff --git a/addons/point_of_sale/account_statement_view.xml b/addons/point_of_sale/account_statement_view.xml index acc0e482e3f..3b3542bb777 100644 --- a/addons/point_of_sale/account_statement_view.xml +++ b/addons/point_of_sale/account_statement_view.xml @@ -106,7 +106,7 @@ <field name="inherit_id" ref="account.view_cash_statement_tree"/> <field name="arch" type="xml"> <field name="journal_id" position="after"> - <field name="user_id"/> + <field name="user_id" string="Responsible"/> </field> </field> </record> diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 26814892775..faca7071007 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -517,47 +517,44 @@ <t t-name="kanban-box"> <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click"> <div class="oe_dropdown_toggle oe_dropdown_kanban"> - <span class="oe_e">i</span> + <span class="oe_e">í</span> <ul class="oe_dropdown_menu"> <li><a type="edit" >Edit...</a></li> <li><a type="delete">Delete</a></li> + <li> + <ul class="oe_kanban_project_times"> + <li><a name="set_remaining_time_1" type="object" class="oe_kanban_button">1</a></li> + <li><a name="set_remaining_time_2" type="object" class="oe_kanban_button">2</a></li> + <li><a name="set_remaining_time_5" type="object" class="oe_kanban_button">5</a></li> + <li><a name="set_remaining_time_10" type="object" class="oe_kanban_button">10</a></li> + <li><a name="do_open" states="draft" string="Validate planned time" type="object" class="oe_kanban_button oe_kanban_button_active">!</a></li> + </ul> + </li> <li><ul class="oe_kanban_colorpicker" data-field="color"/></li> </ul> </div> + <div class="oe_kanban_content"> - <div> - <a t-if="record.priority.raw_value == 1" icon="star-on" type="object" name="set_normal_priority"/> - <a t-if="record.priority.raw_value != 1" icon="star-off" type="object" name="set_high_priority" style="opacity:0.6; filter:alpha(opacity=60);"/> - <b><field name="name"/></b> - </div> - <div> - <field name="partner_id"/> - </div> + <div><b><field name="name"/></b></div> <div> <field name="project_id"/> <t t-esc="kanban_text_ellipsis(record.description.value, 160)"/><br/> <i><field name="date_deadline"/></i> - <span class="oe_kanban_project_times" style="white-space: nowrap; padding-left: 5px;"> - <t t-set="hours" t-value="record.remaining_hours.raw_value"/> - <t t-set="times" t-value="[ - [1, (hours gte 1 and hours lt 2)] - ,[2, (hours gte 2 and hours lt 5)] - ,[5, (hours gte 5 and hours lt 10)] - ,[10, (hours gte 10)] - ]"/> - <t t-foreach="times" t-as="time"><a - t-if="!time[1]" t-attf-data-name="set_remaining_time_#{time[0]}" type="object" class="oe_kanban_button"><t t-esc="time[0]"/></a><b - t-if="time[1]" class="oe_kanban_button oe_kanban_button_active"><t t-esc="Math.round(hours)"/></b></t> - <a name="do_open" states="draft" string="Validate planned time" type="object" class="oe_kanban_button oe_kanban_button_active">!</a> - </span> </div> - <div class="oe_kanban_footer_left" style="margin-top:5px;"> - <div class="oe_right"> - <a t-if="record.kanban_state.raw_value === 'normal'" type="object" string="" name="set_kanban_state_done" class="oe_kanban_status"> </a> - <a t-if="record.kanban_state.raw_value === 'done'" type="object" string="Ready" name="set_kanban_state_blocked" class="oe_kanban_status oe_kanban_status_green"> </a> - <a t-if="record.kanban_state.raw_value === 'blocked'" type="object" string="Blocked" name="set_kanban_state_normal" class="oe_kanban_status oe_kanban_status_red"> </a> - <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/> - </div> + + <div class="oe_kanban_bottom_right"> + <a t-if="record.kanban_state.raw_value === 'normal'" type="object" string="" name="set_kanban_state_done" class="oe_kanban_status"> </a> + <a t-if="record.kanban_state.raw_value === 'done'" type="object" string="Ready" name="set_kanban_state_blocked" class="oe_kanban_status oe_kanban_status_green"> </a> + <a t-if="record.kanban_state.raw_value === 'blocked'" type="object" string="Blocked" name="set_kanban_state_normal" class="oe_kanban_status oe_kanban_status_red"> </a> + <a t-if="record.priority.raw_value == 1" type="object" name="set_normal_priority" class="oe_e oe_star_on">7</a> + <a t-if="record.priority.raw_value != 1" type="object" name="set_high_priority" class="oe_e oe_star_off">7</a> + <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/> + </div> + <div class="oe_kanban_footer_left"> + <span> + <span class="oe_e">N</span> + <t t-esc="Math.round(record.remaining_hours.raw_value)"/> + </span> </div> </div> <div class="oe_clear"></div> diff --git a/addons/sale/res_partner_view.xml b/addons/sale/res_partner_view.xml index bb5695eac39..11ac318b7a7 100644 --- a/addons/sale/res_partner_view.xml +++ b/addons/sale/res_partner_view.xml @@ -1,7 +1,24 @@ <?xml version="1.0"?> <openerp> <data> - <!-- Partner kanban view inherte --> + <record id="act_res_partner_2_sale_order" model="ir.actions.act_window"> + <field name="name">Quotations and Sales</field> + <field name="res_model">sale.order</field> + <field name="view_type">form</field> + <field name="view_mode">tree,form,graph</field> + <field name="context">{'search_default_partner_id': active_id}</field> + <field name="groups_id" eval="[(4, ref('base.group_sale_salesman'))]"/> + <field name="help"> + This customer has no quotation or sale order. + Click here to create a new quotation. + <p> + The "Quotation" is the first step of the Sales flow. Manage your sales from quotation to invoice. + <p> + You will be able to sell products (manage deliveries) as well as services (create projects). + </field> + </record> + + <!-- Partner kanban view inherte --> <record model="ir.ui.view" id="crm_lead_partner_kanban_view"> <field name="name">res.partner.kanban.saleorder.inherit</field> <field name="model">res.partner</field> @@ -18,6 +35,22 @@ </xpath> </field> </record> + + <record id="res_partner_view_buttons" model="ir.ui.view"> + <field name="name">res.partner.view.buttons</field> + <field name="model">res.partner</field> + <field name="type">form</field> + <field name="inherit_id" ref="base.view_partner_form" /> + <field name="priority" eval="20"/> + <field name="arch" type="xml"> + <xpath expr="//div[@name='buttons']" position="inside"> + <button name="%(sale.act_res_partner_2_sale_order)d" type="action" + string="Quotations and Sales" + groups="base.group_sale_salesman"/> + </xpath> + </field> + </record> + </data> </openerp> diff --git a/addons/sale/sale_data.xml b/addons/sale/sale_data.xml index 4622577ac3d..9768f606793 100644 --- a/addons/sale/sale_data.xml +++ b/addons/sale/sale_data.xml @@ -27,4 +27,28 @@ <function eval="('default',False,'shop_id', [('sale.order', False)], shop, True, False, False, False, True)" id="sale_default_set" model="ir.values" name="set"/> </data> + <data> + + <record id="message_welcome_sale" model="mail.message"> + <field name="subject">Module sale installed!</field> + <field name="type">comment</field> + <field name="subtype">text</field> + <field name="model">res.users</field> + <field name="res_id" ref="base.user_root"/> + <field name="body_text">Welcome to OpenERP + + You can click on the top menu Sales to manage your + customers, your quotations and sales orders. + + If you need to manage your sales pipeline (leads, + opportunities, phonecalls), you can install the CRM module + from the Settings top menu. + </field> + </record> + <record id="message_welcome_sale_root" model="mail.notification"> + <field name="user_id" ref="base.user_root"/> + <field name="message_id" ref="message_welcome_sale"/> + </record> + + </data> </openerp> diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 9809c3d9d09..1c41951d438 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -571,14 +571,6 @@ </record> <act_window - context="{'search_default_partner_id': active_id, 'default_partner_id': active_id}" - id="act_res_partner_2_sale_order" - name="Quotations and Sales" - groups="base.group_sale_salesman" - res_model="sale.order" - src_model="res.partner"/> - - <act_window context="{'search_default_product_id': active_id, 'default_product_id': active_id}" id="action_order_line_product_tree" name="Sales Order Lines" diff --git a/addons/sale/wizard/sale_make_invoice.py b/addons/sale/wizard/sale_make_invoice.py index 5265afb9bff..b4b3772a91a 100644 --- a/addons/sale/wizard/sale_make_invoice.py +++ b/addons/sale/wizard/sale_make_invoice.py @@ -68,4 +68,4 @@ class sale_make_invoice(osv.osv_memory): sale_make_invoice() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |