Merge lp:~openerp-dev/openobject-addons/trunk-hr_timesheet-aja into lp:openobject-addons

[ajay javiya (OpenERP)]

Hello,
  Improve code for:
  > the time fields should be a float time, not a simple float.
  > add a descritpion field after the analytic account.
  > add a line should be a link.
  >there shouldn't be a [add]. when adding a line, it should directly create the line.
Thank You.

[lp:~openerp-dev/openobject-addons/trunk-hr_timesheet-aja]

8734. By ajay javiya (OpenERP) on 2013-05-29

[FIX]:on change textarea value lost

8735. By ajay javiya (OpenERP) on 2013-05-29

[IMP]: on change of global description change line name(description)

8736. By ajay javiya (OpenERP) on 2013-05-30

[IMP] : code on_change hours change all description of each line

8737. By ajay javiya (OpenERP) on 2013-05-31

[IMP]: code and remove unwanted rpc call

8738. By ajay javiya (OpenERP) on 2013-05-31

[REM]: unwanted variables

8739. By ajay javiya (OpenERP) on 2013-05-31

[MERG]: with trunk

8740. By ajay javiya (OpenERP) on 2013-05-31

[IMP] : call sync after change and code cleaning

8741. By Vidhin Mehta (OpenERP) on 2013-06-06

[MERGE]Trunk.

8742. By Paramjit Singh Sahota(OpenERP) on 2013-06-25

[MERGE] Sync with lp:openobject-addons.

8743. By Vidhin Mehta (OpenERP) on 2013-06-25

[IMP] Changes to timesheet.

8744. By Paramjit Singh Sahota(OpenERP) on 2013-07-01

[MERGE] Sync with lp:openobject-addons.

8745. By Paramjit Singh Sahota(OpenERP) on 2013-07-03

[IMP]Solved the issue of FALSE in global description and added demo data for hr_timesheet_sheet.

8746. By Paramjit Singh Sahota(OpenERP) on 2013-07-04

[MERGE] Sync with lp:openobject-addons.

8747. By Paramjit Singh Sahota(OpenERP) on 2013-07-09

[IMP] Now the global description will be different for days from where it is changed.

8748. By Paramjit Singh Sahota(OpenERP) on 2013-07-09

[IMP] Revert the code of if condition as present in rev no 8743.

8749. By Paramjit Singh Sahota(OpenERP) on 2013-08-13

[MERGE] Merged lp:openobject-addons.

8750. By ajay javiya (OpenERP) on 2013-09-03

[MERGE]: with trunk

8751. By ajay javiya (OpenERP) on 2013-09-04

[IMP]: Rename from global_desc to sheet_note
-> remove unwanted demo data

8752. By ajay javiya (OpenERP) on 2013-09-12

[FIX]: traceback : null value in column 'name' violates not-null constraint

8753. By ajay javiya (OpenERP) on 2013-10-29

[MERGE]: with trunk

8754. By ajay javiya (OpenERP) on 2013-11-11

[MERGE]: with trunk

Unmerged revisions

8754. By ajay javiya (OpenERP) on 2013-11-11

[MERGE]: with trunk

8753. By ajay javiya (OpenERP) on 2013-10-29

[MERGE]: with trunk

8752. By ajay javiya (OpenERP) on 2013-09-12

[FIX]: traceback : null value in column 'name' violates not-null constraint

8751. By ajay javiya (OpenERP) on 2013-09-04

[IMP]: Rename from global_desc to sheet_note
-> remove unwanted demo data

8750. By ajay javiya (OpenERP) on 2013-09-03

[MERGE]: with trunk

8749. By Paramjit Singh Sahota(OpenERP) on 2013-08-13

[MERGE] Merged lp:openobject-addons.

8748. By Paramjit Singh Sahota(OpenERP) on 2013-07-09

[IMP] Revert the code of if condition as present in rev no 8743.

8747. By Paramjit Singh Sahota(OpenERP) on 2013-07-09

[IMP] Now the global description will be different for days from where it is changed.

8746. By Paramjit Singh Sahota(OpenERP) on 2013-07-04

[MERGE] Sync with lp:openobject-addons.

8745. By Paramjit Singh Sahota(OpenERP) on 2013-07-03

[IMP]Solved the issue of FALSE in global description and added demo data for hr_timesheet_sheet.

