odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity
94,522 Commits 3 Branches 0 Tags 961 MiB
Commit Graph

148 Commits

Author SHA1 Message Date
Denis Ledoux 020caa17e4 [FIX] project_timesheet: undefined employee journal error message 
There is no more any "timesheet" tab in the employee form.
This is actually the "HR Settings" tab, nowadays.

opw-631599
 2015-03-27 10:59:46 +01:00
Denis Ledoux 22acc5d379 [FIX] project_timesheet: retrocompatibility for 73f7a2ba35 
It looks like it was possible to pass vals['date']
in date format (!= datetime format) to _create_analytic_entries.

This rev. is a retrocompatible patch for 73f7a2ba35.

In addition, it solves the same issue than the rev.
73f7a2ba35, but in the case the project is
set on the task after the work hours are created.
See ab5ecef476

opw-628729
 2015-02-25 18:30:26 +01:00
Denis Ledoux 02f4f9a572 [MERGE] forward port of branch 7.0 up to e2dd18f 2014-11-26 12:35:36 +01:00
Denis Ledoux 73f7a2ba35 [FIX] project_timesheet: date of created analytic line not in user tz 
When the user was in timezone UTC + 1, and added a project.task.work which created an analytic entry line (timsheet activity), if the datetime was set to 11/25 00:00:00, the date on the analytic line was set to 11/24, because this was the truncated stored value(UTC Time), which was 11/24 23:00:00
 2014-11-25 12:33:28 +01:00
Christophe Simonis e74fb09a00 [MERGE] forward port of branch 7.0 up to ab5ecef 2014-11-12 10:56:38 +01:00
Martin Trigaux ab5ecef476 [FIX] project_timesheet: accept work without date 
date field on a project.task.work is not required while it is on the hr.analytic.timesheet (with default value).
Avoid error if fill a task work without date, fallback on context_today.
 2014-11-10 15:59:30 +01:00
Dhs-odoo c200ffd74e [FIX] project_timesheet: missing timesheet for tasks without project 
Timesheet activities (hr.analytic.timesheet) are generated when a work activity (project.task.work) is logged on a task.
These are updated if the project of the task is modified.
This patch applies the same behaviour for tasks without project, the timesheet activities are generated once a project is set on the task.
To avoid redundency in the code, extract the computation in a distinct method.
Fixes #701, opw 609481
 2014-11-10 14:13:43 +01:00
Christophe Simonis 4601d85944 [MERGE] forward port of branch 7.0 up to 6fdb783 2014-06-10 11:49:14 +02:00
Holger Brunn d66c96ffa9 [FIX] project_timesheet: don't trigger write if there is nothing to write 
Triggering an empty write could break constraint (can not update past timesheet) (opw 606963)
 2014-06-05 15:44:18 +02:00
Christophe Matthieu 9d9e3d2ef8 [IMP] Improve typos in warning (Grammar mistake, Capitalize title, Typos) 
bzr revid: chm@openerp.com-20130607113829-1mi6jk18c2v3jjhn
 2013-06-07 13:38:29 +02:00
ggh-openerp 3b73e2b2a4 [IMP]Removed space before Exclamation marks [!] 
bzr revid: ggh@tinyerp.com-20130429071557-vnxo5nni03vc886j
 2013-04-29 12:45:57 +05:30
Vo Minh Thu e69326ee3b [REF] removed explicit model instanciations. 
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
 2013-04-15 12:23:49 +02:00
Vo Minh Thu 44514ced89 [REF] project_timesheet: removed openerp.pooler imports. 
bzr revid: vmt@openerp.com-20130327125922-6dl0331b8h9600hk
 2013-03-27 13:59:22 +01:00
Olivier Dony 03b6acd13d [MERGE] Access inherited product fields on the product directly rather than template, courtesy of Alexis de Lattre (Akretion) 
It makes the code a little more straightforward and does not hurt.

bzr revid: odo@openerp.com-20121218225015-6r9ydxjlh147m3z1
 2012-12-18 23:50:15 +01:00
Vo Minh Thu e7f4891d46 [IMP] use the openerp namespace. 
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
 2012-12-06 15:56:32 +01:00
Amit Patel 92ca470488 [MERGE]:trunk 
bzr revid: apa@tinyerp.com-20121029054552-y4phiotzqirk0q1k
 2012-10-29 11:15:52 +05:30
