Commit Graph
139 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
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 2983a4cb6d [MERGE]
bzr revid: mra@mra-laptop-20100611111728-oejn9qk7ajsi0l2m
bzr revid: mra@mra-laptop-20100611122030-bdef6cxvht7ys6yg
2010-06-11 17:50:30 +05:30
Fabien Pinckaers ca09185d52 [IMP] Improvements of access rights in trunk
bzr revid: fp@tinyerp.com-20100611100429-hgj7rx6feytizgag
2010-06-11 12:04:29 +02:00
Mustufa Rangwala 9134be65e6 [MERGE] Merge with trunk addons
bzr revid: mra@mra-laptop-20100611040706-2ezapnahmnyyq342
2010-06-11 09:37:06 +05:30
Launchpad Code Hosting 4b613caa0e Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100611034333-kqlq67hg0dpohwry
2010-06-11 04:43:33 +01:00
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) 198ef51dd7 -[MERGE]:Merge wiht lp:~openerp-dev/openobject-addons/trunk-dev-addons3
bzr revid: sbh@tinyerp.com-20100609105425-fsootcjd2kr7nyaa
2010-06-09 16:24:25 +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
Launchpad Code Hosting ce424c9d8a Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100609033613-vf9fy96jkhh0jw7c
2010-06-09 04:36:13 +01:00
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
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
Launchpad Code Hosting b9a0151cd0 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100608034113-18lu6pczfqath84h
2010-06-08 04:41:13 +01:00
Launchpad Code Hosting 699e7bd331 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100606033440-1e6zwtjwun4uwiw9
bzr revid: codehost@crowberry-20100607034340-osf986i6g1zl2f6e
2010-06-07 04:43:40 +01:00
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
Quentin De Paoli 4add4c2ef6 [MERGE] merge team2's work of sprint 20-21
bzr revid: qdp@cyan-20100601072531-jxop8nx6lxcc52hi
2010-06-01 09:25:31 +02:00
atp (Open ERP) 65afc2f1f4 [ADD]: hr_evaluation: add yaml file for hr_evaluation module.
bzr revid: atp@tinyerp.co.in-20100531122532-vqkf1mc12xwlt4h6
2010-05-31 17:55:32 +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
rpa (Open ERP) 1f29f09ff3 [MERGE]: Merge with lp:openobject-addons
bzr revid: rpa@tinyerp.com-20100528091504-l76uiduokyt7hx5o
2010-05-28 14:45:04 +05:30
apa-tiny 7b2e89b519 [IMP]:hr_expense,hr_evaluation,hr_recruitment:Improved the SQL View reports.
bzr revid: apa@tinyerp.com-20100528072529-fmdwey9q5qkrjd8f
2010-05-28 12:55:29 +05:30
rpa (Open ERP) 7458372c01 [MERGE]: Merge with lp:openobject-addons
bzr revid: rpa@tinyerp.com-20100528050239-knzkowr3xxosj5zh
2010-05-28 10:32:39 +05:30
rpa (Open ERP) 5f936d961c [MERGE]: Merge with lp:openobject-addons
bzr revid: rpa@tinyerp.com-20100526050851-lodfvwj5ruw6rbs0
bzr revid: rpa@tinyerp.com-20100526122202-vp53qayvu46vvkve
bzr revid: rpa@tinyerp.com-20100527051402-mrkzkwazlhosynk2
2010-05-27 10:44:02 +05:30
apa-tiny ee2637fe9e [IMP]:hr_recruitment:Resolved conflicts
bzr revid: apa@tinyerp.com-20100526132137-88wnjs0mog14xr69
2010-05-26 18:51:37 +05:30
apa-tiny 2f38c0a70f Merged from trunk
bzr revid: apa@tinyerp.com-20100526130029-gi6igtboao28i41b
2010-05-26 18:30:29 +05:30
Jay (Open ERP) f388ea5445 [REF]
bzr revid: jvo@tinyerp.com-20100526082837-dzd3mu7n6y5p1x4c
2010-05-26 13:58:37 +05:30
apa-tiny 42dbaa3952 [IMP]:hr_evaluation:improved the SQL report.
bzr revid: apa@tinyerp.com-20100526065421-tuy6sw96apgkz22b
2010-05-26 12:24: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
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 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
hmo 9330c43cda [MERGE] merged lp:~openerp/openobject-addons/trunk
bzr revid: hmo@hmo-20100524091232-ko5oezpr7j866ngo
2010-05-24 14:42:32 +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
JMA (OpenERP) e277449755 [REF]
bzr revid: jma@tinyerp.com-20100521125831-rqe512penoei0kqz
2010-05-21 18:28:31 +05:30
hmo 90f1e9d101 [MERGE] merged from lp:~openerp-dev/openobject-addons/ysa-dev-addons2
bzr revid: hmo@hmo-20100520122700-lejy1xv9yuts4icw
2010-05-20 17:57:00 +05:30
Rvo(Open ERP) f6188dbf2e [MERGE] access rights: addition of some missing access rights for both osv and osv_memory. to be continued
bzr revid: odo@openerp.com-20100519164111-9n8vrpz4lfmml8an
2010-05-19 18:41:11 +02:00
Jay (Open ERP) 50724c0a0f [MERGE] MErged from main branch
bzr revid: jvo@tinyerp.com-20100519145940-s8tk9v6lmxkp6idg
2010-05-19 20:29:40 +05:30
Rvo(Open ERP) 8147f311c3 [MERGE] merged refactoring of superfluous "My ..." buttons in search views
bzr revid: odo@openerp.com-20100519134531-eb6ki0snr5e0xr41
2010-05-19 15:45:31 +02:00
Launchpad Code Hosting a8f570fc90 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100515045849-ey0dktn5xxdr7ut7
bzr revid: codehost@crowberry-20100517050143-zxg7zkyyrn0m7b9u
2010-05-17 06:01:43 +01:00
Vir (Open ERP) bba3dcfe5a [MOD] general usability chabges
bzr revid: vir@tinyerp.com-20100513132923-y3uo7pzwmqhfmc91
2010-05-13 18:59:23 +05:30
Rvo (Open ERP) 8728f6bd0a [IMP,REM]: removed my_button from search view and set it as search_default_field_name:value
bzr revid: rvo@tinyerp.co.in-20100513131719-tw1z2sl5fgagxnil
2010-05-13 18:47:19 +05:30
Ysa (Open ERP) 45700f2e64 [MERGE] Merge with lp:openobject-addons
bzr revid: ysa@tinyerp.co.in-20100513052001-lm485kqokv893ijr
2010-05-13 10:50:01 +05:30