c202dc1c52
merge upstream
...
bzr revid: chs@openerp.com-20140129190834-xfcat3ulfbg5omhn
2014-01-29 20:08:34 +01:00
731019154a
[MERGE] forward port of branch saas-2 up to revid 9109 dle@openerp.com-20140129171022-wf6244k90lpncmah
...
bzr revid: chs@openerp.com-20140129184703-ypd7iqnor5m5lr3d
2014-01-29 19:47:03 +01:00
033c38c304
[MERGE] trunk
...
bzr revid: al@openerp.com-20140129021916-ckb3rplmcpjbqel3
2014-01-29 03:19:16 +01:00
3ce5e01eca
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
2014-01-28 06:41:39 +00:00
5585a38ecc
[MERGE] from trunk, need point_of_sale updates
...
bzr revid: fva@openerp.com-20140127160946-yeswyv4o7t2tfbqt
2014-01-27 17:09:46 +01:00
1fb1a6f2af
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9789 revid:dle@openerp.com-20140124120102-we2yxio553ws2yz4
...
bzr revid: dle@openerp.com-20140120174449-tui0a24zgn9bien2
bzr revid: dle@openerp.com-20140121125538-ke7i6kaz486hwgl8
bzr revid: dle@openerp.com-20140122134115-0ogjemlqe327xoac
bzr revid: dle@openerp.com-20140123103655-mf2zslfbgue97ed2
bzr revid: dle@openerp.com-20140124121027-uk9zy4dx9tqlsblr
2014-01-24 13:10:27 +01:00
83677ed6e6
[REVERT] 9401 dle@openerp.com-20130830125155-1vedifnupu2xvth7
...
This had as side-effect to not allow splitting BOMs
(a manufacturing order for 1 unit of a BOM producing 10 units consumed the lines like it was 10 units, not 1)
This fix was to avoid having a fraction of a unit (for instance, 0.5 unit).
But, finally, it is preferable to allow splitting units:
1. Most users do not use several uoms, and in this case, the unit is the default uom (hidden).
2. At the moment, it is allowed to ask a manufacturing order splitting up the unit uom
(It is allowed to ask the production of 0.5 USB Adapter, for instance)
Thus, we should allow the splitting up of the unit uom in the lines too.
bzr revid: dle@openerp.com-20140124120102-we2yxio553ws2yz4
2014-01-24 13:01:02 +01:00
d69ecb8d8f
[FIX] mrp, stock: avoid float rounding errors using float_compare
...
bzr revid: dle@openerp.com-20140122133822-fkt5gqanpptlx9jx
2014-01-22 14:38:22 +01:00
ec2c2d4e86
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140122123237-5rc5fdyau0422fj2
2014-01-22 13:32:37 +01:00
d5bc07f898
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140122061335-z6h1dn3yd94l8850
2014-01-22 06:13:35 +00:00
698e2de138
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140121062040-gq8r12g3ypksxa4t
2014-01-21 06:20:40 +00:00
28d79433c3
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070457-rn2tgdxis2fi3nqo
bzr revid: launchpad_translations_on_behalf_of_openerp-20140119055822-ajy043mntc4jr407
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055854-z7wtyb24c5t8kcmj
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070538-2xm86ece1aate8u9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140119055932-sa6vrp2g8ua3u88e
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055948-lwcyqcfutgamwac1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070546-d89xqw56zou7e9p9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055955-6wrdxqy1018mo7jq
2014-01-20 05:59:55 +00:00
16109f37cd
[MERGE] mrp: in work orders duration is displayed in decimal numbers instead of time
...
bzr revid: dle@openerp.com-20140116180459-6psj1f0uq4ihxzc2
2014-01-16 19:04:59 +01:00
9cf78e93cc
[MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files.
...
bzr revid: tde@openerp.com-20140116103910-qmm2y6kucmngplnk
2014-01-16 11:39:10 +01:00
91aaaec0a5
[MERGE] forward port of branch saas-2 up to revid 9092 dle@openerp.com-20140115165506-yuux9km39gbv7k4n
...
bzr revid: chs@openerp.com-20140115214454-dhl8xzr429co0j5d
2014-01-15 22:44:54 +01:00
74e0fbae83
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9752 revid:dle@openerp.com-20140110173823-lfekux2jxrj5v9gn
...
bzr revid: dle@openerp.com-20140110160158-ypr2pp63ld6j5g4l
bzr revid: dle@openerp.com-20140110174038-3yogwf6hwk7kpa8w
2014-01-10 18:40:38 +01:00
fd9d8b9ff3
[FIX] mrp: move _prepare_order_line_procurement to module sale_mrp as mrp module does not depends from sale
...
bzr revid: mat@openerp.com-20140110153133-qozwrixyrwxjr44n
2014-01-10 16:31:33 +01:00
5139c760d2
[FIX] mrp: added security rule to enable mrp users to compute production orders
...
bzr revid: tde@openerp.com-20140110142722-3x0zk98aajh0bgxy
2014-01-10 15:27:22 +01:00
3ed5b49e7a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140110053216-23qk0vpm4hr5g1ig
2014-01-10 05:32:16 +00:00
bea411bb98
[IMP] Backport one feature from website: this feature allows to specify a file
...
path on the field tag fetching the right file instead of using the base64
encoded file in the field.
<field name="image" type="base64" file="base/static/img/main_partner-image.png" />
bzr revid: stw@openerp.com-20140109154550-a04qybctzaaqtrlr
2014-01-09 16:45:50 +01:00
05aab83eb1
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9743 revid:qdp-launchpad@openerp.com-20140108160719-9i8xhrat49cn9l5e
...
bzr revid: chs@openerp.com-20140107141524-xzz39a2ym66swr0t
bzr revid: chs@openerp.com-20140107172248-zic9mqg0rigy2czb
bzr revid: chs@openerp.com-20140108160418-ph17jgy5hlejj9hr
bzr revid: dle@openerp.com-20140108171400-8r0fwv3wi36w2im0
2014-01-08 18:14:00 +01:00
0b7ecf8a21
[FIX] mrp: move _prepare_order_line_procurement to model sale.order instead of procurement.oder. This will add the lost property_ids that was removed at rev 9622.
...
bzr revid: mat@openerp.com-20140108114639-jc40rfbrbi1s37e3
2014-01-08 12:46:39 +01:00
49c0b7a820
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140106135700-rt0g44w5xmpbtxiu
2014-01-06 14:57:00 +01:00
e0951d6e18
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131227053952-0hms21l5679mfv9d
bzr revid: launchpad_translations_on_behalf_of_openerp-20131228053802-9q255pplfsr06jvf
bzr revid: launchpad_translations_on_behalf_of_openerp-20131230050715-gywiu51n8ejcvnkp
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231052701-yjrbqgyv2os2z8gt
bzr revid: launchpad_translations_on_behalf_of_openerp-20140101054400-7tz7obdh31v8log8
bzr revid: launchpad_translations_on_behalf_of_openerp-20140102054530-gtwf0yp277zkqm0i
2014-01-02 05:45:30 +00:00
e6a46a855d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131220053413-o3xa4nlpu9snoiq6
2013-12-20 05:34:13 +00:00
54be818a3b
[MERGE] forward port of latest saas-2 until rev 9051 dle@openerp.com-20131217142126-1lbim47d2m2x4bb0
...
bzr revid: mat@openerp.com-20131218155715-khb909yy99cbmna8
2013-12-18 16:57:15 +01:00
d9343e2d27
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20131213094016-ylqkilyo4190g81w
2013-12-13 10:40:16 +01:00
7f00274384
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9691 rev-id: dle@openerp.com-20131211134120-fco4rlqjh258ba36
...
bzr revid: dle@openerp.com-20131210184409-cd9wy856v5bg0f17
bzr revid: dle@openerp.com-20131211134317-f0ev1vbinhrkgjf4
2013-12-11 14:43:17 +01:00
89a9dbee75
[FIX] mrp: cost structure report, do not display twice main supplier
...
bzr revid: dle@openerp.com-20131211134120-fco4rlqjh258ba36
2013-12-11 14:41:20 +01:00
6652856445
[FIX] website_sale: link; product: clean code and use product.template for supplierinfo
...
bzr revid: chm@openerp.com-20131209163254-k9dwxw48rcgz1hbs
2013-12-09 17:32:54 +01:00
cca8bb4d64
[FIX] font: revert previous (use name and not familly in reportlab), fix reports using spaces
...
bzr revid: mat@openerp.com-20131209133431-6gjhq1zmrb2ro6eo
2013-12-09 14:34:31 +01:00
a092227c6e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131207063209-2xi8ba5wu6l6ze00
bzr revid: launchpad_translations_on_behalf_of_openerp-20131208054536-mg4w4d6ljq8ji1nj
bzr revid: launchpad_translations_on_behalf_of_openerp-20131207063232-l64v1fhf1qcpxm2l
bzr revid: launchpad_translations_on_behalf_of_openerp-20131208054646-zixed7abpuze4qt1
bzr revid: launchpad_translations_on_behalf_of_openerp-20131123062625-f7inv72rtg2kel8g
bzr revid: launchpad_translations_on_behalf_of_openerp-20131124054801-1ukcpelfukkvwn60
bzr revid: launchpad_translations_on_behalf_of_openerp-20131125060120-nm8tkfbftg8c88v1
bzr revid: launchpad_translations_on_behalf_of_openerp-20131126060753-jnx5ran2accmo0lh
bzr revid: launchpad_translations_on_behalf_of_openerp-20131127054000-wtg675pf33f3bkar
bzr revid: launchpad_translations_on_behalf_of_openerp-20131129053028-abszdj4y76smnacb
bzr revid: launchpad_translations_on_behalf_of_openerp-20131201054555-3u1m1sy1f2og78nn
bzr revid: launchpad_translations_on_behalf_of_openerp-20131202055227-mm70khzdfnp4qcj9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131207063237-vza5vb51xmd2ipl6
bzr revid: launchpad_translations_on_behalf_of_openerp-20131208054653-f4zth8j3iczlzcqz
2013-12-08 05:46:53 +00:00
4fd98907ce
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131130053134-6u83vcd1133xs8yf
bzr revid: launchpad_translations_on_behalf_of_openerp-20131201054550-w0k8alfqs2bigurx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131202055222-2u7o99e48254dceu
bzr revid: launchpad_translations_on_behalf_of_openerp-20131203061621-hyqqh11jt7g0ilqh
2013-12-03 06:16:21 +00:00
1fedbc18f5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131126060718-7io3n16co82qp5pu
bzr revid: launchpad_translations_on_behalf_of_openerp-20131127053913-ypnlpggd4wt58pzx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131128060603-kk12b8iu0uhhtist
bzr revid: launchpad_translations_on_behalf_of_openerp-20131129052938-u0wq863etr3sl1cm
bzr revid: launchpad_translations_on_behalf_of_openerp-20131129053023-zlbrprsiq9e7vs39
2013-11-29 05:30:23 +00:00
bb1e256f5b
[MERGE] forward port of branch saas-2 up to revid 9010 dle@openerp.com-20131125143003-vjtzj1c5051pdnk3
...
bzr revid: chs@openerp.com-20131125150054-b135qshkx6icakgk
2013-11-25 16:00:54 +01:00
271ed43e7b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121054848-007arsnnoa8fs65e
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121063838-blqn6j0yfmrlw5vp
2013-11-21 06:38:38 +00:00
44664076da
[MERGE] Forward-port of latest 7.0 fixes up to rev 9618 rev-id: dle@openerp.com-20131120142131-s333lyva85cyn41o
...
bzr revid: odo@openerp.com-20131120144059-yyh7emvgdarff09b
bzr revid: odo@openerp.com-20131120144318-11nmn1zj00zmi10z
2013-11-20 15:43:18 +01:00
eaa917bef9
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131120054418-15be15rhz84vk0et
2013-11-20 05:44:18 +00:00
a8f47d3747
[MERGE] [FIX] mrp: correctly handle internal type for stock.picking on manufacturing order
...
lp bug: https://launchpad.net/bugs/1117229 fixed
bzr revid: mat@openerp.com-20131119162522-x4fw8hluvfzt27ha
2013-11-19 17:25:22 +01:00
108ccbf108
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114062958-ies8xa3pft7n59ms
bzr revid: launchpad_translations_on_behalf_of_openerp-20131106055135-r0xt2vr04710jh1t
bzr revid: launchpad_translations_on_behalf_of_openerp-20131107055120-r8z445ergt50erlx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131108062620-bvfofx1jl1wb1csh
bzr revid: launchpad_translations_on_behalf_of_openerp-20131110064525-ioceogsmu0nmx2qj
bzr revid: launchpad_translations_on_behalf_of_openerp-20131111053908-gbrp09ast5fhr6iw
bzr revid: launchpad_translations_on_behalf_of_openerp-20131112062316-5uf2bvbzdhkq1b7k
bzr revid: launchpad_translations_on_behalf_of_openerp-20131113060841-bkjcuz4e9rtzn6f9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114063058-rrm2q5lxkyawuvpz
2013-11-14 06:30:58 +00:00
40c309024c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131026062529-74ir3upguunr9mw3
bzr revid: launchpad_translations_on_behalf_of_openerp-20131027061317-d9s440jzv1juvswi
bzr revid: launchpad_translations_on_behalf_of_openerp-20131028054233-15znliqv2eh2jq0i
bzr revid: launchpad_translations_on_behalf_of_openerp-20131029051429-rcytejyrg2s4t9db
bzr revid: launchpad_translations_on_behalf_of_openerp-20131030055438-gp0hyend0jooi941
2013-10-30 05:54:38 +00:00
a7ff75f94a
[FIX] Remove unused menu item in the mrp_securify file
...
bzr revid: stw@openerp.com-20131028140545-xr3mav7cb3gk45qn
2013-10-28 15:05:45 +01:00
16fd47c3e1
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131019052801-ouw53m70o0eabxnv
bzr revid: launchpad_translations_on_behalf_of_openerp-20131020050509-ar8koyz20p82rdjq
bzr revid: launchpad_translations_on_behalf_of_openerp-20131021045723-bkmqoimoalwb3lzq
2013-10-21 04:57:23 +00:00
ad7c84e43b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131016051402-s4et4c32h28r73sg
2013-10-16 05:14:02 +00:00
9e85aa3e72
[FORWARD] Forward port of saas-2 branch until revision 8931 tde@openerp.com-20131003140458-ztnd9taih2rcq8ty
...
bzr revid: tde@openerp.com-20131004081915-4i2rn3fsj8qzov63
2013-10-04 10:19:15 +02:00
11308f37dd
[FIX] test: avoid getting error when trying to send an email to the newly created user (email replaced by login)
...
bzr revid: mat@openerp.com-20131003143234-8tu732aa4rmycoif
2013-10-03 16:32:34 +02:00
5cba82e2c9
[MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8788 dle@openerp.com-20131003094541-ro29hhkas03rdvw8
...
bzr revid: odo@openerp.com-20131003111222-upt1ytb92db50zay
2013-10-03 13:12:22 +02:00
a9158e5993
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9487 rev-id: dle@openerp.com-20130930141202-ghnujem348kydd2m
...
bzr revid: dle@openerp.com-20130930150804-b4j080uy06t4n7f1
2013-09-30 17:08:04 +02:00
3a4a093ba7
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130930054304-7r885mda98p411ax
bzr revid: launchpad_translations_on_behalf_of_openerp-20130928055410-zlzdspq6yjqrkq33
bzr revid: launchpad_translations_on_behalf_of_openerp-20130929054547-erco56ru1eyc6iq7
bzr revid: launchpad_translations_on_behalf_of_openerp-20130930054318-brbtsqs7pdngwg51
2013-09-30 05:43:18 +00:00
e2e20bae4c
[FIX] mrp: improved fix, used DEFAULT_SERVER_DATETIME_FORMAT for date, removed extra AND and _order from search()
...
bzr revid: rha@tinyerp.com-20130924062648-qshruwnukmtn0b7w
2013-09-24 11:56:48 +05:30
Christophe Simonis
Antony Lesuisse
Launchpad Translations on behalf of openerp
Frédéric van der Essen
Denis Ledoux
Thibault Delavallée
Martin Trigaux
Stephane Wirtel
Christophe Matthieu
Olivier Dony
Rifakat