Commit Graph

47 Commits

Author SHA1 Message Date
Christophe Simonis f654a7719b [MERGE] forward port of branch saas-5 up to 73d39a0 2014-07-10 22:49:53 +02:00
Christophe Simonis a35aec2a0b [MERGE] forward port of branch 7.0 up to 6e96ffd 2014-07-10 22:02:01 +02:00
JoshuaJan 6c776d5406 Update holidays_summary_report.py 2014-07-07 18:17:20 +08:00
JoshuaJan 9da1214de3 Update holidays_summary_report.py
Add context to search method
2014-07-07 17:30:25 +08:00
Raphael Collet cbe2dbb672 [MERGE] new v8 api by rco
A squashed merge is required as the conversion of the apiculture branch from
bzr to git was not correctly done. The git history contains irrelevant blobs
and commits. This branch brings a lot of changes and fixes, too many to list
exhaustively.

- New orm api, objects are now used instead of ids
- Environements to encapsulates cr uid context while maintaining backward compatibility
- Field compute attribute is a new object oriented way to define function fields
- Shared browse record cache
- New onchange protocol
- Optional copy flag on fields
- Documentation update
- Dead code cleanup
- Lots of fixes
2014-07-06 17:05:41 +02:00
JoshuaJan 6c623b59b5 skip the inactivate employee in leaves summary 2014-07-06 17:41:07 +08:00
Denis Ledoux 1508c5dd00 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9718 rev-id: dle@openerp.com-20131224103535-rhtje7dnq1ie7jtb
bzr revid: tde@openerp.com-20131220162158-hbgktly09dv37958
bzr revid: dle@openerp.com-20131223155041-8zp8e08fihbr0ie2
bzr revid: dle@openerp.com-20131224112407-aw6dq2q92312kjbk
2013-12-24 12:24:07 +01:00
Xavier ALT 6df572aae4 [FIX] hr_holidays, hr_timesheet: fix XMLSyntaxError when company name contain an ampersand '&' sign
bzr revid: xal@openerp.com-20131219135147-jpli369iqlanf3t3
2013-12-19 14:51:47 +01:00
Somesh Khare (OpenERP) 4ed53ad39e [FIX]hr_holidays, hr_timesheet: XMLSyntaxError Error occurred when company name have ampersand '&' sign (Case: Ref 591630)
bzr revid: skh@openerp.com-20130422124943-04zhbhbj9snvikqv
2013-04-22 18:19:43 +05:30
Vo Minh Thu f507ca0982 [REF] hr_holidays: removed openerp.pooler imports.
bzr revid: vmt@openerp.com-20130327121421-exjyfvx11e1j9n2t
2013-03-27 13:14:21 +01:00
Cecile Tonglet 15fe515601 [MERGE] From trunk
bzr revid: cto@openerp.com-20121217144306-tkodwpox30cuvb28
2012-12-17 15:43:06 +01:00
Vo Minh Thu ca89ae8f71 [IMP] use the openerp namespace.
bzr revid: vmt@openerp.com-20121206151316-u1eqx41ltjpz2lrd
2012-12-06 16:13:16 +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
Nehal Panchal (OpenERP) 4151a1a438 [FIX]hr_holiday: Fixed the encoding issue of Leave Type which is in different language than English
bzr revid: mma@tinyerp.com-20121120061935-e3nrlmoy48cpzcvf
2012-11-20 11:49:35 +05:30
Mayur Maheshwari (OpenERP) aea578ad6a [FIX]hr : Company name with & throws error when opening report
bzr revid: mma@tinyerp.com-20121101092543-w91bmpwbxed5ftkd
2012-11-01 14:55:43 +05:30
Raphael Collet faad7a978a [IMP] hr_holidays: improve English, and fix a few views
bzr revid: rco@openerp.com-20120613142605-vbw88dogd8n83ru7
2012-06-13 16:26:05 +02:00
Pinakin Nayi (OpenERP) 1d5f3debbb [IMP] hr_recruitmentimprove
bzr revid: pna@tinyerp.com-20120611054603-5gph89jeahglcu08
2012-06-11 11:16:03 +05:30
Sbh (Openerp) 668f7d850e [Fix] : hr_holidays: fix report
bzr revid: sbh@tinyerp.com-20120530114607-utfx979m1hb85nff
2012-05-30 17:16:07 +05:30
Ashvin Rathod (OpenERP) f79e8740b3 [IMP] hr_holiday: improve holiday report
bzr revid: ara@tinyerp.com-20120524123536-12qllmpfblgzi5c3
2012-05-24 18:05:36 +05:30
mtr e86e10063f [IMP] hr_attendance, hr_holidays: improved spacing in monthly attendance and holidays summary report
bzr revid: mtr@mtr-20110628052816-3tjak7bz5rozaj0u
2011-06-28 10:58:16 +05:30
mtr 6e1f5c7904 [FIX] hr_attendance, hr_holidays:monthly attendance and holidays summary report are now translated
lp bug: https://launchpad.net/bugs/798721 fixed

