Commit Graph

148 Commits

Author SHA1 Message Date
Richard Mathot 6f1b820d33 [REF] OpenERP --> Odoo in various UI texts (2)
Some things missed by commit 8b67a7202d
2014-07-18 14:59:38 +02:00
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
Jaydeep Barot 026e38b48f [REM] Unnecessary `size` parameters on char fields 2014-06-25 17:13:43 +02:00
Gery Debongnie 9cd84a5834 [IMP] replace the Leaves analysis views in reporting by the new pivot graph view (addon hr_holidays)
bzr revid: ged@openerp.com-20140127103408-8a1fi88gdhl2sud5
2014-01-27 11:34:08 +01:00
Gery Debongnie 9dfb5de2f8 [MERGE] merge from trunk
bzr revid: ged@openerp.com-20131224112327-r1evm1pcw2gpn8dh
bzr revid: ged@openerp.com-20131226132625-33fgmyb0fbu0c9ia
2013-12-26 14:26:25 +01:00
Gery Debongnie bb5a2662c8 [IMP] changes the xml description of the graphs to use the new graph view (and to make sure the result is as close as possible) (addon hr_holidays)
bzr revid: ged@openerp.com-20131224102813-l818l4lp6ml5164i
2013-12-24 11:28:13 +01:00
Thibault Delavallée 1aa92dbc46 [FORWARD] Forward port of saas-2 fixes until revision 9058 (revid tde@openerp.com-20131220162158-hbgktly09dv37958)
bzr revid: tde@openerp.com-20131220165519-2okhclp3qb3if1ey
2013-12-20 17:55:19 +01: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
Martin Trigaux cca8bb4d64 [FIX] font: revert previous (use name and not familly in reportlab), fix reports using spaces
bzr revid: mat@openerp.com-20131209133431-6gjhq1zmrb2ro6eo
2013-12-09 14:34:31 +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 e69326ee3b [REF] removed explicit model instanciations.
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
2013-04-15 12:23:49 +02:00
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
Twinkle Christian (OpenERP) 721adad01e [IMP]Remove type field from the whole hr module
bzr revid: tch@tinyerp.com-20120808124839-ecd1uic8mscg3s7f
2012-08-08 18:18:39 +05:30
Kuldeep Joshi (OpenERP) 36b05a7194 [MERGE] lp:openobject-addons
bzr revid: kjo@tinyerp.com-20120702091329-mur9imoo2v6tb4hc
2012-07-02 14:43:29 +05:30
Sanjay Gohel (Open ERP) 1702b2335d [IMP]remove tabs and add spaces instead of them
bzr revid: sgo@tinyerp.com-20120628064005-zuerrpazumf5lf1q
2012-06-28 12:10:05 +05:30
Pinakin Nayi (OpenERP) e65b5db25a [IMP]reporting-checker-wizards-menus
bzr revid: pna@tinyerp.com-20120627115613-e6q3wh7428b217e6
2012-06-27 17:26:13 +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
Kuldeep Joshi (OpenERP) 8bae4426c6 [IMP]set string leaves to report
bzr revid: kjo@tinyerp.com-20120608053432-aev1g1td5qxcn1hp
2012-06-08 11:04:32 +05:30
Kuldeep Joshi (OpenERP) 6fc261d231 [IMP]hr:change report name and Leave instead of Holiday
bzr revid: kjo@tinyerp.com-20120607132146-gs9m2famzymlsq1f
2012-06-07 18:51:46 +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
Jagdish Panchal (Open ERP) d2d20a1d4c [FIX] hr_holidays: In leaves analysis report filter buttons Year|Month|Month-1 added
lp bug: https://launchpad.net/bugs/908798 fixed

bzr revid: jap@tinyerp.com-20111229104219-fbzgrcxpv9jxyqzp
2011-12-29 16:12:19 +05:30
Numerigraphe - Lionel Sausin 779fa653c1 [IMP] Added missing vim mode lines
lp bug: https://launchpad.net/bugs/524279 fixed

bzr revid: ls@numerigraphe.fr-20111122085138-x6u2lcl6vrpyybp9
2011-11-22 09:51:38 +01:00
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
mtr 07a63fcf71 [IMP] hr_holidays:In xml,added field 'name' on model=ir.actions.act_window
bzr revid: mtr@mtr-20110121065940-d37nys61ta3b1556
2011-01-21 12:29:40 +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
Fabien Pinckaers 65b33b9489 [FIX] Cleaning hr holidays reporting and dashbaords
bzr revid: fp@tinyerp.com-20101229165130-jfr2h23jo7mrjqzu
2010-12-29 17:51:30 +01:00
Fabien Pinckaers 889038611d fix
bzr revid: fp@tinyerp.com-20101229162607-fpmdqtm0x9bo17yt
2010-12-29 17:26:07 +01:00
apa (OpenERP) a6b7a2847e [IMP]:hr_holidays:improved Leave By department report.
bzr revid: apa@tinyerp.com-20101217103701-b6euyan2n4je4m2u
2010-12-17 16:07:01 +05:30
vth a993412a9a [IMP] hr_holidays: Reporting/Dashboard/Human Resources Dashboard put a column allocated leaves instead of remaining leaves and change the string
bzr revid: vth@tinyerp.com-20101102070453-qkfg0x7vhvl43rt7
2010-11-02 12:34:53 +05:30
vth a85e639a4e [MERGE] merge from trunk-dev-addons-3
bzr revid: vth@tinyerp.com-20101102062853-e8l6r292sm830tcy
2010-11-02 11:58:53 +05:30
Fabien Pinckaers fe9500c14e [IMP] access rights cleaning
bzr revid: fp@tinyerp.com-20101016164709-8w551aaosqx0dufu
2010-10-16 18:47:09 +02:00
qdp-launchpad@tinyerp.com e43a45fc9c [MERGE] merged the usability branch (with fixesssss)
bzr revid: qdp-launchpad@tinyerp.com-20101015165315-qigrk92klwozhv5f
2010-10-15 18:53:15 +02:00
Vir (Open ERP) 408e499131 [Merge]
bzr revid: vir@tinyerp.com-20101015104603-c5l8sr53w2wof27o
2010-10-15 16:16:03 +05:30
apa-tiny 70d0b42c7f [MERGE]
bzr revid: apa@tinyerp.com-20101015102603-xmvl60cruptl3g1n
2010-10-15 15:56:03 +05:30
rch 465f91053e [IMP]: HR Dashboard.
bzr revid: rch@rch-desktop-20101014090009-x8m0g12mwacuiz45
2010-10-14 14:30:09 +05:30