79da379130
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20120920101159-oaz40ygm6md27i8y
2012-09-20 12:11:59 +02:00
5bef9aa440
[IMP] in Opportunities form view change button name of 'convert to quote' & put escalate button near the field 'Sales Team'
...
bzr revid: fka@tinyerp.com-20120912064257-3zg1j4oek2o7imje
2012-09-12 12:12:57 +05:30
f1cf4c04b9
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120909110214-2e1c7e7t43c69zzo
2012-09-09 16:32:14 +05:30
eb28892a3a
[IMP]: MOVE PROCUREMENT CHANGES INTO PROCUREMENT..
...
bzr revid: atp@tinyerp.com-20120909101156-9pna66qbx28px2ii
2012-09-09 15:41:56 +05:30
48c081f271
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120904075142-4xnbxyf52ph0jezj
2012-09-04 09:51:42 +02:00
ffc772edfd
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120904045249-1039twan4q8v5oip
2012-09-04 04:52:49 +00:00
6fa349a4eb
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120903091818-0qnjl3e5tss54bbj
2012-09-03 11:18:18 +02:00
e3f1c26e6a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120901045519-l6nqaovtdathorsj
bzr revid: launchpad_translations_on_behalf_of_openerp-20120903052117-yz3n1mkbu0qpbnfo
2012-09-03 05:21:17 +00:00
8b910c1f1d
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120829074244-x6u8dnw4owiw93pv
2012-08-29 09:42:44 +02:00
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
4b0d1be1c0
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120827083705-p2edynkzch7hszrd
2012-08-27 10:37:05 +02:00
121b351b59
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120822175756-ypym270e6cklpbds
2012-08-22 19:57:56 +02:00
e30fed20b8
merge_trunk
...
bzr revid: fp@tinyerp.com-20120822133742-yx81c62bux28wruy
2012-08-22 15:37:42 +02:00
095843797c
[IMP] Improved _openerp__.py of all modules by replacing demo_xml with demo, init_xml and update_xml with data and adding noupdate
...
bzr revid: pso@tinyerp.com-20120822130232-un52dks3sclyx8m5
2012-08-22 18:32:32 +05:30
8f9f860323
[IMP]Update __openerp__.py for all modules
...
bzr revid: hsa@tinyerp.com-20120820125644-px287o03bxrx8h3o
2012-08-20 18:26:44 +05:30
b040d2706d
[IMP]update __openerp__.py in all modules
...
bzr revid: hsa@tinyerp.com-20120817111540-rfql0ifsvbx5nz7g
2012-08-17 16:45:40 +05:30
b62858e83e
[IMP] Merging different ways of posting a message:
...
message_append_note
message_append_dict
message_append
--> merged all to message_post
bzr revid: fp@tinyerp.com-20120817100302-bqsqv23ogrchslew
2012-08-17 12:03:02 +02:00
36b8744644
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120816162407-w35dzm3xqkxj8jry
2012-08-16 18:24:07 +02:00
f35c0b3d44
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120814161000-41ai95ixagtqteok
2012-08-14 21:40:00 +05:30
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
652300eb89
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120814061700-k4swskeiz9r3ypn5
2012-08-14 11:47:00 +05:30
d537abc1b2
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120813161157-55ts36fibrys5o7j
2012-08-13 18:11:57 +02:00
9822629548
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
2012-08-13 18:06:57 +02:00
36aaaf4a32
[MERGE]
...
bzr revid: stw@openerp.com-20120813145708-botpw2f1shkhv3on
2012-08-13 16:57:08 +02:00
01cb3ebb99
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120813124439-izug22kl0plts08x
2012-08-13 14:44:39 +02:00
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
7a1a9460d9
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120813051748-klau4w0nig2apfxb
2012-08-13 10:47:48 +05:30
dd7a2972d8
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20120813051411-5no0xcudwbkw07c5
2012-08-13 10:44:11 +05:30
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
1674c9add5
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120809165534-89dhvj3pi1obnn8q
2012-08-09 22:25:34 +05:30
f33eb7b444
[IMP] opportunity form
...
bzr revid: fp@tinyerp.com-20120809163214-q2sbhmb0ifk7vcq9
2012-08-09 18:32:14 +02:00
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
fc1b1749a8
[IMP]Remove type field from the modules
...
bzr revid: tch@tinyerp.com-20120809060516-zgx3gdyv6wdshfyw
2012-08-09 11:35:16 +05:30
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
e970ecd62c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120809050051-p6f437n80grsr5vz
2012-08-09 05:00:51 +00:00
6065e32e2b
[MERGE] trunk
...
bzr revid: al@openerp.com-20120808154332-8v1vp9yeykzxcey2
2012-08-08 17:43:32 +02:00
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
d597437dd7
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20120808063503-ymsvwnerxakqbcbx
2012-08-08 12:05:03 +05:30
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
fe5956057a
[FIX] spelling: 'insufficient data' instead of 'data insufficient'
...
bzr revid: abo@openerp.com-20120807102326-sro2nxr4zn95zhs1
2012-08-07 12:23:26 +02:00
3cfd65b43d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120807053928-8131c98edycpivlb
2012-08-07 05:39:28 +00:00
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
b12e606e18
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120803160951-4n7ckom9hyhgeio2
2012-08-03 18:09:51 +02:00
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
7cf6da22cc
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120802141841-83t16vuslxyj13h8
2012-08-02 16:18:41 +02:00
1fdc6c9038
[MERGE]:merged with trunk
...
bzr revid: apa@tinyerp.com-20120801070331-vqlkv8hj33f6fhmk
2012-08-01 12:33:31 +05:30
01bea180bb
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20120801064738-vcjdjnt3s57i2hgc
2012-08-01 12:17:38 +05:30
773c2d5c63
[MERGE] Merge with main branch
...
bzr revid: pso@tinyerp.com-20120801064711-y90iik5ialfdnfft
2012-08-01 12:17:11 +05:30
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
e1b50e304d
[MEGUEZ] merged the clean search view branch
...
bzr revid: qdp-launchpad@openerp.com-20120731150358-jqd3eoz06imzlx01
2012-07-31 17:03:58 +02:00
Quentin (OpenERP)
Foram Katharotiya (OpenERP)
Atul Patel (OpenERP)
Thibault Delavallée
Launchpad Translations on behalf of openerp
Antonin Bourguignon
Fabien Pinckaers
Hardik
Frédéric van der Essen
Vo Minh Thu
Stephane Wirtel
Rucha (Open ERP)
pso (OpenERP)
Twinkle Christian (OpenERP)
Antony Lesuisse
Olivier Dony
Amit Patel (OpenERP)