Commit Graph

386 Commits

Author SHA1 Message Date
Divyesh Makwana (Open ERP) d820c71fb7 [FIX] crm : IntegrityError: duplicate key value violates unique constraint.
bzr revid: mdi@tinyerp.com-20121101083908-xangf2ibmzctnvpl
2012-11-01 14:09:08 +05:30
Launchpad Translations on behalf of openerp 87d3caa50f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121030053700-w841c92uvirpii9h
2012-10-30 05:37:00 +00:00
Launchpad Translations on behalf of openerp 5bfa3c5a7d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121019053933-51d6oob5aw0ujz40
2012-10-19 05:39:33 +00:00
Antonin Bourguignon 1653332080 [MERGE] trunk
bzr revid: abo@openerp.com-20121002102915-424prxd74izb1szw
2012-10-02 12:29:15 +02:00
Fabien Pinckaers fa7b5f85ec [MERGE] misc fixes
bzr revid: fp@tinyerp.com-20120928075641-sx7cfje2g188buog
2012-09-28 09:56:41 +02:00
Amit Patel ad5a175d8b [MERGE]:trunk
bzr revid: apa@tinyerp.com-20120928050433-1gb7lpwwxdfpedlu
2012-09-28 10:34:33 +05:30
Fabien Pinckaers e9f4840c93 [IMP] emoving bad code, no invitation system on events
[IMP] no more certifiate, will be managed in apps.openerp.com directly

