Commit Graph
157 Commits
Author SHA1 Message Date
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
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
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
Mustufa Rangwala af7acb8883 [MERGE] merge atp branch for hr yaml some bug fixes
bzr revid: mra@mra-laptop-20100614084805-r215yw9kyk0ljzkb
2010-06-14 14:18:05 +05:30
atp (Open ERP) 51f24907b0 [MERGE]: merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
bzr revid: atp@tinyerp.co.in-20100614054449-kov9r566gpvqohey
2010-06-14 11:14:49 +05:30
atp (Open ERP) 8e8c3e11b2 [IMP]: hr_attendance: Minor improvement in hr_attendance module.
bzr revid: atp@tinyerp.co.in-20100614050816-u9baptw3ptpt3lvd
2010-06-14 10:38:16 +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 65b70827c4 fix_and_better_access_rights
bzr revid: fp@tinyerp.com-20100612220005-4a33xqgs8bvvoa7x
2010-06-13 00:00:05 +02:00
Mustufa Rangwala 38c2a2ba3c [MERGE]
bzr revid: mra@mra-laptop-20100611133114-khn9zbugbolfp209
2010-06-11 19:01:14 +05:30
Fabien Pinckaers 1187aae83a [IMP] better views and security rules
bzr revid: fp@tinyerp.com-20100611130853-scoz86mdvte7ynwm
2010-06-11 15:08:53 +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
JMA (OpenERP) 4cf1362e3b [FIX] Security fixes for sql injections
bzr revid: jma@tinyerp.com-20100610133419-fwbc1xp0xoq77n90
2010-06-10 19:04:19 +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
Vir (Open ERP) 4ab90ab79f [IMP] hr,hr_attendance,hr_contract,hr_evaluation,idea,marketing_campaign,membership icon are modified to new icons, membership search view improved
bzr revid: vir@tinyerp.com-20100603134400-1zua9zqi6y6ty8ys
2010-06-03 19:14:00 +05:30
atp (Open ERP) 43b774e633 [ADD]: hr_attendance: add yaml for hr_attendance module.
bzr revid: atp@tinyerp.co.in-20100531081025-al9hw6umhed1t6vg
2010-05-31 13:40:25 +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
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
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
Launchpad Code Hosting 27dca2a6c7 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100519051216-2hu0shg576awh8rk
2010-05-19 06:12:16 +01:00
Vir (Open ERP) 441d653c59 [Merge] Merge with trunk addons
bzr revid: vir@tinyerp.com-20100514104208-jqi5k13n7k3bg1w0
2010-05-14 16:12:08 +05:30
Vir (Open ERP) bba3dcfe5a [MOD] general usability chabges
bzr revid: vir@tinyerp.com-20100513132923-y3uo7pzwmqhfmc91
2010-05-13 18:59:23 +05:30
Launchpad Code Hosting cf6db2b993 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100513043701-41cmj2olsqommizr
2010-05-13 05:37:01 +01:00
Rvo (Open ERP) 220d5b2f37 [IMP]: usability of HR
bzr revid: rvo@tinyerp.co.in-20100510125915-dqiyo6eeuygftuhc
2010-05-10 18:29:15 +05:30
Launchpad Code Hosting e07150a936 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100417042131-drtfxl7ucnpjuu7a
2010-04-17 05:21:31 +01:00
mra (Open ERP) 99f3afe6c2 [ADD] hr_attnedance: sign in and out wizard => OSV Memory convert
bzr revid: mra@tinyerp.com-20100414092142-4quidut8qyaum8al
2010-04-14 14:51:42 +05:30
mra (Open ERP) 4f203b20b0 [ADD] hr_attendance: Print timesheet by error => osv memory
bzr revid: mra@tinyerp.com-20100413070635-uqojhuuaed0qdfcb
2010-04-13 12:36:35 +05:30
mra (Open ERP) 62ed5f7d46 [ADD] hr_attendance: Print timesheet by week => osv memory
bzr revid: mra@tinyerp.com-20100413064024-1oncb1wygdqqnep0
2010-04-13 12:10:24 +05:30
mra (Open ERP) 8f64f3d3ed [ADD] hr_attendance: Print timesheet by month => osv memory
bzr revid: mra@tinyerp.com-20100413062529-4xt6lsx1pjws6am4
2010-04-13 11:55:29 +05:30
mra (Open ERP) 268e0e7427 [IMP] hr_attendance: Clean
bzr revid: mra@tinyerp.com-20100413053736-lsafjedycvt8xsbm
2010-04-13 11:07:36 +05:30
mra (Open ERP) 464c80d9d3 [IMP] hr_*: Put related button on employee form => timesheets,contracts,interviews
[REM] hr_*: Remove Sign In / Out by Project, Sign In / Out
wizards from employee form view

bzr revid: mra@tinyerp.com-20100409112244-jg1226mpwbh59n12
2010-04-09 16:52:44 +05:30
Vir (Open ERP) c5b474ba29 [Rename] __terp__.py file renamed to __openerp__.py for all account,hr,projects,event,membership modules
bzr revid: vir@tinyerp.com-20100409084117-etmysc9pl982syrs
2010-04-09 14:11:17 +05:30
Fabien Pinckaers d5c54f088c merge
bzr revid: fp@tinyerp.com-20100404185616-yru1x61xly696bk4
2010-04-04 20:56:16 +02:00
Launchpad Code Hosting 05d11f2aa5 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100330035116-gmj49lv1faqo4cy7
bzr revid: codehost@crowberry-20100330041710-6ri9dskhty8ledl3
2010-03-30 05:17:10 +01:00
nel@tinyerp.com 284d02eafa merge
bzr revid: nel@tinyerp.com-20100329090045-ap3csvw3itc5h9vc
2010-03-29 11:00:45 +02:00
nel@tinyerp.com 9a7120d5c3 [IMP] uniformisation layout views / wizards Human resourses
bzr revid: nel@tinyerp.com-20100329084949-zfqbfqrxqgqxea4n
2010-03-29 10:49:49 +02:00
mra (Open ERP) 25db0bfa0c [MERGE] merge with main branch
bzr revid: mra@tinyerp.com-20100319111514-i2qgnm6i8jns3yfr
bzr revid: mra@tinyerp.com-20100322044315-twa9kw9dnr2k3sq5
2010-03-22 10:13:15 +05:30