Randhir Mayatra (OpenERP) 21bd09e017 [MERGE] merge with parent branch 
bzr revid: rma@tinyerp.com-20121023092900-4wq51tm4w51cpdp5
 2012-10-23 14:59:00 +05:30
ajay javiya (OpenERP) ce3882d8d7 [FIX]:Task issue in project module 
bzr revid: aja@tinyerp.com-20121023065037-2i16k4xlsczqj04y
 2012-10-23 12:20:37 +05:30
Fabien Pinckaers a21cc373bf [MERGE] project cleanup 
bzr revid: fp@tinyerp.com-20121022175311-9dqift6jop58qw7m
 2012-10-22 19:53:11 +02:00
Randhir Mayatra (OpenERP) 383040231a [IMP]change the string of exception in project_timesheet 
bzr revid: rma@tinyerp.com-20121019104826-lm2qi3lhs1ov769j
 2012-10-19 16:18:26 +05:30
Amit Patel b2772b2f15 [FIX]:When creating a task work to invoice: 
- the product and journal must be set by default according to the user
 - the invoicing 100% must be set by default too and the uom, journal

bzr revid: apa@tinyerp.com-20121015104402-u8ht0hbfsvez00j8
 2012-10-15 16:14:02 +05:30
Khushboo Bhatt (Open ERP) b34aad01eb [FIX]project_timesheet:if condition for record 
bzr revid: kbh@tinyerp.com-20121015101049-vj69950ccpmvwa24
 2012-10-15 15:40:49 +05:30
Khushboo Bhatt (Open ERP) 7ca9a1294a [IMP]project_timesheet:implemented method for setting default values. 
bzr revid: kbh@tinyerp.com-20121015072014-st4aavfgw4pve3ad
 2012-10-15 12:50:14 +05:30
Khushboo Bhatt (Open ERP) 06ae4d8913 [IMP]project_timesheet:added method for setting default type of invoicing 
bzr revid: kbh@tinyerp.com-20121012090527-zn9ngz25ylbio2nx
 2012-10-12 14:35:27 +05:30
Khushboo Bhatt (Open ERP) fce8bb9c29 [IMP]project_timesheet:added method for setting default product uom. 
bzr revid: kbh@tinyerp.com-20121012083906-3ab8ephqoc09dx7z
 2012-10-12 14:09:06 +05:30
Khushboo Bhatt (Open ERP) 86676cf1c9 [IMP]project_timesheet:added method for setting default product. 
bzr revid: kbh@tinyerp.com-20121012082525-y600x8lv0xteej6a
 2012-10-12 13:55:25 +05:30
Divyesh Makwana (Open ERP) 2bacc70085 [IMP] project_timesheet : Improved the code. 
bzr revid: mdi@tinyerp.com-20121009111124-sdii9no8mui4zopz
 2012-10-09 16:41:24 +05:30
Divyesh Makwana (Open ERP) b273232b71 [FIX] project_timesheet : Fix the integrity error when we embeded 'Timesheet Line' created through project. 
bzr revid: mdi@tinyerp.com-20121004114021-rgbzhr84uditlhhj
 2012-10-04 17:10:21 +05:30
Divyesh Makwana (Open ERP) c5c6c289a9 [Merge] Merge with main addons. 
bzr revid: mdi@tinyerp.com-20121004044022-fqrhpeb37jdpid5t
 2012-10-04 10:10:22 +05:30
Antonin Bourguignon 1786beefa0 [IMP] add a few comments 
bzr revid: abo@openerp.com-20121003143809-621gfqzcc2099ph2
 2012-10-03 16:38:09 +02:00
Antonin Bourguignon 19a70c9d2c [IMP] code style 
bzr revid: abo@openerp.com-20121003142859-tdskhyqzfwthy9sl
 2012-10-03 16:28:59 +02:00
Antonin Bourguignon 77b29a2493 [IMP] variable name and code style 
lp bug: https://launchpad.net/bugs/953006 fixed

bzr revid: abo@openerp.com-20121003133639-pd1dhlbdwg5fltya
 2012-10-03 15:36:39 +02:00
Antonin Bourguignon 1de8b63e9d [IMP] variable name, remove unused variables 
bzr revid: abo@openerp.com-20121003130840-33cf4seornv3jxq6
 2012-10-03 15:08:40 +02:00
Antonin Bourguignon e9571326e2 [IMP] variable name 
bzr revid: abo@openerp.com-20121003130155-s5xw33xcix8pthgc
 2012-10-03 15:01:55 +02:00
