Olivier Dony
196c11d41e
[MERGE] latest trunk
...
bzr revid: odo@openerp.com-20110913132843-eo7vevh8h9924hm2
2011-09-13 15:28:43 +02:00
Quentin (OpenERP)
c7862447c2
[MERGE] sale_crm: -In search view,positioned fields after 'user_id' field in place of removed 'date_order' field of sale.order
...
bzr revid: qdp-launchpad@openerp.com-20110913072103-00ndbex3y3eomm5v
2011-09-13 09:21:03 +02:00
Meera Trambadia (OpenERP)
b86fb12ae8
[FIX] sale_crm:-In search view,positioned fields after 'name' field in place of removed 'date_order' field of sale.order
...
lp bug: https://launchpad.net/bugs/847791 fixed
bzr revid: mtr@tinyerp.com-20110913062126-3lhad3hofobvsxac
2011-09-13 11:51:26 +05:30
Olivier Dony
f42126df0e
[MERGE] latest trunk
...
bzr revid: odo@openerp.com-20110906080846-lyi3haucchsaz7uo
2011-09-06 10:08:46 +02:00
752df5acbd
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110905055933-cld0r3vv3jmiu5bx
bzr revid: launchpad_translations_on_behalf_of_openerp-20110906044018-ajk9u7zfqoiatufs
2011-09-06 04:40:18 +00:00
Antony Lesuisse
71443ad49f
[MERGE] trunk
...
bzr revid: al@openerp.com-20110827211948-kmap692ves3ixo4k
2011-08-27 23:19:48 +02:00
Olivier Dony
2f543db06e
[IMP] mail: cleanup/rename API + adapt dependencies (wip)
...
bzr revid: odo@openerp.com-20110825122757-0mqr0gbol25t0n41
2011-08-25 14:27:57 +02:00
ae7b1699cb
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110823050537-7q5lx6k2wq8n70ld
bzr revid: launchpad_translations_on_behalf_of_openerp-20110824043728-ri9o75i5hp2tss1x
2011-08-24 04:37:28 +00:00
Olivier Dony
4fcb67bef1
[MERGE] latest trunk
...
bzr revid: odo@openerp.com-20110822171856-1zkyunpjyz5ffdth
2011-08-22 19:18:56 +02:00
063e28a83d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110820045348-7oh5zs7l4lr3zsq1
2011-08-20 04:53:48 +00:00
b93ee681aa
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110819043543-y0ffrzj9o2vtuktx
2011-08-19 04:35:43 +00:00
ac9c0e55b0
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110818043608-kjmi6rgmnpk2d36r
2011-08-18 04:36:08 +00:00
Olivier Dony
50507512cb
[MERGE] latest trunk
...
This was a helluva merge, with hundreds of conflicts resolved manually!!
I hope I did not break too many things, but a full review of the mail-related
features (where most of the conflicts occurred) must still be done before
this feature branch can be merged.
bzr revid: odo@openerp.com-20110809234428-3dsvxrt6t54ju0cf
2011-08-10 01:44:28 +02:00
Raphael Collet
81a1eb18a1
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20110718083424-kdaesx3gflza142a
2011-07-18 10:34:24 +02:00
78491dfe17
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110715045140-vrbatydl7fa97wok
bzr revid: launchpad_translations_on_behalf_of_openerp-20110716045705-9z1giql3prjl7zdd
2011-07-16 04:57:05 +00:00
Raphael Collet
292b4683b6
[MERGE] add field 'complexity' in modules
...
bzr revid: rco@openerp.com-20110708100307-5axn5hnn92qm8qiw
2011-07-08 12:03:07 +02:00
Hardik Ansodariy (OpenERP)
1f5aa0643f
[IMP]: module is defined by its complexity
...
bzr revid: han@tinyerp.com-20110706122928-xvcpdu5inpkganfy
2011-07-06 17:59:28 +05:30
Jacques-Etienne Baudoux
d8c9f67865
[IMP] add category in sale order and copy category from opportunity to sale order when creating a quote from an opportunity
...
lp bug: https://launchpad.net/bugs/791151 fixed
bzr revid: jba@openerp.com-20110601102501-5ofq4jyb72u6lqo6
2011-06-01 12:25:01 +02:00
8bed1f4c7b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110517044035-gujm452234pbeq87
2011-05-17 04:40:35 +00:00
12f8701002
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110510043731-q2jphpxofpk96w5o
bzr revid: launchpad_translations_on_behalf_of_openerp-20110511043751-nk6ku955bxwo1i7r
bzr revid: launchpad_translations_on_behalf_of_openerp-20110512043510-7y1qenjz8zlpvolt
2011-05-12 04:35:10 +00:00
Quentin (OpenERP)
15850af75e
[MERGE] merged ksa's branch with naming for act window
...
bzr revid: qdp-launchpad@openerp.com-20110505091917-maesied9noy4m8ye
2011-05-05 11:19:17 +02:00
d553615695
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110429055618-q15rvfmlvfsl2im5
bzr revid: launchpad_translations_on_behalf_of_openerp-20110430045341-qzlphdlvqf2aa1zx
bzr revid: launchpad_translations_on_behalf_of_openerp-20110501045420-py2vl38b1o3mfs7o
bzr revid: launchpad_translations_on_behalf_of_openerp-20110502043731-ym2tvgj2djoitk8f
2011-05-02 04:37:31 +00:00
Harry (OpenERP)
5be7bbd5c3
[MERGE] merged with trunk development branch
...
bzr revid: hmo@tinyerp.com-20110428111210-llk36qlgkdz1ls54
2011-04-28 16:42:10 +05:30
2f1607c786
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110422043906-4a4yeks4mzl3sfef
bzr revid: launchpad_translations_on_behalf_of_openerp-20110423045345-9xga4elfyud8nsec
bzr revid: launchpad_translations_on_behalf_of_openerp-20110424043747-9x0ffekdqw8ldcc1
bzr revid: launchpad_translations_on_behalf_of_openerp-20110425045050-3owniws6mcmmclll
bzr revid: launchpad_translations_on_behalf_of_openerp-20110426044154-jrf1eg82ie49zl0r
2011-04-26 04:41:54 +00:00
Harry (OpenERP)
cf032c0bf0
[MERGE] correction of backlog1
...
bzr revid: hmo@tinyerp.com-20110421095844-73673t3zs2clyeba
2011-04-21 15:28:44 +05:30
Rifakat Haradwala (Open ERP)
4b2f93cb34
[FIX]: removed method _history() and called history() instead
...
bzr revid: rha@tinyerp.com-20110421091915-fw1sr549av69mm4b
2011-04-21 14:49:15 +05:30
838512af0b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110401044755-ox0af9npzekocmtk
bzr revid: launchpad_translations_on_behalf_of_openerp-20110402045547-u88jxku3jz7ejycg
bzr revid: launchpad_translations_on_behalf_of_openerp-20110403044009-x9bqq57ukyqvp6ia
bzr revid: launchpad_translations_on_behalf_of_openerp-20110404044757-3uw7ib92gpv7ezu1
bzr revid: launchpad_translations_on_behalf_of_openerp-20110405044706-ew5moemiz1wxra7h
2011-04-05 04:47:06 +00:00
ff20865adf
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110324045030-dnid31oi7qb2oql6
2011-03-24 04:50:30 +00:00
8c5349a683
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110320044558-ev1jrkafe83u2pxc
bzr revid: launchpad_translations_on_behalf_of_openerp-20110321044719-jq7brro8iejzgpqq
bzr revid: launchpad_translations_on_behalf_of_openerp-20110322043613-5hvgnsn9xs2glqfx
2011-03-22 04:36:13 +00:00
niv-openerp
a898038b47
[MERGE] Merged module screenshots and improvements to module descriptions.
...
bzr revid: nicolas.vanhoren@openerp.com-20110318110816-f8bnmmlfzc9eqyu7
2011-03-18 12:08:16 +01:00
c18e506cf5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110318050000-clr4x2jge8ptg7q6
2011-03-18 05:00:00 +00:00
Quentin (OpenERP)
8295f3125f
[MERGE] lp:684741
...
bzr revid: qdp-launchpad@openerp.com-20110317173316-1nwca68kko2dlu1c
2011-03-17 18:33:16 +01:00
niv-openerp
edbb2d7168
[MERGE] Improvements to manifests.
...
bzr revid: nicolas.vanhoren@openerp.com-20110317122126-q1vxxy287aykxv6h
2011-03-17 13:21:26 +01:00
rch-openerp
8080d02b1d
[ADD]: Images of sale_crm, sale_journal, sale_layout, sale_margin and sale_mrp modules.
...
bzr revid: rch@tinyerp.com-20110316092024-oos3hdegrc71bu66
2011-03-16 14:50:24 +05:30
ksa (Open ERP)
30c2f1c330
[IMP]: Give proper action name
...
bzr revid: ksa@tinyerp.co.in-20110315083826-q4te23k1c7m521ov
2011-03-15 14:08:26 +05:30
Jigar Amin
50fd414738
[BUG/FIX] lp:732518 sale_crm : Covert to Quote shoud show only list of Customers
...
lp bug: https://launchpad.net/bugs/732518 fixed
bzr revid: jam@tinyerp.com-20110311125535-l3trf4ykjpn48qax
2011-03-11 18:25:35 +05:30
Els Van Vossel
a69c473f52
[IMP] Changed all module categories, limited number of categories
...
bzr revid: evv@openerp.com-20110309100505-mwxe08davyzdkfis
2011-03-09 11:05:05 +01:00
Rifakat Haradwala (Open ERP)
64f9d7e94f
[IMP] : base_module_quality, crm, email_template, mail_gateway, sale_crm, share: string formatting
...
bzr revid: rha@tinyerp.com-20110308112208-40jbv5er9w21xiw0
2011-03-08 16:52:08 +05:30
ksa (Open ERP)
3a30b34863
[IMP]:Put names in act_windows because of blank names we are not able to find some act_windows
...
bzr revid: ksa@tinyerp.co.in-20110308083939-ebfhrlt53g7ysuo5
2011-03-08 14:09:39 +05:30
0033dd0a59
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110302043901-hinshf78fz65fwl6
2011-03-02 04:39:01 +00:00
9c7afeb2c8
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110301043841-ufga2xxsn0e0jxpz
2011-03-01 04:38:41 +00:00
91c1768528
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110219050636-1btpvj9zqjimxijv
bzr revid: launchpad_translations_on_behalf_of_openerp-20110220043504-mcl5q57u3gd76v17
bzr revid: launchpad_translations_on_behalf_of_openerp-20110221045124-bqt3wvc41vqbii6y
bzr revid: launchpad_translations_on_behalf_of_openerp-20110222045457-58g74ycfoa1jbk08
2011-02-22 04:54:57 +00:00
Olivier Dony
07f520a856
[MERGE] merged bugfixes from 6.0 up to revision 4401
...
bzr revid: odo@openerp.com-20110214114507-8uwohpcblsfhgjae
2011-02-14 12:45:07 +01:00
5914731fb5
[FIX] Sale_crm : Correction the inheritance of views,made by string. (Ref:SaaS maintenance Case 3974)
...
bzr revid: jvo@tinyerp.com-20110204063243-33yu7bgb4271ox07
2011-02-04 12:02:43 +05:30
bbfa775055
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110202044205-3ws4pqp0lavgg5c5
bzr revid: launchpad_translations_on_behalf_of_openerp-20110203044526-s8t9nmtqd7do7yy4
2011-02-03 04:45:26 +00:00
61a62b1dfe
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110129045401-1zezcgk719d3dm0t
bzr revid: launchpad_translations_on_behalf_of_openerp-20110130044958-yshcathln43o1wdz
bzr revid: launchpad_translations_on_behalf_of_openerp-20110131045457-rzhwci5po7ea72bd
bzr revid: launchpad_translations_on_behalf_of_openerp-20110129045641-xfn2nij4y67wyq3h
bzr revid: launchpad_translations_on_behalf_of_openerp-20110130045141-vh5ecttx8tj5vdg4
bzr revid: launchpad_translations_on_behalf_of_openerp-20110131045711-41727n3c4e3wi0t9
2011-01-31 04:57:11 +00:00
c456ff0d76
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110127043453-7iocd8dbvj0edxzt
bzr revid: launchpad_translations_on_behalf_of_openerp-20110126044003-z1ltdzbzu9trb8qo
bzr revid: launchpad_translations_on_behalf_of_openerp-20110127043733-5jad7vpuuti1my8y
2011-01-27 04:37:33 +00:00
f432535386
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110125070908-zuisvtekjxpi6dny
2011-01-25 07:09:08 +00:00
217e21b620
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110125045659-am7jb132fuddnag8
2011-01-25 04:56:59 +00:00
b54fbb4957
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110121043831-eluknu6abf6pkaf0
bzr revid: launchpad_translations_on_behalf_of_openerp-20110121044107-0jtepgcibqnai8il
2011-01-21 04:41:07 +00:00
Olivier Dony