Minor changes

This commit is contained in:
Alexis de Lattre
2016-01-04 10:09:19 +01:00
parent 0eedae22c6
commit f436a651cf
4 changed files with 5 additions and 34 deletions

View File

@@ -1,23 +1,3 @@
# -*- encoding: utf-8 -*- # -*- coding: utf-8 -*-
##############################################################################
#
# Base Fix Display Address module for OpenERP
# Copyright (C) 2014 Akretion (http://www.akretion.com)
# @author Alexis de Lattre <alexis.delattre@akretion.com>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
from . import partner from . import partner

View File

@@ -40,5 +40,4 @@ Please contact Alexis de Lattre from Akretion <alexis.delattre@akretion.com> for
'depends': ['base'], 'depends': ['base'],
'data': [], 'data': [],
'installable': True, 'installable': True,
'active': False,
} }

View File

@@ -1,4 +1,4 @@
# -*- encoding: utf-8 -*- # -*- coding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Base Fix Display Address module for OpenERP # Base Fix Display Address module for OpenERP
@@ -20,16 +20,16 @@
# #
############################################################################## ##############################################################################
from openerp.osv import orm from openerp import models
class res_partner(orm.Model): class ResPartner(models.Model):
_inherit = 'res.partner' _inherit = 'res.partner'
def _display_address( def _display_address(
self, cr, uid, address, without_company=False, context=None): self, cr, uid, address, without_company=False, context=None):
'''Remove empty lines''' '''Remove empty lines'''
res = super(res_partner, self)._display_address( res = super(ResPartner, self)._display_address(
cr, uid, address, without_company=without_company, context=context) cr, uid, address, without_company=without_company, context=context)
while "\n\n" in res: while "\n\n" in res:
res = res.replace('\n\n', '\n') res = res.replace('\n\n', '\n')

View File

@@ -242,14 +242,6 @@ in the quantities for his reception -->
<field name="model">stock.move</field> <field name="model">stock.move</field>
<field name="inherit_id" ref="stock.view_move_tree_receipt_picking"/> <field name="inherit_id" ref="stock.view_move_tree_receipt_picking"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="partner_id" position="attributes">
<attribute name="string">Destination Address</attribute>
<!-- The partner_id field on stock.move has a label "Destination Address"
but a stupid guy has put a string="Supplier" on the tree view
And, as this field is very often empty, the users think there is a bug
because the supplier is not set ! -->
date_expected
</field>
<field name="date_expected" position="attributes"> <field name="date_expected" position="attributes">
<attribute name="invisible">0</attribute> <attribute name="invisible">0</attribute>
</field> </field>