=== modified file 'analytic/analytic.py'
--- analytic/analytic.py	2013-09-10 12:48:03 +0000
+++ analytic/analytic.py	2013-11-11 05:48:01 +0000
@@ -320,7 +320,6 @@
         'account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, ondelete='restrict', select=True, domain=[('type','<>','view')]),
         'user_id': fields.many2one('res.users', 'User'),
         'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
-
     }
 
     def _get_default_date(self, cr, uid, context=None):

=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet.py'
--- hr_timesheet_sheet/hr_timesheet_sheet.py	2013-09-17 12:21:02 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet.py	2013-11-11 05:48:01 +0000
@@ -544,6 +544,10 @@
         'timesheet_max_difference': lambda *args: 0.0
     }
 
-
+class hr_analytic_timesheet(osv.osv):
+    _inherit = 'hr.analytic.timesheet'
+    _columns = {
+        'sheet_note':fields.text('Sheet Note'),
+    }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet_demo.xml'
--- hr_timesheet_sheet/hr_timesheet_sheet_demo.xml	2012-11-29 22:26:45 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet_demo.xml	2013-11-11 05:48:01 +0000
@@ -2,11 +2,10 @@
 <openerp>
     <data noupdate="1">
         
-<!--        <record id="sheet1" model="hr_timesheet_sheet.sheet">
-            <field name="name">Sheet 1</field>
+    <record id="sheet1" model="hr_timesheet_sheet.sheet">
             <field name="user_id" ref="base.user_root"/>
             <field name="employee_id" ref="hr.employee_fp" />
-        </record>
--->
+    </record>
+
     </data>
 </openerp>

=== modified file 'hr_timesheet_sheet/static/src/css/timesheet.css'
--- hr_timesheet_sheet/static/src/css/timesheet.css	2012-10-26 10:02:07 +0000
+++ hr_timesheet_sheet/static/src/css/timesheet.css	2013-11-11 05:48:01 +0000
@@ -1,4 +1,3 @@
-@charset "utf-8";
 .openerp .oe_form_readonly .oe_timesheet_weekly .oe_timesheet_button_add {
   display: none;
 }
@@ -63,3 +62,6 @@
 .openerp .oe_timesheet_weekly .oe_timesheet_weekly_today {
   background: #ffddee;
 }
+.openerp .oe_form .oe_timesheet_weekly .oe_timesheet_button_add {
+  font-weight: bold;
+}

=== modified file 'hr_timesheet_sheet/static/src/css/timesheet.sass'
--- hr_timesheet_sheet/static/src/css/timesheet.sass	2012-10-26 10:02:07 +0000
+++ hr_timesheet_sheet/static/src/css/timesheet.sass	2013-11-11 05:48:01 +0000
@@ -50,3 +50,7 @@
             width: 200px
         .oe_timesheet_weekly_today
             background: #fde
+    .oe_form
+        .oe_timesheet_weekly
+            .oe_timesheet_button_add
+                font-weight: bold

=== modified file 'hr_timesheet_sheet/static/src/js/timesheet.js'
--- hr_timesheet_sheet/static/src/js/timesheet.js	2013-06-13 15:03:42 +0000
+++ hr_timesheet_sheet/static/src/js/timesheet.js	2013-11-11 05:48:01 +0000
@@ -29,6 +29,7 @@
             this.res_o2m_drop = new instance.web.DropMisordered();
             this.render_drop = new instance.web.DropMisordered();
             this.description_line = _t("/");
