Commit Graph
34754 Commits
Author SHA1 Message Date
Olivier Dony d5129c1eeb [FIX] email_template: avoid trying to write on auto-deleted messages
bzr revid: odo@openerp.com-20110312004514-gbsfs68kbdho0c8m
2011-03-12 01:45:14 +01:00
Olivier Dony cbb98b719b [FIX] marketing_campaign: fixed search on res_name on workitems + minor tweaks
bzr revid: odo@openerp.com-20110312000705-rbjet1wg30y79v12
2011-03-12 01:07:05 +01:00
Quentin (OpenERP) bc12c091d8 [MERGE] merged the dev branch containing the HR improvements
bzr revid: qdp-launchpad@openerp.com-20110311172952-jqlv6z6kf9x64fr8
2011-03-11 18:29:52 +01:00
Quentin (OpenERP) 87ca1eefae [FIX] hr_timesheet_sheet: removed readonly on attendances
bzr revid: qdp-launchpad@openerp.com-20110311172513-7b3cpor9feipqfvf
2011-03-11 18:25:13 +01:00
Quentin (OpenERP) ae319d8495 [FIX] hr_recruitment: decrease no_of_recruitment if employee is hired
bzr revid: qdp-launchpad@openerp.com-20110311172000-2f2ljdljf6y0tqjv
2011-03-11 18:20:00 +01:00
Julien Thewys 3d24d76b4f [FIX] Removed deprecated license files (was GPL v3, we are using AGPL v3).
bzr revid: jth@openerp.com-20110311171816-5zoozckwq3efv7ed
2011-03-11 18:18:16 +01:00
Julien Thewys fbd5877ca3 [FIX] Removed deprecated license files (was GPL v3, we are using AGPL v3).
bzr revid: jth@openerp.com-20110311170937-x9kou1gjwabf2ij3
2011-03-11 18:09:37 +01:00
Jay Vora (OpenERP) e37624d265 [Merge] Merged branch for the fix of lp:732613
bzr revid: jvo@tinyerp.com-20110311163943-cg6zhr9eobvsbh15
2011-03-11 22:09:43 +05:30
Quentin (OpenERP) 68c5102563 [MERGE] lp:729651
bzr revid: qdp-launchpad@openerp.com-20110311160425-g3hp0y1589og7lc6
2011-03-11 17:04:25 +01:00
Quentin (OpenERP) 32304d8fe9 [MERGE] lp:731795
bzr revid: qdp-launchpad@openerp.com-20110311155813-4523ulj2av7l7shd
2011-03-11 16:58:13 +01:00
Quentin (OpenERP) 4cacb67193 [MERGE] lp:731332
bzr revid: qdp-launchpad@openerp.com-20110311154909-jzqf7l3f4qsezsja
2011-03-11 16:49:09 +01:00
Quentin (OpenERP) 10d0c857a4 [MERGE] lp:731787
bzr revid: qdp-launchpad@openerp.com-20110311154647-rg9vhygirxzhq61u
2011-03-11 16:46:47 +01:00
Quentin (OpenERP) 6a213f9c07 [MERGE] lp:729539
bzr revid: qdp-launchpad@openerp.com-20110311154335-omz3sjw6supwr2hc
2011-03-11 16:43:35 +01:00
Quentin (OpenERP) acf53ceed0 [MERGE] lp:728384
bzr revid: qdp-launchpad@openerp.com-20110311154027-ttt0dxt3hx000kkd
2011-03-11 16:40:27 +01:00
Quentin (OpenERP) 028fdd4f8c [MERGE] lp:712555
bzr revid: qdp-launchpad@openerp.com-20110311152011-l4exyyynypxqv08r
2011-03-11 16:20:11 +01:00
Quentin (OpenERP) 6ec75017ed [MERGE] lp:720282
bzr revid: qdp-launchpad@openerp.com-20110311151819-11hyz2byqmee3w22
2011-03-11 16:18:19 +01:00
Quentin (OpenERP) 67e758945d [MERGE] lp:724073
bzr revid: qdp-launchpad@openerp.com-20110311151123-66ps2vpxxh07xqqc
2011-03-11 16:11:23 +01:00
Quentin (OpenERP) ad35eeba58 [MERGE] lp:724059
bzr revid: qdp-launchpad@openerp.com-20110311150926-t7yoq5d0f9rpccdx
2011-03-11 16:09:26 +01:00
Quentin (OpenERP) 03c8e8b36a [IMP] hr: improved recruitement
bzr revid: qdp-launchpad@openerp.com-20110311134136-jal186xbwpjf4hba
2011-03-11 14:41:36 +01:00
Antony Lesuisse 10104a2bf0 addons js loading
bzr revid: al@openerp.com-20110311132622-otrxhghgox9jqax6
2011-03-11 14:26:22 +01:00
ARA (OpenERP) 0cb81b9418 [IMP] Account: changing company currency breaks analytic account
bzr revid: ara@tinyerp.com-20110311130340-ur7dilhk4mmsrk5a
2011-03-11 18:33:40 +05:30
Jigar Amin 50fd414738 [BUG/FIX] lp:732518 sale_crm : Covert to Quote shoud show only list of Customers
lp bug: https://launchpad.net/bugs/732518 fixed

