Commit Graph

265 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 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
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 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
Launchpad Translations on behalf of openerp 7113965a6d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121113051721-ejf86rj1g6qkdbo9
2012-11-13 05:17:21 +00:00
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
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) 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
Quentin (OpenERP) 00f3dfc6d8 [MERGE] use of formatLAng(amount, currency_obj=...) and use of display_address() in reports
bzr revid: qdp-launchpad@openerp.com-20121012071640-sxhy9xnat65r8158
2012-10-12 09:16:40 +02:00
Fabien Pinckaers 914498d2ff [MERGE] trunk
bzr revid: fp@tinyerp.com-20121011081908-fu1don49seb3loro
2012-10-11 10:19:08 +02:00
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
pankita shah (Open ERP) 9b01d91679 [IMP] currency in l10_in_hr_payroll
bzr revid: shp@tinyerp.com-20121003071421-c5kd08mhiumoh6fv
2012-10-03 12:44:21 +05:30
Atul Patel (OpenERP) 8d3086df28 [IMP]: Use display_address()
bzr revid: atp@tinyerp.com-20121002144547-kpbo8wv694qipvm0
2012-10-02 20:15: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
Nimesh (Open ERP) 8c42299413 [REMOVE] remove create button form all posgress report.
bzr revid: nco@tinyerp.com-20120927083839-ruhpxzwgdyasodfe
2012-09-27 14:08:39 +05:30
Twinkle Christian (OpenERP) 3795da5211 [IMP]Remove type field from the l10n_in_hr_payroll
bzr revid: tch@tinyerp.com-20120910111501-aj9g177cvhnw2whp
2012-09-10 16:45:01 +05:30
Fabien Pinckaers bce12722a3 [MERGE] l10n_india_payroll
bzr revid: fp@tinyerp.com-20120907153158-3fa4aebapki0fhw9
2012-09-07 17:31:58 +02:00
Khushboo Bhatt (Open ERP) eb57fb1503 [FIX]l10n_in_hr_payroll:python code for rules
bzr revid: kbh@tinyerp.com-20120830054908-7j6vydmwwfzsoned
2012-08-30 11:19:08 +05:30
Mustufa Rangwala (OpenERP) 95c0fec699 [MERGE] l10n_in_hr_payroll: Improve salary rules
bzr revid: mra@tinyerp.com-20120829121912-rhsuygls3ot6yn9s
2012-08-29 17:49:12 +05:30
Khushboo Bhatt (Open ERP) 699720066b [FIX]l10n_in_hr_payroll:description added
bzr revid: kbh@tinyerp.com-20120829110528-mcvijjnfzt5xj594
2012-08-29 16:35:28 +05:30
Khushboo Bhatt (Open ERP) c42ba7020b [FIX]l10n_in_hr_payroll:All company contribution will not appear on the payslip excepts if company deduction from employee salary
bzr revid: kbh@tinyerp.com-20120829102834-o52m2hyq69783ao1
2012-08-29 15:58:34 +05:30
Khushboo Bhatt (Open ERP) b1724905d4 [FIX]l10n_in_hr_payroll:rules improved,help updated
bzr revid: kbh@tinyerp.com-20120829094252-wzdygt5muwcuochl
2012-08-29 15:12:52 +05:30
Mustufa Rangwala (OpenERP) 6aa5ea647f [IMP] l10n_in_hr_payroll: typo
bzr revid: mra@tinyerp.com-20120827052843-tx702vetryimkldk
2012-08-27 10:58:43 +05:30
Mustufa Rangwala (OpenERP) ee80611902 [IMP] l10n_in_hr_payroll: typo
bzr revid: mra@tinyerp.com-20120827051507-d6jpql116j7s8q3k
2012-08-27 10:45:07 +05:30
Mustufa Rangwala (OpenERP) 239012ff9d [FIX] l10n_in_hr_payroll: small fix
bzr revid: mra@tinyerp.com-20120824114341-cah1258419d439ge
2012-08-24 17:13:41 +05:30
Mustufa Rangwala (OpenERP) 47e33a1d70 [FIX] l10n_in_hr_payroll: small fix
bzr revid: mra@tinyerp.com-20120824110146-n70knsb0c1fn5sfe
2012-08-24 16:31:46 +05:30
Mustufa Rangwala (OpenERP) 599ef6b960 [FIX] l10n_in_hr_payroll:access for payslip report object
bzr revid: mra@tinyerp.com-20120824105441-zpmeznbhwkdznr3e
2012-08-24 16:24:41 +05:30
Mustufa Rangwala (OpenERP) 76bbd83c30 [MERGE] l10n_in_hr_payrol: typo
bzr revid: mra@tinyerp.com-20120824105120-vzp8avej8tyofwx5
2012-08-24 16:21:20 +05:30
Mustufa Rangwala (OpenERP) 8335b55e87 [FIX] l10n_in_hr_payrol: Remove food coupan register for dedcution
bzr revid: mra@tinyerp.com-20120824104031-0je3kogotvsh7i64
2012-08-24 16:10:31 +05:30
Khushboo Bhatt (Open ERP) bcf9ef416e [FIX]l10n_in_hr_payroll:changed name of inputs
bzr revid: kbh@tinyerp.com-20120824103410-lvecrt1ov2szsjvw
2012-08-24 16:04:10 +05:30
Mustufa Rangwala (OpenERP) 9d96cf77b0 [MERGE] l10n_in_hr_payroll: Add payslip analysis report
bzr revid: mra@tinyerp.com-20120824103056-x0ag10f4ih6awrcl
2012-08-24 16:00:56 +05:30
Khushboo Bhatt (Open ERP) d3eac6d18a [ADD]l10n_in_hr_payroll:added postgres report for payslip and palyslip lines
bzr revid: kbh@tinyerp.com-20120824093657-dlw1d0bh39cg7h79
2012-08-24 15:06:57 +05:30
Mustufa Rangwala (OpenERP) d690ebdf16 [MERGE] l10n_in_hr_payroll: report improved
bzr revid: mra@tinyerp.com-20120823110835-h33lannwn66c5c34
2012-08-23 16:38:35 +05:30
Khushboo Bhatt (Open ERP) e2e266e9ad [FIX]l10n_in_hr_payroll:basic,gross and net with amount are bold,removed header
bzr revid: kbh@tinyerp.com-20120823091432-irrs4yxn9xir0fz2
2012-08-23 14:44:32 +05:30
Khushboo Bhatt (Open ERP) 5f8de6a93d [FIX]l10n_in_hr_payroll:basic,gross and net are bold
bzr revid: kbh@tinyerp.com-20120823071656-jedj3au7gyv829mq
2012-08-23 12:46:56 +05:30
Khushboo Bhatt (Open ERP) abbfcc6634 [FIX]l10n_in_hr_payroll:left-right indent added and table width changed in report
bzr revid: kbh@tinyerp.com-20120823062120-p8mu9p3wat1xzdf8
2012-08-23 11:51:20 +05:30
Mustufa Rangwala (OpenERP) 62070621f6 [MERGE] l10n_in_hr_payroll: Changes on salary rules
bzr revid: mra@tinyerp.com-20120823053548-ty3d6mgxcpdlo9wr
2012-08-23 11:05:48 +05:30
Mustufa Rangwala (OpenERP) 05005a5ff3 [IMP] Typo
bzr revid: mra@tinyerp.com-20120823050404-yc5pbt3ezv0gu3li
2012-08-23 10:34:04 +05:30
Khushboo Bhatt (Open ERP) 8ad4dd41c8 [IMP]l10n_in_hr_payroll:note added
bzr revid: kbh@tinyerp.com-20120822132229-abjrha00701xbyd3
2012-08-22 18:52:29 +05:30
Khushboo Bhatt (Open ERP) 55ec89f7ee [IMP]l10n_in_hr_payroll:added rule for labour walfare fund.
bzr revid: kbh@tinyerp.com-20120822130945-xvwjnpf86eba0j1b
2012-08-22 18:39:45 +05:30
Khushboo Bhatt (Open ERP) 13485fd6b0 [IMP]l10n_in_hr_payroll:HRA rule improved,removed field.
bzr revid: kbh@tinyerp.com-20120822125933-bsiky3e4ttawry7a
2012-08-22 18:29:33 +05:30
Khushboo Bhatt (Open ERP) f958f6f064 [IMP/ADD]l10n_in_hr_payroll:improved salary rules and added inputs of salary rules
bzr revid: kbh@tinyerp.com-20120822123223-zlx1lhd06lnluqnz
2012-08-22 18:02:23 +05:30