Merge lp:~openerp-dev/openobject-addons/trunk-project-onboarding-imp-msa into lp:~openerp-dev/openobject-addons/trunk-project-onboarding

[Mitesh Savani (OpenERP)]

[ADD]: Add image in kanban view of project.task which is attached in task comments.

project_timesheet: if there is zero hour than it will not display in project kanban view.

=== modified file 'calendar/controllers/main.py'
--- calendar/controllers/main.py	2014-05-06 16:33:34 +0000
+++ calendar/controllers/main.py	2014-05-07 07:01:55 +0000
@@ -48,8 +48,15 @@
         if attendee:
             attendee_data['current_attendee'] = attendee[0]
 
-        values = dict(init="s.calendar.event('%s', '%s', '%s', '%s' , '%s');" % (db, action, id, 'form', json.dumps(attendee_data)))
-        return request.render('web.webclient_bootstrap', values)
+        css = '<link rel="stylesheet" href="/web/css/web.assets_backend"/>'
+        js = '<script type="text/javascript" src="/web/js/web.assets_backend"></script>'
+
+        return webmain.html_template % {
+            'js': js,
+            'css': css,
+            'modules': simplejson.dumps(webmain.module_boot(db)),
+            'init': "s.calendar.event('%s', '%s', '%s', '%s' , '%s');" % (db, action, id, 'form', json.dumps(attendee_data)),
+        }
 
     # Function used, in RPC to check every 5 minutes, if notification to do for an event or not
     @http.route('/calendar/notify', type='json', auth="none")
 
=== modified file 'edi/controllers/main.py'
--- edi/controllers/main.py	2014-05-06 16:33:34 +0000
+++ edi/controllers/main.py	2014-05-07 07:01:55 +0000
@@ -1,3 +1,4 @@
+import simplejson
 import werkzeug.urls
 
 import openerp
@@ -9,12 +10,21 @@
     def import_url(self, url):
         # http://hostname:8069/edi/import_url?url=URIEncodedURL
         req = openerp.http.request
+        modules = webmain.module_boot(req) + ['edi']
+        modules_str = ','.join(modules)
+        modules_json = simplejson.dumps(modules)
+        css = '<link rel="stylesheet" href="/web/css/web.assets_backend"/>'
+        js = '<script type="text/javascript" src="/web/js/web.assets_backend"></script>'
 
         # `url` may contain a full URL with a valid query string, we basically want to watch out for XML brackets and double-quotes 
         safe_url = werkzeug.url_quote_plus(url,':/?&;=')
 
-        values = dict(init='s.edi.edi_import("%s");' % safe_url)
-        return req.render('web.webclient_bootstrap', values)
+        return webmain.html_template % {
+            'js': js,
+            'css': css,
+            'modules': modules_json,
+            'init': 's.edi.edi_import("%s");' % safe_url,
+        }
 
     @openerp.http.route('/edi/import_edi_url', type='json', auth='none')
     def import_edi_url(self, url):
 
=== modified file 'point_of_sale/controllers/main.py'
--- point_of_sale/controllers/main.py	2014-05-06 16:33:34 +0000
+++ point_of_sale/controllers/main.py	2014-05-07 07:01:55 +0000
@@ -8,7 +8,7 @@
 
 from openerp import http
 from openerp.http import request
-from openerp.addons.web.controllers.main import module_boot, login_redirect
+from openerp.addons.web.controllers.main import manifest_list, module_boot, html_template, login_redirect
 
 _logger = logging.getLogger(__name__)
 
 
=== modified file 'project/project.py'
--- project/project.py	2014-05-06 07:04:47 +0000
+++ project/project.py	2014-05-07 07:01:55 +0000
@@ -795,6 +795,13 @@
         for work in self.pool.get('project.task.work').browse(cr, uid, ids, context=context):
             if work.task_id: result[work.task_id.id] = True
         return result.keys()