bzr revid: jam@tinyerp.com-20110311125535-l3trf4ykjpn48qax
2011-03-11 18:25:35 +05:30
aag (OpenERP) 7cb99c6031 [IMP] hr,hr_timesheet:add one func _no_of_expected_employees ans change string analytic account
bzr revid: aag@tinyerp.co.in-20110311122345-g1ufdl0i4ogzwbe2
2011-03-11 17:53:45 +05:30
psi (Open ERP) cc8bb306f5 [IMP] improve _caluculate method on hr.payslip object so it will consider all line_ids of hr.payslip
bzr revid: psi@tinyerp.co.in-20110311122326-golfefokn1bp2gsz
2011-03-11 17:53:26 +05:30
ARA (OpenERP) 27981af337 [FIX] Account: [6.0]changing company currency breaks analytic account
bzr revid: ara@tinyerp.com-20110311120335-l1one4lu0fxg8die
2011-03-11 17:33:35 +05:30
Quentin (OpenERP) 924c9639c5 [FIX] hr_holidays: type of holidays
bzr revid: qdp-launchpad@openerp.com-20110311115024-5sx7xt40tpla9c6x
2011-03-11 12:50:24 +01:00
Ujjvala Collins (OpenERP) 344d9ebdf3 [REF] sync_google_calendar: Add calendar name as meeting type and attach it to meeting event.
bzr revid: uco@tinyerp.com-20110311114314-2kokoo35hxnf4f6k
2011-03-11 17:13:14 +05:30
mtr 36366390b5 [IMP] hr_payroll:created a function to get parent_id of salary structure
bzr revid: mtr@mtr-20110311114155-stpuykd37s02iyq1
2011-03-11 17:11:55 +05:30
ARA (OpenERP) aad6253cf3 [FIX] Account: [6.0]changing company currency breaks analytic account
lp bug: https://launchpad.net/bugs/728560 fixed

bzr revid: ara@tinyerp.com-20110311113710-wnsy77iv8rlgivj8
2011-03-11 17:07:10 +05:30
rch-openerp 08741bacf4 [IMP]: purchase_requisition, purchase_analytic_plans and purchase_double_validation.
bzr revid: rch@tinyerp.com-20110311113259-ozol9tf37lbk1bq0
2011-03-11 17:02:59 +05:30
Quentin (OpenERP) 73b00ed701 [IMP] hr,hr_holidays: remove extended view on employee category (was conflicting with hr/manager group)
bzr revid: qdp-launchpad@openerp.com-20110311113204-kxmskgilat5vlk3f
2011-03-11 12:32:04 +01:00
Ujjvala Collins (OpenERP) e312be45e9 [REF] sync_google_calendar: Added an option for all calendars' all events.
bzr revid: uco@tinyerp.com-20110311112818-rpx3axlcjk23lg01
2011-03-11 16:58:18 +05:30
Vo Minh Thu 4c45313a04 [FIX] setup.py: py2exe, sdist, and install seem good.
- added commands to the list of modules
- provide an explicit dependency link for pychart (which will be used by easy_install)

