Commit Graph
34754 Commits
Author SHA1 Message Date
Rucha (Open ERP) 54c9ecdeab [MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-rework-addons-commited-aag
bzr revid: rpa@tinyerp.com-20110308133722-9k8bksvumo7yoasn
2011-03-08 19:07:22 +05:30
Rucha (Open ERP) 375dff2b6d [MERGE]: Merge with lp:~openerp-dev/openobject-server/trunk-rework-server-commited-aag
bzr revid: rpa@tinyerp.com-20110308133638-rsd2a6zgrehv91qo
2011-03-08 19:06:38 +05:30
ksa (Open ERP) 6026d3348d [IMP]: Improve code for all child locations
bzr revid: ksa@tinyerp.co.in-20110308133236-yx7dtifwi5sxn7n3
2011-03-08 19:02:36 +05:30
Rucha (Open ERP) 5ec7f2a66d [MERGE]: Merge with lp:~openerp-commiter/openobject-server/trunk-config-wizard-rework-sus
bzr revid: rpa@tinyerp.com-20110308132917-o02jlmgizzpy2fgb
2011-03-08 18:59:17 +05:30
Jigar Amin ad1368ce37 [ADD] base_calendar: Added Security file
bzr revid: jam@tinyerp.com-20110308132529-3nn0l7jhchw3rxm8
2011-03-08 18:55:29 +05:30
Rucha (Open ERP) 503584c681 [MERGE]: Merge with latest trunk
bzr revid: rpa@tinyerp.com-20110308131459-pmdbt4ca3vxnr614
2011-03-08 18:44:59 +05:30
Jigar Amin 4c0cd7b7ed [BUF/FIX] survey, base_calendar : added new access rights for the Survey/User for Invited user of the Survey
lp bug: https://launchpad.net/bugs/730651 fixed

bzr revid: jam@tinyerp.com-20110308125911-pzwecd8396dxjnib
2011-03-08 18:29:11 +05:30
Rifakat Haradwala (Open ERP) 64f9d7e94f [IMP] : base_module_quality, crm, email_template, mail_gateway, sale_crm, share: string formatting
bzr revid: rha@tinyerp.com-20110308112208-40jbv5er9w21xiw0
2011-03-08 16:52:08 +05:30
Antony Lesuisse 04eaeaaeb4 addons loading part2
bzr revid: al@openerp.com-20110308111954-7z5sp3jtp0skllze
2011-03-08 12:19:54 +01:00
Niels Huylebroeck dee15c6342 [IMP] Debian init script now has LOGFILE variable.
bzr revid: niels@bubbles-it.be-20110308105236-0j0488uq0sx0lld6
2011-03-08 11:52:36 +01:00
Niels Huylebroeck 081cd65e36 [IMP] Debian init script now has variable for config file location
bzr revid: niels@bubbles-it.be-20110308105152-w9uodtf166u1827x
2011-03-08 11:51:52 +01:00
niv-openerp f563b184fa [FIX] Fixed setup.py, now it works.
bzr revid: nicolas.vanhoren@openerp.com-20110308102813-i0oyuk297vgpsarq
2011-03-08 11:28:13 +01:00
Ujjvala Collins (OpenERP) d0185a0f3b [IMP] sync_google_calendar: Small improvements.
bzr revid: uco@tinyerp.com-20110308101945-9uwpribrxsxuw4gd
2011-03-08 15:49:45 +05:30
niv-openerp c014ed014b [FIX] Cleaned setup.py
bzr revid: nicolas.vanhoren@openerp.com-20110308100614-j3l1m0nmnsoeibw7
2011-03-08 11:06:14 +01:00
ksa (Open ERP) 3a30b34863 [IMP]:Put names in act_windows because of blank names we are not able to find some act_windows
bzr revid: ksa@tinyerp.co.in-20110308083939-ebfhrlt53g7ysuo5
2011-03-08 14:09:39 +05:30
Ujjvala Collins (OpenERP) 0a66b1bcc5 [IMP] sync_google_calendar: Changed selection from 'all' to 'default'.
bzr revid: uco@tinyerp.com-20110308072653-soo7bi9wf1twhhuk
2011-03-08 12:56:53 +05:30
Ujjvala Collins (OpenERP) cb42c7c22e [IMP] sync_google_calendar: Fetch events from selected calendar.
bzr revid: uco@tinyerp.com-20110308071250-692tzhq5akbhpxf6
2011-03-08 12:42:50 +05:30
ksa (Open ERP) 66ca9a91f0 [IMP]: improvement for set in order by data
bzr revid: ksa@tinyerp.co.in-20110308065944-rdaw3maa69gv8sbd
2011-03-08 12:29:44 +05:30
Mustufa Rangwala d39237d474 [IMP/FIX] hr_payroll: Improvement and cleaning
bzr revid: mra@mra-laptop-20110308063637-zfv8hawzqkdvsk8d
2011-03-08 12:06:37 +05:30
Rifakat Haradwala (Open ERP) 285ef6b2c1 [IMP] : stock, stock_planning: changes in pot file
bzr revid: rha@tinyerp.com-20110308063208-xnjsoli41w9vvxcb
2011-03-08 12:02:08 +05:30
Launchpad Translations on behalf of openerp a22396857b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110308062859-q6ue5zq5lsjtg6th
2011-03-08 06:28:59 +00:00
Rucha (Open ERP) 47c03a1791 [MERGE]: Merge with latest trunk
bzr revid: rpa@tinyerp.com-20110304071529-o3xhrc9pncukz17l
bzr revid: rpa@tinyerp.com-20110308061452-haah37xm0y5rkaf5
2011-03-08 11:44:52 +05:30
mtr a53ecf2423 [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-payroll
bzr revid: mtr@mtr-20110308055255-k0pdcjznb5pzo1a3
2011-03-08 11:22:55 +05:30
mtr de09fe0af3 [IMP] hr_payroll:improved code of onchange_employee_id for min and max range condition
bzr revid: mtr@mtr-20110308055145-q31b346sxscys51o
2011-03-08 11:21:45 +05:30
ARA (OpenERP) fba4c4f2c3 [FIX] sale_analytic_plans: Position of Analytic distribution field
lp bug: https://launchpad.net/bugs/728384 fixed

bzr revid: ara@tinyerp.com-20110308054626-63pcrctnlxkpxlc7
2011-03-08 11:16:26 +05:30
Ujjvala Collins (OpenERP) 918be06345 [FIX] sync_google_contact: Fixed yaml error.
bzr revid: uco@tinyerp.com-20110308052234-kfzlhlq1ic23m2j0
2011-03-08 10:52:34 +05:30
Fabien Meghazi 2bbba687cd Search view groups
bzr revid: fme@openerp.com-20110307162047-xufrqodbvj4h6zwa
2011-03-07 17:20:47 +01:00
Fabien Meghazi 01876da228 css inputs
bzr revid: fme@openerp.com-20110307142440-kby6620q7zvaq7xq
2011-03-07 15:24:40 +01:00
Fabien Meghazi a8394573ca Qweb: added trim support
bzr revid: fme@openerp.com-20110307135515-0vkl56xc7pxtlive
2011-03-07 14:55:15 +01:00
Fabien Meghazi c19798a74e Fix indentation
bzr revid: fme@openerp.com-20110307135237-q6w2asndu84an7a7
2011-03-07 14:52:37 +01:00
Ujjvala Collins (OpenERP) 5edc07449d [ADD] sync_google_calendar: Added a module to import events from google calendar.
bzr revid: uco@tinyerp.com-20110307134215-f79hz1jgi3cre2cr
2011-03-07 19:12:15 +05:30
Thibault Francois 47caccfe28 [IMP] code refactoring
bzr revid: tfr@openerp.com-20110307133354-u5hlh70xn13z0bhl
2011-03-07 14:33:54 +01:00
mtr a4cc0a400d [IMP] hr_payroll:added warning to fix the error on payslip,when structure is not defined for an employee
bzr revid: mtr@mtr-20110307131329-dlpac23lr2edb863
2011-03-07 18:43:29 +05:30
ron@tinyerp.com 185de3a01b [FIX]product:Purchase Order price calculation wrong
lp bug: https://launchpad.net/bugs/728092 fixed

bzr revid: ron@tinyerp.com-20110307125008-pan2v3m9w7ea2t1r
2011-03-07 18:20:08 +05:30
mtr b66b346664 [IMP] hr_payroll:improved code to fix the error on payslip,when structure is not defined for an employee
bzr revid: mtr@mtr-20110307124607-kj0qokxxblhx4uie
2011-03-07 18:16:07 +05:30
Vo Minh Thu a85ed9248e [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20110307121541-62h00c7pp7lbqzhr
2011-03-07 13:15:41 +01:00
mtr 7b7a1915f4 [MERGE] branch merged with trunk-payroll-salary_rules-psi
bzr revid: mtr@mtr-20110307113703-mu4v0hsd8e7a6qqa
2011-03-07 17:07:03 +05:30
mtr 6e6b21a875 [IMP] hr_payroll,hr_contract:commented 'hr.contract.wage.type' and improved strings of menuitem in payroll.
bzr revid: mtr@mtr-20110307112817-f3c7o3fro4oxzejn
2011-03-07 16:58:17 +05:30
Ujjvala Collins (OpenERP) 32f3ddf375 [MERGE]: Merged with trunk-addons.
bzr revid: uco@tinyerp.com-20110307111145-z0ly1cpi6crmo1f2
2011-03-07 16:41:45 +05:30
Jigar Amin 038d246b28 [BUG/FIX] peoject_issue : Assgined to readonly
lp bug: https://launchpad.net/bugs/725736 fixed

bzr revid: jam@tinyerp.com-20110307110647-bucrgruecq0wi2zo
2011-03-07 16:36:47 +05:30
Ujjvala Collins (OpenERP) d00bdceae2 [MERGE]: Merged with google-contact branch to get google_base_account module.
bzr revid: uco@tinyerp.com-20110307105812-tcvy6dvrofbeicv5
2011-03-07 16:28:12 +05:30
mtr ad9f23f99f [IMP] hr_payroll:added field 'python_code' and improved view of Salary Rules
bzr revid: mtr@mtr-20110307104513-mjcjedxtozza6wdf
2011-03-07 16:15:13 +05:30
Anup (OpenERP) 9adaf9ef8c [MERGE] Merged the branch for the fix of write() call on stock
bzr revid: jvo@tinyerp.com-20110307101625-ahn6wwld9e16e3dm
2011-03-07 15:46:25 +05:30
Jay Vora (OpenERP) 05fab9dcce [FIX] Stock : Call to write() with integer format of IDS can cause crash on system,normally write should be called with [IDS] format(Ref : Maintenance case 4416)
bzr revid: jvo@tinyerp.com-20110307095246-32l3ele6e7n2e9fo
2011-03-07 15:22:46 +05:30
mtr e85b5701ee [IMP] hr_payroll:added default company_id on salary rules
bzr revid: mtr@mtr-20110307094710-px4r3q1ik57h536k
2011-03-07 15:17:10 +05:30
Antony Lesuisse 5fabf04810 base_hello manifest
bzr revid: al@openerp.com-20110307093214-df425vc8krhc1bqq
2011-03-07 10:32:14 +01:00
psi (Open ERP) e35ce1fdcd [IMP] hr_payroll: Get line_ids on hr_payslip based on salary rules, Improve _calculate function on hr.payslip, if Appears on payslip is set then the salary rule will be added in line_ids of hr.payslip else it will consider in calculation only
bzr revid: psi@tinyerp.co.in-20110307092649-u6cd4hkfk8biikqq
2011-03-07 14:56:49 +05:30
Antony Lesuisse fc679ac8a5 preliminary addons loading support
bzr revid: al@openerp.com-20110307092632-e0a6rho0bvuk04ei
2011-03-07 10:26:32 +01:00
mtr a40185970f [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-payroll
bzr revid: mtr@mtr-20110307084702-31hy9x8zv2fwnnzb
2011-03-07 14:17:02 +05:30
mtr 11c72fb988 [IMP] hr_payroll:removed 'advantages_net' and 'advantages_gross' fields from hr.contract
bzr revid: mtr@mtr-20110307084515-3o33wpeh1uh3czhe
2011-03-07 14:15:15 +05:30