Commit Graph

1331 Commits

Author SHA1 Message Date
Fabien Pinckaers c3c05928e7 [MERGE] compute payroll
bzr revid: fp@tinyerp.com-20121112083937-6wdxk6313q2lbdim
2012-11-12 09:39:37 +01:00
Vo Minh Thu abbe3ac1de [MERGE] removed a few warnings.
bzr revid: vmt@openerp.com-20121106150431-rem9us13kevan8y0
2012-11-06 16:04:31 +01:00
Mayur Maheshwari (OpenERP) 81560c12fa [FIX]hr_payroll : improved some code
bzr revid: mma@tinyerp.com-20121105101900-bg5pjmsc5pt957pl
2012-11-05 15:49:00 +05:30
Nehal Panchal (OpenERP) 9a6e7799fe [FIX]hr_payroll : Fixed Salary Rules Python Code and Quantity for payslip computation
bzr revid: mma@tinyerp.com-20121105062807-byz6d0kd7scxq3r3
2012-11-05 11:58:07 +05:30
Khushboo Bhatt (Open ERP) 5cde51e636 [IMP]hr_payroll:added unlink method for deleteing draft and cancel payslip.
bzr revid: kbh@tinyerp.com-20121102061126-uzkprztc5aoo0hjf
2012-11-02 11:41:26 +05:30
Mayur Maheshwari (OpenERP) 7d765c0c38 [FIX]hr_payroll : On clicking the Confirm button the salary slip must be computed as well, which is not happening
bzr revid: mma@tinyerp.com-20121101050924-ywsnzr7n930g97pq
2012-11-01 10:39:24 +05:30
Launchpad Translations on behalf of openerp 87d3caa50f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121030053700-w841c92uvirpii9h
2012-10-30 05:37:00 +00:00
Jigar Amin 2ca6464e66 [MERGE] Sync with trunk
bzr revid: jam@tinyerp.com-20121018133243-jybuqt2ub9wcm9h7
2012-10-18 19:02:43 +05:30
Launchpad Translations on behalf of openerp df2750f9fd Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121018044110-cqlg7hbfgy4m2bba
2012-10-18 04:41:10 +00:00
Jigar Amin 40e2c69f66 [MERGE] Sync with trunk
bzr revid: jam@tinyerp.com-20121017043824-pcijflp073el02ih
2012-10-17 10:08:24 +05:30
Twinkle Christian (OpenERP) c23ec49ad0 [FIX]server warninggs when insttaling modules
bzr revid: tch@tinyerp.com-20121011123201-b0rdwialk1uqc14x
2012-10-11 18:02:01 +05:30
Quentin (OpenERP) ce440f16d3 [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20121011075658-bf5ax000j74vi6ro
2012-10-11 09:56:58 +02:00
Launchpad Translations on behalf of openerp fc94df2af5 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121011050045-qe3vhe34wrjw1xb8
2012-10-11 05:00:45 +00:00
Atul Patel (OpenERP) f715525300 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20121003064028-49llvt047893tx2n
2012-10-03 12:10:28 +05:30
Atul Patel (OpenERP) 3d6520b3ff [FIX]hr_payroll: Fix if address is not defined.
bzr revid: atp@tinyerp.com-20121003060346-tdakbm44iumvynw8
2012-10-03 11:33:46 +05:30
Antonin Bourguignon 1653332080 [MERGE] trunk
bzr revid: abo@openerp.com-20121002102915-424prxd74izb1szw
2012-10-02 12:29:15 +02:00
Atul Patel (OpenERP) 082f70cb6f [MERGE]: Merged display_address() field
bzr revid: atp@tinyerp.com-20121002065832-7wick5qjfbbhy5jv
2012-10-02 12:28:32 +05:30
Atul Patel (OpenERP) 0d80ceda1a [MERGE]: Merged nco branch for display amount with currency symbol using formatLang
bzr revid: atp@tinyerp.com-20121001194847-mgepvrrgwi6ifnlh
2012-10-02 01:18:47 +05:30
Nimesh (Open ERP) a9676cfd8c [IMP] amout with currency.
bzr revid: nco@tinyerp.com-20121001110802-r3l169i2ka73t2rh
2012-10-01 16:38:02 +05:30
Fabien Pinckaers 196f68fda4 [MERGE] payslip duplicate
bzr revid: fp@tinyerp.com-20120929121056-kfkqc9jofb87cp2m
2012-09-29 14:10:56 +02:00
Fabien Pinckaers 1d0230a9c4 [FIX] domain on hr_payroll
bzr revid: fp@tinyerp.com-20120929085633-xzu5u5jr1f64zx1g
2012-09-29 10:56:33 +02:00
Fabien Pinckaers f994fbde81 [FIX] contract date on payroll
bzr revid: fp@tinyerp.com-20120929083313-isidx3975voqzh7h
2012-09-29 10:33:13 +02:00
Fabien Pinckaers fc9f8491fe [MERGE] related not in 'More...'
bzr revid: fp@tinyerp.com-20120927173641-i503k4kycnwjyefj
2012-09-27 19:36:41 +02:00
Fabien Pinckaers e9f4840c93 [IMP] emoving bad code, no invitation system on events
[IMP] no more certifiate, will be managed in apps.openerp.com directly

bzr revid: fp@tinyerp.com-20120926121627-60isym4hdjkaxe9p
2012-09-26 14:16:27 +02:00
Antonin Bourguignon 1fbb4a5c16 [IMP] handling of '(copy)' l10n
bzr revid: abo@openerp.com-20120924162645-z1h4l2mj6c8i6wr3
2012-09-24 18:26:45 +02:00
Bharat Devnani (OpenERP) 1c46b40f09 [MERGE] merged with main addons
bzr revid: bde@tinyerp.com-20120921070605-jw08d71hb12nk4s7
2012-09-21 12:36:05 +05:30
Fabien Pinckaers 1766a3a9e2 [MERGE] fixes in payroll
bzr revid: fp@tinyerp.com-20120920091021-ieq47tyn4bffwcmo
2012-09-20 11:10:21 +02:00
Fabien Pinckaers f317c0dc16 [MERGE] hr fixes
bzr revid: fp@tinyerp.com-20120920090706-usen24pssndoag0g
2012-09-20 11:07:06 +02:00
Bharat Devnani (OpenERP) f46b934a7a [IMP] removed same buttons from More button located at top
bzr revid: bde@tinyerp.com-20120919132454-vic77ff22hjro39t
2012-09-19 18:54:54 +05:30
Purnendu Singh (OpenERP) ba12f1e786 [MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120919091058-33m1dqf2k2oly8dj
2012-09-19 14:40:58 +05:30
Amit Patel e6afcac5fd [MERGE]:employee should not access timesheets from the timesheets menu or also payslip
bzr revid: apa@tinyerp.com-20120917122012-rbkf1skp1oeevh5h
2012-09-17 17:50:12 +05:30
Fabien Pinckaers 1a899f1069 [MERGE] HR
bzr revid: fp@openerp.com-20120916160953-8bssla7rcll6gf8g
2012-09-16 18:09:53 +02:00
Mayur Maheshwari 45accdcb11 [FIX] hr_payroll: small fix in code
bzr revid: psi@tinyerp.com-20120914114645-0nmbochejovtmxoa
2012-09-14 17:16:45 +05:30
Purnendu Singh (OpenERP) d6608da313 [FIX] hr_payroll: small fix in code
bzr revid: psi@tinyerp.com-20120914112756-rbzvhcaj35sz5duk
2012-09-14 16:57:56 +05:30
Purnendu Singh (OpenERP) 428259a2b6 [IMP] hr_payroll: improve the onchange employee method on payslip so it will not give traceback in case contract is available for the selected employee and salary structure is not there
bzr revid: psi@tinyerp.com-20120914111847-irocinmn1f29wc5d
2012-09-14 16:48:47 +05:30
Fabien Pinckaers a7368145ca [MERGE] typo
bzr revid: fp@openerp.com-20121024201424-98la8f2wkhfjrtae
2012-10-24 22:14:24 +02:00
Launchpad Translations on behalf of openerp 5bfa3c5a7d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121019053933-51d6oob5aw0ujz40
2012-10-19 05:39:33 +00:00
Mayur Maheshwari (OpenERP) d1131c4a8d [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20121018052756-65fv51x0qrmz7zj6
bzr revid: mma@tinyerp.com-20121019050930-mcht3lslqjk38q22
2012-10-19 10:39:30 +05:30
Mayur Maheshwari (OpenERP) 8346293d72 [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20121015090200-irfaskfn9i1p68j9
bzr revid: mma@tinyerp.com-20121016052513-vl56jxtp7xbpa2ry
2012-10-16 10:55:13 +05:30
Mayur Maheshwari (OpenERP) 0b87880029 [IMP]all: imporve string state to status
bzr revid: mma@tinyerp.com-20121012114258-w2q3hg1wb5wlt8wi
2012-10-12 17:12:58 +05:30
Mayur Maheshwari (OpenERP) 2dff9d3c39 [IMP]account : improve tool tip
bzr revid: mma@tinyerp.com-20120913125745-k4deap3rlva45oik
2012-09-13 18:27:45 +05:30
Mayur Maheshwari (OpenERP) b90853eaf0 [IMP]account : improve string
bzr revid: mma@tinyerp.com-20120913125154-75dc3d48yk1atujy
2012-09-13 18:21:54 +05:30
Amit Patel 5f7466d75a [MERGE]:hr configuration
bzr revid: apa@tinyerp.com-20120913063035-ghidl2su7hsul54t
2012-09-13 12:00:35 +05:30
Launchpad Translations on behalf of openerp ffc772edfd Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120904045249-1039twan4q8v5oip
2012-09-04 04:52:49 +00:00
Pinakin Nayi (OpenERP) 6897a476a1 [IMP]hr configuration
bzr revid: pna@tinyerp.com-20120903084323-xizfs8wsy4iqxuvb
2012-09-03 14:13:23 +05:30
Launchpad Translations on behalf of openerp 4e31d1be93 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120828064335-bftlutj6aiymztbp
bzr revid: launchpad_translations_on_behalf_of_openerp-20120828072410-7ndsu3tnyrjhtuor
2012-08-28 07:24:10 +00:00
Amit (OpenERP) 1987736114 [MERGE]: Merge with lp:openobject-addons
bzr revid: amp@tinyerp.com-20120823053427-xntjhsvbjoktb752
2012-08-23 11:04:27 +05:30
Saurang Suthar(OpenERP) 095843797c [IMP] Improved _openerp__.py of all modules by replacing demo_xml with demo, init_xml and update_xml with data and adding noupdate
bzr revid: pso@tinyerp.com-20120822130232-un52dks3sclyx8m5
2012-08-22 18:32:32 +05:30
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
Jigar Amin - OpenERP ae34954e1d [MERGE] lp:~openerp-dev/openobject-addons/trunk-wiz-remove-btn-highlight-tch
bzr revid: jam@tinyerp.com-20120620123242-tvm11xx0s3olkdif
2012-06-20 18:02:42 +05:30
Twinkle (OpenERP) 660cc67256 [IMP]Added highlight button on wizard
bzr revid: tch@tinyerp.com-20120620104923-z1hty740vn160fg9
2012-06-20 16:19:23 +05:30
Randhir Mayatra (OpenERP) e80980330b [USA] replaced red button class oe_form_button_active_flow to oe_highlight
bzr revid: rma@tinyerp.com-20120620101205-uf0ibqbq4uzu17iq
2012-06-20 15:42:05 +05:30
Purnendu Singh (OpenERP) 4ccafc4c3a [IMP] misc
bzr revid: psi@tinyerp.com-20120620084428-ltgfaqakh3d7h7sg
2012-06-20 14:14:28 +05:30
Twinkle (OpenERP) 1c4476e8b6 [IMP]Improve wizard usability
bzr revid: tch@tinyerp.com-20120620073712-xql1mgekjyb7ufwv
2012-06-20 13:07:12 +05:30
Stephane Wirtel f2fba32b56 [REF] Change the CSS classes
bzr revid: stw@openerp.com-20120619085618-agdxk4fdgy3of6gp
2012-06-19 10:56:18 +02:00
Jigar Amin - OpenERP 7fc1b0b25e [MERGE] lp:openpbject-addons
bzr revid: jam@tinyerp.com-20120619061856-eok4a7xmyodeapku
2012-06-19 11:48:56 +05:30
Purnendu Singh (OpenERP) 4395463c57 [MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120618070239-h6zjmw4hvn3oq543
2012-06-18 12:32:39 +05:30
Turkesh Patel (Open ERP) f971e2c3c1 [IMP] hr_payroll: remove cancel button from wizard and improved view.
bzr revid: tpa@tinyerp.com-20120618052955-rizzewqljm3sxbon
2012-06-18 10:59:55 +05:30
Purnendu Singh (OpenERP) 2663cbca6e [MERGE] hr_*: make some improvements and Merge cha branch
bzr revid: psi@tinyerp.com-20120615125750-7yanak6d4282nk4u
2012-06-15 18:27:50 +05:30
Atul Patel (OpenERP) 1b81db66d5 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20120615112708-yhfb1eyonr883a6j
2012-06-15 16:57:08 +05:30
Turkesh Patel (Open ERP) fb9dd03f05 [IMP] hr_payroll: improved color of button based on business flow
bzr revid: tpa@tinyerp.com-20120614062441-040366zt7ymws9le
2012-06-14 11:54:41 +05:30
Ajay Chauhan (OpenERP) 6db119b7d8 [IMP]hr_* : improve search code in xml
bzr revid: cha@tinyerp.com-20120613124157-z5zpn42aao3w3cf2
2012-06-13 18:11:57 +05:30
Atul Patel (OpenERP) 8984b9705b [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20120612124829-npltu26uzi7atxtg
2012-06-12 18:18:29 +05:30
Sbh (Openerp) 234084df87 [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20120612105345-d10lp54bywb7y7oz
2012-06-12 16:23:45 +05:30
Olivier Dony d496a2cb23 [FIX] *: Correct @version spec in new-style forms, after FP's recent merge
bzr revid: odo@openerp.com-20120611161014-19p6rd5qpkmmijmg
2012-06-11 18:10:14 +02:00
Sanjay Gohel (Open ERP) 0b0425557c [IMP]solved xml architecure error in hr_payroll
bzr revid: sgo@tinyerp.com-20120608094050-04mdh6zrqfppt4mf
2012-06-08 15:10:50 +05:30
Fabien Pinckaers 001d2e84c9 [IMP] form views
bzr revid: fp@tinyerp.com-20120607173007-1kihroun2dbacq1c
2012-06-07 19:30:07 +02:00
Tejas Tank 973a21730e merged with latest
bzr revid: tta@openerp.com-20120605093251-3coaym02vcc812qj
bzr revid: tta@openerp.com-20120606054608-od4zbl17m7ud9pwa
2012-06-06 11:16:08 +05:30
ara@tinyerp.com b71c7c244d [MERGE] merge with parent brnach
bzr revid: ara@tinyerp.com-20120605072734-eqg19sd93rj5yftg
2012-06-05 12:57:34 +05:30
Fabien Pinckaers 48f8823bad [IMP] replaced all oe_form_topbar with the new <header> style
bzr revid: fp@tinyerp.com-20120604121139-zqoqbou9v2fdue5h
2012-06-04 14:11:39 +02:00
Fabien Pinckaers 623fd428bd [IMP] xml of topbars, removed oe_right, oe_clear
bzr revid: fp@tinyerp.com-20120604105056-xvos3jwt3i9wsqrb
2012-06-04 12:50:56 +02:00
Tejas Tank 733f236a4f config wizard cleanup
bzr revid: tta@openerp.com-20120530134613-bv6x9be14yho6nqr
2012-05-30 19:16:13 +05:30
Kuldeep Joshi (OpenERP) 7496ae5bf0 [IMP] set no one group
bzr revid: kjo@tinyerp.com-20120530101238-atvcsna2vc5jwad9
2012-05-30 15:42:38 +05:30
Fabien Pinckaers 5a78049c7a [merge] removed complexity and update applications
bzr revid: fp@tinyerp.com-20120523063913-kn324m7u80o5dgol
2012-05-23 08:39:13 +02:00
Fabien Pinckaers 5c791531aa [IMP] improved typos
bzr revid: fp@tinyerp.com-20120522161055-6013qr1s4p773hoj
2012-05-22 18:10:55 +02:00
Fabien Pinckaers b3fa4ccf5c [IMP] removed icons from topbar
bzr revid: fp@tinyerp.com-20120522091445-mpiknieg2v8sd31f
2012-05-22 11:14:45 +02:00
Fabien Pinckaers ee566d388c [IMP] merged topbar status widgets
bzr revid: fp@tinyerp.com-20120522085037-oktkq3td2hg9lvzr
2012-05-22 10:50:37 +02:00
Mayur Maheshwari (OpenERP) ea859f54c8 [IMP]all: remove a complexity in openerp and move asset management and Payroll in extra modules
bzr revid: mma@tinyerp.com-20120518052605-e6sdmicwtb4kcoq0
2012-05-18 10:56:05 +05:30
Amit Patel (OpenERP) 1aefff9733 [MERGE]:merged from trunk
bzr revid: apa@tinyerp.com-20120517101517-npk57s14kgxlk7in
2012-05-17 15:45:17 +05:30
Raphael Collet bcb9291df3 [MERGE] from trunk
bzr revid: rco@openerp.com-20120514150926-osvdmdyopi6ynn6o
2012-05-14 17:09:26 +02:00
Launchpad Translations on behalf of openerp 420e45e139 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120511051518-305vmplvaiu2zncy
bzr revid: launchpad_translations_on_behalf_of_openerp-20120512054219-7jxlr0c1whe4vrob
bzr revid: launchpad_translations_on_behalf_of_openerp-20120513044345-ujj9bgbnd64gpfnz
bzr revid: launchpad_translations_on_behalf_of_openerp-20120514044358-vu4410a564766u5f
2012-05-14 04:43:58 +00:00
Raphael Collet 45a864c139 [IMP] adapt po files to label changes, to ease translations
bzr revid: rco@openerp.com-20120510132150-bxw8anyiunr5mzoi
2012-05-10 15:21:50 +02:00
Saurang Suthar (OpenERP) a2a05cfc19 [IMP]:improved titles State by Status everywhere
bzr revid: ssu@tinyerp.com-20120504115748-2vd1dns7bxptg384
2012-05-04 17:27:48 +05:30
Mayur Maheshwari (OpenERP) acfd8ab255 [IMP]hr_payroll : Added state and buttons on top bar
bzr revid: mma@tinyerp.com-20120503132018-dohip75it2rwgqmm
2012-05-03 18:50:18 +05:30
Jagdish Panchal (Open ERP) 7dbf665c5d [IMP] HR: Rename field in configuration wizard of hr application, add new field and change the position of field
bzr revid: jap@tinyerp.com-20120427104359-4r9cwx0637y57f0g
2012-04-27 16:13:59 +05:30
Mayur Maheshwari (OpenERP) c71446957f [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20120426091833-ocminkwzjkntdkde
2012-04-26 14:48:33 +05:30
Raphael Collet e4efcb808d [IMP] hr*: remove group_extended
bzr revid: rco@openerp.com-20120425141135-9jgai7os8mxj80go
2012-04-25 16:11:35 +02:00
Mayur Maheshwari (OpenERP) 9e59ce8812 [IMP]all: Improve all typos
bzr revid: mma@tinyerp.com-20120424060532-ohrf0sxwq8rpq6ls
2012-04-24 11:35:32 +05:30
Launchpad Translations on behalf of openerp 75daaf4123 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120419043835-l1vrldcmgh9o6s0c
2012-04-19 04:38:35 +00:00
Launchpad Translations on behalf of openerp 79c1e97479 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120418044206-a2vk0nr789l7d42j
bzr revid: launchpad_translations_on_behalf_of_openerp-20120418045743-hzbql3f1knlrc5yh
2012-04-18 04:57:43 +00:00
Launchpad Translations on behalf of openerp dfda972285 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120417045202-9zgk4szsg252hiln
bzr revid: launchpad_translations_on_behalf_of_openerp-20120417052401-zew26x0fyljrziw5
2012-04-17 05:24:01 +00:00
Launchpad Translations on behalf of openerp 876f092244 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120414045803-1rv00b0kwk1mpv71
bzr revid: launchpad_translations_on_behalf_of_openerp-20120415044258-ajcrqt4n8657dmm2
bzr revid: launchpad_translations_on_behalf_of_openerp-20120416044107-arc2q29ue5n7szmx
bzr revid: launchpad_translations_on_behalf_of_openerp-20120407050332-buq5bktv391us3gy
bzr revid: launchpad_translations_on_behalf_of_openerp-20120409050207-ze633yedjkb17kta
bzr revid: launchpad_translations_on_behalf_of_openerp-20120410050225-xyadncrywlfnh100
bzr revid: launchpad_translations_on_behalf_of_openerp-20120413053835-4sd9w9m9bai7vu3s
bzr revid: launchpad_translations_on_behalf_of_openerp-20120414050449-ru2otwgxyto3vms0
bzr revid: launchpad_translations_on_behalf_of_openerp-20120415044852-h5zx5a8e1lk6eit2
bzr revid: launchpad_translations_on_behalf_of_openerp-20120416045035-ghs2iw9qcuwumwyy
2012-04-16 04:50:35 +00:00
Raphael Collet 068619bf8f [IMP] hr.config.settings: improve code and form layout
bzr revid: rco@openerp.com-20120410115219-78ydkfe521am7g5n
2012-04-10 13:52:19 +02:00
Raphael Collet 63673df964 [IMP] hr*: rename model of config wizard to hr.config.settings
bzr revid: rco@openerp.com-20120410105632-n0bvdklu1ttlxcsa
2012-04-10 12:56:32 +02:00
Raphael Collet b91d41bce7 [MERGE] from trunk
bzr revid: rco@openerp.com-20120410104839-pv9kmiizwv0w8e8f
2012-04-10 12:48:39 +02:00
Raphael Collet 040deac7df [IMP] hr*: fix copyright on res_config.py files
bzr revid: rco@openerp.com-20120410095642-zwpfi3rpodznvza6
2012-04-10 11:56:42 +02:00
DBR (OpenERP) 8d0ab9cd1c [ADD,IMP] HR : Add configuarion files in hr_payroll and set remove module_hr_payroll fields from hr config file
bzr revid: dbr@tinyerp.com-20120405063156-6usu8opc7ntejp2e
2012-04-05 12:01:56 +05:30
Launchpad Translations on behalf of openerp 0634b27f7c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120404044121-394vbp6i7nu4yf2g
bzr revid: launchpad_translations_on_behalf_of_openerp-20120405044345-1akl9s0cao4bjyeb
2012-04-05 04:43:45 +00:00
Meera Trambadia (OpenERP) 0e8ccd774d [MERGE] branch merged with openobject-addons
bzr revid: mtr@tinyerp.com-20120326114847-6yju1vy8h7a33iwv
2012-03-26 17:18:47 +05:30
Jagdish Panchal (Open ERP) 8dc623fb21 [IMP] HR: change sequence of menus and apply group_no_one
bzr revid: jap@tinyerp.com-20120322123823-gpn075d2e09etchq
2012-03-22 18:08:23 +05:30
Jagdish Panchal (Open ERP) 9ab663db09 [IMP] HR: apply group_no_one on menus Categories structure,Job Positions, Contract Types,Attendance Reasons,Stages, Degrees, Sources of Applicants,Salary Structures Hierarchy, Salary Rule Categories, Salary Rule Categories Hierarchy, Salary Rules
bzr revid: jap@tinyerp.com-20120316104313-f3f7234wi8yg98zb
2012-03-16 16:13:13 +05:30