bzr revid: mtr@mtr-20110628051655-1f1egguxm28p4z13
2011-06-28 10:46:55 +05:30
qdp-launchpad@tinyerp.com 717ea6f930 [MERGE] merged the dev3 branch
bzr revid: qdp-launchpad@tinyerp.com-20110117180222-rvby5kh871sxfoyh
2011-01-17 19:02:22 +01:00
ARA (OpenERP) 3ec0d38e20 [FIX]hr_timesheet: Problems printing atttendance by month and holiday summery reports
bzr revid: ara@tinyerp.com-20110117123644-dsywsjudkcfa798x
2011-01-17 18:06:44 +05:30
DBR (OpenERP) ef28e951f5 [MOD/IMP] hr : Usability Improvenment in Accessrights
bzr revid: dbr@tinyerp.com-20101006093147-xaqdyfd23izwtfmm
2010-10-06 15:01:47 +05:30
rch (Open ERP) 4a0e8149cb [IMP]: Solve date formate problem in report 'Human Resource / Reporting /Holidays/Leaves By Department'.
bzr revid: rch_open_erp-20100916085742-89wsk1fvo1ypl74q
2010-09-16 14:27:42 +05:30
rch (Open ERP) a96cc81c02 [IMP]: Improve 'Employee's Holidays' report.
bzr revid: rch_open_erp-20100915070821-rgamrecwcufc5yk8
2010-09-15 12:38:21 +05:30
rch (Open ERP) 252cb55691 [IMP/ADD]: Header in hr_attendance xsl report - 'Attendance By Month' with saperate header template for xsl landscape rport. Add FormatLang in header's date of hr reports.
bzr revid: rch_open_erp-20100914132035-ny793gedcmah1pem
2010-09-14 18:50:35 +05:30
rch (Open ERP) d6486e17d2 [IMP/ADD]: Header in hr_holidays xsl report with saterate template for xsl landscape rport.
bzr revid: rch_open_erp-20100914124100-0ifc15gr11yswtmv
2010-09-14 18:11:00 +05:30
psi (Open ERP) 3690da3b9b [FIX] hr_holidays: Fix the problem related to report Leaves by Department
bzr revid: psi@tinyerp.co.in-20100827053846-tlffr7s2zrze5rbq
2010-08-27 11:08:46 +05:30
RHA (Open ERP) d5ad0b8ff1 [CLEAN]: Removed commented codes, unnecessary spaces.
bzr revid: uco@tinyerp.com-20100819115157-sfsmbnjdgpp4wl12
2010-08-19 17:21:57 +05:30
PSI (Openerp) 9c0ae10d6a [IMP] hr and its related modules improvements
bzr revid: mra@mra-laptop-20100721123948-r2fi24sbelnfk7pr
2010-07-21 18:09:48 +05:30
Mustufa Rangwala c179005fc7 [IMP] Clean hr_* module (Still need to done)
bzr revid: mra@mra-laptop-20100703102152-4ulrrzbkorpd7xei
2010-07-03 15:51:52 +05:30
vra bf8d2a73c0 [IMP][REF] Sql-injection changes, remove print statement, some space improvement.
bzr revid: vra@tinyerp.com-20100616115139-cql5oiqf622spa6p
2010-06-16 17:21:39 +05:30
mra (Open ERP) b1cd4c9456 [ADD] hr_holidays: print summary by employee => osv memory
bzr revid: mra@tinyerp.com-20100415105220-vwoxot3apvg6kkw1
2010-04-15 16:22:20 +05:30
mra (Open ERP) b8cf5efd2c [ADD] hr_holidays: summary report dept wise => OSV memory
bzr revid: mra@tinyerp.com-20100415052414-ooweg59lx4p9lmp7
2010-04-15 10:54:14 +05:30
qdp-launchpad@tinyerp.com e328055359 [IMP] hr_holidays: improvements
bzr revid: qdp-launchpad@tinyerp.com-20100317170926-zyw5frdscx3kpi1p
2010-03-17 18:09:26 +01:00
Stephane Wirtel fb3ef7a2f4 [FIX] Change the year of the copyright
bzr revid: stephane@openerp.com-20100112091839-a6p7tenhb4e4zxyx
2010-01-12 10:18:39 +01:00
Panos Christeas 8d0b4a7418 [MERGE] merge from lp:~xrg/openobject-addons/doc2-5.2
bzr revid: hmo@tinyerp.com-20091126135400-z32iycvadbt9so8n
2009-11-26 19:24:00 +05:30
PSO(OpenERP) eb0b928cc0 Changed licencing terms
bzr revid: hda@tinyerp.com-20091014111534-1vtk21rz8byhszzf
2009-10-14 16:45:34 +05:30
ChristopheChauvet(syleam) 41e8ed59ef changed encoding to coding in all py files
lp bug: https://launchpad.net/bugs/357182 fixed

