Commit Graph

513 Commits

Author SHA1 Message Date
Vo Minh Thu 2376fe0add [MERGE] merged view changes: the `type` is now a functional field derived from the arch.
bzr revid: vmt@openerp.com-20120814121117-dent4ctz89kdcabi
2012-08-14 14:11:17 +02:00
Vo Minh Thu 9822629548 [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
2012-08-13 18:06:57 +02:00
Stephane Wirtel 36aaaf4a32 [MERGE]
bzr revid: stw@openerp.com-20120813145708-botpw2f1shkhv3on
2012-08-13 16:57:08 +02:00
Rucha (Open ERP) dd7a2972d8 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120813051411-5no0xcudwbkw07c5
2012-08-13 10:44:11 +05:30
Stephane Wirtel b01fc5c9a2 [MERGE] lp:~openerp-dev/openobject-addons/trunk-addons-issues4-crm-pso
bzr revid: stw@openerp.com-20120810091332-c80h6kh3gc88mpt7
2012-08-10 11:13:32 +02:00
Fabien Pinckaers f33eb7b444 [IMP] opportunity form
bzr revid: fp@tinyerp.com-20120809163214-q2sbhmb0ifk7vcq9
2012-08-09 18:32:14 +02:00
pso (OpenERP) 55da32ff65 [MERGE] Merged HSA's branch for sale_crm improvement
bzr revid: pso@tinyerp.com-20120809123606-7jrxaxqs9tqhvl2r
2012-08-09 18:06:06 +05:30
Twinkle Christian (OpenERP) fc1b1749a8 [IMP]Remove type field from the modules
bzr revid: tch@tinyerp.com-20120809060516-zgx3gdyv6wdshfyw
2012-08-09 11:35:16 +05:30
Hardik 22a4b11322 [IMP]sale_crm : set the group on shop field
bzr revid: hsa@tinyerp.com-20120808112345-rqgdsncaghzq36nc
2012-08-08 16:53:45 +05:30
Launchpad Translations on behalf of openerp e970ecd62c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120809050051-p6f437n80grsr5vz
2012-08-09 05:00:51 +00:00
Antony Lesuisse 6065e32e2b [MERGE] trunk
bzr revid: al@openerp.com-20120808154332-8v1vp9yeykzxcey2
2012-08-08 17:43:32 +02:00
Olivier Dony 3fd9a77c83 [REVERT] Cancel PO Template changes from rev.2702 - to be fully re-generated before next release
We'll also attempt to replace the master strings in the
translated .po files before replacing the master strings,
to avoid losing translations just because of mere typo fixes.

bzr revid: odo@openerp.com-20120808144613-wtz50tcz5n7kvcza
2012-08-08 16:46:13 +02:00
Rucha (Open ERP) d597437dd7 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120808063503-ymsvwnerxakqbcbx
2012-08-08 12:05:03 +05:30
Antonin Bourguignon a97687a420 [MERGE] latest trunk
also replace the error message title 'Operation Not Permitted' by 'Invalid Action'

bzr revid: abo@openerp.com-20120807120451-zdrrecilfh82obhl
2012-08-07 14:04:51 +02:00
Antonin Bourguignon fe5956057a [FIX] spelling: 'insufficient data' instead of 'data insufficient'
bzr revid: abo@openerp.com-20120807102326-sro2nxr4zn95zhs1
2012-08-07 12:23:26 +02:00
Launchpad Translations on behalf of openerp 3cfd65b43d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120807053928-8131c98edycpivlb
2012-08-07 05:39:28 +00:00
Rucha (Open ERP) b7daa1fb31 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120803045532-wsgei101ogh0o44d
bzr revid: rpa@tinyerp.com-20120806050952-xecwmyhg4p2fs4id
2012-08-06 10:39:52 +05:30
Antonin Bourguignon b12e606e18 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120803160951-4n7ckom9hyhgeio2
2012-08-03 18:09:51 +02:00
Stephane Wirtel 6a92f8856b [FIX] sale_crm: Rename 'Close Opportunity' to 'Mark Won'
bzr revid: stw@openerp.com-20120803074013-4lzh8092oiu7xdcd
2012-08-03 09:40:13 +02:00
Amit Patel (OpenERP) 1fdc6c9038 [MERGE]:merged with trunk
bzr revid: apa@tinyerp.com-20120801070331-vqlkv8hj33f6fhmk
2012-08-01 12:33:31 +05:30
Rucha (Open ERP) 01bea180bb [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120801064738-vcjdjnt3s57i2hgc
2012-08-01 12:17:38 +05:30
pso (OpenERP) 773c2d5c63 [MERGE] Merge with main branch
bzr revid: pso@tinyerp.com-20120801064711-y90iik5ialfdnfft
2012-08-01 12:17:11 +05:30
Launchpad Translations on behalf of openerp e845e2350c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120801044335-2llntxn2tfj8m7yt
bzr revid: launchpad_translations_on_behalf_of_openerp-20120801044411-aoxlecq42a8czbf8
2012-08-01 04:44:11 +00:00
Quentin (OpenERP) e1b50e304d [MEGUEZ] merged the clean search view branch
bzr revid: qdp-launchpad@openerp.com-20120731150358-jqd3eoz06imzlx01
2012-07-31 17:03:58 +02:00
Amit Patel (OpenERP) 5b2c56e935 [MERGE]
bzr revid: apa@tinyerp.com-20120731051722-t09k8cjxlhm3d2gg
2012-07-31 10:47:22 +05:30
Launchpad Translations on behalf of openerp 84ea8f59d7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120731045841-1532ttai3o223dln
2012-07-31 04:58:41 +00:00
vta vta@openerp.com 264d2c3365 [MERGE] Trunk.
bzr revid: vta@openerp.com-20120730123628-49rirhupbwqfzr0r
2012-07-30 14:36:28 +02:00
Rucha (Open ERP) f10270c64a [IMP]: crm*: Improved xml_id of demo cases so it can be generic
bzr revid: rpa@tinyerp.com-20120730102352-wv3g29qk556mx5zc
2012-07-30 15:53:52 +05:30
Sanjay Gohel (Open ERP) 47af4b2c7d [IMP]improve view for inherited button
bzr revid: sgo@tinyerp.com-20120730055756-kie1exivhl152anf
2012-07-30 11:27:56 +05:30
Launchpad Translations on behalf of openerp 0c581831b8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120728045741-hrbggtt37yutrbpx
bzr revid: launchpad_translations_on_behalf_of_openerp-20120729043802-x7m56po0nxue0jb0
2012-07-29 04:38:02 +00:00
Raphael Collet a679622cac [MERGE] trunk-first_10_clicks_crm_m2m_new-mdi (in crm, change category into m2m_tags)
bzr revid: rco@openerp.com-20120725153217-hsf80zd3wfal7h13
2012-07-25 17:32:17 +02:00
pso (OpenERP) e5da0e191b [MERGE] Merged with main branch
bzr revid: pso@tinyerp.com-20120725125332-7qe6b3l0fjryast2
2012-07-25 18:23:32 +05:30
Twinkle Christian (OpenERP) 8e4d39fd9d [IMP]improved search view
bzr revid: tch@tinyerp.com-20120723130532-rmssjxi03ke5qlvv
2012-07-23 18:35:32 +05:30
Twinkle Christian (OpenERP) 25ab7f32dc [IMP]improved search view
bzr revid: tch@tinyerp.com-20120723071202-yxnk98ir6mwtrh3g
2012-07-23 12:42:02 +05:30
Purnendu Singh (OpenERP) c45d68d6b8 [MERGE] Merge with main addons
bzr revid: psi@tinyerp.com-20120718055558-03lss1ha0tcdi2dk
2012-07-18 11:25:58 +05:30
pso (OpenERP) 4218e5924c [IMP] Improved warning messages/exceptions of sale modules
bzr revid: pso@tinyerp.com-20120716103220-ljmc009spnwwt0ot
2012-07-16 16:02:20 +05:30
Purnendu Singh (OpenERP) 2e2f7188d3 [MERGE, IMP] improve and merge cha branch to update desc formatting
bzr revid: psi@tinyerp.com-20120716094548-xx1ip3eljal3ffvl
2012-07-16 15:15:48 +05:30
Divyesh Makwana (Open ERP) 0443db5f9d [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120712043845-ing7eipsv3z20ps5
bzr revid: mdi@tinyerp.com-20120713044825-1wwxd80yp7cv2325
bzr revid: mdi@tinyerp.com-20120716043444-cfqjeo5rmnrj295x
2012-07-16 10:04:44 +05:30
Launchpad Translations on behalf of openerp 8028996327 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120714062750-arh47r4vgtj7zlwu
2012-07-14 06:27:50 +00:00
Hardik da2ce167d9 [IMP]Sale(.pot) : Warning Messages are changed
bzr revid: hsa@tinyerp.com-20120713110026-o8x60knyi1dxpy6i
2012-07-13 16:30:26 +05:30
Ajay Chauhan (OpenERP) 4f72fafa91 [IMP] : Update Description for modules
bzr revid: cha@tinyerp.com-20120713095216-l4xxa28z5lfhp5i1
2012-07-13 15:22:16 +05:30
Hardik 65828916b7 [IMP]Sale : Warinig Messages are Changed
bzr revid: hsa@tinyerp.com-20120712055847-gk58g4lebt9ran3z
2012-07-12 11:28:47 +05:30
Divyesh Makwana (Open ERP) 770df36345 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120711045811-fi5t79g6kk20wn8v
2012-07-11 10:28:11 +05:30
Fabien Pinckaers 64a9321d56 [IMP] footer on forms
bzr revid: fp@tinyerp.com-20120710164011-unqi1okf2uu8yhts
2012-07-10 18:40:11 +02:00
Launchpad Translations on behalf of openerp e9c288b4bf Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120707051326-0nn73he814pbmz14
bzr revid: launchpad_translations_on_behalf_of_openerp-20120708044140-ev3j10bquy9p89t7
bzr revid: launchpad_translations_on_behalf_of_openerp-20120709045113-mh0kg5l420xs8ux4
2012-07-09 04:51:13 +00:00
Divyesh Makwana (Open ERP) c4061ea6aa [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120709043027-l037rvy3z7h0hk9y
2012-07-09 10:00:27 +05:30
Divyesh Makwana (Open ERP) 789103e93b [IMP] crm, sale_crm : Change the field defination of 'categ_id' to many2many and its related changes.
bzr revid: mdi@tinyerp.com-20120706110621-nkgcqllbw1wpf1r6
2012-07-06 16:36:21 +05:30
Raphael Collet 5133bee1d5 [FIX] in form views, replace class 'oe_highlight_on_dirty' by 'oe_highlight'
bzr revid: rco@openerp.com-20120629083024-rqhtbf9melkygg0m
2012-06-29 10:30:24 +02:00
Raphael Collet 2963e31ebf [MERGE] from trunk
bzr revid: rco@openerp.com-20120628142628-qi35145b8hsvpsfi
2012-06-28 16:26:28 +02:00
Jigar Amin - OpenERP 11224704cd [FIX] purchase*, sale, share, report_webkit, buton cancel
bzr revid: jam@tinyerp.com-20120627134530-141mzncfffkmjrom
2012-06-27 19:15:30 +05:30