Commit Graph
51219 Commits
Author SHA1 Message Date
niv-openerp 153375fd35 merge trunk
bzr revid: nicolas.vanhoren@openerp.com-20120604121500-sgfni3iokvm8dh1p
bzr revid: nicolas.vanhoren@openerp.com-20120611090838-vmi2softfyfvv299
2012-06-11 11:08:38 +02:00
Fabien Pinckaers d19aa69747 merge
bzr revid: fp@tinyerp.com-20120611090802-a85fuvi9kkb15nju
2012-06-11 11:08:02 +02:00
niv-openerp fcb1d3f124 [IMP] Improved partners' view, changed kanban view of children to be more usable.
bzr revid: nicolas.vanhoren@openerp.com-20120611090702-46szixayu6bsnzxy
2012-06-11 11:07:02 +02:00
Fabien Pinckaers 9a7573dd7f [IMP] removing layout="manual"
bzr revid: fp@tinyerp.com-20120611090701-57jr0v6oxnbuocwc
2012-06-11 11:07:01 +02:00
Fabien Meghazi 2977e95474 [MOV] Moved instance.notification to instance.web.notification
bzr revid: fme@openerp.com-20120611090622-mvhhdn8cez9tx99h
2012-06-11 11:06:22 +02:00
niv-openerp 2b2ecf9aae merge trunk
bzr revid: nicolas.vanhoren@openerp.com-20120611090549-y4um978338d22bvn
2012-06-11 11:05:49 +02:00
Fabien Pinckaers 0073ff5811 [merge] trunk
bzr revid: fp@tinyerp.com-20120611090305-hh1yws123ile54r3
2012-06-11 11:03:05 +02:00
Fabien Pinckaers fc3873e131 [IMP] views
bzr revid: fp@tinyerp.com-20120611090248-oechaas8kntaqzqf
2012-06-11 11:02:48 +02:00
Sbh (Openerp) feef878efd [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20120611085919-7dscyh3ntxiigukh
2012-06-11 14:29:19 +05:30
Bharat Devnani (OpenERP) 2529ede93a [MERGE] merged with lp:~openerp-dev/openobject-addons/trunk-application_setting_cleanup-atp
bzr revid: bde@tinyerp.com-20120611085744-1wi5vglx330e53b9
2012-06-11 14:27:44 +05:30
Xavier Morel 8121627ff0 [FIX] broken unit tests
bzr revid: xmo@openerp.com-20120611085019-hk9hz31yctmr5qcn
2012-06-11 10:50:19 +02:00
Fabien Meghazi b69ad45904 [ADD] Added oe_form_field_one2many classname
bzr revid: fme@openerp.com-20120612115205-3wj6odknj61qpvit
2012-06-12 13:52:05 +02:00
Atul Patel (OpenERP) 2f70c11e19 [MERGE]: Merged lp:openobject-addons
bzr revid: atp@tinyerp.com-20120611084904-05axwdewpdk4log1
2012-06-11 14:19:04 +05:30
Thibault Delavallée 3b7fffab86 [MERGE] Merged with main addons.
bzr revid: tde@openerp.com-20120611083405-01yuhy0o1fl10rv6
2012-06-11 10:34:05 +02:00
Bharat Devnani (OpenERP) a46b5cfeab [ADD] added group tag inorder to make strings of fields visible
bzr revid: bde@tinyerp.com-20120611073809-fj87yjaz96uxcw2c
2012-06-11 13:08:09 +05:30
Atul Patel (OpenERP) d77ef2cdb7 [MERGE]: Merged lp:~openerp-commiter/openobject-addons/trunk-configuration_wizard_improvement-atp-pproject-configuration-Rearrange-fields-shp
bzr revid: atp@tinyerp.com-20120611071902-3k8drrwv0xys8j43
2012-06-11 12:49:02 +05:30
Amit Patel (OpenERP) a3ebc14784 [IMP]:improved report : add formatLand in date
bzr revid: apa@tinyerp.com-20120611070138-90yuf276q52dypzp
2012-06-11 12:31:38 +05:30
Sbh (Openerp) c79a905cdc [MERGE] Merge report changes
bzr revid: sbh@tinyerp.com-20120611064212-s0gi68zw9q1yyuup
2012-06-11 12:12:12 +05:30
Sbh (Openerp) 8f7568f609 [MERGE] Merge hr_recruitment changes
bzr revid: sbh@tinyerp.com-20120611063852-65ob0jxke6mjgqf1
2012-06-11 12:08:52 +05:30
Amit Patel (OpenERP) 782961ad72 [MERGE]
bzr revid: apa@tinyerp.com-20120611063253-thu785ewcrcs7ci6
2012-06-11 12:02:53 +05:30
Amit Patel (OpenERP) 1e6ffa7570 [MERGE]
bzr revid: apa@tinyerp.com-20120611062142-gf4mtvhx09w0q51w
2012-06-11 11:51:42 +05:30
Amit Patel (OpenERP) 1a986a8f2c [MERGE]
bzr revid: apa@tinyerp.com-20120611060912-zgmaro17mmpv48bx
2012-06-11 11:39:12 +05:30
Pinakin Nayi (OpenERP) 1d5f3debbb [IMP] hr_recruitmentimprove
bzr revid: pna@tinyerp.com-20120611054603-5gph89jeahglcu08
2012-06-11 11:16:03 +05:30
Mayur Maheshwari (OpenERP) f7055f4e7b [FIX]crm:fix the global name error of osv
lp bug: https://launchpad.net/bugs/1011408 fixed

bzr revid: mma@tinyerp.com-20120611053644-pen1vqxahwx4hdve
2012-06-11 11:06:44 +05:30
Kuldeep Joshi (OpenERP) 372477ef72 [IMP]hr_holidays: remove done state and change report
bzr revid: kjo@tinyerp.com-20120611053226-dix0kl57bnipw8dq
2012-06-11 11:02:26 +05:30
Sanjay Gohel (Open ERP) 83ef9bf5b6 [MERGE]merge with parent branch
bzr revid: sgo@tinyerp.com-20120611052846-msrf9ts8ogoljcdx
2012-06-11 10:58:46 +05:30
Divyesh Makwana (Open ERP) 6c6f26250a [Merge] Merge with main server.
bzr revid: mdi@tinyerp.com-20120607090734-ffnwlx6qkw0vbkvz
bzr revid: mdi@tinyerp.com-20120611052350-eb17d5b3fedblujn
2012-06-11 10:53:50 +05:30
Divyesh Makwana (Open ERP) 1c32998fb4 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120608121703-vtsqx7zqgj4bxiok
bzr revid: mdi@tinyerp.com-20120611051938-li5w8usjmi3p2l93
2012-06-11 10:49:38 +05:30
Sanjay Gohel (Open ERP) d59dc20208 [IMP]set xpath correctly in account_journal_billing_rate
bzr revid: sgo@tinyerp.com-20120611045724-gqd8cmjkmb2qv1kq
2012-06-11 10:27:24 +05:30
Bharat Devnani (OpenERP) f8e7928d78 [MERGE] merged with main addons
bzr revid: bde@tinyerp.com-20120611044959-9juccgsc068ijp05
2012-06-11 10:19:59 +05:30
Launchpad Translations on behalf of openerp c95b6d26ab Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120609053947-vtt4bvvka4m7ss08
bzr revid: launchpad_translations_on_behalf_of_openerp-20120610043726-y2hq6n49adbitr1p
bzr revid: launchpad_translations_on_behalf_of_openerp-20120611044647-txtguaozavg1ipp2
2012-06-11 04:46:47 +00:00
Jigar Amin - OpenERP 9e6adf3597 [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120611041945-5wo6brp8rs3q2a6k
2012-06-11 09:49:45 +05:30
Fabien Pinckaers 29e736ccde fix
bzr revid: fp@tinyerp.com-20120610175435-xovklbihgqhnxbfu
2012-06-10 19:54:35 +02:00
Fabien Pinckaers c97a850535 imp
bzr revid: fp@tinyerp.com-20120610175120-hbhky8lzcqighns7
2012-06-10 19:51:20 +02:00
Fabien Pinckaers cfd847480c fix
bzr revid: fp@tinyerp.com-20120610175039-nr76mqt0o938sk8x
2012-06-10 19:50:39 +02:00
Fabien Pinckaers 6c6de5a9cc imp
bzr revid: fp@tinyerp.com-20120610174029-72nr53b40dd8zmqj
2012-06-10 19:40:29 +02:00
Fabien Pinckaers fbb0a80ba1 imp
bzr revid: fp@tinyerp.com-20120610173821-560aihfbvlwm6v3e
2012-06-10 19:38:21 +02:00
Fabien Pinckaers 4bc9562cb0 imp_form_view
bzr revid: fp@tinyerp.com-20120610171341-daug80mm3sps9k2e
2012-06-10 19:13:41 +02:00
Fabien Pinckaers 13989bfc09 fix
bzr revid: fp@tinyerp.com-20120610150918-qyj5kms1lvuwdwkc
2012-06-10 17:09:18 +02:00
Fabien Pinckaers fa448de0d0 fix
bzr revid: fp@tinyerp.com-20120610150458-zrh2bds43w0i3b4g
2012-06-10 17:04:58 +02:00
Fabien Pinckaers 2232a573ee fix
bzr revid: fp@tinyerp.com-20120610143843-tydwjj99qyhi1shh
2012-06-10 16:38:43 +02:00
Fabien Pinckaers f29497feca fix
bzr revid: fp@tinyerp.com-20120610141253-9j6fjjiv5uxjves7
2012-06-10 16:12:53 +02:00
Fabien Pinckaers 60c5fc484b imp
bzr revid: fp@tinyerp.com-20120610134658-65adbtp2mxolakq9
2012-06-10 15:46:58 +02:00
Fabien Pinckaers 1895124395 fix
bzr revid: fp@tinyerp.com-20120610130613-ptxeqrxxn15ultei
2012-06-10 15:06:13 +02:00
Fabien Pinckaers dc309e3c1e fix
bzr revid: fp@tinyerp.com-20120610125845-fyd5o5vb1fuoosbv
2012-06-10 14:58:45 +02:00
Fabien Pinckaers 9901961a2f fix
bzr revid: fp@tinyerp.com-20120610120614-oe3plgxr1364um0q
2012-06-10 14:06:14 +02:00
Fabien Pinckaers 7d89afe7bc fix
bzr revid: fp@tinyerp.com-20120610104338-spr8hfo74z2vy0nj
2012-06-10 12:43:38 +02:00
Fabien Pinckaers e4b0c03d7e fix
bzr revid: fp@tinyerp.com-20120610103254-5iinjtbfoi1ls7c0
2012-06-10 12:32:54 +02:00
Fabien Pinckaers b72a3b9829 fix
bzr revid: fp@tinyerp.com-20120610100338-10i6j62ame7qz0a0
2012-06-10 12:03:38 +02:00
Atul Patel (OpenERP) 4982f23e07 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20120610085412-xbcfzwfpf9o6i2gl
2012-06-10 14:24:12 +05:30