+            this.sheet_note = {};
         },
         go_to: function(event) {
             var id = JSON.parse($(event.target).data("id"));
@@ -145,7 +146,7 @@
                         accounts = _.sortBy(accounts, function(el) {
                             return account_names[el.account];
                         });
-                    });;
+                    });
                 });
             })).then(function(result) {
                 // we put all the gathered data in self, then we render
@@ -153,9 +154,16 @@
                 self.accounts = accounts;
                 self.account_names = account_names;
                 self.default_get = default_get;
+                _.each(self.get('sheets'), function(sheet) {
+                    _.each(accounts, function(account) {
+                        if(sheet.account_id == account.account) {
+                            self.sheet_note[account.account] = sheet['sheet_note'];
+                        }
+                    })
+                });
                 //real rendering
                 self.display_data();
-            });
+           });
         },
         destroy_content: function() {
             if (this.dfm) {
@@ -179,10 +187,12 @@
             var self = this;
             self.$el.html(QWeb.render("hr_timesheet_sheet.WeeklyTimesheet", {widget: self}));
             _.each(self.accounts, function(account) {
+                self.get_sheet_notes(account);
                 _.each(_.range(account.days.length), function(day_count) {
                     if (!self.get('effective_readonly')) {
                         self.get_box(account, day_count).val(self.sum_box(account, day_count, true)).change(function() {
                             var num = $(this).val();
+                            var desc = self.$el.find('.oe_timesheet_desc[data-account = '+ account.account+']').val();
                             if (self.is_valid_value(num)){
                                 num = (num == 0)?0:Number(self.parse_client(num));
                             }
@@ -190,13 +200,8 @@
                                 $(this).val(self.sum_box(account, day_count, true));
                             } else {
                                 account.days[day_count].lines[0].unit_amount += num - self.sum_box(account, day_count);
-                                var product = (account.days[day_count].lines[0].product_id instanceof Array) ? account.days[day_count].lines[0].product_id[0] : account.days[day_count].lines[0].product_id
-                                var journal = (account.days[day_count].lines[0].journal_id instanceof Array) ? account.days[day_count].lines[0].journal_id[0] : account.days[day_count].lines[0].journal_id
-                                new instance.web.Model("hr.analytic.timesheet").call("on_change_unit_amount", [[], product, account.days[day_count].lines[0].unit_amount, false, false, journal]).then(function(res) {
-                                    account.days[day_count].lines[0]['amount'] = res.value.amount || 0;
-                                    self.display_totals();
-                                    self.sync();
-                                });
+                                self.update_sheet_notes(account.account, self.sheet_note[account.account]);
+                                self.display_totals();
                                 if(!isNaN($(this).val())){
                                     $(this).val(self.sum_box(account, day_count, true));
                                 }
@@ -208,7 +213,29 @@
                 });
             });
             self.display_totals();
-            self.$(".oe_timesheet_weekly_adding button").click(_.bind(this.init_add_account, this));
+            self.$(".oe_timesheet_weekly_adding a").click(_.bind(this.init_add_account, this));
+        },
+        get_sheet_notes: function(account) {
+            var self = this;
+            self.get_sheet_note(account).change(function(ev) {
+                 self.update_sheet_notes(parseInt($(this).attr('data-account')), $(this).val())
+            });
+        },
+        update_sheet_notes: function(account_id, current_value){
+            var self = this;
+            var account = _.detect(self.accounts, function(account) {
+                return account.account === account_id;
+            });
+            _.each(account.days, function(day) {
+                _.each(day.lines, function(line) {
+                    if(line.unit_amount && (line.name === self.sheet_note[account.account] || line.name === self.description_line && current_value !== "" && current_value)) {
+                        day.lines[0].name = current_value;
+                    }
+                    if (line.unit_amount) { line.sheet_note = current_value; }
+                });
+            });
+            self.sheet_note[account.account] = current_value;
+            self.sync();
         },
         init_add_account: function() {
             var self = this;
@@ -239,7 +266,7 @@
                 },
             });
             self.account_m2o.prependTo(self.$(".oe_timesheet_weekly_add_row td"));
-            self.$(".oe_timesheet_weekly_add_row button").click(function() {
+            self.account_m2o.on("change:value", self, function() {
                 var id = self.account_m2o.get_value();
                 if (id === false) {
                     self.dfm.set({display_invalid_fields: true});
@@ -250,6 +277,7 @@
                     var def = _.extend({}, self.default_get, res.value, {
                         name: self.description_line,
                         unit_amount: 0,
+                        sheet_note : '',
                         date: instance.web.date_to_str(self.dates[0]),
                         account_id: id,
                     });
@@ -258,6 +286,9 @@
                 });
             });
         },
+        get_sheet_note: function(account) {
+            return this.$el.find('.oe_timesheet_desc[data-account = '+ account.account+']');
+        },
         get_box: function(account, day_count) {
             return this.$('[data-account="' + account.account + '"][data-day-count="' + day_count + '"]');
         },
@@ -316,11 +347,11 @@
             
             _.each(self.accounts, function(account) {
                 var auth_keys = _.extend(_.clone(account.account_defaults), {
-                    name: true, amount:true, unit_amount: true, date: true, account_id:true,
+                    name: true, amount:true, unit_amount: true, date: true, account_id:true, sheet_note:true
                 });
                 _.each(account.days, function(day) {
                     _.each(day.lines, function(line) {
-                        if (line.unit_amount !== 0) {
+                        if (line.unit_amount !== 0 || line.sheet_note) {
                             var tmp = _.clone(line);
                             tmp.id = undefined;
                             _.each(line, function(v, k) {

=== modified file 'hr_timesheet_sheet/static/src/xml/timesheet.xml'
--- hr_timesheet_sheet/static/src/xml/timesheet.xml	2012-11-26 21:29:03 +0000
+++ hr_timesheet_sheet/static/src/xml/timesheet.xml	2013-11-11 05:48:01 +0000
@@ -6,6 +6,7 @@
             <table>
                 <tr>
                     <th class="oe_timesheet_first_col"> </th>
+                    <th class="oe_timesheet_desc_col"> </th>
                     <t t-foreach="widget.dates" t-as="date">
                         <th t-att-class="'oe_timesheet_weekly_date_head' + (Date.compare(date, Date.today()) === 0 ? ' oe_timesheet_weekly_today' : '')">
                             <t t-esc="date.toString('ddd')"/><br />
@@ -16,6 +17,10 @@
                 </tr>
                 <tr t-foreach="widget.accounts" t-as="account">
                     <td class="oe_timesheet_weekly_account"><a href="javascript:void(0)" t-att-data-id="JSON.stringify(account.account)"><t t-esc="widget.account_names[account.account]"/></a></td>
+                    <td>
+                        <textarea t-if="!widget.get('effective_readonly')" rows="1" class="oe_timesheet_desc" t-att-data-account="account.account"><t t-esc="widget.sheet_note[account.account] ? widget.sheet_note[account.account] : ''"/></textarea>
+                        <span t-if="widget.get('effective_readonly')" class="oe_timesheet_desc_box" t-att-data-account="account.account"><t t-esc="widget.sheet_note[account.account] ? widget.sheet_note[account.account] : ''"/></span>
+                    </td>
                     <t t-set="day_count" t-value="0"/>
                     <t t-foreach="account.days" t-as="day">
                         <td t-att-class="(Date.compare(day.day, Date.today()) === 0 ? 'oe_timesheet_weekly_today' : '')">
@@ -30,13 +35,16 @@
                 </tr>
                 <tr class="oe_timesheet_weekly_add_row" style="display: none">
                     <td t-att-colspan="widget.dates.length + 2">
-                        <button class="oe_highlight">Add</button>
                     </td>
                 </tr>
                 <tr class="oe_timesheet_total">
                     <td>
                         <div class="oe_timesheet_weekly_adding_tot">
-                            <div class="oe_timesheet_weekly_adding"><button class="oe_timesheet_button_add">Add a Line</button></div>
+                            <div class="oe_timesheet_weekly_adding"><a class="oe_timesheet_button_add">Add a Line</a></div>
+                        </div>
+                    </td>
+                    <td>
+                        <div class="oe_timesheet_weekly_adding_tot">
                             <div class="oe_timesheet_weekly_tottot"><span>Total</span></div>
                         </div>
                     </td>

=== removed directory 'web_shortcuts'
=== removed directory 'web_shortcuts/i18n'
=== removed file 'web_shortcuts/i18n/bs.po'
--- web_shortcuts/i18n/bs.po	2013-10-27 05:50:02 +0000
+++ web_shortcuts/i18n/bs.po	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-# Bosnian translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2013-10-26 01:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Bosnian <[e-mail]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-10-27 05:50+0000\n"
-"X-Generator: Launchpad (build 16810)\n"
-
-#. module: web_shortcuts
-#. openerp-web
-#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
-#, python-format
-msgid "Add / Remove Shortcut..."
-msgstr "Dodaj / Ukloni pračicu..."

=== removed file 'web_shortcuts/i18n/fi.po'
--- web_shortcuts/i18n/fi.po	2013-11-10 05:54:20 +0000
+++ web_shortcuts/i18n/fi.po	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-# Finnish translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2013-11-08 21:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Finnish <[e-mail]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-10 05:54+0000\n"
-"X-Generator: Launchpad (build 16820)\n"
-
-#. module: web_shortcuts
-#. openerp-web
-#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
-#, python-format
-msgid "Add / Remove Shortcut..."
-msgstr "Lisää / Poista pikavalinta..."