Commit Graph

254 Commits

Author SHA1 Message Date
Atul Patel (OpenERP) 431fae4da5 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20120911045411-mivfwqle7pidfr68
2012-09-11 10:24:11 +05:30
Stephane Wirtel 974c645137 [MERGE] sale_margin: fix a call to super
bzr revid: stw@openerp.com-20120910102726-2j75q19epdk4k2od
2012-09-10 12:27:26 +02:00
Atul Patel (OpenERP) 3017f5d6e3 [FIX]: ADD sale_stock dependency
bzr revid: atp@tinyerp.com-20120909131338-p6bfigvid3f6876m
2012-09-09 18:43:38 +05:30
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
Amit (OpenERP) ea6ef069d0 [MERGE]: Merge with lp:openobject-addons
bzr revid: amp@tinyerp.com-20120824093439-qhfybkn4crjonepz
2012-08-24 15:04:39 +05:30
Antonin Bourguignon 121b351b59 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120822175756-ypym270e6cklpbds
2012-08-22 19:57:56 +02:00
Quentin (OpenERP) a0679e6e4f [MERGE] demo data branch
bzr revid: qdp-launchpad@openerp.com-20120822160856-k308a270wx2wnsj6
2012-08-22 18:08:56 +02:00
Hardik b040d2706d [IMP]update __openerp__.py in all modules
bzr revid: hsa@tinyerp.com-20120817111540-rfql0ifsvbx5nz7g
2012-08-17 16:45:40 +05:30
Frédéric van der Essen 36b8744644 [MERGE] from trunk
bzr revid: fva@openerp.com-20120816162407-w35dzm3xqkxj8jry
2012-08-16 18:24:07 +02:00
Rucha (Open ERP) 7a24bdb1f7 [FIX]: Improved old product names with new
bzr revid: rpa@tinyerp.com-20120816084224-t12wf5vipd8u90a7
2012-08-16 14:12:24 +05:30
Vo Minh Thu 9822629548 [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
2012-08-13 18:06:57 +02:00
Frédéric van der Essen 01cb3ebb99 [MERGE] from trunk
bzr revid: fva@openerp.com-20120813124439-izug22kl0plts08x
2012-08-13 14:44:39 +02:00
Frédéric van der Essen 4c3e048d40 [MERGE WIP] merging from trunk. Still some issues with the thumbnails
bzr revid: fva@openerp.com-20120813120801-gjufnck0f78ddivg
2012-08-13 14:08:01 +02:00
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
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
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
Frédéric van der Essen 7cf6da22cc [MERGE] from trunk
bzr revid: fva@openerp.com-20120802141841-83t16vuslxyj13h8
2012-08-02 16:18:41 +02:00
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
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
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
Rucha (Open ERP) 9be1dc63e5 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120730052105-tjzeohx0hyi43qi4
2012-07-30 10:51:05 +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
Frédéric van der Essen 8bea1218b1 [WIP] resolving conflicts generated by the **** bisect plugin
bzr revid: fva@openerp.com-20120727141228-45h9ir2njvq7hgqd
2012-07-27 16:12:28 +02:00
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
Rucha (Open ERP) 953cd056b4 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120725053226-e67t7qdy472jc3ev
2012-07-25 11:02:26 +05:30
Stephane Wirtel 9f299d9a20 [MERGE] lp:~openerp-dev/openobject-addons/trunk-review_module_desc-psi
bzr revid: stw@openerp.com-20120724080711-6655pbbfubiau3li
2012-07-24 10:07:11 +02:00
Launchpad Translations on behalf of openerp 61f361bfee Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120722044557-vi2dy3u2aq5y09v7
bzr revid: launchpad_translations_on_behalf_of_openerp-20120723051751-qjxz39bz1gs3fi6f
bzr revid: launchpad_translations_on_behalf_of_openerp-20120724045230-9oi8x0xfvobpqjab
2012-07-24 04:52:30 +00:00
Purnendu Singh (OpenERP) ec27d7e44f [MERGE] merge with main branch
bzr revid: psi@tinyerp.com-20120720061203-c6cpwc7f8uaa939n
2012-07-20 11:42:03 +05:30
Quentin (OpenERP) 7b8c3788b1 [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20120719095420-llgnafgasfcwbwu9
2012-07-19 11:54:20 +02:00
Quentin (OpenERP) e1d6ecb015 [IMP] sale, sale_margin: better name for <group> tag
bzr revid: qdp-launchpad@openerp.com-20120719093414-eqsw86hkj8qunxir
2012-07-19 11:34:14 +02:00
Purnendu Singh (OpenERP) c45d68d6b8 [MERGE] Merge with main addons
bzr revid: psi@tinyerp.com-20120718055558-03lss1ha0tcdi2dk
2012-07-18 11:25:58 +05:30
Harry (OpenERP) 5ca4e7a371 [MERGE] upstream
bzr revid: hmo@tinyerp.com-20120716111343-z05o5wes4wj1apbo
2012-07-16 16:43:43 +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
Fabien Pinckaers eb5246f1d7 form
bzr revid: fp@openerp.com-20120714200105-cr5psndz9duu2qfn
2012-07-14 22:01:05 +02:00
Fabien Pinckaers b84f5ef399 [IMP] better addons
bzr revid: fp@openerp.com-20120714195757-zqk43d7zhupitlsk
2012-07-14 21:57:57 +02:00
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) 4f72fafa91 [IMP] : Update Description for modules
bzr revid: cha@tinyerp.com-20120713095216-l4xxa28z5lfhp5i1
2012-07-13 15:22:16 +05:30
Rucha (Open ERP) 4061a1e1d4 [IMP]: sale: Improvement in demo data of sale orders and shop
bzr revid: rpa@tinyerp.com-20120711130603-f5j6jzdpi1ymxnue
2012-07-11 18:36:03 +05:30
Hardik 09701b83ac [IMP]Sale Quotation : view are improved
bzr revid: hsa@tinyerp.com-20120706060256-ymn92nvfmf1m4ctq
2012-07-06 11:32:56 +05:30
Antonin Bourguignon 48c18a60f3 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120626143915-907g4k2d91iwszld
2012-06-26 16:39:15 +02:00
Launchpad Translations on behalf of openerp 32826d52f9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120626052217-ejijeif40inxummm
bzr revid: launchpad_translations_on_behalf_of_openerp-20120626053624-27gc1r3gtzgs227c
2012-06-26 05:36:24 +00:00
Antonin Bourguignon 3c4c6aaf77 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120622130939-bt6d9nfolgza513t
2012-06-22 15:09:39 +02:00
Raphael Collet 2b85a687e5 [FIX] sale_margin: fix inherited view
bzr revid: rco@openerp.com-20120622074759-vm23obg6u0t7yqze
2012-06-22 09:47:59 +02:00
Stephane Wirtel 00d8a0e6dd [MERGE] Upstream
bzr revid: stw@openerp.com-20120619085720-i5k34ugbo24gz4lp
2012-06-19 10:57:20 +02:00
Stephane Wirtel f2fba32b56 [REF] Change the CSS classes
bzr revid: stw@openerp.com-20120619085618-agdxk4fdgy3of6gp
2012-06-19 10:56:18 +02:00
Launchpad Translations on behalf of openerp 8662748bf6 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120619045437-ggvt85jtkryegn8u
2012-06-19 04:54:37 +00:00
Stephane Wirtel 17f11dc7d9 [REF] Review the form views
bzr revid: stw@openerp.com-20120618160057-wzqaoepmqqzgj3tq
2012-06-18 18:00:57 +02:00
Fabien Pinckaers 60c5fc484b imp
bzr revid: fp@tinyerp.com-20120610134658-65adbtp2mxolakq9
2012-06-10 15:46:58 +02:00
Fabien Pinckaers 2047df4e4f [merge] trunk
bzr revid: fp@tinyerp.com-20120610083515-itgsn211254zp1b9
2012-06-10 10:35:15 +02:00
Sanjay Gohel (Open ERP) e7ad2b5f9f [IMP]clean xml in sale_margin
bzr revid: sgo@tinyerp.com-20120607084254-u7qyzvan4gbbmbye
2012-06-07 14:12:54 +05:30