Commit Graph
343 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
qdp-launchpad@tinyerp.com 8e199aadc8 [IMP] account, hr_attendance, hr_timesheet: typo, remove empty lines
[FIX] account_coda: remove wrong comment

bzr revid: qdp-launchpad@tinyerp.com-20100618135520-b1k3la6hsfxs7xuh
2010-06-18 15:55:20 +02: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 fd1578daec [MERGE] merge the changes from trunk main branch.
bzr revid: vra@tinyerp.com-20100618065505-qwivms0atr8ld3zr
2010-06-18 12:25:05 +05:30
Mustufa Rangwala 68f8c1d573 [MERGE]
bzr revid: mra@mra-laptop-20100618043703-1f7cn3iilchx7vxa
bzr revid: mra@mra-laptop-20100618062143-vkgjue5qzdimp96z
2010-06-18 11:51:43 +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
uco (OpenERP) 7095168648 [IMP]: Changed sequences of all main menus.
bzr revid: uco@tinyerp.com-20100617121652-5n6zb5zbk07pztn3
2010-06-17 17:46:52 +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
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
sbh (Open ERP) f45e7c7fa0 [Fix] Account :Fix the problem of menu
bzr revid: sbh@tinyerp.com-20100614114917-v2kl59y4p6cp9r6a
2010-06-14 17:19:17 +05:30
JMA (OpenERP) 291f6cc29b [MERGE] Merge the changes from main trunk branch.
bzr revid: jma@tinyerp.com-20100614104704-tg3nf2v0v167m78z
2010-06-14 16:17:04 +05:30
atp (Open ERP) ccbae1ff08 [IMP]: Minor improvement in yaml file for hr_timesheet_sheet module
bzr revid: atp@tinyerp.co.in-20100614075556-42nirrpbbuxc5h1b
2010-06-14 13:25:56 +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
JMA (OpenERP) 4cf1362e3b [FIX] Security fixes for sql injections
bzr revid: jma@tinyerp.com-20100610133419-fwbc1xp0xoq77n90
2010-06-10 19:04:19 +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) af56ff4bec [MERGE] : Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
bzr revid: sbh@tinyerp.com-20100608110449-f1ygdmhpje242s92
2010-06-08 16:34:49 +05:30
sbh (Open ERP) 395cab9013 hr_timesheet: put the comment of code
bzr revid: sbh@tinyerp.com-20100608103747-yxtmv7drdqidtk1q
2010-06-08 16:07:47 +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) 24dc10e94d Task-919 : Merge the board_project into scrum,project,project_planning,hr_timesheet_sheet
bzr revid: sbh@tinyerp.com-20100608081458-ma9lig9wdm3qmn5q
2010-06-08 13:44:58 +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
nel@tinyerp.com 3621f20374 [IMP] Timesheet
bzr revid: nel@tinyerp.com-20100607104921-o0n8qctydiqegyvf
2010-06-07 12:49:21 +02:00
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
Vir (Open ERP) 06b5dc6d57 [Merge] Usability changes
bzr revid: vir@tinyerp.com-20100602133411-rlijqoxpuxkp3n00
2010-06-02 19:04:11 +05:30
atp (Open ERP) 71ce875c62 [IMP]: hr_timesheet_sheet: add yaml file in test tag in __openerp__.py file inplace of demo.
bzr revid: atp@tinyerp.co.in-20100601061310-ftn7jw8t57y83qkk
2010-06-01 11:43:10 +05:30
atp (Open ERP) 77d6728006 [ADD]: hr_timesheet_sheet: develop yaml for hr_timesheet_sheet module.
bzr revid: atp@tinyerp.co.in-20100531122943-5vc1sbbecjn98pwf
2010-05-31 17:59:43 +05:30
mra (Open ERP) 850bb48ef4 [IMP] hr_timesheet_sheet: View improve (Ref: PSI)
bzr revid: mra@tinyerp.com-20100528114857-9fbov2scutngzhdo
2010-05-28 17:18:57 +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
Jay (Open ERP) f388ea5445 [REF]
bzr revid: jvo@tinyerp.com-20100526082837-dzd3mu7n6y5p1x4c
2010-05-26 13:58:37 +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
hmo 6df9520176 [MERGE] merged with lp:~openerp/openobject-addons/trunk/
bzr revid: hmo@hmo-20100525083015-2fqs62tiep4kr7ap
2010-05-25 14:00:15 +05:30
hmo e11cabf227 [MERGE] improvement in search view ,group by expand=1 and extended options expand=0
bzr revid: hmo@hmo-20100525080645-cekihacs169j9m1b
2010-05-25 13:36:45 +05:30
vra bd419043cb [MERGE] Merged from main branch
bzr revid: vra@tinyerp.com-20100525050516-lhlkcw476t16w0lf
2010-05-25 10:35:16 +05:30
mra (Open ERP) a8241d9449 [MERGE] Merge with trunk addons
bzr revid: mra@tinyerp.com-20100524073029-2tcjnhcafmwip5d4
bzr revid: mra@tinyerp.com-20100525041542-f23qvsxn861qc97i
2010-05-25 09:45:42 +05:30
Launchpad Code Hosting fa35e46d75 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100525034256-wcpl75uif4braq7u
2010-05-25 04:42:56 +01:00
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
ksa (Open ERP) d359e085a6 [IMP] Apply improvement in search view ,group by expand=1 and extended options expand=0
bzr revid: ksa@tinyerp.co.in-20100524062613-bfzk6smcewhcr25c
2010-05-24 11:56:13 +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
JMA (OpenERP) e277449755 [REF]
bzr revid: jma@tinyerp.com-20100521125831-rqe512penoei0kqz
2010-05-21 18:28:31 +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
mra (Open ERP) 38dd957438 [MERGE] Merge with main branch
bzr revid: mra@tinyerp.com-20100520041631-90wyd7ouhnpgwy6a
2010-05-20 09:46:31 +05:30
Fabien Pinckaers a3dd9f05dc [FIX] 3 security rules, [IMP] object names for logs
bzr revid: fp@tinyerp.com-20100519183232-9zieyfnah526r312
2010-05-19 20:32:32 +02:00
Jay (Open ERP) 206aad724a [BACKPORT] Stable fixes and refactorings to trunk
bzr revid: jvo@tinyerp.com-20100519155731-ihlx53vj31ni7d01
2010-05-19 21:27:31 +05:30