bzr revid: fp@tinyerp.com-20120926121627-60isym4hdjkaxe9p
2012-09-26 14:16:27 +02:00
Harry (OpenERP) 6585e5288f [MERGE] merged with trunk
bzr revid: hmo@tinyerp.com-20120926110529-1ye71tpb6rxohn2r
2012-09-26 16:35:29 +05:30
Harry (OpenERP) 121626b6be [FIX] sale, crm_profilling: employee user can able to read answer and sale order
bzr revid: hmo@tinyerp.com-20120926110150-de19coowxgkq0t75
2012-09-26 16:31:50 +05:30
Divyesh Makwana (Open ERP) 6c6f9671ce [FIX] crm_profiling : View type 'form' is not supported in One2Many.
bzr revid: mdi@tinyerp.com-20120918084342-o6sh8kn8oj755m32
2012-09-18 14:13:42 +05:30
Launchpad Translations on behalf of openerp ffc320dcc7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120907045929-grtx16xxp1c4m6rh
bzr revid: launchpad_translations_on_behalf_of_openerp-20120907050524-07x2fgbr194czqbs
2012-09-07 05:05:24 +00:00
Launchpad Translations on behalf of openerp b065d54d96 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120830051221-904da3tt7dpfmhlx
2012-08-30 05:12:21 +00:00
Launchpad Translations on behalf of openerp 4e31d1be93 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120828064335-bftlutj6aiymztbp
bzr revid: launchpad_translations_on_behalf_of_openerp-20120828072410-7ndsu3tnyrjhtuor
2012-08-28 07:24:10 +00:00
pso (OpenERP) c78a04bc68 [MERGE] Merged HSA's branch to improve __openerp__.py of all modules by replacing init_xml, update_xml with data, demo_xml with demo, Adding noupdate in init_xml files
bzr revid: pso@tinyerp.com-20120822071445-yamr1s0zf3fk9jj7
2012-08-22 12:44:45 +05:30
pso (OpenERP) 72ec57d5d4 [MERGE] Merged SSU's branch to improve module description with respect of rst format
bzr revid: pso@tinyerp.com-20120821111356-abyhw484xe2nkzyi
2012-08-21 16:43:56 +05:30
Hardik 8f9f860323 [IMP]Update __openerp__.py for all modules
bzr revid: hsa@tinyerp.com-20120820125644-px287o03bxrx8h3o
2012-08-20 18:26:44 +05:30
help 0d4603f4f9 [IMP]improved modules description from rst2html
bzr revid: help-20120820092716-x61hs1o7d8lz6tpg
2012-08-20 14:57:16 +05:30
Hardik b040d2706d [IMP]update __openerp__.py in all modules
bzr revid: hsa@tinyerp.com-20120817111540-rfql0ifsvbx5nz7g
2012-08-17 16:45:40 +05:30
Vo Minh Thu 9822629548 [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
2012-08-13 18:06:57 +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
Twinkle Christian (OpenERP) 2d6aae609b [IMP]Remove type field from the views
bzr revid: tch@tinyerp.com-20120808121950-r4tux6lfej82bi2h
2012-08-08 17:49:50 +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
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
Jigar Amin - OpenERP 935e31b328 merge lp:openobject-addons
bzr revid: jam@tinyerp.com-20120807105628-j3py2jnd1fnbnzza
2012-08-07 16:26:28 +05:30
Twinkle Christian (OpenERP) 2e689ca4e0 [IMP]improved views
bzr revid: tch@tinyerp.com-20120807093734-0u3ozi0hn7rxiy2q
2012-08-07 15:07:34 +05:30
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) 79a6df542e [IMP]: crm_profiling: Improved demo for partner tags so that one partner can have only 2-3 tags and tags should be 2 levels only
bzr revid: rpa@tinyerp.com-20120727085816-2wighhqwoztw9xhl
2012-07-27 14:28:16 +05:30
Rucha (Open ERP) 4eb76030a6 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120726053855-8j8c70xqc0ynikx1
2012-07-26 11:08:55 +05:30
pso (OpenERP) e5da0e191b [MERGE] Merged with main branch
bzr revid: pso@tinyerp.com-20120725125332-7qe6b3l0fjryast2
2012-07-25 18:23:32 +05:30
Rucha (Open ERP) ab9981e565 [IMP]: Replaced tabs with 4 spaces in some xml demo files
bzr revid: rpa@tinyerp.com-20120725094836-fqa0fs31bygvzh5p
2012-07-25 15:18:36 +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) 524e378d34 [IMP] Improved warning messages/exceptions of crm modules
bzr revid: pso@tinyerp.com-20120716092231-q8xt8fr4yy6sx2wf
2012-07-16 14:52:31 +05:30
Rucha (Open ERP) 64137a63cf [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120716090657-r7mlld3rsufel2ge
2012-07-16 14:36:57 +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
Ajay Chauhan (OpenERP) e2ebb07bd0 [IMP] : Update Description for modules
bzr revid: cha@tinyerp.com-20120712110112-sv55u52q6f7s8k8m
2012-07-12 16:31:12 +05:30
Pinakin Nayi (OpenERP) ea721d65af [IMP]crm-warning-msg
bzr revid: pna@tinyerp.com-20120712055038-06rgow7j1sgae6v6
2012-07-12 11:20:38 +05:30
Rucha (Open ERP) 63bdc1851d [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120711052537-mjxlznfhrt4feee9
2012-07-11 10:55:37 +05:30
Fabien Pinckaers 64a9321d56 [IMP] footer on forms
bzr revid: fp@tinyerp.com-20120710164011-unqi1okf2uu8yhts
2012-07-10 18:40:11 +02:00
Rucha (Open ERP) a6ff1de18a [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120709065757-9myg5025dqps8q65
2012-07-09 12:27:57 +05:30
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
Launchpad Translations on behalf of openerp 5babd88330 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120706045835-psdlu6pet8cabwna
bzr revid: launchpad_translations_on_behalf_of_openerp-20120706050751-xzq60elhr5ajn5i6
2012-07-06 05:07:51 +00:00
Rucha (Open ERP) 953dff0367 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120702054353-ertcuzo8gmqu98wp
2012-07-02 11:13:53 +05:30
Quentin (OpenERP) 6fe94bd4bc [MERGE] merged with maint runk
bzr revid: qdp-launchpad@openerp.com-20120629123618-z1bv3dqdfqy23hno
2012-06-29 14:36:18 +02:00
Raphael Collet 76f17eb480 [IMP] in form views, remove useless colspans on buttons in headers
bzr revid: rco@openerp.com-20120629084603-yz0hdnvtjy1fplp1
2012-06-29 10:46:03 +02:00
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
Rucha (Open ERP) 3c285a6194 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120629070441-o61czak5knl0adgy
2012-06-29 12:34:41 +05:30
Raphael Collet 1debe0efcd [MERGE] from trunk
bzr revid: rco@openerp.com-20120628131210-hyx2t1lqbl5hwm9g
2012-06-28 15:12:10 +02:00
Quentin (OpenERP) 08d25cb352 [MERGE] merged with main trunk
bzr revid: qdp-launchpad@openerp.com-20120628123618-wyfrmfiw68xlt1aw
2012-06-28 14:36:18 +02:00