[MERGE] Addons: various improvements

[IMP] hr
- hr.employee_category: now called 'Tag'
- hr.holidays: improved help on 'limit' field
[IMP] product
- product.pricelist.item: added a default method on 'base' field
- pricelist view: added type in context
[IMP] purchase: modified buttons presence based on state
[IMP] project: added avatar of members in form view

Coming from an old addons-style task.

bzr revid: tde@openerp.com-20130723113539-zdqb4hiuwsr6tc48

addons/hr/hr.py

@@ -51,9 +51,9 @@ class hr_employee_category(osv.osv):
     _name = "hr.employee.category"
     _description = "Employee Category"
     _columns = {
-        'name': fields.char("Category", size=64, required=True),
+        'name': fields.char("Employee Tag", 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),
+        'parent_id': fields.many2one('hr.employee.category', 'Parent Employee Tag', select=True),
         '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'),
     }
@@ -129,7 +129,7 @@ class hr_job(osv.osv):
     }
 
     _sql_constraints = [
-        ('name_company_uniq', 'unique(name, company_id)', 'The name of the job position must be unique per company!'),
+        ('name_company_uniq', 'unique(name, company_id, department_id)', 'The name of the job position must be unique per department in company!'),
     ]
 
 

addons/hr_holidays/hr_holidays.py

