[Merge]: Merge with lp:openobject-addons

bzr revid: rpa@tinyerp.com-20100813071037-0k4u28xxjsotg874

addons/account/account_menuitem.xml

@@ -7,14 +7,14 @@
         <menuitem id="menu_finance_payables" name="Payables" parent="menu_finance" sequence="2" groups="group_account_user,group_account_manager,base.group_system"/>
         <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="3"/>
 <!--        <menuitem id="menu_accounting" name="Accounting" parent="menu_finance" sequence="5"/>-->
-        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user,group_account_manager,base.group_system"/>
-        <menuitem id="periodical_processing_journal_entries_validation" name="Entries to Review" parent="menu_finance_periodical_processing"/>
+        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8"/>
+        <menuitem id="periodical_processing_journal_entries_validation" name="Entries to Review" parent="menu_finance_periodical_processing" groups="group_account_user,group_account_manager,base.group_system"/>
         <menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
 <!--            <menuitem id="periodical_processing_recurrent_entries" name="Recurrent Entries" parent="menu_finance_periodical_processing"/>-->
         <menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
 <!--            <menuitem id="periodical_processing_end_of_period" name="End of Period" parent="menu_finance_periodical_processing"/>-->
         <menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" sequence="5" groups="base.group_system"/>
-        <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="12" groups="base.group_system"/>
+        <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="12" groups="base.group_system,group_account_invoice,group_account_manager,group_account_user"/>
         <menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting"/>
         <menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reporting"/>
         <menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/>
@@ -31,17 +31,17 @@
 <!--        <menuitem id="menu_analytic_accounting1" name="Analytic Accounting" parent="menu_finance_configuration" sequence="80"/>-->
 
 <!--        <menuitem id="menu_finance_reporting11" name="Reporting" parent="account.menu_finance"  sequence="80"/>-->
-        <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reporting" sequence="100"/>
+        <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reporting" sequence="100" groups="base.group_system,group_account_manager"/>
 <!--        <menuitem id="menu_finance_legal_statement1" name="Legal Statements" parent="account.menu_finance_reporting" sequence="200"/>-->
 
         <menuitem id="menu_finance_entries" name="Accounting" parent="menu_finance" sequence="4"
         groups="group_account_user,group_account_manager,base.group_system"/>
-        <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries" parent="menu_finance_periodical_processing" sequence="15"/>
+        <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries" parent="menu_finance_periodical_processing" sequence="15" groups="group_account_user,group_account_manager,base.group_system"/>
 
 <!--        <menuitem id="menu_finance_periodical_processing11" name="Periodical Processing" parent="account.menu_finance"-->
 <!--            sequence="3"-->
 <!--            groups="group_account_user"/>-->
-        <menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing"/>
+        <menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing" groups="group_account_user,group_account_manager,base.group_system"/>
 
         <menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300" groups="account.group_account_manager"/>
 

addons/account/security/ir.model.access.csv

@@ -38,7 +38,6 @@
 "access_account_invoice_uinvoice","account.invoice","model_account_invoice","account.group_account_invoice",1,1,1,1
 "access_account_invoice_line_uinvoice","account.invoice.line","model_account_invoice_line","account.group_account_invoice",1,1,1,1
 "access_account_invoice_tax_uinvoice","account.invoice.tax","model_account_invoice_tax","account.group_account_invoice",1,1,1,1
-"access_account_analytic_line_uinvoice","account.analytic.line","model_account_analytic_line","account.group_account_manager",1,0,0,0
 "access_account_move_uinvoice","account.move","model_account_move","account.group_account_invoice",1,0,0,0
 "access_account_move_line_uinvoice","account.move.line invoice","model_account_move_line","account.group_account_invoice",1,1,1,1
 "access_account_move_reconcile_uinvoice","account.move.reconcile","model_account_move_reconcile","account.group_account_invoice",1,1,1,1
@@ -155,3 +154,7 @@
 "access_res_partner_address_invoice","res.partner.address invoice","base.model_res_partner_address","account.group_account_invoice",1,1,1,1
 "access_account_invoice_line_system","account.invoice.line system","model_account_invoice_line","base.group_system",1,0,0,0
 "access_account_analytic_accountant","account.analytic.account accountant","analytic.model_account_analytic_account","account.group_account_user",1,1,1,1
+"access_account_account_type_invoice","account.account.type invoice","model_account_account_type","account.group_account_invoice",1,1,1,1
+"access_report_account_receivable_invoice","report.account.receivable.invoice","model_report_account_receivable","account.group_account_invoice",1,1,1,1
+"access_report_account_receivable_user","report.account.receivable.user","model_report_account_receivable","account.group_account_user",1,1,1,1
+"access_account_sequence_fiscal_year_invoice","account.sequence.fiscalyear invoice","model_account_sequence_fiscalyear","account.group_account_invoice",1,1,1,1

addons/account_followup/security/ir.model.access.csv

@@ -1,5 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_account_followup_stat","account_followup.stat","model_account_followup_stat","account.group_account_user",1,0,0,0
 "access_account_followup_followup","account_followup.followup","model_account_followup_followup","base.group_system",1,1,1,1
 "access_account_followup_followup_line","account_followup.followup.line","model_account_followup_followup_line","account.group_account_user",1,0,0,0
 "access_account_followup_stat_manager","account_followup.stat.manager","model_account_followup_stat","account.group_account_manager",1,1,1,1
