Commit Graph

350 Commits

Author SHA1 Message Date
Simon Lejeune abf0b4feaa [FIX] l10n_in_hr_payroll: corrext xmlid of reports in test
bzr revid: sle@openerp.com-20140428100709-4css2uwquo74xe23
2014-04-28 12:07:09 +02:00
Simon Lejeune f9f304a781 [MERGE] l10n_in_hr_payroll reports converted to QWeb
bzr revid: sle@openerp.com-20140428093748-x4o2yjr6a8rje22p
2014-04-28 11:37:48 +02:00
Atul Patel (OpenERP) ae858f4d68 [IMP]: Rename report name report_hryearly salary
bzr revid: atp@tinyerp.com-20140425175230-sctyfvvn87c6exm9
2014-04-25 23:22:30 +05:30
Atul Patel (OpenERP) 105331f12a [FIX]: import osv file in report file. add stringin reportxml file
bzr revid: atp@tinyerp.com-20140425170524-fev2rr0uhycalp9h
2014-04-25 22:35:24 +05:30
Atul Patel (OpenERP) 1c1d9eee50 [ADD]: Add payroll advice report
bzr revid: atp@tinyerp.com-20140425163022-q4fw9zcx0f7n35ox
2014-04-25 22:00:22 +05:30
Sunil Sharma d75153f990 [imp]:improve title for allowances with basic
bzr revid: ssh@tinyerp.com-20140425130934-y3oho46frq1ss4p4
2014-04-25 18:39:34 +05:30
Sunil Sharma 18de18a29e [imp]:improve hr yearly salary detail tbody code
bzr revid: ssh@tinyerp.com-20140425130457-rh9fxo703956eyqx
2014-04-25 18:34:57 +05:30
Atul Patel (OpenERP) 1fadb254d5 [FIX]: Fix months count in yearly salary details
bzr revid: atp@tinyerp.com-20140425073719-7nlk18wuoxx3s39o
2014-04-25 13:07:19 +05:30
Atul Patel (OpenERP) be912b1d46 [FIX]: Add qweb xml into openerp.py file
bzr revid: atp@tinyerp.com-20140425042148-jkldr55vvxfrxnmy
2014-04-25 09:51:48 +05:30
Atul Patel (OpenERP) e2aa0707bb [FIX]: ADD formatLang function in date field. use h2 tag in report title.
bzr revid: atp@tinyerp.com-20140425041641-vk95pdxb8w3034ij
2014-04-25 09:46:41 +05:30
Sunil Sharma (OpenERP) 0b2467833a [MERGE]: Merged hr yearly salary details report.
bzr revid: atp@tinyerp.com-20140424164100-1e90drhti5595cr7
2014-04-24 22:11:00 +05:30
Sunil Sharma (OpenERP) 1c6b63a96e [MERGE]: Merged with qweb-report branch.
bzr revid: atp@tinyerp.com-20140424154553-3yk05u7chmc94odd
2014-04-24 21:15:53 +05:30
Sunil Sharma (OpenERP) 1e81e20cca [IMP]: Change function condition.
bzr revid: atp@tinyerp.com-20140424120202-jqbkr72y1a43dbpf
2014-04-24 17:32:02 +05:30
Sunil Sharma e5c1bf06a2 [imp]:remove br or text-center class then improve h2 or p tag
bzr revid: ssh@tinyerp.com-20140424105005-bcg7ynx571h25w3w
2014-04-24 16:20:05 +05:30
Rakesh Sindhav (OpenERP) 2949a395ba [IMP]: set the header to left side
bzr revid: rsi@tinyerp.com-20140424100150-0as1tmhipxo8tfdn
2014-04-24 15:31:50 +05:30
Sunil Sharma ad71e6b87c [imp]:improve th tag to td tag
bzr revid: ssh@tinyerp.com-20140424084402-gam7edp04qvyj7gu
2014-04-24 14:14:02 +05:30
Rakesh Sindhav (OpenERP) 504385cbc7 [MERGE]: Merged with qwebreport-l10n_in
bzr revid: rsi@tinyerp.com-20140424064445-8tnf5sn1tjo91buq
2014-04-24 12:14:45 +05:30
Rakesh Sindhav (OpenERP) c61a1b679e [IMP]: Add the padding to the child level
bzr revid: rsi@tinyerp.com-20140424052118-y92vvkbam7cwlklj
2014-04-24 10:51:18 +05:30
Sunil Sharma 45e74261e4 [imp]:improve use a text-center class
bzr revid: ssh@tinyerp.com-20140424044756-ls3g2mour8rmjtes
2014-04-24 10:17:56 +05:30
Atul Patel (OpenERP) 3446fe0695 [IMP]: Improve bootstrap class with span element.
bzr revid: atp@tinyerp.com-20140423183241-8c7442xgroxoik0s
2014-04-24 00:02:41 +05:30
Atul Patel (OpenERP) 2c042b1824 [IMP]: Renamed wrapped class
bzr revid: atp@tinyerp.com-20140423160740-qnz5k1bnjyybgk9v
2014-04-23 21:37:40 +05:30
Rakesh Sindhav (OpenERP) c43d5235a5 [ADD]: add the view file of Payslip Details
bzr revid: rsi@tinyerp.com-20140423133403-60ukgyi8uy4j6g4k
2014-04-23 19:04:03 +05:30
Rakesh Sindhav (OpenERP) 7932140dd1 [IMP]: convert rml to qweb report of Payslip Details
bzr revid: rsi@tinyerp.com-20140423133032-l1wxnoyytdakdnpx
2014-04-23 19:00:32 +05:30
Sunil Sharma f15123df69 [imp]:improve code firsr first call layout then foreach loop
bzr revid: ssh@tinyerp.com-20140423095339-lkswkyqyhw1cm6oj
2014-04-23 15:23:39 +05:30
Rakesh Sindhav (OpenERP) be542630e8 [IMP]: Code optimization in the view file
bzr revid: rsi@tinyerp.com-20140423065755-83tyantoitle2ow4
2014-04-23 12:27:55 +05:30
Sunil Sharma 06ca6d2540 [imp]:improve code
bzr revid: ssh@tinyerp.com-20140423052910-486im2lmzpqev14n
2014-04-23 10:59:10 +05:30
Rakesh Sindhav (OpenERP) f44148ba22 [IMP]: Optimize the code
bzr revid: rsi@tinyerp.com-20140422135308-ixhpb0d4lbbecl2z
2014-04-22 19:23:08 +05:30
Sunil Sharma 5fdb6292b1 [imp]:add qweb report and remove rml report
bzr revid: ssh@tinyerp.com-20140422123757-6wskvlwyltlyjvp0
2014-04-22 18:07:57 +05:30
Rakesh Sindhav (OpenERP) 166f735ce5 [IMP]: Remove the inline CSS
bzr revid: rsi@tinyerp.com-20140422120915-wpkrw1v1zmjugx5d
2014-04-22 17:39:15 +05:30
Launchpad Translations on behalf of openerp fa60b90c1f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
2014-04-22 07:52:47 +00:00
Rakesh Sindhav (OpenERP) 2e67cf77de [IMP]: Change the file attribute value in report
bzr revid: rsi@tinyerp.com-20140422053121-e146c69xlxbl3lum
2014-04-22 11:01:21 +05:30
Rakesh Sindhav (OpenERP) 7d72983357 [ADD]: Add the view file of the QWEB report
bzr revid: rsi@tinyerp.com-20140421095314-mq4o9qhi2efl5jai
2014-04-21 15:23:14 +05:30
Rakesh Sindhav (OpenERP) a491127ab9 [IMP]: l10n_in_hr_payroll: Convert Yearly Salary by Head report from RML report to QWEB
bzr revid: rsi@tinyerp.com-20140421091311-9ymvwu2g4nn3h630
2014-04-21 14:43:11 +05:30
Launchpad Translations on behalf of openerp e82fbf7d91 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
2014-04-12 08:31:53 +00:00
Launchpad Translations on behalf of openerp 51aa261b44 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
2014-03-27 07:35:04 +00:00
Launchpad Translations on behalf of openerp 9863dbe5c8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
2014-03-04 07:52:38 +00:00
Launchpad Translations on behalf of openerp 3ce5e01eca Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
2014-01-28 06:41:39 +00:00
Christophe Simonis bb1e256f5b [MERGE] forward port of branch saas-2 up to revid 9010 dle@openerp.com-20131125143003-vjtzj1c5051pdnk3
bzr revid: chs@openerp.com-20131125150054-b135qshkx6icakgk
2013-11-25 16:00:54 +01:00
Olivier Dony 44664076da [MERGE] Forward-port of latest 7.0 fixes up to rev 9618 rev-id: dle@openerp.com-20131120142131-s333lyva85cyn41o
bzr revid: odo@openerp.com-20131120144059-yyh7emvgdarff09b
bzr revid: odo@openerp.com-20131120144318-11nmn1zj00zmi10z
2013-11-20 15:43:18 +01:00
Christophe Simonis da00eab39a [FIX] l10n_in_hr_payroll: use xmlid instead of name searching salary rule categories (they may have been renamed, forbidding upgrade)
bzr revid: chs@openerp.com-20131120100623-ip33s4upffu1a52h
2013-11-20 11:06:23 +01:00
Launchpad Translations on behalf of openerp 08abc4345a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131112054140-gta82n1b3iww6qy5
bzr revid: launchpad_translations_on_behalf_of_openerp-20131031051733-nnutbi7hidixsxsb
bzr revid: launchpad_translations_on_behalf_of_openerp-20131102055746-d0emb2aocq3sq1d1
bzr revid: launchpad_translations_on_behalf_of_openerp-20131103052149-y4usleohxatdgczx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131105052928-1izkptj5zusflrvb
bzr revid: launchpad_translations_on_behalf_of_openerp-20131108054204-hrtuxxze2u1ivvez
bzr revid: launchpad_translations_on_behalf_of_openerp-20131110055420-zl5ang9w8lbcvt9d
bzr revid: launchpad_translations_on_behalf_of_openerp-20131111051738-smtttsszytn06ld4
bzr revid: launchpad_translations_on_behalf_of_openerp-20131112054158-7ewd3oxiyxg8s4zw
2013-11-12 05:41:58 +00:00
Launchpad Translations on behalf of openerp 108ccbf108 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114062958-ies8xa3pft7n59ms
bzr revid: launchpad_translations_on_behalf_of_openerp-20131106055135-r0xt2vr04710jh1t
bzr revid: launchpad_translations_on_behalf_of_openerp-20131107055120-r8z445ergt50erlx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131108062620-bvfofx1jl1wb1csh
bzr revid: launchpad_translations_on_behalf_of_openerp-20131110064525-ioceogsmu0nmx2qj
bzr revid: launchpad_translations_on_behalf_of_openerp-20131111053908-gbrp09ast5fhr6iw
bzr revid: launchpad_translations_on_behalf_of_openerp-20131112062316-5uf2bvbzdhkq1b7k
bzr revid: launchpad_translations_on_behalf_of_openerp-20131113060841-bkjcuz4e9rtzn6f9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114063058-rrm2q5lxkyawuvpz
2013-11-14 06:30:58 +00:00
Launchpad Translations on behalf of openerp 9dba69ba48 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130912064018-3vecn03jcu9fm1m8
2013-09-12 06:40:18 +00:00
Fabien Meghazi f58b15af48 [IMP] Remove deprecated manifest keys
bzr revid: fme@openerp.com-20130909110330-kl71n1km00gew1oo
2013-09-09 13:03:30 +02:00
Launchpad Translations on behalf of openerp cb8f9c5a0d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130903054857-i15nhvtthlho7chm
2013-09-03 05:48:57 +00:00
Launchpad Translations on behalf of openerp 08bf51a608 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130719063647-ajybj58frejzmzi1
bzr revid: launchpad_translations_on_behalf_of_openerp-20130720062338-fgevfrm113ns9ohh
bzr revid: launchpad_translations_on_behalf_of_openerp-20130722055949-auzq29nv6b2f3o10
2013-07-22 05:59:49 +00:00
Launchpad Translations on behalf of openerp d1a4e0aef0 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130711062622-v4muic3uqckueux5
bzr revid: launchpad_translations_on_behalf_of_openerp-20130712063505-m63repwd0zokfibu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130713063525-b30s09rh63t3zox4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130714055943-xf6jvk2dpoemt6qx
bzr revid: launchpad_translations_on_behalf_of_openerp-20130715051357-59o0nkhplh3e58mi
bzr revid: launchpad_translations_on_behalf_of_openerp-20130704054706-ace1fcr1vtruoc4s
bzr revid: launchpad_translations_on_behalf_of_openerp-20130705061311-4735gtnj7xjmuprg
bzr revid: launchpad_translations_on_behalf_of_openerp-20130712063510-g2yq0kxqgrx9x1df
bzr revid: launchpad_translations_on_behalf_of_openerp-20130713063533-7mjj5a7226xhtob6
bzr revid: launchpad_translations_on_behalf_of_openerp-20130714055945-h6jn755mtdcubvei
bzr revid: launchpad_translations_on_behalf_of_openerp-20130715051400-rra06yzfd7zw4bt0
2013-07-15 05:14:00 +00:00
Amit Bhavsar (Open ERP) b190137aa6 [Imp] improve view for Payslips Batches and Payment Advices.
bzr revid: amb@tinyerp.com-20130628104052-s9we23nm5gt2z5ht
2013-06-28 16:10:52 +05:30
Amit Bhavsar (Open ERP) 87443c86e0 [MERGE] merge with latest trunk
bzr revid: amb@tinyerp.com-20130628102353-3cdcw34d2e2x9c8c
2013-06-28 15:53:53 +05:30
Antony Lesuisse fc70550ca2 [IMP] move html module description and icon
bzr revid: al@openerp.com-20130628100441-swpanf2jwcojygh4
2013-06-28 12:04:41 +02:00