+    def _get_attachment(self, cr, uid, ids, field_name, arg, context):
+        res={}
+        attachment_obj=self.pool.get('ir.attachment')
+        for result in self.browse(cr, uid, ids, context=None):
+            attachment_id=attachment_obj.search(cr, uid, [('res_id','=',result.id)])
+            res[result.id]= attachment_id
+        return res
 
     _columns = {
         'active': fields.function(_is_template, store=True, string='Not a Template Task', type='boolean', help="This field is computed automatically and have the same behavior than the boolean 'active' field: if the task is linked to a template or unactivated project, it will be hidden unless specifically asked."),
@@ -853,6 +860,7 @@
         'id': fields.integer('ID', readonly=True),
         'color': fields.integer('Color Index'),
         'user_email': fields.related('user_id', 'email', type='char', string='User Email', readonly=True),
+        'attachment_res':fields.function(_get_attachment,type='many2many',relation="ir.attachment",string="attachments",readonly=True),
     }
     _defaults = {
         'stage_id': _get_default_stage_id,
 
=== modified file 'project/project_view.xml'
--- project/project_view.xml	2014-05-06 08:39:37 +0000
+++ project/project_view.xml	2014-05-07 07:01:55 +0000
@@ -531,9 +531,10 @@
                     <field name="date_deadline"/>
                     <field name="message_summary"/>
                     <field name="categ_ids"/>
+                    <field name="attachment_res"/>
                     <templates>
                     <t t-name="kanban-box">
-                        <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
+                        <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_kanban_task">
                             <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_user">
                                 <span class="oe_e">í</span>
                                 <ul class="oe_dropdown_menu">
@@ -579,6 +580,11 @@
                                     <t t-raw="record.message_summary.raw_value"/>
                                     <field name="categ_ids"/>
                                 </div>
+                                <div>
+                                    <t t-foreach="record.attachment_res.raw_value.slice(0,3)" t-as="attachment_img">
+                                      <img t-att-src="kanban_image('ir.attachment', 'datas', attachment_img)" class="oe_kanban_image" t-att-data-member_id="attachment_img"/>
+                                    </t>
+                                </div>
                             </div>
                             <div class="oe_clear"></div>
                         </div>
 
=== modified file 'project/static/src/css/project.css'
--- project/static/src/css/project.css	2014-05-06 06:04:33 +0000
+++ project/static/src/css/project.css	2014-05-07 07:01:55 +0000
@@ -6,7 +6,9 @@
 .oe_kanban_project_list > a > span:hover{
     text-decoration: underline;
 }
-
+.oe_kanban_task{
+	width: 275px;
+}
 .openerp .project_kanban_content{
     margin-right: 15px;
     margin-left: 15px;
 
=== modified file 'project_timesheet/project_timesheet_view.xml'
--- project_timesheet/project_timesheet_view.xml	2014-05-05 06:37:08 +0000
+++ project_timesheet/project_timesheet_view.xml	2014-05-07 07:01:55 +0000
@@ -14,7 +14,7 @@
                     <field name="partner_id"/>
                 </field>
                 <xpath expr="//div[contains(@class, 'oe_kanban_project_list')]" position="inside">
-                    <a t-if="record.use_timesheets.raw_value" style="margin-right: 10px"
+                    <a t-if="record.use_timesheets.raw_value and record.hours_quantity > 0" style="margin-right: 10px"
                         name="open_timesheets" type="object"><field name="hours_quantity"/> Hours</a>
                 </xpath>
             </field>
 
=== modified file 'website/views/website_templates.xml'
--- website/views/website_templates.xml	2014-05-06 15:33:35 +0000
+++ website/views/website_templates.xml	2014-05-07 07:01:55 +0000
@@ -276,9 +276,7 @@
     <script type="text/javascript" src="/website/static/lib/ace/theme-monokai.js"></script>
     <script type="text/javascript" src="/website/static/lib/ace/mode-xml.js"></script>
     <script type="text/javascript" src="/website/static/lib/vkbeautify/vkbeautify.0.99.00.beta.js"></script>
-    <t t-call="web.jqueryui_conflict">
-        <script type="text/javascript" src="/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js"></script>
-    </t>
+    <script type="text/javascript" src="/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js"></script>
     <!-- mutation observers shim backed by mutation events (8 < IE < 11, Safari < 6, FF < 14, Chrome < 17) -->
     <script type="text/javascript" src="/website/static/lib//jquery.mjs.nestedSortable/jquery.mjs.nestedSortable.js"></script>
     <script type="text/javascript" src="/website/static/lib/MutationObservers/test/sidetable.js"></script>
 
=== modified file 'website_sale/views/website_sale.xml'
--- website_sale/views/website_sale.xml	2014-05-06 15:33:35 +0000
+++ website_sale/views/website_sale.xml	2014-05-07 07:01:55 +0000
@@ -95,9 +95,7 @@
 <template id="products" name="Products">
   <t t-call="website.layout">
       <t t-set="head">
-          <t t-call="web.jqueryui_conflict">
-            <script type="text/javascript" src="/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js"></script>
-          </t>
+          <script type="text/javascript" src="/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js"></script>
           <link rel='stylesheet' href="/web/static/lib/jquery.ui/css/smoothness/jquery-ui-1.9.1.custom.css"/>
           <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
           <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>