bzr revid: hda@tinyerp.com-20091013055837-3ntnbe8b938xmk97
2009-10-13 11:28:37 +05:30
HDA (OpenERP) 7d3a5b51ba [Merged] stable and trunk addons
bzr revid: hda@tinyerp.com-20090924104621-7p53erkfs9xa0bev
2009-09-24 16:16:21 +05:30
Niels Huylebroeck 2f216b5358 [FIX] +1 on the lengthmonth returns was too much, removed it
bzr revid: niels@bubbles-it.be-20090903151618-54w6ciiyr36e7z28
2009-09-03 17:16:18 +02:00
Niels Huylebroeck 9824b079bb [FIX] Problem when using hr_holidays Summary Report when entering date 1 jan 2009 for example.
bzr revid: niels@bubbles-it.be-20090903140045-9cv5ty32g1rgsuih
2009-09-03 16:00:45 +02:00
mra (Open ERP) 63b4c5d512 hr_holidays
bzr revid: mra@tinyerp.com-20090313062553-azyc55dpa7d20mit
2009-03-13 11:55:53 +05:30
Christophe Simonis 1a0de2f0f9 [FIX] psycopg2: %d -> %s
bzr revid: christophe@tinyerp.com-20081210142955-ewfr1qhzq9l1tjzn
2008-12-10 15:29:55 +01:00
Priyesh c22ef987b5 changes in project.py and project_view.xml
bzr revid: solanki.priyesh@gmail.com-20080912054231-xrso21mkmyyd8hfv
2008-09-12 11:12:31 +05:30
Fabien Pinckaers 734fa42184 added from extra-addons
bzr revid: fp@tinyerp.com-20080824144543-33o2j8ddmvaxx4ce
2008-08-24 16:45:43 +02:00