Commit Graph

731 Commits

Author SHA1 Message Date
Josse Colpaert 5807343602 [MERGE] Merge from trunk-wms
bzr revid: jco@openerp.com-20140423095528-h4dpd9gdmh8lmk6j
2014-04-23 11:55:28 +02:00
Quentin (OpenERP) 57cebaaac6 [MERGE] merged trunk up to revision 9365.
bzr revid: qdp-launchpad@openerp.com-20140422092815-f4tlfmo8zj1nogbl
2014-04-22 11:28:15 +02:00
Josse Colpaert a7d4e518ae [IMP] Action assign button on production order + quant_ids readonly on serial number
bzr revid: jco@openerp.com-20140422085831-yt7hdb3catb5w00q
2014-04-22 10:58:31 +02:00
Quentin (OpenERP) c5d92d9e1f [REF] mrp: some code cleaning since procure_method and supply_method doesn't exist on the product anymore
bzr revid: qdp-launchpad@openerp.com-20140401132233-2odtndrvudu5ka7q
2014-04-01 15:22:33 +02:00
Jitendra Prajapati (OpenERP) 35e9dd0aa5 [MERGE]with main branch
bzr revid: jpr@tinyerp.com-20140319063549-7jjr6i5tdqitq2jy
2014-03-19 12:05:49 +05:30
Josse Colpaert d5cdec9e16 [MERGE] Merge from trunk-wms
bzr revid: jco@openerp.com-20140219145719-snazgq9oe9q0idrs
2014-02-19 15:57:19 +01:00
Quentin (OpenERP) 4ad9811a90 [FIX] mrp: fixed phantom bom
lp bug: https://launchpad.net/bugs/1278891 fixed