@@ -79,7 +79,7 @@ class hr_holidays_status(osv.osv):
         'categ_id': fields.many2one('crm.meeting.type', 'Meeting Type',
             help='Once a leave is validated, OpenERP will create a corresponding meeting of this type in the calendar.'),
         'color_name': fields.selection([('red', 'Red'),('blue','Blue'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color in Report', required=True, help='This color will be used in the leaves summary located in Reporting\Leaves by Department.'),
-        'limit': fields.boolean('Allow to Override Limit', help='If you select this check box, the system allows the employees to take more leaves than the available ones for this type and take them into account for the "Remaining Legal Leaves" defined on the employee form.'),
+        'limit': fields.boolean('Allow to Override Limit', help='If you select this check box, the system allows the employees to take more leaves than the available ones for this type and will not take them into account for the "Remaining Legal Leaves" defined on the employee form.'),
         'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the leave type without removing it."),
         'max_leaves': fields.function(_user_left_days, string='Maximum Allowed', help='This value is given by the sum of all holidays requests with a positive value.', multi='user_left_days'),
         'leaves_taken': fields.function(_user_left_days, string='Leaves Already Taken', help='This value is given by the sum of all holidays requests with a negative value.', multi='user_left_days'),

addons/product/pricelist.py

@@ -376,11 +376,26 @@ class product_pricelist_item(osv.osv):
         result.append((-2, _('Supplier Prices on the product form')))
         return result
 
+# Added default function to fetch the Price type Based on Pricelist type.
+    def _get_default_base(self, cr, uid, fields, context=None):
+        product_price_type_obj = self.pool.get('product.price.type')
+        if fields.get('type') == 'purchase':
+            product_price_type_ids = product_price_type_obj.search(cr, uid, [('field', '=', 'standard_price')], context=context)
+        elif fields.get('type') == 'sale':
+            product_price_type_ids = product_price_type_obj.search(cr, uid, [('field','=','list_price')], context=context)
+        else:
+            return -1
+        if not product_price_type_ids:
+            return False
+        else:
+            pricetype = product_price_type_obj.browse(cr, uid, product_price_type_ids, context=context)[0]
+            return pricetype.id
+
     _name = "product.pricelist.item"
     _description = "Pricelist item"
     _order = "sequence, min_quantity desc"
     _defaults = {
-        'base': lambda *a: -1,
+        'base': _get_default_base,
         'min_quantity': lambda *a: 0,
         'sequence': lambda *a: 5,
         'price_discount': lambda *a: 0,

addons/product/pricelist_view.xml

@@ -152,7 +152,7 @@
                         <field name="currency_id" groups="base.group_multi_currency"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
-                    <field name="version_id">
+                    <field name="version_id" context="{'type':type}">
                         <form string="Pricelist Version" version="7.0">
                             <group col="4">
                                 <field name="name"/>
@@ -160,7 +160,7 @@
                                 <field name="date_start"/>
                                 <field name="date_end"/>
                             </group>
-                            <field name="items_id"/>
+                            <field name="items_id" context="{'type':type}"/>
                         </form>
                         <tree string="Pricelist Version">
                             <field name="name"/>

addons/project/project_view.xml

@@ -135,6 +135,7 @@
                                             <div style="position: relative">
                                                 <a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
                                                 <div class="oe_module_vignette">
+                                                    <img t-att-src="kanban_image('res.users', 'image_small', record.id.value)" class="oe_avatar oe_kanban_avatar_smallbox"/>
                                                     <div class="oe_module_desc">
                                                         <field name="name"/>
                                                     </div>

addons/purchase/purchase_view.xml

@@ -174,8 +174,8 @@
                     <button name="purchase_approve" states="confirmed" string="Approve Order" class="oe_highlight" groups="purchase.group_purchase_manager"/>
                     <button name="view_picking" string="Receive Products" type="object" attrs="{'invisible': ['|', ('shipped','=',True), ('state','!=', 'approved')]}" class="oe_highlight"/>
                     <button name="view_invoice" string="Receive Invoice" type="object" attrs="{'invisible': ['|', ('invoice_method','=','picking'), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}" class="oe_highlight"/>
-                    <button name="action_cancel_draft" states="cancel,sent,confirmed" string="Set to Draft" type="object" />
-                    <button name="purchase_cancel" states="draft,confirmed,sent" string="Cancel Order"/>
+                    <button name="action_cancel_draft" states="cancel,confirmed" string="Set to Draft" type="object" />
+                    <button name="purchase_cancel" states="draft,confirmed,sent" string="Cancel"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,sent,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue"}' readonly="1"/>
                 </header>
                 <sheet>
@@ -292,7 +292,7 @@
                     <field name="name" string="Reference"/>
                     <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
-                    <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" help="Purchase orders which are in draft state"/>
+                    <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','in',('draft','sent'))]" help="Purchase orders that haven't yet been confirmed"/>
                     <filter icon="terp-check" name="approved" string="Purchase Orders" domain="[('state','not in',('draft','cancel'))]" help="Approved purchase orders"/>
                     <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase orders which are in exception state"/>
                     <separator/>

addons/purchase/report/request_quotation.rml

@@ -95,7 +95,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="371.0,98.0,61.0" repeatRows="1" style="Table_Product_Header_Title">
+    <blockTable colWidths="349.0,90.0,92.0" repeatRows="1" style="Table_Product_Header_Title">
       <tr>
         <td>
           <para style="terp_tblheader_Details"><b>Description</b></para>
@@ -110,7 +110,7 @@
     </blockTable>
     <section>
       <para style="terp_default_9">[[ repeatIn(order.order_line,'order_line') ]]</para>
-      <blockTable colWidths="371.0,98.0,61.0" style="Table_Product_Line">
+      <blockTable colWidths="349.0,89.0,49.0,43.0" style="Table_Product_Line">
         <tr>
           <td>
             <para style="terp_default_9">[[ order_line.name ]]</para>
@@ -119,10 +119,10 @@
             <para style="terp_default_Centre_9">[[ formatLang(order_line.date_planned, date = True) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">
-                [[ formatLang(order_line.product_qty )]]
-                <i>[[ (order_line.product_uom and order_line.product_uom.name) or '' ]]</i>
-            </para>
+            <para style="terp_default_Right_9">[[ formatLang(order_line.product_qty )]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ (order_line.product_uom and order_line.product_uom.name) or '' ]]</para>
           </td>
         </tr>
       </blockTable>