Commit Graph

3074 Commits

Author SHA1 Message Date
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
Josse Colpaert 47d04a43e1 [MERGE] Merge from trunk-wms
bzr revid: jco@openerp.com-20140124105300-vaz4srntbhr9nyk4
2014-01-24 11:53:00 +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
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
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
Josse Colpaert b50247109c [IMP] Basic version working with lots
bzr revid: jco@openerp.com-20140117164232-8gu0bb8qbbk67yrx
2014-01-17 17:42:32 +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
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
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
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
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
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
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
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