Commit Graph
264 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
uco (OpenERP) 42443c892d [IMP] crm, hr, project, stock, sale: Menu Re-organization.
bzr revid: uco@tinyerp.com-20100617100451-75hoxnbpjoo1clie
2010-06-17 15:34:51 +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
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) f78d458ca4 [IMP]: hr_timesheet: Improvement in yml file for hr_timesheet module.
bzr revid: atp@tinyerp.co.in-20100614051824-np9mkacac875i5dw
2010-06-14 10:48:24 +05:30
atp (Open ERP) 70edef7787 [IMP]: hr_timesheet: Improvement in hr_timesheet_sign_in_out wizard for emp_id field.
bzr revid: atp@tinyerp.co.in-20100614051659-2ecn73g7m1awf37t
2010-06-14 10:46:59 +05:30
Mustufa Rangwala 38c2a2ba3c [MERGE]
bzr revid: mra@mra-laptop-20100611133114-khn9zbugbolfp209
2010-06-11 19:01:14 +05:30
Fabien Pinckaers 220eac1612 fix
bzr revid: fp@tinyerp.com-20100611132211-zd8zff7aq2ifgsde
2010-06-11 15:22:11 +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
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
Mustufa Rangwala ae1e9118e0 [MERGE]
bzr revid: mra@mra-laptop-20100609040554-cm0aa0e8h0u5p2ky
bzr revid: mra@mra-laptop-20100609084513-mxmrz48bgg90j7bx
2010-06-09 14:15:13 +05:30
Launchpad Code Hosting ce424c9d8a Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100609033613-vf9fy96jkhh0jw7c
2010-06-09 04:36:13 +01:00
Mustufa Rangwala 1ce9ff0ac5 [MERGE] pap branch for account invoice usebility task (uom onchange) and timesheet lines working hours
bzr revid: mra@mra-laptop-20100608114424-nikplga0apj96prq
2010-06-08 17:14:24 +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
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
pap (openerp) df4c619986 [IMP]:added menus for working hours in hr.timesheet and put fields.selection on uos in invoice line in account.invoice
bzr revid: pap@tinyerp.co.in-20100608091447-kc2o31rijy0a2l1h
2010-06-08 14:44:47 +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) a1d16708ec [MOD/IMP] Report menu names are changed
bzr revid: vir@tinyerp.com-20100608070947-aeu6wiq5mossvi9r
2010-06-08 12:39:47 +05:30
Launchpad Code Hosting b9a0151cd0 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100608034113-18lu6pczfqath84h
2010-06-08 04:41:13 +01: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
Stephane Wirtel 859b9b84c5 [REF] Refactor the code of the wizard 'Sign In / Sign Out'
[FIX] Remove the unless exception handling

bzr revid: stephane@openerp.com-20100603095106-4v2uvxg3g6eakp82
2010-06-03 11:51:06 +02:00
mra (Open ERP) 59a5344427 [MERGE] merge with main branch changes from dev2 team from trunk addons => Remove conflicts on idea
bzr revid: mra@tinyerp.com-20100601084216-0yihd6bc3knvskdp
2010-06-01 14:12:16 +05:30
atp (Open ERP) b5462c9b1b [ADD]: hr_timesheet: add yaml for hr_timesheet module.
bzr revid: atp@tinyerp.co.in-20100531081727-8h30d52ydh6fls44
2010-05-31 13:47:27 +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
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
rpa (Open ERP) bd50a157c9 [MERGE]: Merge with lp:openobject-addons
bzr revid: rpa@tinyerp.com-20100524050031-t7begh13c1x2r5ap
bzr revid: rpa@tinyerp.com-20100525050319-vw5dl9sdizcfugaq
bzr revid: rpa@tinyerp.com-20100525122710-5orcyh0m2zj7rbg9
2010-05-25 17:57:10 +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
JMA (OpenERP) e277449755 [REF]
bzr revid: jma@tinyerp.com-20100521125831-rqe512penoei0kqz
2010-05-21 18:28:31 +05:30
hmo 3aaebcb3a9 [MERGE] merge with master trunk-addons
bzr revid: hmo@hmo-20100520113303-67jlxy1thn3iafdn
2010-05-20 17:03:03 +05:30
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
psi (Open ERP) 84dfed9da7 [IMP] account, hr_contract, hr_timesheet, project: small changes, clean
bzr revid: psi@tinyerp.co.in-20100519130703-fgog8lo8zgh8g4rk
2010-05-19 18:37:03 +05:30
JMA (OpenERP) f0503973ad [FIX] default_get corrected
bzr revid: jma@tinyerp.com-20100518143817-haxikg9solycjuk9
2010-05-18 20:08:17 +05:30
ksa (Open ERP) 1a8ce11d22 [MERGE]: Merge with lp:openobject-trunk-dev-addons2
bzr revid: ksa@tinyerp.co.in-20100514064906-fbte140kwld456wk
2010-05-14 12:19:06 +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
Launchpad Code Hosting cf6db2b993 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100513043701-41cmj2olsqommizr
2010-05-13 05:37:01 +01:00
rpa (Open ERP) 78000800c3 [IMP]: partner_infotab: Renamed partner_crm to partner_infotab, Made relation with timesheet lines and partner
bzr revid: rpa@tinyerp.com-20100512140535-cu62e5qzbiy1vvyp
2010-05-12 19:35:35 +05:30