pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch saas-14 up to 637e4c68fc

Browse Source
This commit is contained in:
Christophe Simonis
2018-10-08 17:29:03 +02:00
parent 6cb75dc3d6 637e4c68fc
commit 0ef5cedebb
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mail/models/mail_tracking_value.py
+2 -2
View File
@@ -60,8 +60,8 @@ class MailTracking(models.Model):
values.update({ values.update({
'old_value_integer': initial_value and initial_value.id or 0, 'old_value_integer': initial_value and initial_value.id or 0,
'new_value_integer': new_value and new_value.id or 0, 'new_value_integer': new_value and new_value.id or 0,
'old_value_char': initial_value and initial_value.name_get()[0][1] or '', 'old_value_char': initial_value and initial_value.sudo().name_get()[0][1] or '',
'new_value_char': new_value and new_value.name_get()[0][1] or '' 'new_value_char': new_value and new_value.sudo().name_get()[0][1] or ''
}) })
else: else:
tracked = False tracked = False
addons/mail/views/mail_templates.xml
+1 -1
View File
@@ -42,7 +42,7 @@
</template> </template>
<template id="message_user_assigned"> <template id="message_user_assigned">
<p>Dear <t t-esc="object.user_id.name"/>,</p> <p>Dear <t t-esc="object.user_id.sudo().name"/>,</p>
<p>You have been assigned to the <t t-esc="object._description.lower()"/> <t t-esc="object.name_get()[0][1]"/>.</p> <p>You have been assigned to the <t t-esc="object._description.lower()"/> <t t-esc="object.name_get()[0][1]"/>.</p>
<p> <p>
<a t-att-href="'/mail/view?model=%s&amp;res_id=%s' % (object._name, object.id)" <a t-att-href="'/mail/view?model=%s&amp;res_id=%s' % (object._name, object.id)"
addons/stock_account/models/stock.py
+5 -2
View File
@@ -118,10 +118,13 @@ class StockQuant(models.Model):
else: else:
self.with_context(force_company=company_from.id)._create_account_move_line(move, acc_valuation, acc_dest, journal_id) self.with_context(force_company=company_from.id)._create_account_move_line(move, acc_valuation, acc_dest, journal_id)
if move.company_id.anglo_saxon_accounting and move.location_id.usage == 'supplier' and move.location_dest_id.usage == 'customer': if move.company_id.anglo_saxon_accounting:
# Creates an account entry from stock_input to stock_output on a dropship move. https://github.com/odoo/odoo/issues/12687 # Creates an account entry from stock_input to stock_output on a dropship move. https://github.com/odoo/odoo/issues/12687
journal_id, acc_src, acc_dest, acc_valuation = move._get_accounting_data_for_valuation() journal_id, acc_src, acc_dest, acc_valuation = move._get_accounting_data_for_valuation()
self.with_context(force_company=move.company_id.id)._create_account_move_line(move, acc_src, acc_dest, journal_id) if move.location_id.usage == 'supplier' and move.location_dest_id.usage == 'customer':
self.with_context(force_company=move.company_id.id)._create_account_move_line(move, acc_src, acc_dest, journal_id)
if move.location_id.usage == 'customer' and move.location_dest_id.usage == 'supplier':
self.with_context(force_company=move.company_id.id)._create_account_move_line(move, acc_dest, acc_src, journal_id)
def _create_account_move_line(self, move, credit_account_id, debit_account_id, journal_id): def _create_account_move_line(self, move, credit_account_id, debit_account_id, journal_id):
# group quants by cost # group quants by cost
odoo/addons/base/res/res_country_data.xml
+1 -1
View File
@@ -1708,7 +1708,7 @@
<field file="base/static/img/country_flags/vn.png" name="image" type="base64" /> <field file="base/static/img/country_flags/vn.png" name="image" type="base64" />
<field name="currency_id" ref="VND" /> <field name="currency_id" ref="VND" />
<field eval="84" name="phone_code" /> <field eval="84" name="phone_code" />
<field eval="'%(street)s\n%(street2)s\n%(city)s\n%(name)s %(zip)s %(country_name)s'" name="address_format" /> <field eval="'%(street)s\n%(street2)s\n%(city)s\n%(state_name)s %(country_name)s'" name="address_format" />
</record> </record>
<record id="vu" model="res.country"> <record id="vu" model="res.country">
<field name="name">Vanuatu</field> <field name="name">Vanuatu</field>