Commit Graph

3261 Commits

Author SHA1 Message Date
Cedric Snauwaert 73183be469 [FIX]when creating location for warehouse, use warehouse code as base name for location instead of warehouse name
bzr revid: csn@openerp.com-20140213094820-v76n4fuqd1omicvy
2014-02-13 10:48:20 +01:00
Launchpad Translations on behalf of openerp faf6d33bc0 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140213064742-xiotlx8wzfhexnhc
2014-02-13 06:47:42 +00:00
Launchpad Translations on behalf of openerp 3eceef7802 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140213054839-bknb7wozzfcl2b5p
bzr revid: launchpad_translations_on_behalf_of_openerp-20140213061121-vm9ot1x4ve6ekaoe
2014-02-13 06:11:21 +00:00
Olivier Dony bbd813e76e [MERGE] Forward-port of latest saas-2 (incl. 7.0) bugfixes, up to rev. 9127 odo@openerp.com-20140212122042-3m2tysmr31mtecnc
bzr revid: odo@openerp.com-20140212175141-i9yz8zlseglrk8sb
2014-02-12 18:51:41 +01:00
Launchpad Translations on behalf of openerp 9554c144ff Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140212062357-8n13ec90bnclm1ek
2014-02-12 06:23:57 +00:00
Launchpad Translations on behalf of openerp 0bbf709f5c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140212052933-2x7w3n6hxognlz1m
2014-02-12 05:29:33 +00:00
Thibault Delavallée d93fce56b6 [MERGE] mrp: small usability fixes
- updated groups on some fields of bom
- removed some icons in form view, to be coherent with other form views
- BOM form view: updated onchange_product_id that now takes product_qty into account to compute
uos and uos quantity.

bzr revid: tde@openerp.com-20140211152116-niwt0pak4r0n8jst
2014-02-11 16:21:16 +01:00
Thibault Delavallée 394b6389f0 [MERGE] Sync with upstream (trunk)
bzr revid: tde@openerp.com-20140211141925-p3sziwkon7jlsq5r
2014-02-11 15:19:25 +01:00
Launchpad Translations on behalf of openerp c00c424221 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140211064129-f1q7m95fq4tplc1s
2014-02-11 06:41:29 +00:00
Launchpad Translations on behalf of openerp 06c3efde04 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140211055037-i7s59zrp7mrzmlun
2014-02-11 05:50:37 +00:00
Cedric Snauwaert 3ba9e8715a [MERGE-FIX]merge with latest trunk-wms and fix a few mistakes while adapting action_confirm to return a list of ids
bzr revid: csn@openerp.com-20140210160346-zmpgs6rys3isz9cu
2014-02-10 17:03:46 +01:00
Cedric Snauwaert d1abe6a4cc [FIX]move: action_confirm now returns ids of move (needed for bom_explode)
bzr revid: csn@openerp.com-20140210145446-djwfreh3f0pdcfet
2014-02-10 15:54:46 +01:00
Darshan Kalola (OpenERP) b3c6e20e36 [MERGE]sync with trunk and resolve conflicts.
bzr revid: dka@tinyerp.com-20140210084803-rjkt9e4rhni8nhlt
2014-02-10 14:18:03 +05:30
Atul Patel (OpenERP) bdaccb7053 [MERGE]: Merged with addons
bzr revid: atp@tinyerp.com-20140210060020-2kfsig5t3ps14i4k
2014-02-10 11:30:20 +05:30
Launchpad Translations on behalf of openerp 8d85c23e4a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140209065003-9soyulgvssk8n5ci
bzr revid: launchpad_translations_on_behalf_of_openerp-20140208071621-b018rnkhyxmmm5jk
bzr revid: launchpad_translations_on_behalf_of_openerp-20140209065224-kih7tx56elds0zok
bzr revid: launchpad_translations_on_behalf_of_openerp-20140210055324-raxopm5ej680oc73
2014-02-10 05:53:24 +00:00
Cedric Snauwaert 31348b1e4a [FIX]sale_order with product using phantom bom
bzr revid: csn@openerp.com-20140207112606-k0cxzhpytlodjd1y
2014-02-07 12:26:06 +01:00
Launchpad Translations on behalf of openerp ffabcd257c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140206062321-j6cpns6xz3f81net
bzr revid: launchpad_translations_on_behalf_of_openerp-20140206062510-x502ahdwzezvea54
2014-02-06 06:25:10 +00:00
Quentin (OpenERP) ec0a1678ee [FIX] mrp: fixed action_produce errors added in the last refactoring
bzr revid: qdp-launchpad@openerp.com-20140205132521-ul3grdqryppig7o0
2014-02-05 14:25:21 +01:00
Quentin (OpenERP) 0afb7076d4 [REF] mrp, stock: refactoring made during code review
bzr revid: qdp-launchpad@openerp.com-20140205104324-5h5hu0fv71omhigf
2014-02-05 11:43:24 +01:00
Quentin (OpenERP) 2c101e9432 [REF] mrp: code refactoring + removal of a useless and confusing part of a yaml test
bzr revid: qdp-launchpad@openerp.com-20140205093411-2xqnn5l3gyw6hmw5
2014-02-05 10:34:11 +01:00
Quentin (OpenERP) 19501096f5 [MERGE] main trunk-wms branch
bzr revid: qdp-launchpad@openerp.com-20140204110840-iur4q0t9rz5v2y5i
2014-02-04 12:08:40 +01:00
Launchpad Translations on behalf of openerp 2bebb9cd4d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140201065304-8md3g4d14l1b51ii
bzr revid: launchpad_translations_on_behalf_of_openerp-20140202060105-bnt8nw1mcbg2c3m3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140203055609-uxdqgnistwilvo2v
bzr revid: launchpad_translations_on_behalf_of_openerp-20140204064835-qdcrcxldc5zsutio
2014-02-04 06:48:35 +00:00
Quentin (OpenERP) bbe5811e56 [FIX] fix needed after the previous merge with trunk: produce_delay field doesn't belong to product module anymore
bzr revid: qdp-launchpad@openerp.com-20140203184520-5p1j2y3sk1asu8hj
2014-02-03 19:45:20 +01:00
Quentin (OpenERP) 753f7541db [MERGE] main trunk
bzr revid: qdp-launchpad@openerp.com-20140203173000-mk092iw2wz3y0e3e
2014-02-03 18:30:00 +01:00
Denis Ledoux 3e4d932c58 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9801 revid:mat@openerp.com-20140131160304-22mokur2uuo1cw4r
bzr revid: dle@openerp.com-20140131162637-046v995ozpy22qjj
2014-01-31 17:26:37 +01:00
Martin Trigaux 62d72aa238 [FIX] stock: when creating manufacturing order from procurement workflow, do not write location on state (already set previously). (opw 603600)
This avoids having an access rights error when trying to write on a move in done state (eg: in case of force availibility)