@@ -7,3 +6,4 @@
 "access_account_followup_followup_line_manager","account_followup.followup.line.manager","model_account_followup_followup_line","account.group_account_manager",1,1,1,1
 "access_account_followup_followup_line_system","account_followup.followup.line system","model_account_followup_followup_line","base.group_system",1,1,1,1
 "access_account_followup_followup_accountant","account_followup.followup user","model_account_followup_followup","account.group_account_user",1,0,0,0
+"access_account_followup_stat_invoice","account_followup.stat.invoice","model_account_followup_stat","account.group_account_invoice",1,1,1,1

addons/account_payment/security/ir.model.access.csv

@@ -11,3 +11,5 @@
 "access_payment_order_system","payment.order system","model_payment_order","base.group_system",1,0,0,0
 "access_payment_mode_system","payment.mode system","model_payment_mode","base.group_system",1,1,1,1
 "access_payment_type_system","payment.type system","model_payment_type","base.group_system",1,1,1,1
+"access_payment_order_invoice","payment.order invoice","model_payment_order","account.group_account_invoice",1,1,1,1
+"access_payment_line_invoice","payment.line invoice","model_payment_line","account.group_account_invoice",1,1,1,1

addons/base_calendar/base_calendar.py

@@ -1154,7 +1154,10 @@ true, it will allow you to hide the event alarm information without removing it.
     def default_organizer(self, cr, uid, context=None):
         user_pool = self.pool.get('res.users')
         user = user_pool.browse(cr, uid, uid, context=context)