bzr revid: vmt@openerp.com-20110311110905-y8s85a24naq5zxdy
2011-03-11 12:09:05 +01:00
Rucha (Open ERP) 9bc35e9192 [IMP]: hr: Added on change department in employee form to set manager
bzr revid: rpa@tinyerp.com-20110311105449-0h02fpefhrk6kqhu
2011-03-11 16:24:49 +05:30
Olivier Dony 599d655465 [FIX] marketing_campaign: workitem.process_all() must respect campaign states
bzr revid: odo@openerp.com-20110311104831-ewujjdgwg1jd5qhc
2011-03-11 11:48:31 +01:00
Olivier Dony 02a703770a [IMP] marketing_campaign: activity now passes workitem to server actions via context
bzr revid: odo@openerp.com-20110311104300-ka3616hqa8ad52qg
2011-03-11 11:43:00 +01:00
Rucha (Open ERP) e11dc0b43c [IMP]: hr_holidays: Made demo of leave allocation request as validated to avoid warning when confirming a leave request for another demo
bzr revid: rpa@tinyerp.com-20110311103109-lgqt6vp1wz94c0sh
2011-03-11 16:01:09 +05:30
mtr 5c0680f7f8 [MERGE] branch merged with trunk-payroll-salary_rules-psi
bzr revid: mtr@mtr-20110311101220-9yehi8n5lz7ui2hx
2011-03-11 15:42:20 +05:30
Rucha (Open ERP) 36fe64becc [IMP]: Rename "Confirm" to "Submit to Manager"
bzr revid: rpa@tinyerp.com-20110311101016-gzi2lkvfj5029n8x
2011-03-11 15:40:16 +05:30
Rucha (Open ERP) 2be7bebe87 [IMP]: hr_recruitment: Improvement in wizard to hire applicant
* Put appripriate function names
* Improved view

bzr revid: rpa@tinyerp.com-20110311100752-ltcri0xmbn89ic30
2011-03-11 15:37:52 +05:30
rch-openerp 05e1ad9234 [IMP]: images for purchase module.
bzr revid: rch@tinyerp.com-20110311095939-1bkr276bn1osye1g
2011-03-11 15:29:39 +05:30
Ujjvala Collins (OpenERP) e1654e7deb [MERGE]
bzr revid: uco@tinyerp.com-20110311092257-vwor5jbrsnv9dwhz
2011-03-11 14:52:57 +05:30
mtr 473a1541e1 [IMP] hr_payroll:added code in onchange_employee_id if salary structure has parent_id
bzr revid: mtr@mtr-20110311085740-gkz19qlnpt38gowc
2011-03-11 14:27:40 +05:30
Rucha (Open ERP) d64d4b0d83 [MERGE]: Merge with trunk addons
bzr revid: rpa@tinyerp.com-20110311084452-hlkwjehf0tzkbdoh
2011-03-11 14:14:52 +05:30
Xavier ALT 3755c34404 type break read for 'security by field'
Signed-off-by: P. Christeas <p_christ@hol.gr>
(cherry picked from commit 92051d61345431173fc9eafc4dc015c0fb6002e8)

bzr revid: p_christ@hol.gr-20110311082720-h30rd6iab9dihijk
2011-03-11 10:27:20 +02:00
Launchpad Translations on behalf of openerp 144292e286 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110305063005-fzycex3mu1xfb0jw
bzr revid: launchpad_translations_on_behalf_of_openerp-20110307062047-n8j178a0s89erjma
bzr revid: launchpad_translations_on_behalf_of_openerp-20110308062757-8j0c4yyvv5vaiwa5
bzr revid: launchpad_translations_on_behalf_of_openerp-20110309061236-sqodh7t8rvcf6qaj
bzr revid: launchpad_translations_on_behalf_of_openerp-20110311060003-olc6n287sm2vrsqc
2011-03-11 06:00:03 +00:00
Jigar Amin ae526beef0 [MERGE] with lp:openobject-addons
bzr revid: jam@tinyerp.com-20110310130751-4khjwfq1d8yl2k7y
bzr revid: jam@tinyerp.com-20110311050353-7r08lpp060oozm0s
2011-03-11 10:33:53 +05:30
Launchpad Translations on behalf of openerp a0cc38df3b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110310044459-bl4c8to5a8lkqoie
bzr revid: launchpad_translations_on_behalf_of_openerp-20110311044533-vzu3t2xfqo9rpcie
bzr revid: launchpad_translations_on_behalf_of_openerp-20110311044949-0wrkjd4vljipalzz
2011-03-11 04:49:49 +00:00
Xavier Morel 28ea1057df Remove old qweb demo file
bzr revid: xmo@openerp.com-20110310170806-qwl6ieqqvd38nf9d
2011-03-10 18:08:06 +01:00
Xavier Morel 9cf7baee6b [FIX] use simplejson as json is not available on Python 2.5 (also simplejson has better perfs)
bzr revid: xmo@openerp.com-20110310155345-8nxu3i92hno4j2yc
2011-03-10 16:53:45 +01:00