[MERGE] sync with trunk
bzr revid: odo@openerp.com-20120905163135-9f6q0ghri1kq6z75
This commit is contained in:
commit
41e16c6592
|
@ -383,7 +383,7 @@
|
|||
<field name="type">cash</field>
|
||||
<field name="profit_account_id" model="account.account" ref="rsa" />
|
||||
<field name="loss_account_id" model="account.account" ref="rsa" />
|
||||
<field name="internal_account_id" model="account.account" ref="chart0" />
|
||||
<field name="internal_account_id" model="account.account" ref="rsa" />
|
||||
<field name="with_last_closing_balance" eval="True" />
|
||||
<field name="cash_control" eval="True" />
|
||||
<field name="view_id" ref="account_journal_bank_view"/>
|
||||
|
|
|
@ -40,6 +40,10 @@ class CashBox(osv.osv_memory):
|
|||
|
||||
return {}
|
||||
|
||||
def _create_bank_statement_line(self, cr, uid, box, record, context=None):
|
||||
values = self._compute_values_for_statement_line(cr, uid, box, record, context=context)
|
||||
return self.pool.get('account.bank.statement.line').create(cr, uid, values, context=context)
|
||||
|
||||
|
||||
class CashBoxIn(CashBox):
|
||||
_name = 'cash.box.in'
|
||||
|
@ -49,30 +53,24 @@ class CashBoxIn(CashBox):
|
|||
'ref' : fields.char('Reference', size=32),
|
||||
})
|
||||
|
||||
def _create_bank_statement_line(self, cr, uid, box, record, context=None):
|
||||
absl_proxy = self.pool.get('account.bank.statement.line')
|
||||
|
||||
values = {
|
||||
def _compute_values_for_statement_line(self, cr, uid, box, record, context=None):
|
||||
return {
|
||||
'statement_id' : record.id,
|
||||
'journal_id' : record.journal_id.id,
|
||||
'account_id' : record.journal_id.internal_account_id.id,
|
||||
'amount' : box.amount or 0.0,
|
||||
'ref' : "%s" % (box.ref or ''),
|
||||
'ref' : '%s' % (box.ref or ''),
|
||||
'name' : box.name,
|
||||
}
|
||||
|
||||
return absl_proxy.create(cr, uid, values, context=context)
|
||||
|
||||
CashBoxIn()
|
||||
|
||||
class CashBoxOut(CashBox):
|
||||
_name = 'cash.box.out'
|
||||
|
||||
def _create_bank_statement_line(self, cr, uid, box, record, context=None):
|
||||
absl_proxy = self.pool.get('account.bank.statement.line')
|
||||
|
||||
def _compute_values_for_statement_line(self, cr, uid, box, record, context=None):
|
||||
amount = box.amount or 0.0
|
||||
values = {
|
||||
return {
|
||||
'statement_id' : record.id,
|
||||
'journal_id' : record.journal_id.id,
|
||||
'account_id' : record.journal_id.internal_account_id.id,
|
||||
|
@ -80,6 +78,4 @@ class CashBoxOut(CashBox):
|
|||
'name' : box.name,
|
||||
}
|
||||
|
||||
return absl_proxy.create(cr, uid, values, context=context)
|
||||
|
||||
CashBoxOut()
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
<t t-extend="Login">
|
||||
<t t-jquery=".oe_login .oe_login_logo" t-operation="after">
|
||||
<ul class="openid_providers">
|
||||
<ul class="openid_providers oe_semantic_html_override">
|
||||
<li><a href="#login,password" title="Password" data-url="" id="btn_password">Password</a></li>
|
||||
<li><a href="#google" title="Google" data-url="https://www.google.com/accounts/o8/id">Google</a></li>
|
||||
<li><a href="#googleapps" title="Google Apps" data-url="https://www.google.com/accounts/o8/site-xrds?hd={id}">Google</a></li>
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
</div>
|
||||
</t>
|
||||
<t t-name="DashBoard.layouts">
|
||||
<div class="oe_dashboard_layout_selector">
|
||||
<div class="oe_dashboard_layout_selector oe_semantic_html_override">
|
||||
<p>
|
||||
<strong>Choose dashboard layout</strong>
|
||||
</p>
|
||||
|
|
|
@ -298,7 +298,7 @@
|
|||
<field name="message_unread"/>
|
||||
<templates>
|
||||
<t t-name="lead_details">
|
||||
<ul class="oe_kanban_tooltip">
|
||||
<ul class="oe_kanban_tooltip oe_semantic_html_override">
|
||||
<li t-if="record.phone.raw_value"><b>Phone:</b> <field name="phone"/></li>
|
||||
<li><b>Probability:</b> <field name="probability"/>%%</li>
|
||||
<li><b>Creation date:</b> <field name="create_date"/></li>
|
||||
|
@ -307,11 +307,11 @@
|
|||
</t>
|
||||
<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">
|
||||
<div class="oe_dropdown_toggle oe_dropdown_kanban oe_semantic_html_override">
|
||||
<span class="oe_e">í</span>
|
||||
<ul class="oe_dropdown_menu">
|
||||
<li><a type="edit" >Edit...</a></li>
|
||||
<li><a type="delete">Delete</a></li>
|
||||
<t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
|
||||
<t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
|
||||
<li><a name="%(mail.action_email_compose_message_wizard)d" type="action">Send Email</a></li>
|
||||
<li><a name="%(opportunity2phonecall_act)d" type="action">Log Call</a></li>
|
||||
<li><a name="action_makeMeeting" type="object">Schedule Meeting</a></li>
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
<t t-call="WebClient"/>
|
||||
</t>
|
||||
<t t-name="EdiView">
|
||||
<table border="0" cellpadding="0" cellspacing="0" width="100%" height="100%" id="oe_app" class="oe-application oe_forms">
|
||||
<table border="0" cellpadding="0" cellspacing="0" width="100%" height="100%" id="oe_app" class="oe-application oe_forms oe_semantic_html_override">
|
||||
<tr>
|
||||
<td colspan="2" valign="top" id="oe_header" class="header">
|
||||
<div> <a href="/" class="company_logo_link">
|
||||
|
|
|
@ -151,7 +151,7 @@
|
|||
reference <strong><t t-esc="doc.internal_number"/></strong> on the transfer:
|
||||
<br/><br/>
|
||||
</p>
|
||||
<ul class="oe_edi_nested_block_pay oe_edi_pay_wire_nested">
|
||||
<ul class="oe_edi_nested_block_pay oe_edi_pay_wire_nested oe_semantic_html_override">
|
||||
<t t-foreach="doc.company_address.bank_ids" t-as="bank_info">
|
||||
<li><t t-esc="bank_info[1]"/></li>
|
||||
</t>
|
||||
|
|
|
@ -151,7 +151,7 @@
|
|||
reference <strong><t t-esc="doc.name"/></strong> on the transfer:
|
||||
<br/><br/>
|
||||
</p>
|
||||
<ul class="oe_edi_nested_block_pay oe_edi_pay_wire_nested">
|
||||
<ul class="oe_edi_nested_block_pay oe_edi_pay_wire_nested oe_semantic_html_override">
|
||||
<t t-foreach="doc.company_address.bank_ids" t-as="bank_info">
|
||||
<li><t t-esc="bank_info[1]"/></li>
|
||||
</t>
|
||||
|
|
|
@ -258,6 +258,25 @@ class event_event(osv.osv):
|
|||
}
|
||||
return {'value': dic}
|
||||
|
||||
def on_change_address_id(self, cr, uid, ids, address_id, context=None):
|
||||
values = {
|
||||
'street' : False,
|
||||
'city' : False,
|
||||
'zip' : False,
|
||||
}
|
||||
if isinstance(address_id, (long, int)):
|
||||
address = self.pool.get('res.partner').browse(cr, uid, address_id, context=context)
|
||||
|
||||
values.update({
|
||||
'street' : address.street,
|
||||
|
||||
'city' : address.city,
|
||||
'zip' : address.zip,
|
||||
})
|
||||
|
||||
return {'value' : values}
|
||||
|
||||
|
||||
# ----------------------------------------
|
||||
# OpenChatter methods and notifications
|
||||
# ----------------------------------------
|
||||
|
|
|
@ -124,7 +124,7 @@
|
|||
<group>
|
||||
<label for="address_id" string="Location Address"/>
|
||||
<div>
|
||||
<field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}"/>
|
||||
<field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}" on_change="on_change_address_id(address_id)" />
|
||||
<field name="street" placeholder="Street..."/>
|
||||
<div>
|
||||
<field name="zip" class="oe_inline" placeholder="Zip"/>
|
||||
|
@ -143,7 +143,7 @@
|
|||
</group>
|
||||
</group>
|
||||
</div>
|
||||
<!-- <div class="oe_right" style="height: 200px"></div> -->
|
||||
<div class="oe_google_map" style="height: 200px"></div>
|
||||
<notebook>
|
||||
<page string="Event Description">
|
||||
<field name="note" colspan="4" nolabel="1"/>
|
||||
|
|
|
@ -128,7 +128,7 @@
|
|||
<field name="last_login"/>
|
||||
<templates>
|
||||
<t t-name="kanban-box">
|
||||
<div class="oe_employee_vignette">
|
||||
<div class="oe_employee_vignette oe_semantic_html_override">
|
||||
<div class="oe_employee_image">
|
||||
<a type="open"><img t-att-src="kanban_image('hr.employee', 'image_medium', record.id.value)" class="oe_employee_picture"/></a>
|
||||
</div>
|
||||
|
|
|
@ -271,19 +271,19 @@
|
|||
<field name="categ_ids"/>
|
||||
<templates>
|
||||
<t t-name="kanban-tooltip">
|
||||
<ul class="oe_kanban_tooltip">
|
||||
<ul class="oe_kanban_tooltip oe_semantic_html_override">
|
||||
<li t-if="record.type_id.raw_value"><b>Degree:</b> <field name="type_id"/></li>
|
||||
<li t-if="record.partner_id.raw_value"><b>Contact:</b> <field name="partner_id"/></li>
|
||||
<li t-if="record.department_id.raw_value"><b>Departement:</b> <field name="department_id"/></li>
|
||||
</ul>
|
||||
</t>
|
||||
<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 t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_semantic_html_override">
|
||||
<div class="oe_dropdown_toggle oe_dropdown_kanban">
|
||||
<span class="oe_e">i</span>
|
||||
<ul class="oe_dropdown_menu">
|
||||
<li><a type="edit">Edit...</a></li>
|
||||
<li><a type="delete">Delete</a></li>
|
||||
<t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
|
||||
<t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
|
||||
<li><a name="action_makeMeeting" type="object">Schedule Interview</a></li>
|
||||
<li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
|
||||
</ul>
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
</div>
|
||||
</t>
|
||||
<t t-name="kanban-box">
|
||||
<div t-attf-class="{record.message_is_follower.raw_value} oe_group_vignette">
|
||||
<div t-attf-class="{record.message_is_follower.raw_value} oe_group_vignette oe_semantic_html_override">
|
||||
<div class="oe_group_image">
|
||||
<a type="open"><img t-att-src="kanban_image('mail.group', 'image_medium', record.id.value)" class="oe_group_photo" tooltip="kanban-description"/></a>
|
||||
</div>
|
||||
|
|
|
@ -79,7 +79,7 @@
|
|||
container, holding the composition form. Then come the various
|
||||
messages. Then comes the 'more' button.
|
||||
-->
|
||||
<ul t-name="mail.thread" class="oe_mail oe_mail_thread">
|
||||
<ul t-name="mail.thread" class="oe_mail oe_mail_thread oe_semantic_html_override">
|
||||
<div class="oe_mail_thread_action">
|
||||
<!-- contains the composition box (form + image) -->
|
||||
<t t-call="mail.compose_message"/>
|
||||
|
@ -94,7 +94,7 @@
|
|||
|
||||
<!-- default layout -->
|
||||
<li t-name="mail.thread.message" class="oe_mail oe_mail_thread_msg">
|
||||
<div t-attf-class="oe_mail_msg_#{record.type}">
|
||||
<div t-attf-class="oe_mail_msg_#{record.type} oe_semantic_html_override">
|
||||
<img class="oe_mail_icon oe_mail_frame oe_left" t-att-src="record.avatar"/>
|
||||
<div class="oe_mail_msg_content">
|
||||
<!-- dropdown menu with message options and actions -->
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
followers main template
|
||||
Template used to display the followers and the actions in a record.
|
||||
-->
|
||||
<div t-name="mail.followers" class="oe_mail_recthread_aside">
|
||||
<div t-name="mail.followers" class="oe_mail_recthread_aside oe_semantic_html_override">
|
||||
<div class="oe_mail_recthread_actions">
|
||||
<button type="button" class="oe_mail_button_follow oe_mail_button_mouseout">Not following</button>
|
||||
<button type="button" class="oe_mail_button_unfollow oe_mail_button_mouseout">Following</button>
|
||||
|
|
|
@ -46,6 +46,9 @@ class note_note(osv.osv):
|
|||
_pad_fields = ['note_pad']
|
||||
_description = "Note"
|
||||
|
||||
def _set_note_first_line(self, cr, uid, id, name, value, args, context=None):
|
||||
return self.write(cr, uid, [id], {'note': value}, context=context)
|
||||
|
||||
def _get_note_first_line(self, cr, uid, ids, name, args, context=None):
|
||||
res = {}
|
||||
for note in self.browse(cr, uid, ids, context=context):
|
||||
|
@ -68,7 +71,7 @@ class note_note(osv.osv):
|
|||
return result
|
||||
|
||||
_columns = {
|
||||
'name': fields.function(_get_note_first_line, string='Note Summary', type="text", store=True),
|
||||
'name': fields.function(_get_note_first_line, fnct_inv=_set_note_first_line, string='Note Summary', type="text"),
|
||||
'note': fields.text('Pad Content'),
|
||||
'note_pad_url': fields.char('Pad Url', size=250),
|
||||
'sequence': fields.integer('Sequence'),
|
||||
|
|
|
@ -57,7 +57,7 @@
|
|||
<field name="follower_ids"/>
|
||||
<templates>
|
||||
<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 t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_semantic_html_override">
|
||||
<!-- dropdown menu -->
|
||||
<div class="oe_dropdown_toggle oe_dropdown_kanban">
|
||||
<span class="oe_e">í</span>
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
<separator string="Installation and Configuration Steps"/>
|
||||
<p>Click on the link above to download the installer for either 32 or 64 bits, and execute it.</p>
|
||||
<p>System requirements:</p>
|
||||
<ul>
|
||||
<ul class="oe_semantic_html_override">
|
||||
<li>1. MS Outlook 2005 or above.</li>
|
||||
<li>2. MS .Net Framework 3.5 or above.</li>
|
||||
</ul>
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
</group>
|
||||
<separator string="Installation and Configuration Steps"/>
|
||||
<p>Thunderbird plugin installation:</p>
|
||||
<ul>
|
||||
<ul class="oe_semantic_html_override">
|
||||
<li>1. Save the Thunderbird plug-in.</li>
|
||||
<li>2. From the Thunderbird menubar: Tools > Add-ons -> Screwdriver/Wrench Icon -> Install add-on from file...</li>
|
||||
<li>3. Select the plug-in (the file named openerp_plugin.xpi).</li>
|
||||
|
|
|
@ -422,7 +422,7 @@ class pos_session(osv.osv):
|
|||
self.pool.get('pos.order')._create_account_move_line(cr, uid, order_ids, session, move_id, context=context)
|
||||
|
||||
for order in session.order_ids:
|
||||
if order.state != 'paid':
|
||||
if order.state not in ('paid', 'invoiced'):
|
||||
raise osv.except_osv(
|
||||
_('Error!'),
|
||||
_("You cannot confirm all orders of this session, because they have not the 'paid' status"))
|
||||
|
|
|
@ -897,7 +897,7 @@
|
|||
</group>
|
||||
<newline/>
|
||||
|
||||
<group string="Opening Cash Control" attrs="{'invisible' : ['|', ('cash_control', '=', False),('state', '=', 'closed')]}">
|
||||
<group string="Opening Cash Control" attrs="{'invisible' : ['|', ('cash_control', '=', False),('state', 'in', ('opened', 'closing_control'))]}">
|
||||
<field name="opening_details_ids" nolabel="1" colspan="2" attrs="{'readonly' : [('state', 'not in', ('opening_control',))]}">
|
||||
<tree string="Opening Cashbox Lines" editable="bottom">
|
||||
<field name="pieces" readonly="1" />
|
||||
|
@ -906,7 +906,7 @@
|
|||
</tree>
|
||||
</field>
|
||||
</group>
|
||||
<group string="Closing Cash Control" attrs="{'invisible': ['|', ('cash_control', '=', False), ('state', '!=', 'closing_control')]}">
|
||||
<group string="Closing Cash Control" attrs="{'invisible': ['|', ('cash_control', '=', False), ('state', 'in', ('opening_control', 'opened'))]}">
|
||||
<field name="details_ids" nolabel="1" colspan="2">
|
||||
<tree string="Cashbox Lines" editable="bottom">
|
||||
<field name="pieces" readonly="1" />
|
||||
|
@ -916,14 +916,14 @@
|
|||
</field>
|
||||
</group>
|
||||
|
||||
<div attrs="{'invisible': [('state', '!=', 'closed')]}">
|
||||
<div attrs="{'invisible' : ['|', ('cash_control', '=', False),('state', 'in', ('opened', 'closing_control'))]}">
|
||||
<group class="oe_subtotal_footer oe_right">
|
||||
<field name="cash_register_balance_start" readonly="1" string="Opening Balance" class="oe_subtotal_footer_separator"/>
|
||||
<field name="cash_register_total_entry_encoding" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="+ Transactions"/>
|
||||
<field name="cash_register_balance_end" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="= Theorical Balance"/>
|
||||
</group>
|
||||
<div class="oe_clear"/>
|
||||
<div attrs="{'invisible' : [('cash_journal_id', '=', False)]}" class="oe_view_nocontent" groups="point_of_sale.group_pos_manager">
|
||||
<div attrs="{'invisible' : ['|', ('cash_journal_id', '=', False), ('state', '!=', 'opening_control')]}" class="oe_view_nocontent" groups="point_of_sale.group_pos_manager">
|
||||
<p class="oe_view_nocontent_create">
|
||||
You can define another list of available currencies on the
|
||||
<i>Cash Registers</i> tab of the <b><field name="cash_journal_id" class="oe_inline"/></b>
|
||||
|
@ -933,7 +933,7 @@
|
|||
</div>
|
||||
|
||||
|
||||
<group class="oe_subtotal_footer oe_right" attrs="{'invisible' : [('state', '!=', 'closed')]}">
|
||||
<group class="oe_subtotal_footer oe_right" attrs="{'invisible': ['|', ('cash_control', '=', False), ('state', 'in', ('opening_control', 'opened'))]}">
|
||||
<field name="cash_register_balance_end_real" class="oe_subtotal_footer_separator"/>
|
||||
<field name="cash_register_difference" class="oe_subtotal_footer_separator"/>
|
||||
</group>
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
<templates id="template" xml:space="preserve">
|
||||
|
||||
<t t-name="PosWidget">
|
||||
<div class="point-of-sale">
|
||||
<div class="point-of-sale oe_semantic_html_override">
|
||||
<div id="topheader">
|
||||
<div id="branding">
|
||||
<img src="/point_of_sale/static/src/img/logo.png" />
|
||||
|
|
|
@ -15,8 +15,7 @@ class PosBox(CashBox):
|
|||
active_ids = context.get('active_ids', []) or []
|
||||
|
||||
if active_model == 'pos.session':
|
||||
records = self.pool.get(active_model).browse(cr, uid, context.get('active_ids', []) or [], context=context)
|
||||
|
||||
records = self.pool.get(active_model).browse(cr, uid, active_ids, context=context)
|
||||
bank_statements = [record.cash_register_id for record in records if record.cash_register_id]
|
||||
|
||||
if not bank_statements:
|
||||
|
@ -30,6 +29,30 @@ class PosBox(CashBox):
|
|||
class PosBoxIn(PosBox):
|
||||
_inherit = 'cash.box.in'
|
||||
|
||||
def _compute_values_for_statement_line(self, cr, uid, box, record, context=None):
|
||||
values = super(PosBoxIn, self)._compute_values_for_statement_line(cr, uid, box, record, context=context)
|
||||
|
||||
active_model = context.get('active_model', False) or False
|
||||
active_ids = context.get('active_ids', []) or []
|
||||
|
||||
if active_model == 'pos.session':
|
||||
session = self.pool.get(active_model).browse(cr, uid, active_ids, context=context)[0]
|
||||
values['ref'] = session.name
|
||||
|
||||
return values
|
||||
|
||||
|
||||
class PosBoxOut(PosBox):
|
||||
_inherit = 'cash.box.out'
|
||||
|
||||
def _compute_values_for_statement_line(self, cr, uid, box, record, context=None):
|
||||
values = super(PosBoxOut, self)._compute_values_for_statement_line(cr, uid, box, record, context=context)
|
||||
|
||||
active_model = context.get('active_model', False) or False
|
||||
active_ids = context.get('active_ids', []) or []
|
||||
|
||||
if active_model == 'pos.session':
|
||||
session = self.pool.get(active_model).browse(cr, uid, active_ids, context=context)[0]
|
||||
values['ref'] = session.name
|
||||
|
||||
return values
|
||||
|
|
|
@ -40,14 +40,14 @@
|
|||
<templates>
|
||||
<t t-name="kanban-box">
|
||||
<h4><field name="name"/></h4>
|
||||
<ul class="oe_portal_crm_address">
|
||||
<ul class="oe_portal_crm_address oe_semantic_html_override">
|
||||
<li t-if="record.street"><field name="street"/></li>
|
||||
<li t-if="record.street2"><field name="street2"/></li>
|
||||
<li t-if="record.zip"><field name="zip"/></li>
|
||||
<li t-if="record.city"><field name="city"/></li>
|
||||
<li t-if="record.country_id"><field name="country_id"/></li>
|
||||
</ul>
|
||||
<ul class="oe_portal_crm_contact_info">
|
||||
<ul class="oe_portal_crm_contact_info oe_semantic_html_override">
|
||||
<li t-if="record.phone"><field name="phone"/></li>
|
||||
<li t-if="record.email.raw_value">
|
||||
<a title="Mail" t-att-href="'mailto:'+record.email.value">
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
|
||||
<templates>
|
||||
<t t-name="kanban-box">
|
||||
<div class="oe_employee_vignette">
|
||||
<div class="oe_employee_vignette oe_semantic_html_override">
|
||||
<div class="oe_employee_image">
|
||||
<img t-att-src="kanban_image('hr.employee', 'photo', record.id.value)" class="oe_employee_picture"/>
|
||||
</div>
|
||||
|
|
|
@ -200,7 +200,7 @@
|
|||
<field name="list_price"/>
|
||||
<templates>
|
||||
<t t-name="kanban-box">
|
||||
<div class="oe_kanban_vignette">
|
||||
<div class="oe_kanban_vignette oe_semantic_html_override">
|
||||
<a type="open"><img t-att-src="kanban_image('product.product', 'image_small', record.id.value)" class="oe_kanban_image"/></a>
|
||||
<div class="oe_kanban_details">
|
||||
<h4>
|
||||
|
|
|
@ -232,12 +232,12 @@
|
|||
<field name="alias_domain"/>
|
||||
<templates>
|
||||
<t t-name="kanban-box">
|
||||
<div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_global_click">
|
||||
<div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_global_click oe_semantic_html_override">
|
||||
<div class="oe_dropdown_toggle oe_dropdown_kanban">
|
||||
<span class="oe_e">í</span>
|
||||
<ul class="oe_dropdown_menu">
|
||||
<li><a type="edit">Edit...</a></li>
|
||||
<li><a type="delete">Delete</a></li>
|
||||
<t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
|
||||
<t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
|
||||
<li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
@ -533,12 +533,12 @@
|
|||
<field name="categ_ids"/>
|
||||
<templates>
|
||||
<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 t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_semantic_html_override">
|
||||
<div class="oe_dropdown_toggle oe_dropdown_kanban">
|
||||
<span class="oe_e">í</span>
|
||||
<ul class="oe_dropdown_menu">
|
||||
<li><a type="edit" >Edit...</a></li>
|
||||
<li><a type="delete">Delete</a></li>
|
||||
<t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
|
||||
<t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
|
||||
<li>
|
||||
<ul class="oe_kanban_project_times">
|
||||
<li><a name="set_remaining_time_1" type="object" class="oe_kanban_button">1</a></li>
|
||||
|
|
|
@ -247,18 +247,18 @@
|
|||
<field name="date_deadline"/>
|
||||
<templates>
|
||||
<t t-name="kanban-tooltip">
|
||||
<ul class="oe_kanban_tooltip">
|
||||
<ul class="oe_kanban_tooltip oe_semantic_html_override">
|
||||
<li><b>Project:</b> <field name="project_id"/></li>
|
||||
<li><b>Category:</b> <field name="categ_ids"/></li>
|
||||
</ul>
|
||||
</t>
|
||||
<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 t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_semantic_html_override">
|
||||
<div class="oe_dropdown_toggle oe_dropdown_kanban">
|
||||
<span class="oe_e">i</span>
|
||||
<ul class="oe_dropdown_menu">
|
||||
<li><a type="edit" >Edit...</a></li>
|
||||
<li><a type="delete">Delete</a></li>
|
||||
<t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
|
||||
<t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
|
||||
<li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
@ -200,7 +200,7 @@
|
|||
<t t-esc="record.delivery_count.value"/> Deliveries
|
||||
</a>
|
||||
</xpath>
|
||||
<ul position="inside">
|
||||
<ul position="inside" class="oe_semantic_html_override">
|
||||
<li t-if="record.type.raw_value != 'service'">On hand: <field name="qty_available"/> <field name="uom_id"/></li>
|
||||
<li t-if="record.type.raw_value != 'service'">Available: <field name="virtual_available"/> <field name="uom_id"/></li>
|
||||
</ul>
|
||||
|
|
|
@ -298,12 +298,12 @@
|
|||
<field name="color"/>
|
||||
<templates>
|
||||
<t t-name="kanban-box">
|
||||
<div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card">
|
||||
<div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_semantic_html_override">
|
||||
<div class="oe_dropdown_toggle oe_dropdown_kanban">
|
||||
<span class="oe_e">i</span>
|
||||
<ul class="oe_dropdown_menu">
|
||||
<li><a type="edit">Edit...</a></li>
|
||||
<li><a type="delete">Delete</a></li>
|
||||
<t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
|
||||
<t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
|
||||
<li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
-->
|
||||
<templates id="template" xml:space="preserve">
|
||||
<t t-name="Systray.Shortcuts">
|
||||
<div class="oe_systray_shortcuts oe_topbar_item oe_dropdown_toggle">
|
||||
<div class="oe_systray_shortcuts oe_topbar_item oe_dropdown_toggle oe_semantic_html_override">
|
||||
<span class="oe_e oe_star_off">7</span>
|
||||
<ul class="oe_systray_shortcuts_items oe_dropdown_menu"/>
|
||||
</div>
|
||||
|
|
Loading…
Reference in New Issue