Merge lp:~openerp-commiter/openobject-training/6.1-migration-kbh into lp:~openerp-commiter/openobject-training/6.1

[Khushboo Bhatt(openerp)]

Hello,

  == training ==

 I have added kanban view for training stackholder request.And small fix for Purchase order.

Thank you,
KBH.

[lp:~openerp-commiter/openobject-training/6.1-migration-kbh]

2710. By Khushboo Bhatt(openerp) on 2012-07-12

[MERGE]merge with project branch

2711. By Khushboo Bhatt(openerp) on 2012-07-12

[FIX]

2712. By Khushboo Bhatt(openerp) on 2012-07-12

[FIX]

=== modified file 'training/training.py'
--- training/training.py	2012-07-11 13:06:53 +0000
+++ training/training.py	2012-07-12 06:16:19 +0000
@@ -3860,6 +3860,7 @@
                                       'training.participation.stakeholder': (_store_get_requests, None, 25),
                                       'training.participation.stakeholder.purchase': (_store_purchase_get_requests, None, 25),
                                   }),
+        'color': fields.integer('Color Index'),
     }
 
     _defaults = {
@@ -3962,6 +3963,8 @@
     def _trigger_purchase_order_signal(self, cr, uid, ids, signal_name, context=None):
         wf_service = netsvc.LocalService('workflow')
         for this in self.browse(cr, uid, ids, context=context):
+            if not this.purchase_order_id:
+                continue
             wf_service.trg_validate(uid, 'purchase.order', this.purchase_order_id.id, signal_name, cr)
         return True
 
@@ -4773,7 +4776,6 @@
     def product_id_change(self, cr, uid, ids, pricelist_id, product_id, qty, uom_id,
             partner_id, date_order=False, fiscal_position_id=False, date_planned=False,
             name=False, price_unit=False, notes=False, attachment_ids=None, context=None):
-        print pricelist_id, partner_id
         r = super(purchase_order_line, self).product_id_change(cr, uid, ids, pricelist_id, product_id, qty, uom_id,
                         partner_id, date_order, fiscal_position_id, date_planned,
                         name, price_unit, notes, context=context)

=== modified file 'training/training_view.xml'
--- training/training_view.xml	2012-07-11 13:06:53 +0000
+++ training/training_view.xml	2012-07-12 06:16:19 +0000
@@ -2377,11 +2377,62 @@
             </field>
         </record>
 
+        <record model="ir.ui.view" id="view_training_stakeholder_request_kanban">
+            <field name="name">training.participation.stakeholder.request.kanban</field>
+            <field name="model">training.participation.stakeholder.request</field>
+            <field name="type">kanban</field>
+            <field name="arch" type="xml">
+                <kanban default_group_by="state">
+                    <field name="reference"/>
+                    <field name="color"/>
+                    <field name="session_id"/>
+                    <field name="job_id"/>
+                    <field name="payment_mode_id"/>
+                    <field name="price"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <t t-set="color" t-value="kanban_color(record.color.raw_value || record.reference.raw_value)"/>
+                                <div t-att-class="color + (record.color.raw_value == 1 ? ' oe_kanban_color_alert' : '')">
+                                    <div class="oe_kanban_box oe_kanban_color_border">
+                                        <div class="oe_kanban_box_header oe_kanban_color_bgdark oe_kanban_color_border oe_kanban_draghandle">
+                                            <table class="oe_kanban_table">
+                                                <tr>
+                                                    <td class="oe_kanban_title" align="left" valign="middle">
+                                                        <field name="reference"/>
+                                                    </td>
+                                                </tr>
+                                            </table>
+                                        </div>
+                                        <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger">
+                                            <div class="oe_kanban_description">
+                                                <table>
+                                                    <tr><td>Session: <field name="session_id"/></td></tr>
+                                                    <tr><td>Contact: <field name="job_id"/></td></tr>
+                                                    <tr><td>Payment Mode: <field name="payment_mode_id"/></td></tr>
+                                                    <tr><td>Remuneration: <field name="price"/></td></tr>
+                                                </table>
+                                            </div>
+                                            <div class="oe_kanban_buttons_set oe_kanban_color_border oe_kanban_color_bglight oe_kanban_box_show_onclick">
+                                                <div class="oe_kanban_left">
+                                                    <a string="Edit" icon="gtk-edit" type="edit"/>
+                                                    <a string="Change Color" icon="color-picker" type="color" name="color"/>
+                                                </div>
+                                                <br class="oe_kanban_clear"/>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
+
         <record model="ir.actions.act_window" id="participation_stakeholder_request_act">
             <field name="name">Stakeholder Requests</field>
             <field name="res_model">training.participation.stakeholder.request</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,kanban</field>
             <field name="search_view_id" ref="view_participation_stakeholder_request_search"/>
         </record>