Browse Source
Merge branch '7.0' to master
Merge branch '7.0' to master
Conflicts: .travis.yml __unported__/users_ldap_mail/__openerp__.py dbfilter_from_header/__init__.py disable_openerp_online/data/ir_ui_menu.xml mass_editing/__init__.py mass_editing/models/mass_object.py mass_editing/wizard/__init__.pypull/40/head
Alexandre Fayolle
10 years ago
38 changed files with 596 additions and 466 deletions
-
19.travis.yml
-
2__unported__/auth_admin_passkey/model/res_users.py
-
3__unported__/auth_from_http_basic/__init__.py
-
2__unported__/base_external_dbsource/__openerp__.py
-
22__unported__/base_external_dbsource/base_external_dbsource.py
-
6__unported__/base_external_dbsource/test/dbsource_connect.yml
-
7__unported__/base_optional_quick_create/__openerp__.py
-
3__unported__/base_optional_quick_create/model.py
-
2__unported__/configuration_helper/config.py
-
11__unported__/cron_run_manually/model/ir_cron.py
-
11__unported__/email_template_template/__openerp__.py
-
4__unported__/email_template_template/model/email_template.py
-
4__unported__/fetchmail_attach_from_folder/match_algorithm/base.py
-
15__unported__/fetchmail_attach_from_folder/match_algorithm/email_domain.py
-
9__unported__/fetchmail_attach_from_folder/match_algorithm/email_exact.py
-
23__unported__/fetchmail_attach_from_folder/match_algorithm/openerp_standard.py
-
72__unported__/fetchmail_attach_from_folder/model/fetchmail_server.py
-
87__unported__/fetchmail_attach_from_folder/model/fetchmail_server_folder.py
-
93__unported__/fetchmail_attach_from_folder/wizard/attach_mail_manually.py
-
29__unported__/import_odbc/__openerp__.py
-
40__unported__/import_odbc/import_odbc.py
-
9__unported__/mail_environment/__openerp__.py
-
211__unported__/mail_environment/env_mail.py
-
18__unported__/scheduler_error_mailer/ir_cron.py
-
2__unported__/server_environment/serv_config.py
-
2__unported__/server_environment/system_info.py
-
2__unported__/server_environment_files/__init__.py
-
2__unported__/super_calendar/__init__.py
-
26__unported__/super_calendar/__openerp__.py
-
84__unported__/super_calendar/super_calendar.py
-
33__unported__/users_ldap_groups/__openerp__.py
-
121__unported__/users_ldap_groups/users_ldap_groups.py
-
33__unported__/users_ldap_groups/users_ldap_groups_operators.py
-
21__unported__/users_ldap_mail/__openerp__.py
-
12__unported__/users_ldap_mail/users_ldap_model.py
-
6__unported__/users_ldap_populate/model/populate_wizard.py
-
12__unported__/users_ldap_populate/model/users_ldap.py
-
4__unported__/web_context_tunnel/__openerp__.py
Write
Preview
Loading…
Cancel
Save
Reference in new issue