bzr revid: mat@openerp.com-20140131160304-22mokur2uuo1cw4r
2014-01-31 17:03:04 +01:00
Pooja Zankhariya (OpenERP) d6975f7ae3 [MERGE]Sync with Trunk
bzr revid: pza@tinyerp.com-20140131065044-sn70e45ax46h97w3
2014-01-31 11:50:44 +05:00
Josse Colpaert 10123ce0c5 [IMP] Revert commit 9498 to have split between tracking of packages and tracking of serial numbers / lots /...
bzr revid: jco@openerp.com-20140130174711-2sl1rvnkx2ju2tef
2014-01-30 18:47:11 +01:00
Quentin (OpenERP) b944882755 [MERGE] main trunk-wms branch
bzr revid: qdp-launchpad@openerp.com-20140130104326-64ep633xtqar2ku3
2014-01-30 11:43:26 +01:00
Quentin (OpenERP) b1c784d8c0 [MERGE] mrp: removal of a deprecated option (module stock_no_autopicking doesn't exist anymore)
lp bug: https://launchpad.net/bugs/1271466 fixed

bzr revid: qdp-launchpad@openerp.com-20140130095142-jueza81dhql1am14
2014-01-30 10:51:42 +01:00
Pooja Zankhariya (OpenERP) d76083087d [MERGE]Sync with Trunk
bzr revid: pza@tinyerp.com-20140130055452-dntwofrc41897k1f
2014-01-30 10:54:52 +05:00
Sunil Sharma (OpenERP) b2ac002e1b [MRG]:merge lp:openobject-addons
bzr revid: sunilsharma.sharma07@gmail.com-20140130044953-qfg8wbm6835hi9dz
2014-01-30 10:19:53 +05:30
Sunil Sharma (OpenERP) 30170062dd [rem]:mrp:remove mrp dashboard
bzr revid: sunilsharma.sharma07@gmail.com-20140130044632-m0kw1a8ya466tlg3
2014-01-30 10:16:32 +05:30
Christophe Simonis c202dc1c52 merge upstream
bzr revid: chs@openerp.com-20140129190834-xfcat3ulfbg5omhn
2014-01-29 20:08:34 +01:00
Christophe Simonis 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
Josse Colpaert 5626d63634 [REMOVE] Remove split wizards
bzr revid: jco@openerp.com-20140129134424-c72zk1z2n3rixnwg
2014-01-29 14:44:24 +01:00
Josse Colpaert 3590a5ff93 [MERGE] Merge from trunk
bzr revid: jco@openerp.com-20140129132300-qaiiqza23bgipjjd
2014-01-29 14:23:00 +01:00
Josse Colpaert 4a7a79779d [IMP] Consume only products when already assigned and
bzr revid: jco@openerp.com-20140129131046-r8yv3h8l679c3m3s
2014-01-29 14:10:46 +01:00
Josse Colpaert 7848349e53 [ADD] Add files now needed in mrp instead of stock
bzr revid: jco@openerp.com-20140129085303-war5qlk5pqkf3gfg
2014-01-29 09:53:03 +01:00
Antony Lesuisse 033c38c304 [MERGE] trunk
bzr revid: al@openerp.com-20140129021916-ckb3rplmcpjbqel3
2014-01-29 03:19:16 +01:00
Josse Colpaert 68f0f8db8f [FIX] Use correct wizard and solve infinite loop
bzr revid: jco@openerp.com-20140128164048-43ptahppk2w2tyn7
2014-01-28 17:40:48 +01:00
Josse Colpaert 34b923a19e [IMP] change split signature and take into account for action_consume
bzr revid: jco@openerp.com-20140128154125-3j1rpc4w6maywcmt
2014-01-28 16:41:25 +01:00
Josse Colpaert 8ec0968f8d [WIP] Reorganise action_consume wizard to start from mrp and clean op inventory wizards
bzr revid: jco@openerp.com-20140128151834-ni90kny7b2y6sr36
2014-01-28 16:18:34 +01:00
Launchpad Translations on behalf of openerp 3ce5e01eca Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
2014-01-28 06:41:39 +00:00
Pooja Zankhariya (OpenERP) aaabe58be6 [MERGE]Sync with Trunk
bzr revid: pza@tinyerp.com-20140128060634-bvqzr8yaqkxa2p1d
2014-01-28 11:06:34 +05:00
Frédéric van der Essen 5585a38ecc [MERGE] from trunk, need point_of_sale updates
bzr revid: fva@openerp.com-20140127160946-yeswyv4o7t2tfbqt
2014-01-27 17:09:46 +01:00
Quentin (OpenERP) 7acaac732c [MERGE] stock: fixed error of production lot propagation in action_consume and action_scrap
lp bug: https://launchpad.net/bugs/1268994 fixed

bzr revid: qdp-launchpad@openerp.com-20140124154953-lr0m6v1ok6q0futo
2014-01-24 16:49:53 +01:00
Denis Ledoux 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
Denis Ledoux 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
Josse Colpaert 47d04a43e1 [MERGE] Merge from trunk-wms
bzr revid: jco@openerp.com-20140124105300-vaz4srntbhr9nyk4
2014-01-24 11:53:00 +01:00
Cedric Snauwaert f7d2d9e918 [FIX]remove setting for stock_no_autopicking that has been removed
lp bug: https://launchpad.net/bugs/1271466 fixed

bzr revid: csn@openerp.com-20140122141123-wbxk3exizay9cgf9
2014-01-22 15:11:23 +01:00
Denis Ledoux 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
Thibault Delavallée ec2c2d4e86 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140122123237-5rc5fdyau0422fj2
2014-01-22 13:32:37 +01:00
Josse Colpaert da22ca89bb [FIX] Make sure the tests for mrp.product.produce do the onchange for consume_lines
bzr revid: jco@openerp.com-20140122092921-rjgehregzpqfreyg
2014-01-22 10:29:21 +01:00
Launchpad Translations on behalf of openerp d5bc07f898 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140122061335-z6h1dn3yd94l8850
2014-01-22 06:13:35 +00:00
Josse Colpaert 72b0c03b96 [IMP] Change the action_produce to be able to take into account wizard or not
bzr revid: jco@openerp.com-20140121133909-0xzgqmzhs4mhgqtp
2014-01-21 14:39:09 +01:00
Josse Colpaert 056bfc00a9 [IMP] Make sure the wizard does not take negative quants and refactor a little bit not to have duplicate code
bzr revid: jco@openerp.com-20140121104051-87ihs7fnz72i0b9z
2014-01-21 11:40:51 +01:00
Josse Colpaert 96120dcdbd [IMP] Make sure consumed_for is set before doing action_done
bzr revid: jco@openerp.com-20140121093027-2h6xlgouhg49sr76
2014-01-21 10:30:27 +01:00
Quentin (OpenERP) e32b5bb6ae [FIX] sale_mrp; fixed error in yaml test. It seems we forgot the property_ids field on sale.order.line -_- . Also removed a unused method (_prepare_order_line_procurement on procurement order => this must be/is already defined in sale.order object)
bzr revid: qdp-launchpad@openerp.com-20140121084946-8aws5axdkgr8ng9r
2014-01-21 09:49:46 +01:00
Launchpad Translations on behalf of openerp 698e2de138 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140121062040-gq8r12g3ypksxa4t
2014-01-21 06:20:40 +00:00
Josse Colpaert 24f6ed8973 [WIP] Give warnings when not possible to do traceability and needed, group by quants
bzr revid: jco@openerp.com-20140120162828-6xgxshtkc44tlesi
2014-01-20 17:28:28 +01:00
Quentin (OpenERP) fc93025818 [MERGE] merged trunk
bzr revid: qdp-launchpad@openerp.com-20140120144243-5kw535p28t1x7yeg
2014-01-20 15:42:43 +01:00
Launchpad Translations on behalf of openerp 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
Josse Colpaert b50247109c [IMP] Basic version working with lots
bzr revid: jco@openerp.com-20140117164232-8gu0bb8qbbk67yrx
2014-01-17 17:42:32 +01:00
Pooja Zankhariya (OpenERP) d1cc6afe5f [MERGE]Merge with Parent
bzr revid: pza@tinyerp.com-20140117140458-obuxulf1sfamoi4w
2014-01-17 19:04:58 +05:00
Denis Ledoux 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
Josse Colpaert 338013803d [WIP] Extending wizard with consume lines
bzr revid: jco@openerp.com-20140116174800-kap083m5jvacsbh6
2014-01-16 18:48:00 +01:00
Thibault Delavallée 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
Christophe Simonis 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
Josse Colpaert d2605491ff [IMP] Add dependence on partner
bzr revid: jco@openerp.com-20140115141659-3ek1usz8ugllsn9e
2014-01-15 15:16:59 +01:00
Josse Colpaert 6b1ec21cb6 [IMP] Make sure the quant has lot when we restrict lot in pickingless move
bzr revid: jco@openerp.com-20140115133719-ivn71uatgd7gtin6
2014-01-15 14:37:19 +01:00
Josse Colpaert 557a052cb3 [IMP] When consuming in mrp, take into account lot
bzr revid: jco@openerp.com-20140114173101-5999401bm7q64q1f
2014-01-14 18:31:01 +01:00
Denis Ledoux 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
Martin Trigaux 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
Thibault Delavallée 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
Pooja Zankhariya (OpenERP) 0dfa248326 [MERGE]Mergw with Trunk
bzr revid: pza@tinyerp.com-20131226055518-pl2wp3medwd55d14
bzr revid: pza@tinyerp.com-20131230052417-iqe74dvbj3ozhtp1
bzr revid: pza@tinyerp.com-20140110054631-564ljohag0nsgfv2
2014-01-10 10:46:31 +05:00
Launchpad Translations on behalf of openerp 3ed5b49e7a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140110053216-23qk0vpm4hr5g1ig
2014-01-10 05:32:16 +00:00
Stephane Wirtel 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
Denis Ledoux 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
Martin Trigaux 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
Quentin (OpenERP) 05da75b823 [REF] stock: reduced the number of options to track or not serial numbers to 1
bzr revid: qdp-launchpad@openerp.com-20140107152358-uwwfufkg3y1eob8l
2014-01-07 16:23:58 +01:00
Quentin (OpenERP) 6da122d071 [FIX] mrp installation (wrong xml reference)
bzr revid: qdp-launchpad@openerp.com-20140107125143-yhlxkos76s0u57ih
2014-01-07 13:51:43 +01:00
Quentin (OpenERP) a0558ad4fd [IMP] stock: rehabilited the constraint check on traceability of lots. Improved it by allowing to track all operations (included the internal -> internal ones). Refactored in order to move the track_production field in mrp, where it's meaningful. Removed also a unused/deprecated wizard to change qty on a move
bzr revid: qdp-launchpad@openerp.com-20140107103915-bx9spjoclrlhalbr
2014-01-07 11:39:15 +01:00
Thibault Delavallée 49c0b7a820 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140106135700-rt0g44w5xmpbtxiu
2014-01-06 14:57:00 +01:00
Launchpad Translations on behalf of openerp 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
Quentin (OpenERP) f5718efa6e [MERGE] merged with trunk
bzr revid: qdp-launchpad@openerp.com-20131230102802-y1ux8470wxnj4yfr
2013-12-30 11:28:02 +01:00
Quentin (OpenERP) 3972c0948c [IMP] mrp, project_mrp, stock: usbility of product form view
bzr revid: qdp-launchpad@openerp.com-20131220103333-3sftj95kg56637rz
2013-12-20 11:33:33 +01:00
Quentin (OpenERP) ee9aa9ffd4 [IMP] mrp, product, stock, project_mrp: usability of product form view
bzr revid: qdp-launchpad@openerp.com-20131220095806-16siwncivyuokrym
2013-12-20 10:58:06 +01:00
Launchpad Translations on behalf of openerp e6a46a855d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131220053413-o3xa4nlpu9snoiq6
2013-12-20 05:34:13 +00:00
Martin Trigaux 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
Thibault Delavallée d9343e2d27 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20131213094016-ylqkilyo4190g81w
2013-12-13 10:40:16 +01:00
Quentin (OpenERP) 7130496dcb [FIX] stock: removed unecessary demo data for company2 (Brimingham), stock locations + fixed location used in stock move
bzr revid: qdp-launchpad@openerp.com-20131212095512-4af332hwtht0865e
2013-12-12 10:55:12 +01:00
Denis Ledoux 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
Denis Ledoux 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
Quentin (OpenERP) a5cc6d6aed [MERGE] merged with main trunk
bzr revid: qdp-launchpad@openerp.com-20131211100354-hwlt65vk8p3xih9u
2013-12-11 11:03:54 +01:00
Christophe Matthieu 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
Martin Trigaux 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
Pooja Zankhariya (OpenERP) 3abf050afc [IMP]Improved colors for components
bzr revid: pza@tinyerp.com-20131209094948-4zne4efiijzm2ly6
2013-12-09 14:49:48 +05:00
Launchpad Translations on behalf of openerp 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
Launchpad Translations on behalf of openerp 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
Jignesh Rathod (OpenERP) 229c057f3b [IMP] Add colors in tree view of components..
bzr revid: jir@tinyerp.com-20131202055331-jk00a7cgpu55vnwf
2013-12-02 11:23:31 +05:30
Quentin (OpenERP) df2d5e148e [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20131129165644-fx0m3ok07l41o507
2013-11-29 17:56:44 +01:00
Quentin (OpenERP) 6204218a43 [FIX] mrp: fixed traceback when no BoM defined for a mrp product. Fixed also messages on procurement. Set the BoM on creation of mrp.production also instead of waiting the computation
bzr revid: qdp-launchpad@openerp.com-20131129144327-f7vdb0ozpm02fe4u
2013-11-29 15:43:27 +01:00
Launchpad Translations on behalf of openerp 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
Christophe Simonis 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
Launchpad Translations on behalf of openerp 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
Olivier Dony 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
Launchpad Translations on behalf of openerp eaa917bef9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131120054418-15be15rhz84vk0et
2013-11-20 05:44:18 +00:00
Martin Trigaux 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
Launchpad Translations on behalf of openerp 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
Quentin (OpenERP) 588507c071 [FIX] stock: reconfiguration of warehouse was buggy when the default resupply warehouse was removed from both the m2o and the m2m, the rules were also wrongly created (not in MTO) and the code was not clean. The renaming of a warehouse is also fixed and the buy/manufacture pull rules are now treated as well
bzr revid: qdp-launchpad@openerp.com-20131105154923-sl8ei71aa123t108
2013-11-05 16:49:23 +01:00
Quentin (OpenERP) 473d530b3e [MERGE] merged the branch of jke with new tests on procurement cancelation
bzr revid: qdp-launchpad@openerp.com-20131030145105-15lzttxq19fpjtdd
2013-10-30 15:51:05 +01:00
Launchpad Translations on behalf of openerp 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
Darshan Kalola (OpenERP) 960924195e [MERGE]merged with main addons
bzr revid: dka@tinyerp.com-20131030052926-i9c25mf6wpseioh3
2013-10-30 10:59:26 +05:30
jke-openerp 3ba6a4dac4 [MERGE] Merge with trunk-wms branche
bzr revid: jke@openerp.com-20131029192931-63zc0kd0qyr4e8m1
2013-10-29 20:29:31 +01:00
Atul Patel (OpenERP) 2ba32016dc [MERGE]: Merged with addons
bzr revid: atp@tinyerp.com-20131029134329-mak074spts9zjscu
2013-10-29 19:13:29 +05:30
jke-openerp 2c65def713 [FIX] According to [wms] APR's Review from 20131022 - Move lead_time in mrp module, trace back on split delivery
bzr revid: jke@openerp.com-20131029074815-mws7cuvqgxr6q2d4
2013-10-29 08:48:15 +01:00
Stephane Wirtel 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
jke-openerp 57e794c2a9 [FIX] Split demo_pre.yml in stock_data.xml for ir_model_data
bzr revid: jke@openerp.com-20131028103906-izdlfpzknc3j73kp
2013-10-28 11:39:06 +01:00
Quentin (OpenERP) 3e023b667b [REM] mrp: removed deprecated and unused code
bzr revid: qdp-launchpad@openerp.com-20131028090054-39qvajzoto3xb9dz
2013-10-28 10:00:54 +01:00
Quentin (OpenERP) 171c086414 [MERGE] jke branch with fixes, improvement of warehouse config...
bzr revid: qdp-launchpad@openerp.com-20131028084702-j0e5c8i4df84zsfy
2013-10-28 09:47:02 +01:00
Quentin (OpenERP) 34862f4b43 [FIX] purchase, mrp: create buy/manufacture rules that belong to the warehouse
bzr revid: qdp-launchpad@openerp.com-20131023151912-adi1oa85rulzefkk
2013-10-23 17:19:12 +02:00
Quentin (OpenERP) 45c990e833 [REF] some refactoring
bzr revid: qdp-launchpad@openerp.com-20131023134021-jf2n0l1coh7uuc0c
2013-10-23 15:40:21 +02:00
Quentin (OpenERP) f2b9d8f05f [MERGE] merged with main branch
bzr revid: qdp-launchpad@openerp.com-20131023122842-d4yxulpthx4qa9q5
2013-10-23 14:28:42 +02:00
jke-openerp 22ab454ce2 [FIX] Fixing code according to review "Need Fixing"
bzr revid: jke@openerp.com-20131023091226-69scxv3fnns3slvg
2013-10-23 11:12:26 +02:00
jke-openerp 14cc990846 [IMP] Task Warehouse configuration - Add buy route/rule in purchase and manufacture route/rule in mrp + field default resupply in warehouse form auto hide/display
bzr revid: jke@openerp.com-20131022065446-sxsqy1y9wg8kdzrz
2013-10-22 08:54:46 +02:00
Quentin (OpenERP) e0b7ff8de6 [IMP] stock, procurement, purchase, mrp: cancelation of a procurement now propagate the cancellation upstream if the rule says so
bzr revid: qdp-launchpad@openerp.com-20131021151235-y0kjr9vy06a3curr
2013-10-21 17:12:35 +02:00
Launchpad Translations on behalf of openerp 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
Quentin (OpenERP) a3c28ede83 [MERGE] mergedf jke branch with removal of useless picking_id field on mrp.production + temporary commented crashing yaml test
bzr revid: qdp-launchpad@openerp.com-20131016073302-3hvpuikmacvbo00c
2013-10-16 09:33:02 +02:00
jke-openerp 18a9318cfd [FIX] mrp: removed picking_id field on mrp.production
bzr revid: jke@openerp.com-20131016071209-pryay03jucyezjje
2013-10-16 09:12:09 +02:00
Launchpad Translations on behalf of openerp ad7c84e43b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131016051402-s4et4c32h28r73sg
2013-10-16 05:14:02 +00:00
Purnendu Singh (OpenERP) 25c9549d31 [FIX] yml fix, need to update the system as it's not working in case of only service type of product in bom
bzr revid: psi@tinyerp.com-20131014131052-sil5acy3yez0f7gq
2013-10-14 18:40:52 +05:30
Quentin (OpenERP) 65966940c8 [MERGE] merged with main trunk
bzr revid: qdp-launchpad@openerp.com-20131010133212-t058auv973pvvmjm
2013-10-10 15:32:12 +02:00
Thibault Delavallée 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
Martin Trigaux 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
Quentin (OpenERP) c5d672ccfc [IMP] mrp: restrict_lot_id and restrict_partner_id field on mrp.production form view
bzr revid: qdp-launchpad@openerp.com-20131003142455-1z4iz0pk6zx4je7t
2013-10-03 16:24:55 +02:00
Olivier Dony 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
Quentin (OpenERP) 11fa96bbbd [FIX] fixed find_suitable_rule, fixed data for main warehouse and added debug statement for crashing yaml test
bzr revid: qdp-launchpad@openerp.com-20131003091709-q4boyc5dwz2ec7ho
2013-10-03 11:17:09 +02:00
Denis Ledoux 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
Launchpad Translations on behalf of openerp 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
Quentin (OpenERP) 9760632523 [FIX] stock: action_consume was using wrong quantity field
bzr revid: qdp-launchpad@openerp.com-20130925125039-tb8e6qfxyohrk72f
2013-09-25 14:50:39 +02:00
Quentin (OpenERP) 1e944f8c03 [MERGE] merged the branch with mrp test rehab (includes mrp workflow fixes)
bzr revid: qdp-launchpad@openerp.com-20130925102034-fn2qdkx55ylai9rr
2013-09-25 12:20:34 +02:00
Quentin (OpenERP) e503beb955 [FIX] mrp: workflow
bzr revid: qdp-launchpad@openerp.com-20130925083749-iafe0qoq2jqmvgk5
2013-09-25 10:37:49 +02:00
Quentin (OpenERP) a0941178b2 [FIX] mrp workflow
bzr revid: qdp-launchpad@openerp.com-20130924151643-gr7qhcx81e46rlld
2013-09-24 17:16:43 +02:00
Quentin (OpenERP) 4fd61763a6 [FIX] mrp workflow
bzr revid: qdp-launchpad@openerp.com-20130924151415-xkep4hps2mdo7sna
2013-09-24 17:14:15 +02:00
Quentin (OpenERP) 0e06471680 [MERGE] merge with main branch
bzr revid: qdp-launchpad@openerp.com-20130924090225-1is038pb3sngz9qe
2013-09-24 11:02:25 +02:00
Rifakat 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
Denis Ledoux db84e912bd [MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8781 rev-id: dle@openerp.com-20130923165651-0jt823r5wy37enw6
bzr revid: dle@openerp.com-20130923171310-mav1riq3d2rebmv2
2013-09-23 19:13:10 +02:00
Launchpad Translations on behalf of openerp 5d89ca5f6d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130919045555-o80w0vjyl4g3d2qn
bzr revid: launchpad_translations_on_behalf_of_openerp-20130920060115-eauj5wlxmkpyxwys
bzr revid: launchpad_translations_on_behalf_of_openerp-20130922053444-ai66yjl1419gee8h
bzr revid: launchpad_translations_on_behalf_of_openerp-20130923053502-xuqx6gazdvsak6e5
bzr revid: launchpad_translations_on_behalf_of_openerp-20130921055928-8y21w291t5w0k13o
bzr revid: launchpad_translations_on_behalf_of_openerp-20130922053456-pcgrwl35kk8b7ff8
bzr revid: launchpad_translations_on_behalf_of_openerp-20130923053531-3twd4g12gj4iqmv3
2013-09-23 05:35:31 +00:00
Cedric Snauwaert de01bca260 [FIX]cosmetics on different views
bzr revid: csn@openerp.com-20130919141319-4b2iquo74w9qcr66
2013-09-19 16:13:19 +02:00