[MERGE] polish1 (stw)

bzr revid: al@openerp.com-20111108225914-4ivtczbmyqk96na7

addons/account/account_installer.xml

@@ -28,7 +28,8 @@
                         <field name="charts"/>
                             <group colspan="4" groups="account.group_account_user">
                                 <separator col="4" colspan="4" string="Configure Fiscal Year"/>
-                                <field name="company_id" colspan="4" widget="selection"/><!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
+                                <field name="has_default_company" invisible="1" />
+                                <field name="company_id" colspan="4" widget="selection" attrs="{'invisible' : [('has_default_company', '=', True)]}"/><!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
                                 <field name="date_start" on_change="on_change_start_date(date_start)"/>
                                 <field name="date_stop"/>
                                 <field name="period" colspan="4"/>

addons/account/installer.py

@@ -38,7 +38,9 @@ class account_installer(osv.osv_memory):
 
     def _get_charts(self, cr, uid, context=None):
         modules = self.pool.get('ir.module.module')
-        ids = modules.search(cr, uid, [('name', 'like', 'l10n_')], context=context)
+        # Looking for the module with the 'Account Charts' category
+        category_name, category_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'module_category_localization_account_charts')
+        ids = modules.search(cr, uid, [('category_id', '=', category_id)], context=context)
         charts = list(
             sorted(((m.name, m.shortdesc)
                     for m in modules.browse(cr, uid, ids, context=context)),
@@ -59,12 +61,17 @@ class account_installer(osv.osv_memory):
         'sale_tax': fields.float('Sale Tax(%)'),
         'purchase_tax': fields.float('Purchase Tax(%)'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
+        'has_default_company' : fields.boolean('Has Default Company', readonly=True),
     }
 
     def _default_company(self, cr, uid, context=None):
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         return user.company_id and user.company_id.id or False
 
+    def _default_has_default_company(self, cr, uid, context=None):
+        count = self.pool.get('res.company').search_count(cr, uid, [], context=context)
+        return bool(count == 1)
+
     _defaults = {
         'date_start': lambda *a: time.strftime('%Y-01-01'),
         'date_stop': lambda *a: time.strftime('%Y-12-31'),
@@ -72,6 +79,7 @@ class account_installer(osv.osv_memory):
         'sale_tax': 0.0,
         'purchase_tax': 0.0,
         'company_id': _default_company,
+        'has_default_company': _default_has_default_company,
         'charts': 'configurable'
     }
 

addons/account_analytic_analysis/__openerp__.py

@@ -21,9 +21,9 @@
 
 
 {
-    'name'      : 'Analytic Account View',
+    'name'      : 'Sales Contract Management',
     'version'   : '1.1',
-    'category'  : 'Hidden',
+    'category'  : 'Sales Management',
     'complexity': "normal",
     'description': """
 This module is for modifying account analytic view to show important data to project manager of services companies.

addons/association/__openerp__.py

@@ -23,7 +23,7 @@
 {
     'name': 'Association profile',
     'version': '0.1',
-    'category': 'Vertical Applications',
+    'category': 'Specific Industry Applications',
     'complexity': "normal",
     'description': """
 This module is to configure modules related to an association.

addons/auction/__openerp__.py

@@ -23,7 +23,7 @@
 {
     'name': 'Auction Management',
     'version': '1.0',
-    'category': 'Vertical Applications',
+    'category': 'Specific Industry Applications',
     'complexity': "normal",
     'description': """
 This module manages the records of artists, auction articles, buyers and sellers.

addons/crm/crm_lead_demo.xml

@@ -386,7 +386,7 @@
             <field name="stage_id" ref="crm.stage_lead4"/>
             <field eval="'Need new design for my website'" name="name"/>
             <field eval="time.strftime('%Y-05-01')" name="date_action"/>
-            <field eval="time.strftime('%Y-06-32')" name="date_deadline"/>
+            <field eval="time.strftime('%Y-06-30')" name="date_deadline"/>
             <field eval="'info@opensides.be'" name="email_from"/>
             <field eval="'Convert to quote'" name="title_action"/>
             <field name="partner_name">Dubois sprl</field>

addons/crm/crm_lead_view.xml

@@ -688,8 +688,7 @@
                     name="pending"
                     domain="[('state','=','pending')]"/>
                 <separator orientation="vertical"/>
-                <field name="name" string="Opportunity"/>
-                <field name="partner_id" string="Customer / Email" filter_domain="['|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]"/>
+                <field name="name" string="Opportunity / Customer" filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
                 <field name="user_id">
                     <filter icon="terp-personal-"
                         domain="[('user_id','=', False)]"

addons/crm/crm_phonecall.py

@@ -35,7 +35,7 @@ class crm_phonecall(crm_base, osv.osv):
     _columns = {
         # From crm.case
         'id': fields.integer('ID', readonly=True),
-        'name': fields.char('Call Summary', size=64),
+        'name': fields.char('Call Summary', size=64, required=True),
         'active': fields.boolean('Active', required=False),
         'date_action_last': fields.datetime('Last Action', readonly=1),
         'date_action_next': fields.datetime('Next Action', readonly=1),

addons/hr/hr.py

@@ -47,7 +47,8 @@ class hr_employee_category(osv.osv):
         'name': fields.char("Category", size=64, required=True),
         'complete_name': fields.function(_name_get_fnc, type="char", string='Name'),
         'parent_id': fields.many2one('hr.employee.category', 'Parent Category', select=True),
-        'child_ids': fields.one2many('hr.employee.category', 'parent_id', 'Child Categories')
+        'child_ids': fields.one2many('hr.employee.category', 'parent_id', 'Child Categories'),
+        'employee_ids': fields.many2many('hr.employee', 'employee_category_rel', 'category_id', 'emp_id', 'Employees'),
     }
 
     def _check_recursion(self, cr, uid, ids, context=None):

addons/hr/hr_view.xml

@@ -287,6 +287,8 @@
                 <form string="Employee Category">
                     <field name="name" />
                     <field name="parent_id" />
+                    <separator string="Employees" colspan="4" />
+                    <field name="employee_ids" colspan="4" nolabel="1" />
                 </form>
             </field>
         </record>

addons/hr_contract/hr_contract_view.xml

@@ -74,7 +74,7 @@
                         <field name="wage"/>
                         <field name="type_id" widget="selection"/>
                     </group>
-                    <notebook>
+                    <notebook colspan='4'>
                     <page string="Information" name="information">
                         <group col="2" colspan="2" name="left_column">
                             <separator colspan="2" string="Duration"/>

addons/hr_holidays/hr_holidays_workflow.xml

@@ -84,7 +84,7 @@
         <field name="act_from" ref="act_validate" />
         <field name="act_to" ref="act_validate1" />
         <field name="signal">second_validate</field>
-        <field name="group_id" ref="base.group_hr_user"/>
+        <field name="group_id" ref="base.group_hr_manager" />
     </record>
 
     <record model="workflow.transition" id="t11">

addons/hr_payroll/__openerp__.py

@@ -23,7 +23,7 @@
     'name': 'Payroll',
     'version': '1.0',
     'category': 'Human Resources',
-    'complexity': "expert",
+    'complexity': "normal",
     'description': """
 Generic Payroll system.
 =======================

addons/idea/__openerp__.py

@@ -23,7 +23,7 @@
 {
     'name': 'Ideas Box',
     'version': '0.1',
-    'category': 'Hidden',
+    'category': 'Human Resources',
     'complexity': "easy",
     'description': """
 This module allows your user to easily and efficiently participate in enterprise innovation.

addons/l10n_hn/__openerp__.py

@@ -35,7 +35,7 @@
 {
     'name': 'Honduras - Plan contable general',
     'version': '0.1',
-    'category': 'Localisation/Account Charts',
+    'category': 'Localization/Account Charts',
     'description': """Agrega una nomenclatura contable para Honduras. También incluye impuestos y la moneda Lempira. -- Adds accounting chart for Honduras.  It also includes taxes and the Lempira currency""",
     'author': 'Salvatore Josue Trimarchi Pinto',
     'website': 'http://trimarchi.co.cc',

addons/lunch/__openerp__.py

@@ -33,7 +33,7 @@
     """,
     "version": "0.1",
     "depends": ["base_tools"],
-    "category" : "Hidden",
+    "category" : "Human Resources",
     'description': """
     The base module to manage lunch
 

addons/product_expiry/__openerp__.py

@@ -21,7 +21,7 @@
     "name" : "Products Expiry Date",
     "version" : "1.0",
     "author" : "OpenERP SA",
-    "category" : "Vertical Applications",
+    "category" : "Specific Industry Applications",
     'complexity': "easy",
     "depends" : ["stock"],
     "init_xml" : [],

addons/sale_crm/wizard/crm_make_sale.py

@@ -103,12 +103,13 @@ class crm_make_sale(osv.osv_memory):
                 }
                 if partner.id:
                     vals['user_id'] = partner.user_id and partner.user_id.id or uid
-                new_id = sale_obj.create(cr, uid, vals)
+                new_id = sale_obj.create(cr, uid, vals, context=context)
+                sale_order = sale_obj.browse(cr, uid, new_id, context=context)
                 case_obj.write(cr, uid, [case.id], {'ref': 'sale.order,%s' % new_id})
                 new_ids.append(new_id)
                 message = _("Opportunity  '%s' is converted to Quotation.") % (case.name)
                 self.log(cr, uid, case.id, message)
-                case_obj.message_append(cr, uid, [case], _("Converted to Sales Quotation(id: %s).") % (new_id), context=context)
+                case_obj.message_append(cr, uid, [case], _("Converted to Sales Quotation(%s).") % (sale_order.name), context=context)
 
             if make.close:
                 case_obj.case_close(cr, uid, data)
@@ -148,7 +149,7 @@ class crm_make_sale(osv.osv_memory):
     }
     _defaults = {
          'shop_id': _get_shop_id,
-         'close': True,
+         'close': False,
          'partner_id': _selectPartner,
     }