bzr revid: qdp-launchpad@openerp.com-20140214150330-an2my0n8vjdf38vx
2014-02-14 16:03:30 +01:00
Josse Colpaert 1277c16dd7 [MERGE] Merge from trunk
bzr revid: jco@openerp.com-20140214100157-1vbjgifkouh0h4ix
2014-02-14 11:01:57 +01: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
Atul Patel (OpenERP) bdaccb7053 [MERGE]: Merged with addons
bzr revid: atp@tinyerp.com-20140210060020-2kfsig5t3ps14i4k
2014-02-10 11:30:20 +05:30
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
Quentin (OpenERP) 19501096f5 [MERGE] main trunk-wms branch
bzr revid: qdp-launchpad@openerp.com-20140204110840-iur4q0t9rz5v2y5i
2014-02-04 12:08:40 +01: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
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
Pooja Zankhariya (OpenERP) d76083087d [MERGE]Sync with Trunk
bzr revid: pza@tinyerp.com-20140130055452-dntwofrc41897k1f
2014-01-30 10:54:52 +05: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 68f0f8db8f [FIX] Use correct wizard and solve infinite loop
bzr revid: jco@openerp.com-20140128164048-43ptahppk2w2tyn7
2014-01-28 17:40:48 +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
Josse Colpaert b50247109c [IMP] Basic version working with lots
bzr revid: jco@openerp.com-20140117164232-8gu0bb8qbbk67yrx
2014-01-17 17:42:32 +01: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
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
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
Pooja Zankhariya (OpenERP) 3abf050afc [IMP]Improved colors for components
bzr revid: pza@tinyerp.com-20131209094948-4zne4efiijzm2ly6
2013-12-09 14:49:48 +05: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) 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
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
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) 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) 45c990e833 [REF] some refactoring
bzr revid: qdp-launchpad@openerp.com-20131023134021-jf2n0l1coh7uuc0c
2013-10-23 15:40:21 +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
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
Quentin (OpenERP) 65966940c8 [MERGE] merged with main trunk
bzr revid: qdp-launchpad@openerp.com-20131010133212-t058auv973pvvmjm
2013-10-10 15:32:12 +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
Josse Colpaert 9494290cb1 [FIX] Try to fix mrp tests and mrp
bzr revid: jco@openerp.com-20130918135612-n8d1qqbxh0rbgtcw
2013-09-18 15:56:12 +02:00
Christophe Simonis 3fa90321e1 [MERGE] forward port of branch saas-1 up to revid 8772 chs@openerp.com-20130910122113-171osvcukxffxcry
bzr revid: chs@openerp.com-20130910124803-wxkb8gkz1tub5qjf
2013-09-10 14:48:03 +02:00
Denis Ledoux 546a191f0a [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9459 rev-id: fva@openerp.com-20130918153347-fy4nuvbm82ngfb8x
bzr revid: mat@openerp.com-20130826135110-f9q4p65ds2aholcw
bzr revid: dle@openerp.com-20130828141129-ecxl2vlpb8vw0o9f
bzr revid: dle@openerp.com-20130828162659-n8a0ku9o3h01qaov
bzr revid: dle@openerp.com-20130830094205-q3itwd7x0246d9n6
bzr revid: dle@openerp.com-20130830133604-mfnfbscn5wdk4vi4
bzr revid: dle@openerp.com-20130902131244-v9uh0s8rg4889i7j
bzr revid: mat@openerp.com-20130903134105-68ziuaccreu6rs61
bzr revid: chs@openerp.com-20130906171851-jtfsf4au1k30wwlr
bzr revid: dle@openerp.com-20130909103120-k5oefxgebhyslac3
bzr revid: dle@openerp.com-20130909170047-pbzw4ernvcpivbhh
bzr revid: chs@openerp.com-20130910122113-171osvcukxffxcry
bzr revid: tde@openerp.com-20130912121059-k840pi4rwdzpez8g
bzr revid: dle@openerp.com-20130913085251-p906ci2divy82jur
bzr revid: tde@openerp.com-20130913092546-kzshg1a7sls566l8
bzr revid: mat@openerp.com-20130917122102-drf8fj9lrjj0fvju
bzr revid: mat@openerp.com-20130917161614-w8u2c1ayeb5kxm30
bzr revid: dle@openerp.com-20130918161305-7ep1642nxzyy3vhd
2013-09-18 18:13:05 +02:00
Josse Colpaert 30f27b8cbb [IMP] Move route_ids from product from stock_location to stock and remove supply_method (change with route)
bzr revid: jco@openerp.com-20130909115515-7z6ixaxe7bpxxe73
2013-09-09 13:55:15 +02:00
Atul Patel (OpenERP) 75524b550d [MERGE]: Merged with addons
bzr revid: atp@tinyerp.com-20130909052837-ogi34t0msiqwa0y9
2013-09-09 10:58:37 +05:30
Thibault Delavallée 8b48cc9520 [MERGE] addons: added groups when quick creating user in various addons.
bzr revid: tde@openerp.com-20130904141122-uaxlnu7qxzri4q3a
2013-09-04 16:11:22 +02:00
Thibault Delavallée ed0a829cb3 [MERGE] [IMP] addons: improved name and tooltips of groupby date in various addons.
bzr revid: tde@openerp.com-20130904141053-yustqiuzynbettq8
2013-09-04 16:10:53 +02:00
Martin Trigaux 98541c5827 [FIX] mrp: display Bill of Materials as a list, not as a tree
bzr revid: mat@openerp.com-20130826132943-mp8f331mxafb3z9z
2013-08-26 15:29:43 +02:00
Christophe Simonis 5343c48c5f [MERGE] forward port of branch saas-1 up to revid 8760 chs@openerp.com-20130823143114-83tdjhbsdes0kydr
bzr revid: chs@openerp.com-20130823154655-blm2wyfivmg8qi2z
2013-08-23 17:46:55 +02:00
Christophe Simonis 58868227f9 [MERGE] forward port of branch 7.0 up to revid 9382 chs@openerp.com-20130823131214-ipouwtnz8r16mlvv
bzr revid: chs@openerp.com-20130823143114-83tdjhbsdes0kydr
2013-08-23 16:31:14 +02:00