-        return user.user_email or user.name
+        res = user.name
+        if user.user_email:
+            res += " <%s>" %(user.user_email)
+        return res
 
     _defaults = {
             'state': 'tentative',

addons/caldav/calendar.py

@@ -83,6 +83,60 @@ def openobjectid2uid(cr, uidval, oomodel):
     value = 'OpenObject-%s_%s@%s' % (oomodel, uidval, cr.dbname)
     return value
 
+def mailto2str(arg):
+    """Take a dict of mail and convert to string.
+    """
+    ret = []
+    if isinstance(arg, dict):
+        args = [arg,]
+    else:
+        args = arg
+    
+    for ard in args:
+        rstr = ard.get('name','')
+        if ard.get('company',False):
+            rstr += ' (%s)' % ard.get('company')
+        if ard.get('email'):
+            rstr += ' <%s>' % ard.get('email')
+        ret.append(rstr)
+    return ', '.join(ret)
+
+def str2mailto(emailstr, multi=False):
+    """Split one email string to a dict of name, company, mail parts
+
+       @param multi Return an array, recognize comma-sep
+    """
+    # TODO: move to tools or sth.
+    mege = re.compile(r'([^\(\<]+) *(\((.*?)\))? *(\< ?(.*?) ?\>)? ?(\((.*?)\))? *$')
+    
+    mailz= [emailstr,]
+    retz = []
+    if multi:
+        mailz = emailstr.split(',')
+    
+    for mas in mailz:
+        m = mege.match(mas.strip())
+        if not m:
+            # one of the rare non-matching strings is "sad" :(
+            # retz.append({ 'name': mas.strip() })
+            # continue
+            raise ValueError("Invalid email address %r" % mas)
+        rd = {  'name': m.group(1).strip(), 
+                'email': m.group(5), }
+        if m.group(2):
+            rd['company'] = m.group(3).strip()
+        elif m.group(6):
+            rd['company'] = m.group(7).strip()
+        
+        if rd['name'].startswith('"') and rd['name'].endswith('"'):
+            rd['name'] = rd['name'][1:-1]
+        retz.append(rd)
+        
+    if multi:
+        return retz
+    else:
+        return retz[0]
+
 def get_attribute_mapping(cr, uid, calname, context=None):
     """ Attribute Mapping with Basic calendar fields and lines
         @param cr: the current row, from the database cursor,
@@ -237,9 +291,11 @@ class CalDAV(object):
         
         for cal_data in child.getChildren():
             if cal_data.name.lower() == 'organizer':
-                self.ical_set(cal_data.name.lower(),
-                        {'name': cal_data.params.get('CN', ['',])[0]},
-                        'value')
+                dmail = { 'name': cal_data.params.get('CN', ['',])[0],
+                            'email': cal_data.value.replace('MAILTO:',''),
+                            # TODO: company? 
+                            }
+                self.ical_set(cal_data.name.lower(), mailto2str(dmail), 'value')
                 continue
             if cal_data.name.lower() == 'attendee':
                 ctx = context.copy()
@@ -338,10 +394,11 @@ class CalDAV(object):
                                 exdates_updated.append(ex_date)
                             exfield.value = map(parser.parse, exdates_updated)
                     elif field == 'organizer' and data[map_field]:
-                        organizer = data[map_field]
+                        organizer = str2mailto(data[map_field])
                         event_org = vevent.add('organizer')
-                        event_org.params['CN'] = [organizer]
-                        event_org.value = 'MAILTO:' + (organizer)
+                        event_org.params['CN'] = [organizer['name']]
+                        event_org.value = 'MAILTO:' + (organizer.get('email') or '')
+                        # TODO: company?
                     elif data[map_field]:
                         if map_type in ("char", "text"):
                             if field in ('exdate'):

addons/document_webdav/dav_fs.py

@@ -129,6 +129,7 @@ class openerp_dav_handler(dav_interface):
             raise default_exc(err.strerror)
         except Exception,e:
             import traceback
+            if cr: cr.close()
             self.parent.log_error("Cannot %s: %s", opname, str(e))
             self.parent.log_message("Exc: %s",traceback.format_exc())
             raise default_exc("Operation failed")

addons/email_template/email_template_account_view.xml

@@ -2,8 +2,8 @@
 <openerp>
     <data>
 
-        <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="28"/>
-        <menuitem name="Emails" id="base.menu_emails" parent="base.menu_tools" sequence="5"/>
+        <menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17" groups="base.group_system,base.res_groups_email_template_admin"/>
+        <menuitem name="Emails" id="base.menu_emails" parent="base.marketing_menu" sequence="5"/>
         <menuitem name="Email Template" id="menu_email_template" parent="base.menu_emails"/>
 
         <record model="ir.ui.view" id="email_template_account_form">
@@ -96,8 +96,8 @@
             <field name="search_view_id" ref="view_email_template_account_search"/>
         </record>
 
-        <menuitem name="Configuration" parent="base.menu_tools"
-         id="base.menu_lunch_survey_root" sequence="20"/>
+        <menuitem name="Configuration" parent="base.marketing_menu"
+         id="base.menu_lunch_survey_root" sequence="20" groups="base.group_system"/>
         <menuitem name="Emails" id="menu_email_template_configuration" parent="base.menu_lunch_survey_root" />
 
         <menuitem name="Email Accounts" id="menu_email_template_account_all" parent="menu_email_template_configuration" action="action_email_template_account_tree_all"/>

addons/hr_attendance/__openerp__.py

@@ -30,10 +30,10 @@
     actions(Sign in/Sign out) performed by them.
        """,
     'author': 'OpenERP SA',
-    'depends': ['base', 'hr'],
+    'depends': ['hr'],
     'update_xml': [
         'security/hr_security.xml',
-        'security/ir.model.access.csv', 
+        'security/ir.model.access.csv',
         'hr_attendance_view.xml',
         'hr_attendance_wizard.xml',
         'hr_attendance_report.xml',

addons/hr_attendance/hr_attendance.py

@@ -34,6 +34,7 @@ class hr_action_reason(osv.osv):
     _defaults = {
         'action_type': 'sign_in',
     }
+
 hr_action_reason()
 
 def _employee_get(obj, cr, uid, context=None):
@@ -59,7 +60,7 @@ class hr_attendance(osv.osv):
     _columns = {
         'name': fields.datetime('Date', required=True, select=1),
         'action': fields.selection([('sign_in', 'Sign In'), ('sign_out', 'Sign Out'), ('action','Action')], 'Action', required=True),
-        'action_desc': fields.many2one("hr.action.reason", "Action reason", domain="[('action_type', '=', action)]", help='Specifies the reason for Signing In/Signing Out in case of extra hours.'),
+        'action_desc': fields.many2one("hr.action.reason", "Action Reason", domain="[('action_type', '=', action)]", help='Specifies the reason for Signing In/Signing Out in case of extra hours.'),
         'employee_id': fields.many2one('hr.employee', "Employee's Name", required=True, select=True),
         'day': fields.function(_day_compute, method=True, type='char', string='Day', store=True, select=1, size=32),
     }
@@ -86,6 +87,7 @@ class hr_attendance(osv.osv):
 
     _constraints = [(_altern_si_so, 'Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)', ['action'])]
     _order = 'name desc'
+
 hr_attendance()
 
 class hr_employee(osv.osv):
@@ -144,16 +146,14 @@ class hr_employee(osv.osv):
                 raise osv.except_osv(_('Warning'), _('You tried to %s with a date anterior to another event !\nTry to contact the administrator to correct attendances.')%(warning_sign,))
 
             res = {'action': type, 'employee_id': emp['id']}
-
             if dt:
                 res['name'] = dt
             id = obj_attendance.create(cr, uid, res, context=context)
 
         if type != 'action':
             return id
-
         return True
 
 hr_employee()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/hr_attendance/wizard/hr_attendance_bymonth.py

@@ -29,11 +29,11 @@ class hr_attendance_bymonth(osv.osv_memory):
     _columns = {
         'month': fields.selection([(1, 'January'), (2, 'February'), (3, 'March'), (4, 'April'), (5, 'May'), (6, 'June'), (7, 'July'), (8, 'August'), (9, 'September'), (10, 'October'), (11, 'November'), (12, 'December')], 'Month', required=True),
         'year': fields.integer('Year', required=True)
-                }
+    }
     _defaults = {
          'month': time.gmtime()[1],
          'year': time.gmtime()[0],
-             }
+    }
 
     def print_report(self, cr, uid, ids, context=None):
         if context is None:
@@ -42,13 +42,13 @@ class hr_attendance_bymonth(osv.osv_memory):
              'ids': [],
              'model': 'hr.employee',
              'form': self.read(cr, uid, ids)[0]
-                 }
+        }
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'hr.attendance.bymonth',
             'datas': datas,
-            }
+        }
 
 hr_attendance_bymonth()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/hr_attendance/wizard/hr_attendance_byweek.py

@@ -28,11 +28,11 @@ class hr_attendance_byweek(osv.osv_memory):
     _columns = {
         'init_date': fields.date('Starting Date', required=True),
         'end_date': fields.date('Ending Date', required=True)
-        }
+    }
     _defaults = {
          'init_date': time.strftime('%Y-%m-%d'),
          'end_date': time.strftime('%Y-%m-%d'),
-        }
+    }
 
     def print_report(self, cr, uid, ids, context=None):
         if context is None:
@@ -41,12 +41,12 @@ class hr_attendance_byweek(osv.osv_memory):
              'ids': [],
              'model': 'hr.employee',
              'form': self.read(cr, uid, ids)[0]
-                 }
+        }
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'hr.attendance.allweeks',
             'datas': datas,
-            }
+        }
 hr_attendance_byweek()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/hr_attendance/wizard/hr_attendance_error.py

