Commit Graph

1198 Commits

Author SHA1 Message Date
Cecile Tonglet a3939acfa5 [FIX] replace from/import decimal_precision by from/import openerp.addons.decimal_precision
bzr revid: cto@openerp.com-20121217152303-8e3b1x30rlw9cb0d
2012-12-17 16:23:03 +01:00
Cecile Tonglet 15fe515601 [MERGE] From trunk
bzr revid: cto@openerp.com-20121217144306-tkodwpox30cuvb28
2012-12-17 15:43:06 +01:00
Launchpad Translations on behalf of openerp a7ddf7c689 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121217044754-0kl222skaeva43lx
bzr revid: launchpad_translations_on_behalf_of_openerp-20121216050743-iza21869j5keaqi5
bzr revid: launchpad_translations_on_behalf_of_openerp-20121217045834-1f6wbi5gkmzotgsl
2012-12-17 04:58:34 +00:00
Launchpad Translations on behalf of openerp 809c92fdef Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121214053618-1gz9xun2cb10afle
bzr revid: launchpad_translations_on_behalf_of_openerp-20121215050358-th0pl9jeams3pwkr
bzr revid: launchpad_translations_on_behalf_of_openerp-20121215050620-y27swfcuh62k8u32
bzr revid: launchpad_translations_on_behalf_of_openerp-20121215051723-6cnx1julk94gkm66
2012-12-15 05:17:23 +00:00
Launchpad Translations on behalf of openerp cc8025387b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121214053905-mac64ijay9566opr
bzr revid: launchpad_translations_on_behalf_of_openerp-20121214054902-12ndwftreb4g1964
2012-12-14 05:49:02 +00:00
Launchpad Translations on behalf of openerp d6ea61789f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121213044507-t1hpxi43gks88w2e
bzr revid: launchpad_translations_on_behalf_of_openerp-20121213050131-3r9t674ehhnkneky
2012-12-13 05:01:31 +00:00
Launchpad Translations on behalf of openerp cc69fe1b25 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121211044948-8q9vf1f9ftrzq4wm
bzr revid: launchpad_translations_on_behalf_of_openerp-20121211050318-3noic2ymt0j497rw
2012-12-11 05:03:18 +00: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
Launchpad Translations on behalf of openerp 683f31e51b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121204055506-fin73s7n3o52fmuy
bzr revid: launchpad_translations_on_behalf_of_openerp-20121204055956-fsd4tp3felpk8pm5
2012-12-04 05:59:56 +00:00
Olivier Dony 308e4f1073 [I18N] Removed duplicated terms for inherited [_sql]_constraints -> 400 terms removed
bzr revid: odo@openerp.com-20121203162755-p71dnn0k0t2b98yp
2012-12-03 17:27:55 +01:00
Launchpad Translations on behalf of openerp c0d74ff9a5 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121202043859-e4rnpga3ab08i8ks
2012-12-02 04:38:59 +00:00
Launchpad Translations on behalf of openerp f12df4e8ea Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121130050827-124dy1fyx1f113n9
bzr revid: launchpad_translations_on_behalf_of_openerp-20121130051820-ru59ffbuvhm96b8l
2012-11-30 05:18:20 +00:00
Launchpad Translations on behalf of openerp 828cce9be0 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121125063324-fjz8k77annh364u7
bzr revid: launchpad_translations_on_behalf_of_openerp-20121126044235-u20vi1440dgppikf
bzr revid: launchpad_translations_on_behalf_of_openerp-20121125064209-s515ia18188hl147
bzr revid: launchpad_translations_on_behalf_of_openerp-20121126045508-rm6d2mx71a0sjqh9
2012-11-26 04:55:08 +00:00
Launchpad Translations on behalf of openerp 117bf937b9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121124055830-p04ni2o2ogsch9zc
bzr revid: launchpad_translations_on_behalf_of_openerp-20121124065500-zwtkurcb1ic9ktqb
bzr revid: launchpad_translations_on_behalf_of_openerp-20121124070752-itto1xb6r6oao3z5
2012-11-24 07:07:52 +00:00
Olivier Dony 771b216118 [I18N] Update translation templates in preparation for 7.0 release
bzr revid: odo@openerp.com-20121124030804-9dvr1qwec830p8fc
2012-11-24 04:08:04 +01:00
Fabien Pinckaers 91a06febe8 [MERGE] fix demo data for payroll
bzr revid: fp@tinyerp.com-20121113081330-0vytlyg5524uvdtv
2012-11-13 09:13:30 +01:00
Fabien Pinckaers 8fe74c7900 [MERGE] do not delete confirmed payslip
bzr revid: fp@tinyerp.com-20121113075733-kidt1mqc9tf8xayh
2012-11-13 08:57:33 +01:00
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