Antony Lesuisse
fc70550ca2
[IMP] move html module description and icon
...
bzr revid: al@openerp.com-20130628100441-swpanf2jwcojygh4
2013-06-28 12:04:41 +02:00
Thibault Delavallée
bf4ada34b4
[REF] mail_thread: message_track now uses browse records instead of read results.
...
Updated addons accordingly.
Updated tests to test corner cases using False / null browse records.
bzr revid: tde@openerp.com-20130627144647-swbj77i84vo9ii0v
2013-06-27 16:46:47 +02:00
Thibault Delavallée
e738adfafe
[FIX] sale, sale_stock: fixed calls to get_company taking an extra uid
...
bzr revid: tde@openerp.com-20130614143317-65mbgfugskxqnxp7
2013-06-14 16:33:17 +02:00
Thibault Delavallée
1a51e9b88d
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130614141720-7qjo6fpkm83jhpm2
2013-06-14 16:17:20 +02:00
Thibault Delavallée
bc58a5a224
[CLEAN] Misc cleaning before merging.
...
bzr revid: tde@openerp.com-20130614141643-29z9zslusyhj4u5j
2013-06-14 16:16:43 +02:00
Thibault Delavallée
48071be570
[MERGE] Merged branch holding addons-30 misc improvement. FP-style merge for testing purpose.
...
bzr revid: tde@openerp.com-20130613105923-xt7rvj0n3n3egvzj
2013-06-13 12:59:23 +02:00
sgo@tinyerp.com
2bda4f7b3c
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130607113500-jzhet9cr98c0ss4s
2013-06-07 17:05:00 +05:30
Christophe Matthieu
8c6ff33bef
[IMP] Improve typos in warning (Grammar mistake, Capitalize title, Typos)
...
bzr revid: chm@openerp.com-20130607102359-is19utzap127nwr4
2013-06-07 12:23:59 +02:00
Launchpad Translations on behalf of openerp
5deae04585
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130607054825-38kbw2umxndg1w3v
2013-06-07 05:48:25 +00:00
Martin Trigaux
ccb38117ee
[MERGE] Forward porting of saas-1 until rev 8739
...
bzr revid: mat@openerp.com-20130605090453-e4mg37kms5j1r18n
2013-06-05 11:04:53 +02:00
sgo@tinyerp.com
1202f9c6d5
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130605072213-cwxmjtzt36434mgt
2013-06-05 12:52:13 +05:30
Thibault Delavallée
a3c677b337
[CLEAN] sale, sale_crm: reverted some changes, cleaning before merging.
...
bzr revid: tde@openerp.com-20130604123026-f0xks6ky1rkw3ser
2013-06-04 14:30:26 +02:00
Thibault Delavallée
37fb148346
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130604091042-6aethn2pmxtniqaw
2013-06-04 11:10:42 +02:00
sgo@tinyerp.com
bdeaa2c722
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130604053815-g0iohxg8vtgapt7p
2013-06-04 11:08:15 +05:30
Launchpad Translations on behalf of openerp
95c9d77c9f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130604052044-tc482yzk760flm6m
2013-06-04 05:20:44 +00:00
Christophe Matthieu
d86f6f24c0
[IMP] suppress button oe_demo_play
...
bzr revid: chm@openerp.com-20130603154158-7k9tvdwmn6ukp5x3
2013-06-03 17:41:58 +02:00
Vo Minh Thu
38d9325f66
[MERGE] views: removed unnecessary `model` attribute used with `ref`.
...
bzr revid: vmt@openerp.com-20130603144446-ara6oli0her5rdm3
2013-06-03 16:44:46 +02:00
sgo@tinyerp.com
45d760773e
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130603131453-t3m0b9emuyp2tmsx
2013-06-03 18:44:53 +05:30
Thibault Delavallée
71df2e6f7d
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130531101916-81xwtv4t58krnfaw
2013-05-31 12:19:16 +02:00
Fabien Pinckaers
36cd14400a
[IMP] manifest modules
...
bzr revid: fp@openerp.com-20130529180527-x2uxuqdblkkpzeix
2013-05-29 20:05:27 +02:00
Turkesh Patel (Open ERP)
a65375648b
[MRG] merge with lp:openobject-addons
...
bzr revid: vja@tinyerp.com-20130516054745-lmqr1uuac6wlqi70
bzr revid: tpa@tinyerp.com-20130528122735-ixcewpz9uga5hv86
2013-05-28 17:57:35 +05:30
Amit Bhavsar (Open ERP)
24848a8dcc
[MERGE] merge with latest trunk
...
bzr revid: bde@tinyerp.com-20130522095432-1sl1b6uu6ewod4md
bzr revid: amb@tinyerp.com-20130528091941-wak8fnembuvewwjf
2013-05-28 14:49:41 +05:30
Thibault Delavallée
71df1a41bc
[FORWARD] Forward port of addons 7.0 until revision 9172
...
bzr revid: tde@openerp.com-20130528104500-ds3irrs2u0qpst37
2013-05-28 12:45:00 +02:00
Quentin (OpenERP)
34b1314bb2
[FIX] sale: removed fontName from sale order report in order to allow a default style definition in company (to allow chinese characters for example, with Sun-ExtA font)
...
bzr revid: qdp-launchpad@openerp.com-20130527165133-81sps2mv2wgqb98w
2013-05-27 18:51:33 +02:00
Fabien Pinckaers
0dc0d9f83c
[IMP] modules manifest
...
bzr revid: fp@openerp.com-20130526205613-k4d8b5gb0mrxpm2f
2013-05-26 22:56:13 +02:00
Christophe Matthieu
096962342a
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20130522145042-3ril2zvogqs55ako
bzr revid: chm@openerp.com-20130524100533-fc0c7l47hb8j4xib
2013-05-24 12:05:33 +02:00
Martin Trigaux
faa4202a78
[MERGE] [FIX] res partner copy method returns None
...
bzr revid: mat@openerp.com-20130523132327-dx94wwzoeq7famem
2013-05-23 15:23:27 +02:00
Fabien Meghazi
3c0b65f5d1
[MERGE] application descriptions
...
bzr revid: fme@openerp.com-20130522140734-j6gw2u68zuu0suyf
2013-05-22 16:07:34 +02:00
Najlaâ
361cd5fc40
[FIX] remove index on SO line text field
...
bzr revid: nel@tinyerp.com-20130522130842-whn5n8fbc0gv34jx
2013-05-22 15:08:42 +02:00
Christophe Matthieu
35cd85b0ba
[FIX] sale: overwrite _make_invoice and get section_id in sale_crm module
...
bzr revid: chm@openerp.com-20130522104858-zlhe453zu9r41lqx
2013-05-22 12:48:58 +02:00
Thibault Delavallée
8aa85c2523
[FORWARD] Forward port of addons until revision 8711
...
bzr revid: tde@openerp.com-20130521133807-5n97jep45f3lf6uq
bzr revid: tde@openerp.com-20130522083012-4yry4ht2943sjatn
2013-05-22 10:30:12 +02:00
sgo@tinyerp.com
c04dfafe0b
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130522062700-rcbg30jfinv0o392
2013-05-22 11:57:00 +05:30
Fabien Meghazi
8b0b9e071c
[ADD] testimonials photo for sale
...
bzr revid: fme@openerp.com-20130521154251-lhcb43x5uvmdn9px
2013-05-21 17:42:51 +02:00
Fabien Meghazi
1fcc1515a3
[ADD] testimonials
...
bzr revid: fme@openerp.com-20130521150552-1krrc7y2xatjlb70
2013-05-21 17:05:52 +02:00
Christophe Matthieu
d8b6bc245d
[IMP] sale: add a default_section_id in the context to create invoice
...
bzr revid: chm@openerp.com-20130521131906-ck1nslkrbuymubhw
2013-05-21 15:19:06 +02:00
Fabien Meghazi
0ce5edad43
[ADD] Application descriptions
...
bzr revid: fme@openerp.com-20130521094005-yt8h4w79182vvk8d
2013-05-21 11:40:05 +02:00
Launchpad Translations on behalf of openerp
a7a4f33d0f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130427063416-maq2j295cuj0d2j4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130429060435-zyumznnykvw92bfg
bzr revid: launchpad_translations_on_behalf_of_openerp-20130501051425-9uhm1n0nmvyus33i
bzr revid: launchpad_translations_on_behalf_of_openerp-20130506063526-tj5l5h3fger6llmw
bzr revid: launchpad_translations_on_behalf_of_openerp-20130501051533-veqndxlj87s13tnp
bzr revid: launchpad_translations_on_behalf_of_openerp-20130502060901-j2v1cs2l31in4q6t
bzr revid: launchpad_translations_on_behalf_of_openerp-20130503062950-h0ojr1tlzqx5nu76
bzr revid: launchpad_translations_on_behalf_of_openerp-20130504071101-jh8a9d3cb8gcz34e
bzr revid: launchpad_translations_on_behalf_of_openerp-20130505060428-4qacudpyuiez39b3
bzr revid: launchpad_translations_on_behalf_of_openerp-20130506063544-ggq3rpht7nsoinxs
bzr revid: launchpad_translations_on_behalf_of_openerp-20130504071108-g8u3u06xpp3g4sks
bzr revid: launchpad_translations_on_behalf_of_openerp-20130506063552-lwxw1ldh3mbflzqf
2013-05-06 06:35:52 +00:00
Christophe Matthieu
a26c8d76b9
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20130503140029-vv7u9gjmax73qyta
2013-05-03 16:00:29 +02:00
Cedric Snauwaert
a1ab6be4df
[FIX]sale wizard: missing import and local variable to call worflow action
...
bzr revid: csn@openerp.com-20130503124345-f1cvr6wps0d9bcu8
2013-05-03 14:43:45 +02:00
Olivier Dony
9c08e12962
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9085
...
revision-id: odo@openerp.com-20130429105458-r89mnkx8okdxsdld
bzr revid: odo@openerp.com-20130429151410-54y94063gijyk16o
2013-04-29 17:14:10 +02:00
Xavier Morel
07607f054b
[REM] more nonsensical @model + @ref
...
bzr revid: xmo@openerp.com-20130429125217-slmp1v9t7uri6ev6
2013-04-29 14:52:17 +02:00
Olivier Dony
56dbd6078e
[FIX] sale: safer inheritance of res.partner form view + no hiding of use_parent_address field
...
The use_parent_address field is not directly related to the
address type field and was not really meant to be hidden
along with it.
In addition, the div[@name=div_type] and the corresponding
label[@for=type] were duplicated in the embedded form view
inside the `child_ids` field, but that happened later in
the 7.0 series. As a consequence the inherited view must
not rely on the presence of the latter, since some users
may install sales on top of an older version of the base
views. The XPath expressions were therefore modified to
match the first occurrence of these elements in the original
res.partner view, and to match *only* the second occurrence
in the new version of the view.
This works via a dirty hack relying on the fact that
the `use_parent_address` field is present in the first
occurrence of the div in the original view, but not
in the newer view, so the XPath expression can be made
to match only *one* element in each version of the view.
(Keep in mind that XPath evaluation will always return
results in the order of the document being looked up,
and the ORM only uses the first match. So matching
both nodes was not an option.)
bzr revid: odo@openerp.com-20130429105458-r89mnkx8okdxsdld
2013-04-29 12:54:58 +02:00
ggh-openerp
3b73e2b2a4
[IMP]Removed space before Exclamation marks [!]
...
bzr revid: ggh@tinyerp.com-20130429071557-vnxo5nni03vc886j
2013-04-29 12:45:57 +05:30
Launchpad Translations on behalf of openerp
3536f65967
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130427063440-bmcyenjvm2fm94ck
bzr revid: launchpad_translations_on_behalf_of_openerp-20130428054142-1k74s6tp0zv4aeu5
bzr revid: launchpad_translations_on_behalf_of_openerp-20130429060457-72jpzgm0ky022n8u
2013-04-29 06:04:57 +00:00
Launchpad Translations on behalf of openerp
7561f48578
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130426062412-awemubat7ag9ji19
bzr revid: launchpad_translations_on_behalf_of_openerp-20130426062416-6321y5y98sute3k0
2013-04-26 06:24:16 +00:00
Quentin (OpenERP)
37b424648a
[MERGE] typo
...
bzr revid: qdp-launchpad@openerp.com-20130425140756-ijyanyyfltkidnf7
2013-04-25 16:07:56 +02:00
Launchpad Translations on behalf of openerp
83fb6fbf02
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130425060541-r1eqpc1djb3vy953
bzr revid: launchpad_translations_on_behalf_of_openerp-20130425060609-9otf0125cci1hjvi
2013-04-25 06:06:09 +00:00
Launchpad Translations on behalf of openerp
6b04a532b8
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130423060902-2j8xouki50aemi14
bzr revid: launchpad_translations_on_behalf_of_openerp-20130423061017-5os2p9ztugb6jjph
bzr revid: launchpad_translations_on_behalf_of_openerp-20130423061019-n2660taj1o9os75c
2013-04-23 06:10:19 +00:00
sgo@tinyerp.com
3d0b5aa747
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130423053031-g501q3w9akfiro2d
2013-04-23 11:00:31 +05:30
Quentin (OpenERP)
33f27b362b
[MERGE] forward port of addons v7 up to revision 9045
...
bzr revid: qdp-launchpad@openerp.com-20130422153449-c62emljfa4a49758
2013-04-22 17:34:49 +02:00