Cedric Snauwaert
c8607c8b81
[FIX]few cosmetic of code
...
bzr revid: csn@openerp.com-20140411122753-qzxb29uwkw89mrxs
2014-04-11 14:27:53 +02:00
Richard Mathot (OpenERP)
2a8232c25e
[IMP] Typo and add link in layout
...
bzr revid: rim@openerp.com-20140411122620-33rcxanaxhf5qxap
2014-04-11 14:26:20 +02:00
Rashmin Lumbhani (OpenERP)
59ca5c36b8
[IMP]add blocked reason field
...
bzr revid: rlu@tinyerp.com-20140411122327-mj7ihfh4ai8kzsgv
2014-04-11 17:53:27 +05:30
Rashmin Lumbhani (OpenERP)
daf69ced12
[IMP]add blocked reason dialog
...
bzr revid: rlu@tinyerp.com-20140411122320-o0zmebvaz0985mrx
2014-04-11 17:53:20 +05:30
Fabien Pinckaers
63c2093d2c
[IMP] Larger texts
...
bzr revid: fp@tinyerp.com-20140411122232-s8yipnar4tllspm0
2014-04-11 14:22:32 +02:00
Richard Mathot (OpenERP)
22fff5237b
[FIX] Correct prefill for comment answers
...
bzr revid: rim@openerp.com-20140411121541-pj3m0z44hwd0z89w
2014-04-11 14:15:41 +02:00
Frédéric van der Essen
f3cd340628
[MERGE] posbox : regression fix, made it easier to add support for new printers
...
bzr revid: fva@openerp.com-20140411121003-dxt1mx57felkufb9
2014-04-11 14:10:03 +02:00
Richard Mathot (OpenERP)
41447050e5
[FIX] Dirty fix: prevent crash in computing data from SCQ/MCQ/matrices by ignoring comments
...
bzr revid: rim@openerp.com-20140411120735-u04occnkchgm3ztc
2014-04-11 14:07:35 +02:00
Frédéric van der Essen
57c636fb7a
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20140411120636-o6yuuzphfiq33b8j
2014-04-11 14:06:36 +02:00
Frédéric van der Essen
d704fb0060
[IMP] hw_proxy, hw_escpos: it is now possible to add support for new printers from the posbox hardware status page + fix backward compatiblity for hardcoded receipts
...
bzr revid: fva@openerp.com-20140411120510-t3a8b3axq1q4wuje
2014-04-11 14:05:10 +02:00
4550b532ca
[FIX] website_sale: add product: customize img (forgotten merge)
...
bzr revid: chm@openerp.com-20140411115939-yw257u179wqbh6sy
2014-04-11 13:59:39 +02:00
Richard Mathot (OpenERP)
1e330fdd9e
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140401071103-v3290rmesztf6rjl
bzr revid: rim@openerp.com-20140402073433-y5spv10ms9nnmdim
bzr revid: rim@openerp.com-20140404062949-88d0tqhn8mr4ejnz
bzr revid: rim@openerp.com-20140407141506-e54pr3bwtnts6y3g
bzr revid: rim@openerp.com-20140408140530-fy6u3iz2x75xil9c
bzr revid: rim@openerp.com-20140409193801-ckzgmc5zfjlg4irk
bzr revid: rim@openerp.com-20140410120421-md5ts8wxd33mitnl
bzr revid: rim@openerp.com-20140410152240-t54id35dkowbqi56
bzr revid: rim@openerp.com-20140411115553-cbd8pq1yafkv7qcr
2014-04-11 13:55:53 +02:00
Richard Mathot (OpenERP)
8ce4ac4d94
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140411115525-87b9wa1ttwphiwf2
2014-04-11 13:55:25 +02:00
ab5aa5daff
[FIX] website tour: write undefined in log
...
bzr revid: chm@openerp.com-20140411115502-804e5669do02swm2
2014-04-11 13:55:02 +02:00
aa6386467a
[FIX] website: snippet clean_for_save: filter snippet before create overlay
...
bzr revid: chm@openerp.com-20140411115314-xr5yutao88j8fusu
2014-04-11 13:53:14 +02:00
Olivier Dony
511cf0270c
[MERGE] sale_order_dates: several improvements to usability and planned date computing, courtesy of Lionel Sausin (Numerigraphe)
...
bzr revid: odo@openerp.com-20140411113007-yj4x5zui3luckg2n
2014-04-11 13:30:07 +02:00
584f2bea07
[IMP] website: Tour: add a log time
...
bzr revid: chm@openerp.com-20140411105105-y7vxgkf7nydjb1f8
2014-04-11 12:51:05 +02:00
Randhir Mayatra rma-openerp
99d9022830
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20140411102703-6yglfuicsyx5gjoh
2014-04-11 15:57:03 +05:30
Olivier Dony
4ed8413dc7
[FIX] mail.thread: avoid wrongly matching model,id from a foreign OpenERP system
...
When emails transit from an OpenERP system to another
there is a chance of wrongly considering the foreign
model,id pair as local, possibly attaching a reply
to a wrong parent message.
This naive heuristic ignore the foreign identifiers
unless the hostname of the message-id mentioned in
the In-Reply-To header matches the local one.
This may fail after a change of local hostname but
is still better than the alternative.
In OpenERP v8 we should stop including the model,res_id
in outgoing Message-Id headers and only rely on the
stored, opaque, unique Message-Ids, preventing
any future mismatch.
bzr revid: odo@openerp.com-20140411101349-h3jmkdzvbr7lut26
2014-04-11 12:13:49 +02:00
Josse Colpaert
36b12e4339
[MERGE] Merge from trunk-wms
...
bzr revid: jco@openerp.com-20140411095928-jnlqi15cn7zz491d
2014-04-11 11:59:28 +02:00
Josse Colpaert
aeea3f8b4e
[FIX] Product_qty should not default to 1, but be calculated from product_uom_qty
...
bzr revid: jco@openerp.com-20140411095723-wvr5hb1gpbi4lswt
2014-04-11 11:57:23 +02:00
DJ Patel
bd665fbada
[IMP] stock_landed_costs : If weight and volume is not there, then divide the cost equally among the lines.
...
bzr revid: mdi@tinyerp.com-20140411094843-o0ravoiyfw9mda0m
2014-04-11 15:18:43 +05:30
Olivier Dony
410c82bd6a
[MERGE] Sync with trunk
...
bzr revid: odo@openerp.com-20140411094018-zqw3ac1br991qsnp
2014-04-11 11:40:18 +02:00
DJ Patel
442a73af4e
[ADD] stock_landed_costs : Added the mechanism to create valuation line per cost line.
...
bzr revid: mdi@tinyerp.com-20140411093957-ucna8z1837urzez2
2014-04-11 15:09:57 +05:30
Kunal Chavda (Open ERP)
a7dae4e741
[MERGE]with latest trunk.
...
bzr revid: kch@tinyerp.com-20140411093642-6o1luwd111qwtirn
2014-04-11 15:06:42 +05:30
Thibault Delavallée
24e5270347
[IMP] ir_qweb: added country flag management in contact widget
...
bzr revid: tde@openerp.com-20140411091621-q0c2ndzv9xpptzqo
2014-04-11 11:16:21 +02:00
1fc8f89bc1
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140411082050-lr7vtew6yvsqaon6
2014-04-11 10:20:50 +02:00
9941f49364
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140411081513-xlptxuxmvs5ysb8s
2014-04-11 10:15:13 +02:00
aaa3265f47
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140411081401-0ybuuboo6f3b58kv
2014-04-11 10:14:01 +02:00
Martin Trigaux
478cbd7c70
[FIX] read_group: avoid shared context and initialise if none
...
bzr revid: mat@openerp.com-20140411075556-kdxn1lsth45twgmj
2014-04-11 09:55:56 +02:00
Thibault Delavallée
94c580e933
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140411075551-xh4o3k3172cr7scz
2014-04-11 09:55:51 +02:00
Mansi Kariya (OpenERP)
43e19980ba
[Fix] Fixed an issue occured as branch merged with main
...
bzr revid: mka@tinyerp.com-20140411071543-kxn4go9bgng37wk1
2014-04-11 12:45:43 +05:30
Randhir Mayatra rma-openerp
6da28202f3
[MERGE] merge with latest trunk
2014-04-11 12:36:24 +05:30
Randhir Mayatra rma-openerp
85714eabb6
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20140411062328-srzutp1ln9xe7sxq
2014-04-11 11:53:28 +05:30
Randhir Mayatra rma-openerp
a8e2cf3006
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20140411061843-kxugxk0p63ifkjg7
2014-04-11 11:48:43 +05:30
Randhir Mayatra rma-openerp
cbc86bb4ee
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20140411061647-m6iupt9567igzs4x
2014-04-11 11:46:47 +05:30
Kunal Chavda (Open ERP)
67b413dba5
[IMP]improved code for increasing speed pf closing help as per usability review.
...
bzr revid: kch@tinyerp.com-20140411060833-mjf3j2549ya2pre9
2014-04-11 11:38:33 +05:30
63e9150cff
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140411055930-7coykr7rveqsucp3
2014-04-11 05:59:30 +00:00
Mansi Kariya (OpenERP)
fcd7f025a0
[MERGE] Merged with main Addons
...
bzr revid: mka@tinyerp.com-20140410103213-kq36gxiih5xdmt4l
bzr revid: mka@tinyerp.com-20140411053339-yic5dugaubzbyfhq
2014-04-11 11:03:39 +05:30
Barad Mahendra
b22b2c09a2
[Merge]with trunk
...
bzr revid: mba@tinyerp.com-20140411045442-y4rcnxhjupiyxtdp
2014-04-11 10:24:42 +05:30
DJ Patel
5e04721db4
[ADD] stock_landed_costs : Added the mechanism to automatically fill the weight and volume on picking onchange.
...
bzr revid: mdi@tinyerp.com-20140411045437-p6fhz1tgpp9893lh
2014-04-11 10:24:37 +05:30
Barad Mahendra
850b4f198a
[Merge]with trunk
...
bzr revid: mba@tinyerp.com-20140408123619-j3qv10fsnrxqn6a9
bzr revid: mba@tinyerp.com-20140411045426-dngn51p0qw4nduig
2014-04-11 10:24:26 +05:30
DJ Patel
fb18693a4d
[ADD] stock_landed_costs : Added the weight and volume in valuation adjustments.
...
bzr revid: mdi@tinyerp.com-20140411044608-hn5qm6o5nwahutzq
2014-04-11 10:16:08 +05:30
Fabien Meghazi
2b79294500
[ADD] cache
...
bzr revid: fme@openerp.com-20140410182723-x1aoo2o0zhgkvwsf
2014-04-10 20:27:23 +02:00
Barad Mahendra
0152bea512
[MERGE] [ADD] website_twitter: add twitter scroller snippet
...
bzr revid: odo@openerp.com-20140410174622-j2waid38nk3fqitt
2014-04-10 19:46:22 +02:00
Olivier Dony
7c75b5e004
[FIX] website: avoid discarding snippet animator after edit + properly restart animation while disabling clicks
...
bzr revid: odo@openerp.com-20140410174314-vecg7inmfgm7r5fq
2014-04-10 19:43:14 +02:00
Fabien Meghazi
93073dff94
[FIX] exclude /web/[css|js] in parsing
...
bzr revid: fme@openerp.com-20140410174025-74hmzzalkxux3tvb
2014-04-10 19:40:25 +02:00
Fabien Meghazi
4cc3ed6fab
[MERGE] trunk
...
bzr revid: fme@openerp.com-20140410173630-eq1uh58nba7yptf8
2014-04-10 19:36:30 +02:00
Fabien Meghazi
e1bf418856
[MERGE] trunk
...
bzr revid: fme@openerp.com-20140410173524-9oz7irm59a5d8d7g
2014-04-10 19:35:24 +02:00
Fabien Meghazi
1228cf5539
[REM] remove obsolete code
...
bzr revid: fme@openerp.com-20140410170658-vrxzpya5p9ouafey
2014-04-10 19:06:58 +02:00
Cedric Snauwaert