@@ -31,12 +31,12 @@ class hr_attendance_error(osv.osv_memory):
         'init_date': fields.date('Starting Date', required=True),
         'end_date': fields.date('Ending Date', required=True),
         'max_delay': fields.integer('Max. Delay (Min)', required=True)
-        }
+    }
     _defaults = {
          'init_date': time.strftime('%Y-%m-%d'),
          'end_date': time.strftime('%Y-%m-%d'),
          'max_delay': 120,
-        }
+    }
 
     def print_report(self, cr, uid, ids, context=None):
         if context is None:
@@ -59,13 +59,13 @@ class hr_attendance_error(osv.osv_memory):
              'ids': [],
              'model': 'hr.employee',
              'form': data_error
-                 }
+        }
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'hr.attendance.error',
             'datas': datas,
-            }
+        }
 
 hr_attendance_error()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/hr_attendance/wizard/hr_attendance_sign_in_out.py

@@ -192,4 +192,4 @@ class hr_sign_in_out(osv.osv_memory):
 
 hr_sign_in_out()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/idea/__openerp__.py

@@ -36,12 +36,13 @@
     'depends': ['base'],
     'init_xml': [],
     'update_xml': [
+        'security/idea_security.xml',
+        'security/ir.model.access.csv',
         'wizard/idea_post_vote_view.xml',
         'idea_view.xml',
         'idea_workflow.xml',
         'report/report_vote_view.xml',
-        'security/idea_security.xml',
-        'security/ir.model.access.csv',
+
     ],
     'demo_xml': [
         "idea_data.xml"

addons/idea/idea_view.xml

@@ -383,7 +383,7 @@
     <menuitem name="Idea" parent="base.menu_lunch_reporting" id="menu_idea_reporting" sequence="3"/>
 
     <menuitem name="Vote Statistics" parent="menu_idea_reporting"
-        id="menu_idea_vote_stat" action="action_idea_vote_stat" />
+        id="menu_idea_vote_stat" action="action_idea_vote_stat" groups="base.group_tool_manager,base.group_tool_user,base.group_system"/>
 
     <!-- Vote For Idea Action  -->
     <record model="ir.actions.act_window" id="action_idea_vote">

addons/idea/report/report_vote_view.xml

@@ -84,7 +84,7 @@
             <field name="context">{'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
         </record>
 
-        <menuitem action="action_report_vote_all" id="menu_report_vote_all" parent="menu_idea_reporting" sequence="1" groups="base.group_survey_manager"/>
+        <menuitem action="action_report_vote_all" id="menu_report_vote_all" parent="menu_idea_reporting" sequence="1" groups="base.group_tool_manager,base.group_system"/>
     </data>
 </openerp>
 

addons/idea/security/idea_security.xml

@@ -13,10 +13,10 @@
         <field name="name">Sales / User</field>
     </record>
 
-   	<record model="res.groups" id="base.group_survey_manager">
+   	<record model="res.groups" id="base.group_tool_manager">
         	<field name="name">Tools / Manager</field>
    		</record>
-   	<record model="res.groups" id="base.group_survey_user">
+   	<record model="res.groups" id="base.group_tool_user">
         	<field name="name">Tools / User</field>
    	</record>
 

addons/idea/security/ir.model.access.csv

@@ -9,14 +9,17 @@
 "access_report_vote","report.vote","model_report_vote","base.group_user",1,1,1,1
 "access_idea_idea_sale_salesman","idea.idea.sale","model_idea_idea","base.group_sale_salesman",1,1,1,1
 "access_idea_vote_sale_salesman","idea.vote.sale","model_idea_vote","base.group_sale_salesman",1,1,1,1
-"access_idea_category_user","idea.category user","model_idea_category","base.group_survey_user",1,1,1,1
-"access_idea_idea_user","idea.idea user","model_idea_idea","base.group_survey_user",1,1,1,1
-"access_idea_vote_user","idea.vote user","model_idea_vote","base.group_survey_user",1,1,1,1
-"access_idea_category_manager","idea.category manager","model_idea_category","base.group_survey_manager",1,0,0,0
-"access_idea_idea_manager","idea.idea manager","model_idea_idea","base.group_survey_manager",1,0,0,0
-"access_idea_vote_manager","idea.vote manager","model_idea_vote","base.group_survey_manager",1,0,0,0
-"access_idea_vote_stat_user","idea.vote.stat user","model_idea_vote_stat","base.group_survey_user",1,1,1,1
-"access_idea_comment_user","idea.comment user","model_idea_comment","base.group_survey_user",1,1,1,1
-"access_report_vote_manager","report.vote manager","model_report_vote","base.group_survey_manager",1,1,1,1
+"access_idea_category_user","idea.category user","model_idea_category","base.group_tool_user",1,1,1,1
+"access_idea_idea_user","idea.idea user","model_idea_idea","base.group_tool_user",1,1,1,1
+"access_idea_vote_user","idea.vote user","model_idea_vote","base.group_tool_user",1,1,1,1
+"access_idea_category_manager","idea.category manager","model_idea_category","base.group_tool_manager",1,0,0,0
+"access_idea_idea_manager","idea.idea manager","model_idea_idea","base.group_tool_manager",1,0,0,0
+"access_idea_vote_manager","idea.vote manager","model_idea_vote","base.group_tool_manager",1,0,0,0
+"access_idea_vote_stat_user","idea.vote.stat user","model_idea_vote_stat","base.group_tool_user",1,1,1,1
+"access_idea_comment_user","idea.comment user","model_idea_comment","base.group_tool_user",1,1,1,1
+"access_report_vote_manager","report.vote manager","model_report_vote","base.group_tool_manager",1,1,1,1
 "access_idea_idea_system","idea.idea system","model_idea_idea","base.group_system",1,0,0,0
 "access_idea_vote_system","idea.vote system","model_idea_vote","base.group_system",1,0,0,0
+"access_report_vote_system","report.vote system","model_report_vote","base.group_system",1,0,0,0
+"access_idea_vote_stat_manager","idea.vote.stat manager","model_idea_vote_stat","base.group_tool_manager",1,1,1,1
+"access_idea_vote_stat_system","idea.vote.stat system","model_idea_vote_stat","base.group_system",1,1,1,1

addons/lunch/security/ir.model.access.csv

@@ -6,14 +6,16 @@
 "access_lunch_order","lunch.order","model_lunch_order","base.group_user",1,1,1,1
 "access_report_lunch_amount","report.lunch.amount","model_report_lunch_amount","base.group_user",1,1,1,1
 "access_lunch_order_sale_salesman","lunch.order.sale","model_lunch_order","base.group_sale_salesman",1,1,1,1
-"access_lunch_order_user","lunch.order user","model_lunch_order","base.group_survey_user",1,1,1,1
-"access_lunch_order_manager","lunch.order manager","model_lunch_order","base.group_survey_manager",1,0,0,0
-"access_lunch_cashmove_user","lunch.cashmove user","model_lunch_cashmove","base.group_survey_user",1,1,1,1
-"access_lunch_cashmove_manager","lunch.cashmove manager","model_lunch_cashmove","base.group_survey_manager",1,0,0,0
-"access_report_lunch_amount_manager","report.lunch.amount manager","model_report_lunch_amount","base.group_survey_manager",1,1,1,1
+"access_lunch_order_user","lunch.order user","model_lunch_order","base.group_tool_user",1,1,1,1
+"access_lunch_order_manager","lunch.order manager","model_lunch_order","base.group_tool_manager",1,0,0,0
+"access_lunch_cashmove_user","lunch.cashmove user","model_lunch_cashmove","base.group_tool_user",1,1,1,1
+"access_lunch_cashmove_manager","lunch.cashmove manager","model_lunch_cashmove","base.group_tool_manager",1,0,0,0
+"access_report_lunch_amount_manager","report.lunch.amount manager","model_report_lunch_amount","base.group_tool_manager",1,1,1,1
 "access_lunch_category_system","lunch.category system","model_lunch_category","base.group_system",1,1,1,1
 "access_lunch_product_system","lunch.product system","model_lunch_product","base.group_system",1,1,1,1
 "access_lunch_cashbox_system","lunch.cashbox system","model_lunch_cashbox","base.group_system",1,1,1,1
 "access_lunch_order_system","lunch.order system","model_lunch_order","base.group_system",1,0,0,0
 "access_lunch_cashmove_system","lunch.cashmove system","model_lunch_cashmove","base.group_system",1,0,0,0
-"access_report_lunch_order_manager","report.lunch.order manager","model_report_lunch_order","base.group_survey_manager",1,1,1,1
+"access_report_lunch_order_manager","report.lunch.order manager","model_report_lunch_order","base.group_tool_manager",1,1,1,1
+"access_lunch_product_user","lunch.product user","model_lunch_product","base.group_tool_user",1,1,1,1
+"access_lunch_cashbox_user","lunch.cashbox user","model_lunch_cashbox","base.group_tool_user",1,1,1,1

addons/lunch/security/lunch_security.xml

@@ -5,10 +5,10 @@
     <record id="base.group_sale_salesman" model="res.groups">
         <field name="name">Sales / User</field>
     </record>
-   	<record model="res.groups" id="base.group_survey_manager">
+   	<record model="res.groups" id="base.group_tool_manager">
         	<field name="name">Tools / Manager</field>
    		</record>
-   	<record model="res.groups" id="base.group_survey_user">
+   	<record model="res.groups" id="base.group_tool_user">
         	<field name="name">Tools / User</field>
    	</record>
 

addons/marketing_campaign/security/ir.model.access.csv

@@ -8,3 +8,6 @@
 "access_marketing_campaign_workitem_all","marketing.campaign.workitem","model_marketing_campaign_workitem","base.group_user",1,0,0,0
 "access_email_template_user","email.template","model_email_template","base.res_groups_email_template_admin",1,1,1,1
 "access_email_template_account_user","email_template.account.user","email_template.model_email_template_account","base.res_groups_email_template_admin",1,1,1,1
+"access_marketing_campaign_system","marketing.campaign system","model_marketing_campaign","base.group_system",1,0,0,0
+"access_marketing_campaign_segment_system","marketing.campaign.segment system","model_marketing_campaign_segment","base.group_system",1,0,0,0
+"access_marketing_campaign_workitem_system","marketing.campaign.workitem system","model_marketing_campaign_workitem","base.group_system",1,0,0,0

addons/outlook/README

@@ -0,0 +1,31 @@
+OpenERP Outlook PLUG-IN Installation Guide
+
+Pre requirements :
+======================================================================================
+1.Python 2.6+ . python can be downloaded from http://www.python.org/download/releases/ .
+2.Python for Windows extensions - PyWin32 this module for python must be installed for appropriate version of the Python. It can be downloaded from http://sourceforge.net/projects/pywin32/files/ or http://starship.python.net/crew/mhammond/win32/ 
+
+How to install openerp-outlook plug-in?
+======================================================================================
+1.Open your Python installation directory (e.g.: C:\Python26).
+2.Create folder named “openerp-outlook-plugin”.
+3.Extract your zip file  “outlook-plugin.zip” to the folder.
+4.Open the folder outlook-plugin.
+5.And Run “Register-plugin.bat” file.
+6.Run Outlook and Check addin has been registered.
+7.Tools->OpenERP Configuration and test your connection.
+8.See User Guide for More. 
+
+How to uninstall openerp-outlook plug-in?
+=====================================================================================
+1.Open the folder outlook-plugin.
+2.And Run “Unregister-plugin.bat” file.
+
+Note : Plug In has been successfully tested with MS Office 2003 and MS Offcie 2007.
+
+
+Enjoy Archiving your Outlook E-mails to OpenERP.
+
+
+
+

addons/sale/sale.py

@@ -703,6 +703,7 @@ class sale_order(osv.osv):
             for proc_id in proc_ids:
                 wf_service = netsvc.LocalService("workflow")
                 wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
+                wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_check', cr)
 
             if order.state == 'shipping_except':
                 val['state'] = 'progress'

addons/sale/sale_view.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_sale_salesman,base.group_sale_manager,base.group_system"/>
+        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_sale_salesman,base.group_sale_manager,base.group_system,base.group_partner_manager"/>
         <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
 
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>

addons/stock_planning/stock_planning_view.xml

@@ -182,7 +182,7 @@
         <!-- Forecast section -->
         
         <menuitem id="menu_stock_sale_forecast" name="Sales Forecasts" 
-                parent="base.menu_base_partner" sequence="6"/>
+                parent="base.menu_base_partner" sequence="6" groups="base.group_extended,base.group_system"/>
 
         <record id="view_stock_sale_forecast_filter" model="ir.ui.view">
             <field name="name">stock.sale.forecast.list.select</field>

addons/subscription/security/ir.model.access.csv

@@ -3,8 +3,8 @@ access_subscription_document,subscription.document,model_subscription_document,b
 access_subscription_document_fields,subscription.document.fields,model_subscription_document_fields,base.group_system,1,1,1,1
 access_subscription_subscription,subscription.subscription,model_subscription_subscription,base.group_user,1,1,1,1
 access_subscription_subscription_history,subscription.subscription.history,model_subscription_subscription_history,base.group_user,1,1,1,1
-access_subscription_subscription_user,subscription.subscription user,model_subscription_subscription,base.group_survey_user,1,1,1,1
-access_subscription_subscription_manager,subscription.subscription manager,model_subscription_subscription,base.group_survey_manager,1,0,0,0
-access_subscription_subscription_history_user,subscription.subscription.history user,model_subscription_subscription_history,base.group_survey_user,1,1,1,1
+access_subscription_subscription_user,subscription.subscription user,model_subscription_subscription,base.group_tool_user,1,1,1,1
+access_subscription_subscription_manager,subscription.subscription manager,model_subscription_subscription,base.group_tool_manager,1,0,0,0
+access_subscription_subscription_history_user,subscription.subscription.history user,model_subscription_subscription_history,base.group_tool_user,1,1,1,1
 access_subscription_subscription_system,subscription.subscription system,model_subscription_subscription,base.group_system,1,0,0,0
-access_subscription_document_user,subscription.document user,model_subscription_document,base.group_survey_user,1,1,1,1
+access_subscription_document_user,subscription.document user,model_subscription_document,base.group_tool_user,1,1,1,1

addons/subscription/security/subcription_security.xml

@@ -2,10 +2,10 @@
 <openerp>
 <data noupdate="0">
 
-   	<record model="res.groups" id="base.group_survey_manager">
+   	<record model="res.groups" id="base.group_tool_manager">
         	<field name="name">Tools / Manager</field>
    		</record>
-   	<record model="res.groups" id="base.group_survey_user">
+   	<record model="res.groups" id="base.group_tool_user">
         	<field name="name">Tools / User</field>
    	</record>
 

addons/survey/security/ir.model.access.csv

@@ -1,30 +1,30 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_survey_type_manager","survey.type manager","model_survey_type","base.group_survey_manager",1,1,1,1
-"access_survey_type_user","survey.type user","model_survey_type","base.group_survey_user",1,1,1,1
-"access_survey_manager","survey","model_survey","base.group_survey_manager",1,0,0,0
+"access_survey_type_manager","survey.type manager","model_survey_type","base.group_tool_manager",1,1,1,1
+"access_survey_type_user","survey.type user","model_survey_type","base.group_tool_user",1,1,1,1
+"access_survey_manager","survey","model_survey","base.group_tool_manager",1,0,0,0
 "access_survey_system","survey","model_survey","base.group_system",1,0,0,0
-"access_survey_user","survey","model_survey","base.group_survey_user",1,1,1,1
-"access_survey_page_manager","survey.page manager","model_survey_page","base.group_survey_manager",1,0,0,0
+"access_survey_user","survey","model_survey","base.group_tool_user",1,1,1,1
+"access_survey_page_manager","survey.page manager","model_survey_page","base.group_tool_manager",1,0,0,0
 "access_survey_page_system","survey.page system","model_survey_page","base.group_system",1,0,0,0
-"access_survey_page_user","survey.page user","model_survey_page","base.group_survey_user",1,1,1,1
-"access_survey_question_manager","survey.question manager","model_survey_question","base.group_survey_manager",1,1,1,1
-"access_survey_question_user","survey.question user","model_survey_question","base.group_survey_user",1,1,1,1
-"access_survey_answer_manager","survey.answer manager","model_survey_answer","base.group_survey_manager",1,1,1,1
-"access_survey_answer_user","survey.answer user","model_survey_answer","base.group_survey_user",1,1,1,1
-"access_survey_response_manager","survey.response manager","model_survey_response","base.group_survey_manager",1,1,1,1
-"access_survey_response_user","survey.response user","model_survey_response","base.group_survey_user",1,1,1,1
-"access_survey_response_answer_manager","survey.response.answer manager","model_survey_response_answer","base.group_survey_manager",1,1,1,1
-"access_survey_response_answer_user","survey.response.answer user","model_survey_response_answer","base.group_survey_user",1,1,1,1
-"access_survey_history_user","survey.history.user","model_survey_history","base.group_survey_user",1,1,1,1
-"access_survey_question_column_heading_manager","survey.question.column.heading manager","model_survey_question_column_heading","base.group_survey_manager",1,1,1,1
-"access_survey_question_column_heading_user","survey.question.column.heading user","model_survey_question_column_heading","base.group_survey_user",1,0,0,0
-"access_survey_request_manager","survey.request manager","model_survey_request","base.group_survey_manager",1,0,0,0
-"access_survey_request_user","survey.request user","model_survey_request","base.group_survey_user",1,1,1,1
+"access_survey_page_user","survey.page user","model_survey_page","base.group_tool_user",1,1,1,1
+"access_survey_question_manager","survey.question manager","model_survey_question","base.group_tool_manager",1,1,1,1
+"access_survey_question_user","survey.question user","model_survey_question","base.group_tool_user",1,1,1,1
+"access_survey_answer_manager","survey.answer manager","model_survey_answer","base.group_tool_manager",1,1,1,1
+"access_survey_answer_user","survey.answer user","model_survey_answer","base.group_tool_user",1,1,1,1
+"access_survey_response_manager","survey.response manager","model_survey_response","base.group_tool_manager",1,1,1,1
+"access_survey_response_user","survey.response user","model_survey_response","base.group_tool_user",1,1,1,1
+"access_survey_response_answer_manager","survey.response.answer manager","model_survey_response_answer","base.group_tool_manager",1,1,1,1
+"access_survey_response_answer_user","survey.response.answer user","model_survey_response_answer","base.group_tool_user",1,1,1,1
+"access_survey_history_user","survey.history.user","model_survey_history","base.group_tool_user",1,1,1,1
+"access_survey_question_column_heading_manager","survey.question.column.heading manager","model_survey_question_column_heading","base.group_tool_manager",1,1,1,1
+"access_survey_question_column_heading_user","survey.question.column.heading user","model_survey_question_column_heading","base.group_tool_user",1,0,0,0
+"access_survey_request_manager","survey.request manager","model_survey_request","base.group_tool_manager",1,0,0,0
+"access_survey_request_user","survey.request user","model_survey_request","base.group_tool_user",1,1,1,1
 "access_survey_request_system","survey.request system","model_survey_request","base.group_system",1,0,0,0
-"access_survey_tbl_column_heading_manager","survey.tbl.column.heading manager","model_survey_tbl_column_heading","base.group_survey_manager",1,1,1,1
-"access_survey_tbl_column_heading_user","survey.tbl.column.heading user","model_survey_tbl_column_heading","base.group_survey_user",1,1,1,1
-"access_survey_response_line_manager","survey.response.line manager","model_survey_response_line","base.group_survey_manager",1,1,1,1
-"access_survey_response_line_manager","survey.response.line manager","model_survey_response_line","base.group_survey_user",1,1,1,1
+"access_survey_tbl_column_heading_manager","survey.tbl.column.heading manager","model_survey_tbl_column_heading","base.group_tool_manager",1,1,1,1
+"access_survey_tbl_column_heading_user","survey.tbl.column.heading user","model_survey_tbl_column_heading","base.group_tool_user",1,1,1,1
+"access_survey_response_line_manager","survey.response.line manager","model_survey_response_line","base.group_tool_manager",1,1,1,1
+"access_survey_response_line_manager","survey.response.line manager","model_survey_response_line","base.group_tool_user",1,1,1,1
 "access_survey_type","survey.type","model_survey_type","base.group_hr_manager",1,1,1,1
 "access_survey","survey","model_survey","base.group_hr_manager",1,1,1,1
 "access_survey_history_manager","survey.history","model_survey_history","base.group_hr_manager",1,1,1,1
@@ -38,7 +38,7 @@
 "access_survey_response_answer","survey.response.answer","model_survey_response_answer","base.group_hr_manager",1,1,1,1
 "access_survey_res_users","res.users","base.model_res_users","base.group_hr_manager",1,1,1,1
 "access_survey_request","survey.request","model_survey_request","base.group_hr_manager",1,1,1,1
-"access_survey_history_survey_manager","survey.history manager","model_survey_history","base.group_survey_manager",1,0,0,0
+"access_survey_history_survey_manager","survey.history manager","model_survey_history","base.group_tool_manager",1,0,0,0
 "access_survey_type_system","survey.type system","model_survey_type","base.group_system",1,0,0,0
 "access_survey_question_system","survey.question system","model_survey_question","base.group_system",1,0,0,0
 "access_survey_history_system","survey.history.system","model_survey_history","base.group_system",1,0,0,0

addons/survey/security/survey_security.xml

@@ -11,10 +11,10 @@
     <record id="base.group_hr_user" model="res.groups">
         <field name="name">Human Resources / User</field>
     </record>
-   	<record model="res.groups" id="base.group_survey_manager">
+   	<record model="res.groups" id="base.group_tool_manager">
         	<field name="name">Tools / Manager</field>
    		</record>
-   	<record model="res.groups" id="base.group_survey_user">
+   	<record model="res.groups" id="base.group_tool_user">
         	<field name="name">Tools / User</field>
    	</record>
 

addons/survey/survey_view.xml

@@ -2,15 +2,15 @@
 <openerp>
     <data>
 
-            <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="28" groups="base.group_system,base.group_survey_manager,base.group_survey_user"/>
+            <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="28" groups="base.group_system,base.group_tool_manager,base.group_tool_user"/>
             <menuitem name="Surveys" id="menu_surveys" parent="base.menu_tools"
-                        groups="base.group_survey_manager,base.group_survey_user,base.group_system" sequence="2"/>
+                        groups="base.group_tool_manager,base.group_tool_user,base.group_system" sequence="2"/>
             <menuitem name="Define Surveys" id="menu_define_survey"
-                 groups="base.group_survey_manager,base.group_survey_user,base.group_system"
+                 groups="base.group_tool_manager,base.group_tool_user,base.group_system"
                  parent="menu_surveys" />
-            <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_survey_manager,base.group_survey_user,base.group_system"/>
+            <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_tool_manager,base.group_tool_user,base.group_system"/>
             <menuitem name="Reporting" parent="base.menu_tools"
-                id="base.menu_lunch_reporting" groups="base.group_survey_manager" sequence="6"/>
+                id="base.menu_lunch_reporting" sequence="6"/>
             <menuitem name="Surveys" id="menu_reporting" parent="base.menu_lunch_reporting" sequence="2"/>
         <!--
             Survey
@@ -291,7 +291,7 @@
 
         <menuitem name="Surveys" id="menu_survey_form"
             action="action_survey_form1" parent="menu_define_survey"
-            groups="base.group_survey_manager,base.group_survey_user,base.group_system"/>
+            groups="base.group_tool_manager,base.group_tool_user,base.group_system"/>
 
         <!--
             Survey Pages
@@ -491,7 +491,7 @@
 
         <menuitem name="Pages" id="menu_survey_page_form1"
             action="action_survey_page_form" parent='menu_define_survey'
-            groups="base.group_survey_manager,base.group_survey_user,base.group_system"/>
+            groups="base.group_tool_manager,base.group_tool_user,base.group_system"/>
 
         <record model="ir.ui.view" id="survey_page_wizard_test1">
             <field name="name">survey_page_wizard_test</field>
@@ -1116,7 +1116,7 @@
 
         <menuitem name="Survey Requests" id="menu_survey_type_form1"
             action="action_survey_request_tree" parent='menu_answer_surveys'
-            groups="base.group_survey_manager,base.group_survey_user,base.group_system"/>
+            groups="base.group_tool_manager,base.group_tool_user,base.group_system"/>
 
         <!--
             Survey Type
@@ -1191,7 +1191,7 @@
 
         <menuitem name="Answer a Survey" id="menu_run_survey_form" sequence="2"
             action="action_view_survey_name" parent="menu_answer_surveys"
-            groups="base.group_survey_manager,base.group_survey_user,base.group_system" icon="STOCK_INDEX"/>
+            groups="base.group_tool_manager,base.group_tool_user,base.group_system" icon="STOCK_INDEX"/>
 
     </data>
 </openerp>

addons/survey/wizard/survey_browse_answer.xml

@@ -35,7 +35,7 @@
 
 		<menuitem name="Browse Answers" id="menu_browse_survey_response"
 			action="action_browse_survey_response" parent="menu_reporting"
-			groups="base.group_survey_manager" icon="STOCK_PRINT_PREVIEW"/>
+			groups="base.group_tool_manager" icon="STOCK_PRINT_PREVIEW"/>
 
 	</data>
 </openerp>

addons/survey/wizard/survey_print.xml

@@ -37,7 +37,7 @@
 
         <menuitem name="Surveys" id="menu_print_survey_form" sequence="1"
             action="action_view_survey_print" parent="menu_reporting"
-            groups="base.group_survey_manager" icon="STOCK_PRINT"/>
+            groups="base.group_tool_manager" icon="STOCK_PRINT"/>
 
 	</data>
 </openerp>

addons/survey/wizard/survey_print_answer.xml

@@ -37,7 +37,7 @@
 		</record>
 
 		<menuitem name="Surveys Answers" action="action_view_survey_print_answer" id="menu_print_survey_answer"
-			parent="menu_reporting" icon="STOCK_PRINT" groups="base.group_survey_manager"/>
+			parent="menu_reporting" icon="STOCK_PRINT" groups="base.group_tool_manager"/>
 
 	</data>
 </openerp>

addons/survey/wizard/survey_print_statistics.xml

@@ -31,7 +31,7 @@
 		</record>
 
 		<menuitem name="Surveys Statistics" action="action_view_survey_print_statistics" id="menu_print_survey_statistics"
-			parent="menu_reporting" icon="STOCK_PRINT" groups="base.group_survey_manager"/>
+			parent="menu_reporting" icon="STOCK_PRINT" groups="base.group_tool_manager"/>
 
 	</data>
 </openerp>

addons/survey/wizard/survey_send_invitation.py

@@ -100,7 +100,7 @@ class survey_send_invitation(osv.osv_memory):
         survey_ref= self.pool.get('survey')
 
         model_data_obj = self.pool.get('ir.model.data')
-        group_id = model_data_obj._get_id(cr, uid, 'survey', 'group_survey_user')
+        group_id = model_data_obj._get_id(cr, uid, 'survey', 'base.group_tool_user')
         group_id = model_data_obj.browse(cr, uid, group_id, context=context).res_id
 
         act_id = self.pool.get('ir.actions.act_window')