Olivier Dony
0ad3703b18
[FIX] sale: writing False on a m2m is a no-op, and rather confusing here
...
bzr revid: odo@openerp.com-20121129153330-ld55e5qksflqy3bx
2012-11-29 16:33:30 +01:00
Thibault Delavallée
37a949e30a
[DOC] First draft of doc on _auto_join, to at least have something.
...
bzr revid: tde@openerp.com-20121129152852-akslcby3ics61vuz
2012-11-29 16:28:52 +01:00
d298d89500
[MERGE]latest trunk
...
bzr revid: dle@openerp.com-20121129152634-vaow28cyw2qcmr8x
2012-11-29 16:26:34 +01:00
cd9e7a3265
[FIX]Hide useless columns in bank statement
...
bzr revid: dle@openerp.com-20121129152444-vislwoifnro7khcw
2012-11-29 16:24:44 +01:00
Quentin (OpenERP)
a520d65e87
[IMP] account: in account.move.line search view, allow to search on code of accounts as well as on the name column
...
bzr revid: qdp-launchpad@openerp.com-20121129152233-y5sqdyyygq76fcbi
2012-11-29 16:22:33 +01:00
Christophe Simonis
4622172c81
merge upstream
...
bzr revid: chs@openerp.com-20121129152103-e7w590lynz4veqn9
2012-11-29 16:21:03 +01:00
Christophe Simonis
64c486e59f
[FIX] setup.py: include docutils on windows
...
bzr revid: chs@openerp.com-20121129152038-hx3km5x55x0oj9r1
2012-11-29 16:20:38 +01:00
Christophe Simonis
4d91b6a87c
[FIX] osutils: missing import
...
bzr revid: chs@openerp.com-20121129151746-r7t5xgddekvoq23w
2012-11-29 16:17:46 +01:00
Thibault Delavallée
5fc19e0454
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20121129151120-e6ovaugw0pkccyuu
2012-11-29 16:11:20 +01:00
Thibault Delavallée
7e678dd130
[MERGE] Sync with newly-green trunk.
...
bzr revid: tde@openerp.com-20121129151113-sd3qdx0udf9ihz8b
2012-11-29 16:11:13 +01:00
bd458541c1
[FIX]Deleted ir.values makes test fail
...
bzr revid: dle@openerp.com-20121129145657-g8dgyay16mcije1r
2012-11-29 15:56:57 +01:00
Thibault Delavallée
66f11ca3df
[FIX] mail.js: removed default values for non-existing field anymore. Added a comment to fix it really asap.
...
bzr revid: tde@openerp.com-20121129145601-m9exd1awcaes79zj
2012-11-29 15:56:01 +01:00
Fabien Pinckaers
5b71f38603
[FIX]
...
bzr revid: fp@tinyerp.com-20121129145219-q6wqvzy61mki2j26
2012-11-29 15:52:19 +01:00
Christophe Simonis
da574605c7
merge upstream
...
bzr revid: chs@openerp.com-20121129145039-mzj8b1vpdu48budl
2012-11-29 15:50:39 +01:00
Thibault Delavallée
9f84bbddfb
[IMP] mail: message_unread searchable field now returns a domain. This domain is quite complex, because it bypasses limitations of the _auto_join feature used on message_ids. It should be: message_ids.read = False. However, it takes into account the one2many model, as well as to_read being a function field also searchable. Ths parsing is not capable to handle this kind of thing correctly now without using an ugly hack. Updated _search_to_read and _search_starred.
...
bzr revid: tde@openerp.com-20121129144253-i9e7m2kqjteq8ajr
2012-11-29 15:42:53 +01:00
e08d02dc2b
[Merge]merge mistakes
...
bzr revid: dle@openerp.com-20121129143607-lwzsfxv3rsu2eojc
2012-11-29 15:36:07 +01:00
Quentin (OpenERP)
81035fea58
[IMP] analytic: Add the parent field on the template form
...
bzr revid: qdp-launchpad@openerp.com-20121129142712-yoluy6mxeh7a6ax1
2012-11-29 15:27:12 +01:00
Quentin (OpenERP)
574f096fce
[IMP] analytic: When creating new contract, select the Template and dates Start and are now adapted accordingly to current time
...
bzr revid: qdp-launchpad@openerp.com-20121129142428-zpdy567efax0s5qb
2012-11-29 15:24:28 +01:00
f5dffcfd11
[FIX] Fixed type of invoices in online payment.
...
bzr revid: vta@openerp.com-20121129142146-1c8z7zqrsm9icbym
2012-11-29 15:21:46 +01:00
2052aaffab
[MERGE]trunk
...
bzr revid: dle@openerp.com-20121129142010-8yt0p417ibx3p7sy
2012-11-29 15:20:10 +01:00
40042cec1b
[MERGE]trunk
...
bzr revid: dle@openerp.com-20121129141854-2o6o44jhrpi54ssp
2012-11-29 15:18:54 +01:00
Xavier Morel
c166c19ed1
[REM] dead code from evaluation being client-side only
...
bzr revid: xmo@openerp.com-20121129141759-wj4je85nkrfznql1
2012-11-29 15:17:59 +01:00
Tejas Tank
ec5c761b7d
[IMP] Avoid to set to_invoice 100% when 'use timesheet' set.
...
bzr revid: tta@openerp.com-20121129141529-avzooa3gxgtpv32d
2012-11-29 19:15:29 +05:00
Vo Minh Thu
001c451608
[REV] reverted install-all commit (vmt@openerp.com-20121128142106-pdkcruhyz0sjltk8)
...
bzr revid: vmt@openerp.com-20121129140745-wn2o9ek3beuf7y3y
2012-11-29 15:07:45 +01:00
Xavier Morel
0b0cfff063
[MERGE] missing translation marks, courtesy of Csaba TOTH
...
lp bug: https://launchpad.net/bugs/1084306 fixed
bzr revid: xmo@openerp.com-20121129140109-bwx1njhyqfenc2d3
2012-11-29 15:01:09 +01:00
Josse Colpaert
f393691091
[IMP] Finalized tests with a test with paying invoice and clearing action afterwards
...
bzr revid: jco@openerp.com-20121129135346-hqd7bcdv1nfujj5v
2012-11-29 14:53:46 +01:00
Quentin (OpenERP)
b75fde3773
[FIX] account, sale_crm: fixed invoices analysis
...
bzr revid: qdp-launchpad@openerp.com-20121129134842-cro77z9siesjifdm
2012-11-29 14:48:42 +01:00
c72fc633fc
[FIX]Wrong inherit commented
...
bzr revid: dle@openerp.com-20121129134318-c770ejnoop2b3z0j
2012-11-29 14:43:18 +01:00
niv-openerp
184593003b
[FIX] race condition problem with m2m
...
bzr revid: nicolas.vanhoren@openerp.com-20121129134051-5hiw9z5hi99fxtve
2012-11-29 14:40:51 +01:00
Bhumi Thakkar (Open ERP)
3717146dc4
[IMP] Channel_id and type field displayed if marketing module installed and in lead form reffered field put inside Misc section.
...
bzr revid: bth@tinyerp.com-20121129134018-jpo0huhe4ca87466
2012-11-29 19:10:18 +05:30
Xavier Morel
759f11f110
[FIX] py.js: bug in tokenization of single-quoted empty string
...
bzr revid: xmo@openerp.com-20121129132738-fcnam8bkqyt7h8ey
2012-11-29 14:27:38 +01:00
Khushboo Bhatt (Open ERP)
8b251e53ca
[REM]crm:message improved for merge oppertunities/lead
...
bzr revid: kbh@tinyerp.com-20121129131720-iq54wku42h55bfdm
2012-11-29 18:47:20 +05:30
99064105fd
[FIX] Now when sending a SO also add as followers all recipients, not only the customer.
...
bzr revid: vta@openerp.com-20121129131701-t8o121dzujs8r2pd
2012-11-29 14:17:01 +01:00
8cc5780e58
[FIX]More links
...
bzr revid: dle@openerp.com-20121129131317-0s1rru4pxjn0lzl3
2012-11-29 14:13:17 +01:00
Xavier Morel
9f76458404
[FIX] groupby on editable list
...
Because of the "meta" columns (e.g. group name column),
ListView#columns would end up with a different number of elements than
ListView#fields_view.arch.children, and when zipping them together (to
build the form view for edition) things wouldn't match anymore.
It would seem simply filtering out meta columns (and only keep those
actually specified by the view) is sufficient to fix the issue and
have everything line up again. I'm midly impressed.
bzr revid: xmo@openerp.com-20121129131301-scc38i4l55ea7lis
2012-11-29 14:13:01 +01:00
Hardik
3f19f5d00b
[MERGE]with latest trunk
...
bzr revid: hsa@tinyerp.com-20121129131201-osnygazw0mtehr3l
2012-11-29 18:42:01 +05:30
Anand Patel (OpenERP)
11aff53d50
[IMP]Improved code for purchase order when order is in done state then fiscal_position should be read-only
...
bzr revid: pan@tinyerp.com-20121129131134-b32d7ja4qzkbiabm
2012-11-29 18:41:34 +05:30
Atul Patel (OpenERP)
5aee5bf58d
[FIX]: Fix for event sale module.
...
bzr revid: atp@tinyerp.com-20121129130856-cy0z91i36idorpbh
2012-11-29 18:38:56 +05:30
63ab1dd18c
[FIX] Fixed context of menu action.
...
bzr revid: vta@openerp.com-20121129130700-r9jy618jmdkwmkuh
2012-11-29 14:07:00 +01:00
Fabien Pinckaers
bd61641572
[FIX] project issue
...
bzr revid: fp@tinyerp.com-20121129130655-rm5hrk8m7tsy8g4v
2012-11-29 14:06:55 +01:00
Quentin (OpenERP)
d760fe7f99
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20121129130433-wbcix78s6tdwc3r0
2012-11-29 14:04:33 +01:00
Quentin (OpenERP)
b6997b7c74
[FIX] account: not enough argument given during format string
...
bzr revid: qdp-launchpad@openerp.com-20121129130346-ewydqj74l8h9qrby
2012-11-29 14:03:46 +01:00
191536962d
[FIX] Hide 'Portal Settings' tab for non group_user.
...
bzr revid: vta@openerp.com-20121129125418-s9jswrsj1sxxgy09
2012-11-29 13:54:18 +01:00
Tejas Tank
cc7bfc23d4
[IMP] Image crop with transparent effect.
...
bzr revid: tta@openerp.com-20121129125148-6j0qryd0wx6uqdbm
2012-11-29 17:51:48 +05:00
b1c8c44393
[FIX] Show the public_info field in the employees kanban view.
...
bzr revid: vta@openerp.com-20121129125147-4f5rw80kdd1yt7dh
2012-11-29 13:51:47 +01:00
07a7e7c81c
[FIX] Hide 'Invoice' button on sale.order.line form view.
...
bzr revid: vta@openerp.com-20121129123831-64axxpxficmkyvp7
2012-11-29 13:38:31 +01:00
Fabien Meghazi
7bfab22e1f
[FIX] Propagate context to kanban's add_group() action
...
bzr revid: fme@openerp.com-20121129120738-fgulo5hqib2uqeqa
2012-11-29 13:07:38 +01:00
tsabi
83b7823f25
some more change in the new pyeval.js file
...
bzr revid: csaba.toth@i3rendszerhaz.hu-20121129115454-rpviywfnosjdmovm
2012-11-29 12:54:54 +01:00
tsabi
72109e7541
fix tab problem
...
bzr revid: csaba.toth@i3rendszerhaz.hu-20121129115306-ifncjymnmuk989eq
2012-11-29 12:53:06 +01:00
Saurang Suthar
eecf5b79c2
[MERGE]merged with main addons
...
bzr revid: ssu@tinyerp.com-20121129114728-eset8521j5007w6s
2012-11-29 17:17:28 +05:30
Olivier Dony