@ -18,5 +18,4 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import test_serialized
from test_serialized import TestBaseFieldSerialized
from . import test_serialized
@ -18,7 +18,7 @@
import model
from . import model
from openerp.tools.misc import upload_data_thread
upload_data_thread.run = lambda x: None
@ -18,4 +18,4 @@
import publisher_warranty_contract
from . import publisher_warranty_contract
@ -110,7 +110,7 @@ class MassEditingWizard(orm.TransientModel):
etree.SubElement(xml_group, 'field', {
'name': "selection__" + field.name,
'colspan': '2',
'colspan': '2'})
})
'name': field.name, 'nolabel': '1',
'attrs': (
@ -1 +1 @@
@ -50,7 +50,7 @@ class CompanyLDAP(orm.Model):
if not conf['create_user']:
continue
attribute_match = re.search(
'([a-zA-Z_]+)=\%s', conf['ldap_filter'])
r'([a-zA-Z_]+)=\%s', conf['ldap_filter'])
if attribute_match:
login_attr = attribute_match.group(1)
else: