diff --git a/addons/auth_signup/auth_signup_data.xml b/addons/auth_signup/auth_signup_data.xml index 4a6bf9ae4b9..39b62148494 100644 --- a/addons/auth_signup/auth_signup_data.xml +++ b/addons/auth_signup/auth_signup_data.xml @@ -13,7 +13,7 @@ - + auth_signup.template_user_id diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py index 48ec05e2e92..b1afacfbd01 100644 --- a/addons/base_calendar/__openerp__.py +++ b/addons/base_calendar/__openerp__.py @@ -20,7 +20,7 @@ ############################################################################## { - 'name': 'Calendar Layer', + 'name': 'Calendar', 'version': '1.0', 'depends': ['base', 'base_status', 'mail', 'base_action_rule'], 'description': """ @@ -51,6 +51,7 @@ If you need to manage your meetings, you should install the CRM module. ], 'test' : ['test/base_calendar_test.yml'], 'installable': True, + 'application': True, 'auto_install': False, 'certificate': '00694071962960352821', 'images': ['images/base_calendar1.jpeg','images/base_calendar2.jpeg','images/base_calendar3.jpeg','images/base_calendar4.jpeg',], diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index a6d5f6859af..85199d09c60 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -1431,7 +1431,10 @@ rule or repeating pattern of time to exclude from the recurring rule."), if r['class']=='private': for f in r.keys(): if f not in ('id','date','date_deadline','duration','user_id','state'): - r[f] = False + if isinstance(r[f], list): + r[f] = [] + else: + r[f] = False if f=='name': r[f] = _('Busy') diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml index 0ea2be4f37f..d374c2e6d88 100644 --- a/addons/base_calendar/base_calendar_view.xml +++ b/addons/base_calendar/base_calendar_view.xml @@ -428,5 +428,6 @@ name="Events" parent="base.menu_calendar_configuration" sequence="15" action="action_view_event"/> + diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py index 4ea4776ad9b..0ee23ed1d0f 100644 --- a/addons/base_calendar/crm_meeting.py +++ b/addons/base_calendar/crm_meeting.py @@ -53,7 +53,7 @@ class crm_meeting(base_state, osv.Model): 'partner_ids': fields.many2many('res.partner', 'crm_meeting_partner_rel', 'meeting_id','partner_id', string='Attendees', states={'done': [('readonly', True)]}), 'state': fields.selection( - [('draft', 'Unconfirmed'), ('open', 'Confirmed'), ('cancel', 'Cancelled'), ('done', 'Done')], + [('draft', 'Unconfirmed'), ('open', 'Confirmed')], string='Status', size=16, readonly=True), # Meeting fields 'name': fields.char('Meeting Subject', size=128, required=True, states={'done': [('readonly', True)]}), diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml index 928f8d94d5c..b963de68130 100644 --- a/addons/base_calendar/crm_meeting_view.xml +++ b/addons/base_calendar/crm_meeting_view.xml @@ -69,9 +69,7 @@ crm.meeting
-
- -
+
diff --git a/addons/base_calendar/static/src/img/icon.png b/addons/base_calendar/static/src/img/icon.png new file mode 100644 index 00000000000..f612cd9ea4b Binary files /dev/null and b/addons/base_calendar/static/src/img/icon.png differ diff --git a/addons/base_status/base_stage.py b/addons/base_status/base_stage.py index 859e577bf31..6ecb62a1663 100644 --- a/addons/base_status/base_stage.py +++ b/addons/base_status/base_stage.py @@ -69,7 +69,7 @@ class base_stage(object): return False return uid - def onchange_partner_address_id(self, cr, uid, ids, add, email=False): + def onchange_partner_address_id(self, cr, uid, ids, add, email=False, context=None): """ This function returns value of partner email based on Partner Address :param add: Id of Partner's address :param email: Partner's email ID @@ -77,10 +77,20 @@ class base_stage(object): data = {'value': {'email_from': False, 'phone':False}} if add: address = self.pool.get('res.partner').browse(cr, uid, add) - data['value'] = {'email_from': address and address.email or False , - 'phone': address and address.phone or False} - if 'phone' not in self._columns: - del data['value']['phone'] + data['value'] = {'partner_name': address and address.name or False, + 'email_from': address and address.email or False, + 'phone': address and address.phone or False, + 'street': address and address.street or False, + 'street2': address and address.street2 or False, + 'city': address and address.city or False, + 'state_id': address.state_id and address.state_id.id or False, + 'zip': address and address.zip or False, + 'country_id': address.country_id and address.country_id.id or False, + } + fields = self.fields_get(cr, uid, context=context or {}) + for key in data['value'].keys(): + if key not in fields: + del data['value'][key] return data def onchange_partner_id(self, cr, uid, ids, part, email=False): diff --git a/addons/contacts/__init__.py b/addons/contacts/__init__.py new file mode 100644 index 00000000000..26c654db9dd --- /dev/null +++ b/addons/contacts/__init__.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# 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 . +# +############################################################################## + diff --git a/addons/contacts/__openerp__.py b/addons/contacts/__openerp__.py new file mode 100644 index 00000000000..3b4df183478 --- /dev/null +++ b/addons/contacts/__openerp__.py @@ -0,0 +1,44 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# 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 . +# +############################################################################## + +{ + 'name': 'Address Book', + 'version': '1.0', + 'category': 'Tools', + 'description': """ +This module gives you a quick view of your address book, accessible from your home page. +You can track your suppliers, customers and other contacts. +""", + 'author': 'OpenERP SA', + 'website': 'http://openerp.com', + 'summary': 'Contacts, People and Companies', + 'depends': [ + 'mail', + ], + 'data': [ + 'contacts_view.xml', + ], + 'installable': True, + 'application': True, + 'auto_install': False, +} + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/contacts/contacts_view.xml b/addons/contacts/contacts_view.xml new file mode 100644 index 00000000000..4908653aa2b --- /dev/null +++ b/addons/contacts/contacts_view.xml @@ -0,0 +1,53 @@ + + + + + + + Contacts + ir.actions.act_window + res.partner + form + kanban,tree,form + + +

+ Click to add a contact in your address book. +

+ OpenERP helps you easily track all activities related to + a customer; discussions, history of business opportunities, + documents, etc. +

+
+
+ + + + kanban + + + + + + tree + + + + + + form + + + + + + +
+
+ + diff --git a/addons/contacts/static/src/img/icon.png b/addons/contacts/static/src/img/icon.png new file mode 100644 index 00000000000..dc9f8ee3422 Binary files /dev/null and b/addons/contacts/static/src/img/icon.png differ diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py index b2993a3ad80..5d3623576b3 100644 --- a/addons/crm/__openerp__.py +++ b/addons/crm/__openerp__.py @@ -25,7 +25,7 @@ 'version': '1.0', 'category': 'Customer Relationship Management', 'sequence': 2, - 'summary': 'Leads, Opportunities, Agenda', + 'summary': 'Leads, Opportunities, Phone Calls', 'description': """ The generic OpenERP Customer Relationship Management ===================================================== diff --git a/addons/crm/crm.py b/addons/crm/crm.py index aff2bcb610b..330bbb1fc9b 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -92,9 +92,10 @@ class crm_case_stage(osv.osv): _defaults = { 'sequence': lambda *args: 1, 'probability': lambda *args: 0.0, - 'state': 'draft', + 'state': 'open', 'fold': False, 'type': 'both', + 'case_default': True, } class crm_case_section(osv.osv): diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml index 2f885e09b61..8c1e1c9ec76 100644 --- a/addons/crm/crm_phonecall_view.xml +++ b/addons/crm/crm_phonecall_view.xml @@ -104,56 +104,55 @@
-
- -
-
-
-

-
-
-

-
- - - - - - - - - - - + +
+
+
+
+
+

+
+
+

+
+ + + + + + + + + + + + - -
-
- - -
+ +
+
+ + +
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml index a3c60d4421c..eae78de70a0 100644 --- a/addons/crm/res_partner_view.xml +++ b/addons/crm/res_partner_view.xml @@ -130,10 +130,10 @@