Commit Graph
37875 Commits
Author SHA1 Message Date
Raphael Collet 06e6ccce6d [MERGE] add survey data in modules hr_evaluation and hr_recruitment
bzr revid: rco@openerp.com-20110526081549-uk3l0hb1fyntbi23
2011-05-26 10:15:49 +02:00
Raphael Collet 289ee18f2d [MERGE] purchase improvement, add picking to invoice
bzr revid: rco@openerp.com-20110526074335-hmcwwvk1pt9myt9i
2011-05-26 09:43:35 +02:00
Atul Patel (OpenERP) edd635f598 [IMP]: Usability Improvment. 1)Merge Meeting and meeting task into Meeting.2)add group no one for multiinstance field.3)add messagein import launch wizard.
bzr revid: atp@tinyerp.com-20110526073228-9sbqbbxhz9n3kc71
2011-05-26 13:02:28 +05:30
ARA (OpenERP) f7ad4dfffa [FIX] account:Inconsistency between Sales Receipt <> Supplier Voucher
bzr revid: ara@tinyerp.com-20110526071732-q4o9oxewkx1epx80
2011-05-26 12:47:32 +05:30
Tejas (OpenERP) 549334db27 [usability] removed the module_name from action
bzr revid: tta@openerp.com-20110526063505-yqrjppysjn9ovswx
2011-05-26 12:05:05 +05:30
Tejas (OpenERP) 4e7e34b61b [usability] add name attribute to filter
bzr revid: tta@openerp.com-20110526062658-3d84t7g1y7ib49bs
2011-05-26 11:56:58 +05:30
mtr 09b88682e1 [IMP] hr_payroll: improved help string categories=>rule_categories
bzr revid: mtr@mtr-20110526055655-iw9yg4999a5l8g1z
2011-05-26 11:26:55 +05:30
mtr 8b32533bec [IMP] hr_payroll: revert back the changes from localdict => category_dict
bzr revid: mtr@mtr-20110526055402-ua3mu846d8zw4jso
2011-05-26 11:24:02 +05:30
Launchpad Translations on behalf of openerp a2491c255a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110524060323-rmp5knt511n7lrah
bzr revid: launchpad_translations_on_behalf_of_openerp-20110525061458-7u81saqmumn8pr5p
bzr revid: launchpad_translations_on_behalf_of_openerp-20110526054131-ugrdyn7fyj0qqdlr
2011-05-26 05:41:31 +00:00
psi (Open ERP) 4f1ed7c970 [MERGE] hr_payroll: Merge with main payroll branch
bzr revid: psi@tinyerp.co.in-20110526053146-cybrig63j99qt4tx
2011-05-26 11:01:46 +05:30
Atul Patel (OpenERP) 5dee4face0 [MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-import_sugarcrm
bzr revid: atp@tinyerp.com-20110526042945-4wrepx2umm9e0ft7
2011-05-26 09:59:45 +05:30
Vo Minh Thu a2087303c8 [REF] osv: factored out duplicated createInstance methods.
bzr revid: vmt@openerp.com-20110525221907-48dgtocw3wsnakow
2011-05-26 00:19:07 +02:00
Vo Minh Thu 2f6dff7690 [MERGE] moved around some code (preparing for some refactoring) (large diff).
bzr revid: vmt@openerp.com-20110525160607-45pq13910rduijkk
2011-05-25 18:06:07 +02:00
tfr@openerp.com 1091975333 [MERGE] import_base
bzr revid: tfr@openerp.com-20110525155905-43yrgbb9ec7emn4i
2011-05-25 17:59:05 +02:00
tfr@openerp.com ddf020103e [FIX] self dependencies
bzr revid: tfr@openerp.com-20110525155744-zw7odokw76ngvz38
2011-05-25 17:57:44 +02:00
tfr@openerp.com 1f448080f4 [FIX] review + mapping correction
bzr revid: tfr@openerp.com-20110525155542-ihuc27j8awpd4nqy
2011-05-25 17:55:42 +02:00
Vo Minh Thu 959ff88d64 [MERGE] orm: correctly store in db the translate flag.
bzr revid: vmt@openerp.com-20110525154411-c6eg6mpo31yseldi
2011-05-25 17:44:11 +02:00
Vo Minh Thu 96b506c051 [MERGE] ir: no more openerp.ir module.
bzr revid: vmt@openerp.com-20110525153324-9gxdrbm44mc8neb9
2011-05-25 17:33:24 +02:00
Vo Minh Thu ce664cb4b1 [FIX] ir: forgot to remove the parent module openerp.ir.
bzr revid: vmt@openerp.com-20110525152640-hinzi1ry567jzwix
2011-05-25 17:26:40 +02:00
Vo Minh Thu 5d83528841 [MERGE] merged trunk
bzr revid: vmt@openerp.com-20110525151722-w9qt1qjficpv71re
2011-05-25 17:17:22 +02:00
Vo Minh Thu 823abab958 [MERGE] merged changes from 6.0
bzr revid: vmt@openerp.com-20110525151149-78gkoolppmjekrl6
2011-05-25 17:11:49 +02:00
Xavier Morel 7d0ceef7d4 [FIX] apoptosis on lists
bzr revid: xmo@openerp.com-20110525150240-brxcbyfh2lltz4ai
2011-05-25 17:02:40 +02:00
Vo Minh Thu 8156aae67e [MERGE] osv: custom fields are no more _inherited.
lp bug: https://launchpad.net/bugs/766944 fixed

bzr revid: vmt@openerp.com-20110525150151-ksjmm5nc2foow3nx
2011-05-25 17:01:51 +02:00
Vo Minh Thu 728fe04ba8 [FIX] typos.
bzr revid: vmt@openerp.com-20110525145909-9f6h4wsr7mmwdzh7
2011-05-25 16:59:09 +02:00
Xavier Morel 47f7922554 [IMP] look of list-wise aggregates
bzr revid: xmo@openerp.com-20110525143516-wmav0tly51uw6ly5
2011-05-25 16:35:16 +02:00
Xavier Morel a49729461d [FIX] aggregates display on initial list loading
bzr revid: xmo@openerp.com-20110525140456-ylo5e0kf0kp3xe15
2011-05-25 16:04:56 +02:00
tfr@openerp.com 20a7bda478 [IMP] email for user, user ok
bzr revid: tfr@openerp.com-20110525140106-sg13z2s1s8unbtao
2011-05-25 16:01:06 +02:00
Quentin (OpenERP) c6fa707ca2 [MERGE]
bzr revid: qdp-launchpad@openerp.com-20110525134101-7v3n4bjszg1di0k7
2011-05-25 15:41:01 +02:00
tfr@openerp.com 95d03ee46f [MERGE] import_base
bzr revid: tfr@openerp.com-20110525133043-kum1rhgdweksarc6
2011-05-25 15:30:43 +02:00
tfr@openerp.com a84c8d0757 [MERGE] atp team bakclog 4 5 6 complete
bzr revid: tfr@openerp.com-20110525132914-d19doksprb4mfa03
2011-05-25 15:29:14 +02:00
skh 57c4766efa [FIX]:Change in the __openerp__.py of base_report_designer module and in the base_report_design_view.xml (Ref : Case 5661)
bzr revid: skh@tinyerp.com-20110525132621-uylt83br0m1vppuh
2011-05-25 18:56:21 +05:30
Vo Minh Thu 3dc30f5ea5 [FIX] osv: don't _inherit _custom fields.
- a attribute 'manual' is added on _column to recognize accurately custom fields.

bzr revid: vmt@openerp.com-20110525132612-dlxwlh4jvvfhyfsi
2011-05-25 15:26:12 +02:00
tfr@openerp.com 5d251c741f [IMP] email notfication + [FIX] instance name not hard coded anymore
bzr revid: tfr@openerp.com-20110525132455-kcspd1huwj36jubs
2011-05-25 15:24:55 +02:00
Xavier Morel 88773e6c89 [ADD] basic implementation of list-wise aggregation functions
bzr revid: xmo@openerp.com-20110525130414-a1wkfb4inix2q4we
2011-05-25 15:04:14 +02:00
Quentin (OpenERP) f476d037da [MERGE] merged the branch with the speicify your terminology wizard
bzr revid: qdp-launchpad@openerp.com-20110525125026-hsuv1293sxguz9p3
2011-05-25 14:50:26 +02:00
Quentin (OpenERP) 633fb5ba22 [IMP] base_setup: specify your terminology wizard
bzr revid: qdp-launchpad@openerp.com-20110525124736-t9fx3bhy9nyu2r96
2011-05-25 14:47:36 +02:00
Tejas (OpenERP) 41add68371 [usability] sale's product view improved, old changed removed.
bzr revid: tta@openerp.com-20110525124002-z49h60drvfnqdv1a
2011-05-25 18:10:02 +05:30
skh d3b701d97c [FIX]: Change in data[] and init_xml[] in the stable 6.0 addons (Ref : Case 5661)
bzr revid: skh@tinyerp.com-20110525115133-nif4bdakz2rd222i
2011-05-25 17:21:33 +05:30
Kunal Chavda (OpenERP) 233f743315 [IMP]Improved code for groupby when domain is there.
bzr revid: kch@tinyerp.com-20110525113949-3spob7ruoskuws33
2011-05-25 17:09:49 +05:30
bde 34d1eb32ce [IMP] usability
bzr revid: bde@tiny2-desktop-20110525093529-59xp434262hngtzj
2011-05-25 15:05:29 +05:30
Fabien Pinckaers c3f355d2e2 [fIX] small useability issue
bzr revid: fp@tinyerp.com-20110525092921-pjpkumga6tq4nspg
2011-05-25 11:29:21 +02:00
Xavier Morel 3dbc88c696 [IMP] make get_selection call and selected ListView event provide both ids of selected records and the selected records themselves
bzr revid: xmo@openerp.com-20110525092813-ciahklygwshkpdl0
2011-05-25 11:28:13 +02:00
Fabien Pinckaers d436944eae [FIX] Misc useability issues
bzr revid: fp@tinyerp.com-20110525092253-odme1r9saxgce2dg
2011-05-25 11:22:53 +02:00
mtr 60794632f8 [IMP] hr_payroll: improved payslip state as per workflow changes and removed unrequired methods
bzr revid: mtr@mtr-20110525091234-ih8c8e9vei8vfhbp
2011-05-25 14:42:34 +05:30
Fabien Meghazi 8069038a1d [FIX] Replaced eval() by JSON.parse for attrs parsing in list & form.
This fixes a strange bug I was the only one to encounter.

bzr revid: fme@openerp.com-20110525090435-q1sz2rm7iydj0udl
2011-05-25 11:04:35 +02:00
Quentin (OpenERP) 577f6871a0 [MERGE]
bzr revid: qdp-launchpad@openerp.com-20110525090109-wddw63z2okn2flag
2011-05-25 11:01:09 +02:00
Quentin (OpenERP) c8417fc7ce [MERGE] merged branch with new field category on ir.actions.todo + removal of unused config wizard 'create new users'
bzr revid: qdp-launchpad@openerp.com-20110525085605-9l8ddlaa2wr28o53
2011-05-25 10:56:05 +02:00
Vo Minh Thu 6d0f31fbd1 [MERGE] don't assign a reused node.text value.
lp bug: https://launchpad.net/bugs/640677 fixed

bzr revid: vmt@openerp.com-20110525080921-fyrkdkdm3niupn1f
2011-05-25 10:09:21 +02:00
Vo Minh Thu 1122a2361a [MERGE] added Ugandan Shilling and changed the CFA currency into XOF and XAF.
bzr revid: vmt@openerp.com-20110525074840-xb6j67fvudodkb1z
2011-05-25 09:48:40 +02:00
mtr 46afc22ac9 [MERGE] branch merged with trunk-payroll
bzr revid: mtr@mtr-20110525062621-m04kj8v37ov1v6bu
2011-05-25 11:56:21 +05:30