Commit Graph

1183 Commits

Author SHA1 Message Date
Hardik 8f9f860323 [IMP]Update __openerp__.py for all modules
bzr revid: hsa@tinyerp.com-20120820125644-px287o03bxrx8h3o
2012-08-20 18:26:44 +05:30
Hardik b040d2706d [IMP]update __openerp__.py in all modules
bzr revid: hsa@tinyerp.com-20120817111540-rfql0ifsvbx5nz7g
2012-08-17 16:45:40 +05:30
Vo Minh Thu 9822629548 [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
2012-08-13 18:06:57 +02:00
Rucha (Open ERP) dd7a2972d8 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120813051411-5no0xcudwbkw07c5
2012-08-13 10:44:11 +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
Launchpad Translations on behalf of openerp e970ecd62c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120809050051-p6f437n80grsr5vz
2012-08-09 05:00:51 +00:00
Olivier Dony 3fd9a77c83 [REVERT] Cancel PO Template changes from rev.2702 - to be fully re-generated before next release
We'll also attempt to replace the master strings in the
translated .po files before replacing the master strings,
to avoid losing translations just because of mere typo fixes.

bzr revid: odo@openerp.com-20120808144613-wtz50tcz5n7kvcza
2012-08-08 16:46:13 +02:00
Rucha (Open ERP) d597437dd7 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120808063503-ymsvwnerxakqbcbx
2012-08-08 12:05:03 +05:30
Antonin Bourguignon a97687a420 [MERGE] latest trunk
also replace the error message title 'Operation Not Permitted' by 'Invalid Action'

bzr revid: abo@openerp.com-20120807120451-zdrrecilfh82obhl
2012-08-07 14:04:51 +02:00
Antonin Bourguignon 8a64e7580a [IMP] all the error messages now start with 'Error\!' (not 'Error' or 'Error \!')
bzr revid: abo@openerp.com-20120807113137-44vehm0mthqawlo3
2012-08-07 13:31:37 +02:00
Launchpad Translations on behalf of openerp 3cfd65b43d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120807053928-8131c98edycpivlb
2012-08-07 05:39:28 +00:00
pso (OpenERP) 389f8d6803 [MERGE] Merge with main branch
bzr revid: pso@tinyerp.com-20120806094234-1b145yrjixy5yrsg
2012-08-06 15:12:34 +05:30
Rucha (Open ERP) b7daa1fb31 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120803045532-wsgei101ogh0o44d
bzr revid: rpa@tinyerp.com-20120806050952-xecwmyhg4p2fs4id
2012-08-06 10:39:52 +05:30
Fabien Pinckaers ea52cfae17 [IMP] introducing new file type: html
bzr revid: fp@openerp.com-20120804143556-457q040g6q30x3fu
2012-08-04 16:35:56 +02:00
Fabien Pinckaers b363b1f622 fix
bzr revid: fp@openerp.com-20120804135631-9qqfgcz9513qsyzp
2012-08-04 15:56:31 +02:00
Fabien Pinckaers 4e69bdd6fc [IMP] improved menu tips - 10 firsts clicks
bzr revid: fp@openerp.com-20120804132136-2b18cfkwv0njsglj
2012-08-04 15:21:36 +02:00
Antonin Bourguignon b12e606e18 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120803160951-4n7ckom9hyhgeio2
2012-08-03 18:09:51 +02:00
Antonin Bourguignon ac271a71c7 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120802132147-usbd4zosv80hq0ro
2012-08-02 15:21:47 +02:00
Rajesh Prajapati (OpenERP) 2e4c6523af [IMP] hr : wizard traceback of "all children rules" removed
bzr revid: rpr@tinyerp.com-20120801071446-13jar5rxtg0xsy5v
2012-08-01 12:44:46 +05:30
Rucha (Open ERP) 01bea180bb [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120801064738-vcjdjnt3s57i2hgc
2012-08-01 12:17:38 +05:30
pso (OpenERP) 773c2d5c63 [MERGE] Merge with main branch
bzr revid: pso@tinyerp.com-20120801064711-y90iik5ialfdnfft
2012-08-01 12:17:11 +05:30
Amit Patel (OpenERP) c5eae6dec7 [MERGE]:merged with trunk
bzr revid: apa@tinyerp.com-20120801054207-8cfqqna4wauzarkb
2012-08-01 11:12:07 +05:30
Launchpad Translations on behalf of openerp e845e2350c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120801044335-2llntxn2tfj8m7yt
bzr revid: launchpad_translations_on_behalf_of_openerp-20120801044411-aoxlecq42a8czbf8
2012-08-01 04:44:11 +00:00
Quentin (OpenERP) e1b50e304d [MEGUEZ] merged the clean search view branch
bzr revid: qdp-launchpad@openerp.com-20120731150358-jqd3eoz06imzlx01
2012-07-31 17:03:58 +02:00
Sanjay Gohel (Open ERP) 7b29dc344a [IMP]improve hr view as per suggestion
bzr revid: sgo@tinyerp.com-20120731113042-ok4399xaxl0gzqvz
2012-07-31 17:00:42 +05:30
Twinkle Christian (OpenERP) cb1c6c08af [IMP]Improve search view in all modules
bzr revid: tch@tinyerp.com-20120731112804-a0akxtqr1z0uew6w
2012-07-31 16:58:04 +05:30
Sanjay Gohel (Open ERP) 9c63ddb992 [MERGE]merge with trunk
bzr revid: sgo@tinyerp.com-20120731054300-j6ax39hs18svscgz
2012-07-31 11:13:00 +05:30
Launchpad Translations on behalf of openerp 84ea8f59d7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120731045841-1532ttai3o223dln
2012-07-31 04:58:41 +00:00
vta vta@openerp.com 264d2c3365 [MERGE] Trunk.
bzr revid: vta@openerp.com-20120730123628-49rirhupbwqfzr0r
2012-07-30 14:36:28 +02:00
Amit (OpenERP) 6e161afd7d [FIX] : Fixes the duplicate payslip problem on made payment order field
bzr revid: amp@tinyerp.com-20120730055804-lbsgiok0i4uflmgx
2012-07-30 11:28:04 +05:30
Rucha (Open ERP) 9be1dc63e5 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120730052105-tjzeohx0hyi43qi4
2012-07-30 10:51:05 +05:30
Launchpad Translations on behalf of openerp 0c581831b8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120728045741-hrbggtt37yutrbpx
bzr revid: launchpad_translations_on_behalf_of_openerp-20120729043802-x7m56po0nxue0jb0
2012-07-29 04:38:02 +00:00
Amit (OpenERP) ddc19ac369 [FIX] hr_payroll : Fixes the duplicate payslip problem
lp bug: https://launchpad.net/bugs/1029318 fixed

bzr revid: amp@tinyerp.com-20120726111113-0jo81xcclbusdp8g
2012-07-26 16:41:13 +05:30
Rucha (Open ERP) 4eb76030a6 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120726053855-8j8c70xqc0ynikx1
2012-07-26 11:08:55 +05:30
Stephane Wirtel 6a84f697b1 [MERGE] lp:~openerp-dev/openobject-addons/trunk-addons_issue_hr-mma
bzr revid: stw@openerp.com-20120725143446-2ir9qawtn20iimz2
2012-07-25 16:34:46 +02:00
pso (OpenERP) e5da0e191b [MERGE] Merged with main branch
bzr revid: pso@tinyerp.com-20120725125332-7qe6b3l0fjryast2
2012-07-25 18:23:32 +05:30
Saurang Suthar(OpenERP) 25d650e96e [IMP] Improved warning messages for hr* modules
bzr revid: pso@tinyerp.com-20120725121354-hypwxo74c43jm5gp
2012-07-25 17:43:54 +05:30
Amit Patel (OpenERP) fa012f5f6a [MERGE]
bzr revid: apa@tinyerp.com-20120725112648-920akzwzi7z4leoj
2012-07-25 16:56:48 +05:30
Stephane Wirtel 9f299d9a20 [MERGE] lp:~openerp-dev/openobject-addons/trunk-review_module_desc-psi
bzr revid: stw@openerp.com-20120724080711-6655pbbfubiau3li
2012-07-24 10:07:11 +02:00
Mayur Maheshwari (OpenERP) 8903313f8f [IMP]hr_all: fix some traceback issue related to hr module
bzr revid: mma@tinyerp.com-20120723063055-bfxz1s0kj8hb8lnn
2012-07-23 12:00:55 +05:30
Turkesh Patel (Open ERP) b49a782375 [IMP] hr_payroll: improved search views.
bzr revid: tpa@tinyerp.com-20120720105039-49zv86s2a3mncbg7
2012-07-20 16:20:39 +05:30
Amit Patel (OpenERP) a5aea1df13 [IMP]:improved code
bzr revid: apa@tinyerp.com-20120720071250-1h5cmcaxdwkqmsju
2012-07-20 12:42:50 +05:30
Sanjay Gohel (Open ERP) 2ad16d53ba [IMP]hr:hr config_wizard view improvement
bzr revid: sgo@tinyerp.com-20120719112103-gt818a5mgshjlccn
2012-07-19 16:51:03 +05:30
pso (OpenERP) 8048661b01 [MERGE] Merge with main branch
bzr revid: pso@tinyerp.com-20120719073136-a7a5t43y2nm51zji
2012-07-19 13:01:36 +05:30
Rucha (Open ERP) d729b44e5f [IMP]: hr_payroll: Improved creation of new partner for emplyee and changed proper references
bzr revid: rpa@tinyerp.com-20120718131952-mj0zk3nx7ifwft2n
2012-07-18 18:49:52 +05:30
Purnendu Singh (OpenERP) c45d68d6b8 [MERGE] Merge with main addons
bzr revid: psi@tinyerp.com-20120718055558-03lss1ha0tcdi2dk
2012-07-18 11:25:58 +05:30
Purnendu Singh (OpenERP) f186ff2145 [MERGE] Merge with main addons
bzr revid: psi@tinyerp.com-20120718055314-7a8w836mzjlueexu
2012-07-18 11:23:14 +05:30
Quentin (OpenERP) b1d19923de [REV] settings: reverted to revision 6971, for usability purposes
bzr revid: qdp-launchpad@openerp.com-20120716134314-os07j9sxreqc39tl
2012-07-16 15:43:14 +02:00
Sanjay Gohel (Open ERP) 3dab31051b [IMP]hr,mrp,project:res_config view improvement as per suggetion
bzr revid: sgo@tinyerp.com-20120716114158-nef7622tzmnzcpxa
2012-07-16 17:11:58 +05:30
pso (OpenERP) fc26f3975d [IMP] Improved warning messages/exceptions of hr modules
bzr revid: pso@tinyerp.com-20120716091918-hua9cjnv21nqa2yl
2012-07-16 14:49:18 +05:30
Sanjay Gohel (Open ERP) b81c51c73c [MERGE]merge with trunk addons
bzr revid: sgo@tinyerp.com-20120716065703-gcmugagvaaq1xl4c
2012-07-16 12:27:03 +05:30
Purnendu Singh (OpenERP) e5ae685374 [MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120713130824-r6p6d28u1h3c7nol
bzr revid: psi@tinyerp.com-20120716052129-2lj20gqc7zuyet1s
2012-07-16 10:51:29 +05:30
Launchpad Translations on behalf of openerp 8028996327 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120714062750-arh47r4vgtj7zlwu
2012-07-14 06:27:50 +00:00
Rajesh Prajapati (OpenERP) 71122ae47a [IMP]tooltip : I have changed the tooltip of fields as suggested
bzr revid: rpr@tinyerp.com-20120713101751-zokuph2bcpcmlfc5
2012-07-13 15:47:51 +05:30
Pinakin Nayi (OpenERP) 27226c12b2 [IMP]hr-warning-message
bzr revid: pna@tinyerp.com-20120713070425-b3envibswfdt6umq
2012-07-13 12:34:25 +05:30
Purnendu Singh (OpenERP) 79a8450b72 [MERGE] merge with main branch
bzr revid: psi@tinyerp.com-20120711090814-z3khnc83bl9ndcy6
2012-07-11 14:38:14 +05:30
Ajay Chauhan (OpenERP) 8a847dcf5e [IMP] : improve title & description for modules
bzr revid: cha@tinyerp.com-20120711084057-b7f3jt6p0kht6wrp
2012-07-11 14:10:57 +05:30
Sanjay Gohel (Open ERP) 94d5c91975 [IMP]improve some view and remove errors
bzr revid: sgo@tinyerp.com-20120709060814-3y9vliizd448820o
2012-07-09 11:38:14 +05:30
Quentin (OpenERP) e6ef77b047 [MERGE] hr review of form views
bzr revid: qdp-launchpad@openerp.com-20120705092921-0edv4n7z0392ia83
2012-07-05 11:29:21 +02:00
Amit Patel (OpenERP) d761f9ef09 [IMP]:removed tabs
bzr revid: apa@tinyerp.com-20120705065845-bb0lgzwdd93ph2ql
2012-07-05 12:28:45 +05:30
Quentin (OpenERP) 6867bc1375 [IMP] review of some hr form view
bzr revid: qdp-launchpad@openerp.com-20120704162910-zatsmoxyu2reaab2
2012-07-04 18:29:10 +02:00
Sanjay Gohel (Open ERP) 900081de80 [MERGE]merge with trunk addons
bzr revid: sgo@tinyerp.com-20120704125902-wf202qb5p14iew7n
2012-07-04 18:29:02 +05:30
Amit Patel (OpenERP) 5260efe702 [MERGE]:merged from trunk
bzr revid: apa@tinyerp.com-20120629124820-aec88wzcrvm6xps4
2012-06-29 18:18:20 +05:30
Quentin (OpenERP) 6fe94bd4bc [MERGE] merged with maint runk
bzr revid: qdp-launchpad@openerp.com-20120629123618-z1bv3dqdfqy23hno
2012-06-29 14:36:18 +02:00
Amit Patel (OpenERP) 68a85ea596 [MERGE]
bzr revid: apa@tinyerp.com-20120629094757-97dmerqzrdp4sjtv
2012-06-29 15:17:57 +05:30
Raphael Collet 76f17eb480 [IMP] in form views, remove useless colspans on buttons in headers
bzr revid: rco@openerp.com-20120629084603-yz0hdnvtjy1fplp1
2012-06-29 10:46:03 +02:00
Raphael Collet 5133bee1d5 [FIX] in form views, replace class 'oe_highlight_on_dirty' by 'oe_highlight'
bzr revid: rco@openerp.com-20120629083024-rqhtbf9melkygg0m
2012-06-29 10:30:24 +02:00
Sanjay Gohel (Open ERP) faddab4935 [IMP]reorganize group in contract form and remove total from my timesheet
bzr revid: sgo@tinyerp.com-20120629064443-kwyp4r59620qse3k
2012-06-29 12:14:43 +05:30
Raphael Collet 2963e31ebf [MERGE] from trunk
bzr revid: rco@openerp.com-20120628142628-qi35145b8hsvpsfi
2012-06-28 16:26:28 +02:00
Amit Patel (OpenERP) 1325558868 [IMP]:improved HR Application view after reviewed
bzr revid: apa@tinyerp.com-20120628131210-gpy7i3d2ekg6b7da
2012-06-28 18:42:10 +05:30
Quentin (OpenERP) 46f2c2c9ca [IMP] improvements during code review
bzr revid: qdp-launchpad@openerp.com-20120628121820-r8bxfzq38fy8pcgt
2012-06-28 14:18:20 +02:00
Quentin (OpenERP) 8c225089e5 [MERGE] merged main trunk branch
bzr revid: qdp-launchpad@openerp.com-20120628115332-6leye61nr42a2umx
2012-06-28 13:53:32 +02:00
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
Sanjay Gohel (Open ERP) 7ed6f5052d [IMP]remove all select=1 and select=2
bzr revid: sgo@tinyerp.com-20120628061736-ujwe0swulvrcrkjt
2012-06-28 11:47:36 +05:30
Amit Patel (OpenERP) d2db198984 [IMP]:hr,hr_payroll:improved view
bzr revid: apa@tinyerp.com-20120626105841-3fosyc7jnum2vlc4
2012-06-26 16:28:41 +05:30
Twinkle (OpenERP) 471037495c [IMP]Apply css class flow on wizards buttons
bzr revid: tch@tinyerp.com-20120626063119-5i93di16milljxap
2012-06-26 12:01:19 +05:30
Amit Patel (OpenERP) 38ff29d066 [MERGE]
bzr revid: apa@tinyerp.com-20120626052202-k2a17biwlfqlhe5s
2012-06-26 10:52:02 +05:30
Jigar Amin - OpenERP c2918cf099 [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120626040843-do8qlugwmdayqp2z
2012-06-26 09:38:43 +05:30
Raphael Collet 6787048b80 [MERGE] trunk-application_setting_cleanup-atp (clean up config wizards, and adapt forms to new style)
bzr revid: rco@openerp.com-20120625142342-59tc4d9ycozzxalg
2012-06-25 16:23:42 +02:00
Jigar Amin - OpenERP a973485bc9 [MERGE] lp:~openerp-dev/openobject-addons/trunk-wizard-remove-cancel-editable-tch
bzr revid: jam@tinyerp.com-20120625111519-j8rpvnhb804tl1o1
2012-06-25 16:45:19 +05:30
Twinkle (OpenERP) 0e97cefe9e [IMP]Improve wizard button
bzr revid: tch@tinyerp.com-20120625100901-ucjbttxod55erqmf
2012-06-25 15:39:01 +05:30
Amit Patel (OpenERP) 23de44d8ff [IMP]:improved views
bzr revid: apa@tinyerp.com-20120625100530-b1ba3l7g3i7pnaav
2012-06-25 15:35:30 +05:30
Raphael Collet d62297df78 [IMP] hr, hr_payroll, hr_recruitment, hr_timesheet_sheet: improve config wizard form
bzr revid: rco@openerp.com-20120625075632-rycdswuz3widi6wb
2012-06-25 09:56:32 +02:00
Amit Patel (OpenERP) 87e079367a [IMP]:hr,hr_contract:improved view
bzr revid: apa@tinyerp.com-20120625062922-lvv1arp9yr7z801y
2012-06-25 11:59:22 +05:30
Jigar Amin - OpenERP 622abf69b3 [MERGE] remove wizard cancel button and make action button red
bzr revid: jam@tinyerp.com-20120625051048-y6mydqljdpysabn1
2012-06-25 10:40:48 +05:30
Amit Patel (OpenERP) 5e12f8dbf6 [MERGE]
bzr revid: apa@tinyerp.com-20120625045019-86qrhmewdodwbbis
2012-06-25 10:20:19 +05:30
Jigar Amin - OpenERP 43a50a651b [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120625041934-v1twcjzbjupl369n
2012-06-25 09:49:34 +05:30
Jigar Amin - OpenERP dfdbf8cf17 [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120625041316-rwtc4zf2pska9t5c
2012-06-25 09:43:16 +05:30
Amit Patel (OpenERP) b6b97caa6b [IMP]:hr_contract:improved view
bzr revid: apa@tinyerp.com-20120622132735-hds4xywi4rckbuq8
2012-06-22 18:57:35 +05:30
Amit Patel (OpenERP) e78a09065a [IMP]:improved hr view with new style.
bzr revid: apa@tinyerp.com-20120622122300-c623awtkcjvzsqp6
2012-06-22 17:53:00 +05:30
Quentin (OpenERP) c9ef276770 [REF] search views: removed filter_domain if only one element was inside + made some small usability changes
bzr revid: qdp-launchpad@openerp.com-20120622102959-fhc1oe2w8in8y6v2
2012-06-22 12:29:59 +02:00
Raphael Collet fdca6f9078 [MERGE] from trunk
bzr revid: rco@openerp.com-20120622094140-b9ixp1d85lrxqfwp
2012-06-22 11:41:40 +02:00
Purnendu Singh (OpenERP) 1c35eb1049 [MERGE] Mearge with main addons
bzr revid: psi@tinyerp.com-20120622055230-trqmxu7r1qtxa0ut
2012-06-22 11:22:30 +05:30
Sanjay Gohel (Open ERP) cf2b8e1737 [IMP]improve and clean hr_department hr_job, hr_payroll_status,hr,hr_holidays as per new form view guidelines
bzr revid: sgo@tinyerp.com-20120621132501-srjmo019uho1mgif
2012-06-21 18:55:01 +05:30
Jigar Amin - OpenERP 501721883d [USB] removed useless class defination
bzr revid: jam@tinyerp.com-20120621070959-qrkmzuk1xg304kwa
2012-06-21 12:39:59 +05:30
Sanjay Gohel (Open ERP) 3f068c097b [IMP]Payslip Info and Advantage should be in 2 columns
bzr revid: sgo@tinyerp.com-20120621065608-5mw14bj3iwec2z0o
2012-06-21 12:26:08 +05:30
Sanjay Gohel (Open ERP) 7ad658375f [IMP]clean form view and improve hr employee form view
bzr revid: sgo@tinyerp.com-20120621061333-zfjlr55m0oo83f24
2012-06-21 11:43:33 +05:30
Jigar Amin - OpenERP f7db2ab215 [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120621044348-3r8ur7izhjriing4
2012-06-21 10:13:48 +05:30
Jigar Amin - OpenERP d145817fb8 [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120621043747-n4sjqa91q2xc3wl9
2012-06-21 10:07:47 +05:30
Quentin (OpenERP) 6a75cc721d [IMP] payroll modules: improved the management of accounting entries created by a payslip + data for contribution registers in l10n_be payroll modules
bzr revid: qdp-launchpad@openerp.com-20120620130449-aa0qe86kjig8ud4m
2012-06-20 15:04:49 +02:00