Commit Graph
347 Commits
Author SHA1 Message Date
Launchpad Code Hosting 09fa5d4fb2 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100624034728-gyv0119m128veldp
2010-06-24 04:47:28 +01:00
Launchpad Code Hosting ad0129985e Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100622042050-gbet3uvllvx7vhyu
2010-06-22 05:20:50 +01:00
Mustufa Rangwala 3be7801205 [MERGE] merge with trunk addons and remove conficts
bzr revid: mra@mra-laptop-20100618083859-5jbrk4u9l2vojxu6
2010-06-18 14:08:59 +05:30
vra 22ca2fd839 [MERGE] Merge the changes from main trunk branch.
bzr revid: vra@tinyerp.com-20100618052116-lbcdxkqh4cqv1xlt
2010-06-18 10:51:16 +05:30
Mustufa Rangwala ec23bbbe73 [MERGE]
bzr revid: mra@mra-laptop-20100617071519-u4kb74yay8v55q08
bzr revid: mra@mra-laptop-20100617103236-ac03zl97wcvuu7bu
bzr revid: mra@mra-laptop-20100617131201-lorh9maj58oagbnh
2010-06-17 18:42:01 +05:30
Mustufa Rangwala a69889cb91 [MERGE]
bzr revid: mra@mra-laptop-20100616132917-468ufwdm4xzqe90e
2010-06-16 18:59:17 +05:30
uco (OpenERP) 2a29eb4566 [MERGE]: Merged with trunk-addons
bzr revid: uco@tinyerp.com-20100616115456-xhcg3wah0vwnk01q
2010-06-16 17:24:56 +05:30
vra bf8d2a73c0 [IMP][REF] Sql-injection changes, remove print statement, some space improvement.
bzr revid: vra@tinyerp.com-20100616115139-cql5oiqf622spa6p
2010-06-16 17:21:39 +05:30
uco (OpenERP) 2bfffa9e1a [IMP] mrp, purchase, stock, hr, project: Re-organized menus.
bzr revid: uco@tinyerp.com-20100616114359-5l1fa5ht1k59wvlr
2010-06-16 17:13:59 +05:30
Vir (Open ERP) e28676b821 [MOD,IMP] point_of_sale : improvements in pos order report, account,hr,mrp,project,stock: changes in icons
bzr revid: vir@tinyerp.com-20100616114141-l6nbfgc6wsof1hzh
2010-06-16 17:11:41 +05:30
Mustufa Rangwala e2c0ba196e [MERGE] merge with trunk
bzr revid: mra@mra-laptop-20100614044510-iffai5yviiknzqfa
2010-06-14 10:15:10 +05:30
Fabien Pinckaers 85ba0d3d1d [IMP] improve views, reviewed widget=selection
bzr revid: fp@tinyerp.com-20100612174933-pr33o0l3ho2z4dai
2010-06-12 19:49:33 +02:00
Mustufa Rangwala 2ef34e8773 [MERGE]
bzr revid: mra@mra-laptop-20100611125732-bacf2l409og8pncb
2010-06-11 18:27:32 +05:30
Fabien Pinckaers 672f3e8d6c [IMP] access rights improvements
bzr revid: fp@tinyerp.com-20100611125528-mlhkzlditz2awk1k
2010-06-11 14:55:28 +02:00
psi (Open ERP) 5bf5f81b7a [MERGE] merge with dev addons3 branch
bzr revid: psi@tinyerp.co.in-20100610094230-fs2zdfmy7m7ffsej
2010-06-10 15:12:30 +05:30
psi (Open ERP) 2a6a0af029 [IMP] hr_hoidays:Change is demo data, hr_recruitment: add a new field of type char
bzr revid: psi@tinyerp.co.in-20100610093638-n5bj4ptgicyd49ct
2010-06-10 15:06:38 +05:30
Mustufa Rangwala c9e2f6a493 [MERGE] atp branch for yaml hr modules (has some problems will be solved)
bzr revid: mra@mra-laptop-20100610092802-bgs4ula327mt6ydc
2010-06-10 14:58:02 +05:30
sbh (Open ERP) d22735f5ba [ADD]: Add description for All module where dashboards are added
bzr revid: sbh@tinyerp.com-20100609085435-ga581uf4dgg2st9h
2010-06-09 14:24:35 +05:30
atp (Open ERP) 07019ad6ca [MERGE]: merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
bzr revid: atp@tinyerp.co.in-20100608100934-nt8ya0loh7h2rmlx
2010-06-08 15:39:34 +05:30
sbh (Open ERP) 517a706a60 [IMP] HR: Merge the board_hr with hr module
bzr revid: sbh@tinyerp.com-20100608074036-266qa8r60drrx41f
2010-06-08 13:10:36 +05:30
Vir (Open ERP) 222abd4e03 [MOD,IMP] hr_expense,hr_holidays,hr_recruitment,hr_timesheet,hr_timesheet_invoice_hr_timesheet_sheet : Icons are changed to new icons
bzr revid: vir@tinyerp.com-20100604060225-0q1hy0m129m3ifah
2010-06-04 11:32:25 +05:30
mra (Open ERP) 596afa285c [MERGE] Merge with main branch
bzr revid: mra@tinyerp.com-20100531032205-4e20l0p31hxs3wn1
2010-05-31 08:52:05 +05:30
Launchpad Code Hosting 48f88c1246 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100529035321-pmdc06jd7d0s5z4u
bzr revid: codehost@crowberry-20100530034446-g39k4m3i5ev8dpw4
bzr revid: codehost@crowberry-20100531034732-c5gljubmzzihgrco
2010-05-31 04:47:32 +01:00
atp (Open ERP) 87f2ff759d [IMP]: Minor Improvement in comment of yaml file.
bzr revid: atp@tinyerp.co.in-20100528105657-vhre832jnwh7elze
2010-05-28 16:26:57 +05:30
atp (Open ERP) 8e1d4d1946 [MERGE]: merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
bzr revid: atp@tinyerp.co.in-20100527053425-ombfy3edopdxuwtb
2010-05-27 11:04:25 +05:30
mra (Open ERP) e6aa74a6fa [MERGE] Merge with main trunk addons branch
bzr revid: mra@tinyerp.com-20100527030635-qd7ugz2oceezloe3
2010-05-27 08:36:35 +05:30
mra (Open ERP) 41d68124f2 [IMP] hr_holidays: search view of holidays minir improve
bzr revid: mra@tinyerp.com-20100526101925-me6z7t6bt9eq0s6a
2010-05-26 15:49:25 +05:30
atp (Open ERP) 0b2bf2d16e [Add]: hr_holidays: create yaml for hr_holidays module.
bzr revid: atp@tinyerp.co.in-20100526100702-08nskxmv56fy4nrw
2010-05-26 15:37:02 +05:30
mra (Open ERP) f1d7c9a0a3 [IMP] hr_holidays: improve code: Made separate method for creating and removing resoure leave
bzr revid: mra@tinyerp.com-20100526095456-l4vxnyrszenx2e8v
2010-05-26 15:24:56 +05:30
mra (Open ERP) 51be28793d [MERGE]
bzr revid: mra@tinyerp.com-20100526084950-uhf4kqygqqvtvi9g
2010-05-26 14:19:50 +05:30
Jay (Open ERP) f388ea5445 [REF]
bzr revid: jvo@tinyerp.com-20100526082837-dzd3mu7n6y5p1x4c
2010-05-26 13:58:37 +05:30
Jay (Open ERP) 17a30e204c [FIX] Resolved a committed conflict
bzr revid: jvo@tinyerp.com-20100526052921-6k18mel3o6u6mcr3
2010-05-26 10:59:21 +05:30
vra 110b37954d [MERGE] Merged from main branch
bzr revid: vra@tinyerp.com-20100526051022-ylqotlgwi95j6mvm
2010-05-26 10:40:22 +05:30
mra (Open ERP) 45df657eb9 [MERGE]
bzr revid: mra@tinyerp.com-20100526045215-2yitn5wri6b18zwl
2010-05-26 10:22:15 +05:30
hmo 62a86ade0d [MERGE] merged useabiity work from lp:~openerp-commiter/openobject-addons/trunk_useability_addons/
bzr revid: hmo@hmo-20100525163303-0la5uyj7e23dgvk9
2010-05-25 22:03:03 +05:30
apa-tiny e03b956d0c [IMP]:hr_holidays:Improved Code.
bzr revid: apa@tinyerp.com-20100525123503-fud2emceh9p3ks0g
2010-05-25 18:05:03 +05:30
ksa (Open ERP) 0711bf6e86 [IMP] task-776 set group by expand=1,extended option expand=0
bzr revid: ksa@tinyerp.co.in-20100525104805-7xz30wflr4yj7gs0
2010-05-25 16:18:05 +05:30
psi (Open ERP) 1e4b9639c6 [IMP] hr_holidays:Improve Search view of reports
bzr revid: psi@tinyerp.co.in-20100525051555-lpb7tfbs53m71w9c
2010-05-25 10:45:55 +05:30
psi (Open ERP) 0419df7b9d [IMP] hr_holidays: Change discription for allocation leaves
bzr revid: psi@tinyerp.co.in-20100524125449-zwideq8idx6kj0z6
2010-05-24 18:24:49 +05:30
psi (Open ERP) 04601c0f95 [IMP] hr_holidays: Change in demo data and improve search view for report
bzr revid: psi@tinyerp.co.in-20100524123525-rumvu781euw3dav2
2010-05-24 18:05:25 +05:30
hmo 9330c43cda [MERGE] merged lp:~openerp/openobject-addons/trunk
bzr revid: hmo@hmo-20100524091232-ko5oezpr7j866ngo
2010-05-24 14:42:32 +05:30
vra ff1b4fd3f0 [MERGE] Merged from main branch.
bzr revid: vra@tinyerp.com-20100524081117-s63vktc1m3grcu8v
2010-05-24 13:41:17 +05:30
psi (Open ERP) 46c1bd4e24 [IMP] hr_holidays: Improve view and change in demo data
bzr revid: psi@tinyerp.co.in-20100524073052-0gumt324nzs34wsr
2010-05-24 13:00:52 +05:30
psi (Open ERP) c11b19a78a [MERGE] Merge with dev-addons3 Branch
bzr revid: psi@tinyerp.co.in-20100524045320-qwjsfofadfxodf31
bzr revid: psi@tinyerp.co.in-20100524050632-ufvagxpmsujrw3nm
2010-05-24 10:36:32 +05:30
mra (Open ERP) 95ee96a179 [FIX] hr_holidays
bzr revid: mra@tinyerp.com-20100524050217-5mkk06z1q1d6lxu8
2010-05-24 10:32:17 +05:30
mra (Open ERP) dd874eb878 [MERGE] Merge with trunk addons branch (Remove conflicts for hr_holidays report, project and hr_timesheet_sheet report)
bzr revid: mra@tinyerp.com-20100524044002-3r81xso5ljy1qkkw
2010-05-24 10:10:02 +05:30
psi (Open ERP) 174162b344 [IMP] hr_holidays: Bug fix and Improve demo data
bzr revid: psi@tinyerp.co.in-20100521134658-wo4egxgfu57qk6c2
2010-05-21 19:16:58 +05:30
psi (Open ERP) e22621085b [IMP] hr_holidays: Improve views and misc changes
bzr revid: psi@tinyerp.co.in-20100521105815-nksa5emczxbal238
2010-05-21 16:28:15 +05:30
psi (Open ERP) 48e2594272 [IMP] hr_holidays: Improve demo data, hr_timesheet_invoice:Imoprove search view
bzr revid: psi@tinyerp.co.in-20100521064654-buj0bu0pwaxfj8eu
2010-05-21 12:16:54 +05:30
nel@tinyerp.com 8ec9a7a780 [MERGE] from trunk addons
bzr revid: nel@tinyerp.com-20100520133040-g1ylbrdwfju4r1sz
2010-05-20 15:30:40 +02:00