Antonin Bourguignon c0cc5b01d7 [IMP] code style 
bzr revid: abo@openerp.com-20121003121639-uv0x4n8j9vyinbrc
 2012-10-03 14:16:39 +02:00
Divyesh Makwana (Open ERP) fd6da42e30 [IMP] project_timesheet : Click on timesheet button from a new project. You will get this 'Record your timesheets for the project '%s''.Instead of name of the project. 
bzr revid: mdi@tinyerp.com-20121003112319-ancbub1h7u5mtylk
 2012-10-03 16:53:19 +05:30
Antonin Bourguignon 6ce2edb54b [MERGE] trunk 
bzr revid: abo@openerp.com-20121003104416-r2qxoe8vbbg9zqps
 2012-10-03 12:44:16 +02:00
Antonin Bourguignon 1653332080 [MERGE] trunk 
bzr revid: abo@openerp.com-20121002102915-424prxd74izb1szw
 2012-10-02 12:29:15 +02:00
Fabien Pinckaers bf33153a58 [IMP] useability of project view 
bzr revid: fp@openerp.com-20120929201326-nt6s4vicmr9ebuu2
 2012-09-29 22:13:26 +02:00
Amit Parik ca9c797275 [FIX]:project_timesheet impossible to edit task work 
bzr revid: pja@tinyerp.com-20120905113313-c2cbi37xqr6mnvrc
 2012-09-05 17:03:13 +05:30
Fabien Pinckaers 8b0f2cfd71 [IMP] cleaning project/contracts and removing unused code 
bzr revid: fp@tinyerp.com-20120830074903-m8yiovofd2891p7i
 2012-08-30 09:49:03 +02:00
Antonin Bourguignon b0e8ae4c7d [IMP] error messages 
fix errors ending with an exclamation point; use a point instead
remove uniques (or almost) error messages titles, like 'Encoding Error' (1 occurrence in addons), 'Integrity Error' (1 occurrence in addons), 'Report Name' (1 occurrence in addons), 'Value Error' (1 occurrence in addons), 'Wrong Period Code' (1 occurrence in addons); replace these with 'Error'
add newline character after some messages titles, when necessary
fix 'UserError': should be 'User Error'
remove spaces before exclamation marks
add capital letters to messages titles words (e.g.: 'Invalid action' becomes 'Invalid Action')

bzr revid: abo@openerp.com-20120807110616-u3nlnybtgaebro18
 2012-08-07 13:06:16 +02:00
Alexis de Lattre f9fe637803 Remplace all occurences of my_browse_rec.product_id.product_tmpl_id.field to my_browse_rec.product_id.field 
bzr revid: alexis@via.ecp.fr-20120727015202-7fylff5jr26sgxez
 2012-07-27 03:52:02 +02:00
Saurang Suthar(OpenERP) c7060ffa18 [IMP] Improved warning messages for project* modules 
bzr revid: pso@tinyerp.com-20120725121605-rvid4ebeomtr0zzo
 2012-07-25 17:46:05 +05:30
Pinakin Nayi (OpenERP) ab00152169 [IMP]project-warning-message 
bzr revid: pna@tinyerp.com-20120712095441-4xwox1hhog7je8oz
 2012-07-12 15:24:41 +05:30
Quentin (OpenERP) f90612ec3b [MERGE] lp: 953006 
bzr revid: qdp-launchpad@openerp.com-20120627135425-cs8q2cdsiarwvguw
 2012-06-27 15:54:25 +02:00
Quentin (OpenERP) c2b6c35dd9 [IMP] Clean Modules name: there are 3 modules named Contracts Management. 
bzr revid: qdp-launchpad@openerp.com-20120625095448-hzpekh2x5gls0t8o
 2012-06-25 11:54:48 +02:00
Quentin (OpenERP) 9d705e8081 [FIX] project form view: moved open_timesheets() method from project_timesheet to analytic_contract_project, where the view that call this action belongs 
bzr revid: qdp-launchpad@openerp.com-20120618171633-h4zyjvqojuau6bal
 2012-06-18 19:16:33 +02:00
Quentin (OpenERP) efdbaf4088 [IMP] project: version 7.0 for the project form view 
bzr revid: qdp-launchpad@openerp.com-20120615144835-189jbt84u2z3si8u
 2012-06-15 16:48:35 +02:00
Raphael Collet 36346f081e [IMP] project_timesheet: improve field names for project kanban view 
bzr revid: rco@openerp.com-20120509082451-jfsd0pgn7o4vddf5
 2012-05-09 10:24:51 +02:00