Commit Graph

319 Commits

Author SHA1 Message Date
Josse Colpaert bf5585851a [IMP] Make sure tests pass without procurement_jit installation
bzr revid: jco@openerp.com-20140424093654-r04xvcp544du1lkj
2014-04-24 11:36:54 +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
Launchpad Translations on behalf of openerp fa60b90c1f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
2014-04-22 07:52:47 +00:00
Quentin (OpenERP) 398d96f273 [MERGE] merged trunk up to revision 9327
bzr revid: qdp-launchpad@openerp.com-20140414094743-hv0u7qhigv1to2uc
2014-04-14 11:47:43 +02:00
Launchpad Translations on behalf of openerp e82fbf7d91 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
2014-04-12 08:31:53 +00:00
Quentin (OpenERP) ff4726ea7d [MERGE] merged trunk up to revision 9281
bzr revid: qdp-launchpad@openerp.com-20140403081427-7xpn57wdfv08v2al
2014-04-03 10:14:27 +02:00
Launchpad Translations on behalf of openerp 51aa261b44 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
2014-03-27 07:35:04 +00:00
Quentin (OpenERP) da210e4b5e [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20140311132813-0gmbof2u8nmgv9p3
2014-03-11 14:28:13 +01:00
Launchpad Translations on behalf of openerp 9863dbe5c8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
2014-03-04 07:52:38 +00:00
Cedric Snauwaert 9a664bb298 [FIX]test for sale_stock and sale_mrp
bzr revid: csn@openerp.com-20140211094444-j54nqmisqrs2ncnl
2014-02-11 10:44:44 +01: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
Quentin (OpenERP) 753f7541db [MERGE] main trunk
bzr revid: qdp-launchpad@openerp.com-20140203173000-mk092iw2wz3y0e3e
2014-02-03 18:30:00 +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
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
Quentin (OpenERP) 8d8b592fbd [FIX] sale_mrp: fixed wrong signature of _prepare_order_line_procurement().
bzr revid: qdp-launchpad@openerp.com-20140120163403-pwzrlhww131gu329
2014-01-20 17:34:03 +01:00
Quentin (OpenERP) fc93025818 [MERGE] merged trunk
bzr revid: qdp-launchpad@openerp.com-20140120144243-5kw535p28t1x7yeg
2014-01-20 15:42:43 +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
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 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
Launchpad Translations on behalf of openerp 67e479e96e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131225060225-zss93rqqqz3holkp
bzr revid: launchpad_translations_on_behalf_of_openerp-20131226060540-odnnltlm0bobiqp9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131227052235-xq201ghozcgucfuq
bzr revid: launchpad_translations_on_behalf_of_openerp-20131228051943-jo247cfuiyx4w767
bzr revid: launchpad_translations_on_behalf_of_openerp-20131230043947-d1jcf2vpf9go93ec
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231044745-8v24a0fydnvde3js
2013-12-31 04:47:45 +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
Launchpad Translations on behalf of openerp 20dba40661 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131213055207-syrqwzpvnts4z05q
bzr revid: launchpad_translations_on_behalf_of_openerp-20131214054232-imi9a8u9v0ktnahm
bzr revid: launchpad_translations_on_behalf_of_openerp-20131216051546-5os7f9apxcrnrx05
bzr revid: launchpad_translations_on_behalf_of_openerp-20131217053233-yv0pe0b16pixnuk4
2013-12-17 05:32:33 +00:00
Launchpad Translations on behalf of openerp 94b4618c13 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131215054553-py8zfwrk3bir6m1l
bzr revid: launchpad_translations_on_behalf_of_openerp-20131212055820-zh0fqpweezvphdc6
bzr revid: launchpad_translations_on_behalf_of_openerp-20131213064308-hil3cycv38im8qds
bzr revid: launchpad_translations_on_behalf_of_openerp-20131215054616-uyc9y42oetvmq1cs
bzr revid: launchpad_translations_on_behalf_of_openerp-20131216053557-w3gf0jlw5wrtzllr
2013-12-16 05:35:57 +00:00
Launchpad Translations on behalf of openerp 45e34f2f6b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131211053249-7onr7u94z5rfg60p
bzr revid: launchpad_translations_on_behalf_of_openerp-20131212051525-n6q6vsucee027ihr
2013-12-12 05:15:25 +00: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
Launchpad Translations on behalf of openerp 6fd5575930 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131127053957-ekc1bfm5ohug21aa
2013-11-27 05:39:57 +00: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
Launchpad Translations on behalf of openerp 2160342cea Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131116062538-hsi3j63m1pw01qem
bzr revid: launchpad_translations_on_behalf_of_openerp-20131117054515-0jw3bd84wk546u6j
bzr revid: launchpad_translations_on_behalf_of_openerp-20131118055319-wz4qa3cxwowlonxt
2013-11-18 05:53:19 +00: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
Launchpad Translations on behalf of openerp 9d4c7f4db9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131101062724-823uztz81d48e7zk
bzr revid: launchpad_translations_on_behalf_of_openerp-20131102062340-1guhkeb34orj1d77
bzr revid: launchpad_translations_on_behalf_of_openerp-20131103054341-mg7xr0dkzd2rp6rx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131104060249-fio493wxgjvvlthm
2013-11-04 06:02:49 +00: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
jke-openerp 3ba6a4dac4 [MERGE] Merge with trunk-wms branche
bzr revid: jke@openerp.com-20131029192931-63zc0kd0qyr4e8m1
2013-10-29 20:29:31 +01:00
jke-openerp c9237c2c47 [REF] Improve code according to review
bzr revid: jke@openerp.com-20131029192702-w6ddr9pwr2kzqhqn
2013-10-29 20:27:02 +01:00
Quentin (OpenERP) 2a982d199e [MERGE] merged with trunk
bzr revid: qdp-launchpad@openerp.com-20131028093247-8eegjl3zle5aoqae
2013-10-28 10:32:47 +01:00
Launchpad Translations on behalf of openerp e142005a01 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131028052339-0v9n7leiirwlacok
2013-10-28 05:23:39 +00:00
jke-openerp 0cac453e16 [REF] Indentation + var name
bzr revid: jke@openerp.com-20131025143551-lb86077kl5yaaujn
2013-10-25 16:35:51 +02:00
jke-openerp 121b5c3e73 [IMP] Add test for sale_mrp and stock_complex_route about the propagation when we cancel the main procurement.
bzr revid: jke@openerp.com-20131025135051-2yzuxd3grlj2qtfn
2013-10-25 15:50:51 +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
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
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
Martin Trigaux eb26358196 [FIX] sale_crm: move code reverted at revision 9452 to the sale_crm module instead of project_mrp
bzr revid: mat@openerp.com-20130918073333-xikarmzmmmdzp3ia
2013-09-18 09:33:33 +02:00
Josse Colpaert 089cb7c856 [IMP] proc_ids search domain was wrong in yml
bzr revid: jco@openerp.com-20130916100724-92vgj02c3axdg1zw
2013-09-16 12:07:24 +02:00
Launchpad Translations on behalf of openerp 07f41591af Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130914055308-488d7jp6pk12s4oq
bzr revid: launchpad_translations_on_behalf_of_openerp-20130915061118-idedxdulpa7nb0s0
bzr revid: launchpad_translations_on_behalf_of_openerp-20130916061418-3r990vgrtgj1quyt
2013-09-16 06:14:18 +00:00
Launchpad Translations on behalf of openerp 9dba69ba48 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130912064018-3vecn03jcu9fm1m8
2013-09-12 06:40:18 +00:00
Cedric Snauwaert 79faa9ff78 [FIX]fix test sale_mrp: field type on sol does not exists anymore
bzr revid: csn@openerp.com-20130911145332-ck6w8euus97fu91l
2013-09-11 16:53:32 +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
Launchpad Translations on behalf of openerp cb8f9c5a0d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130903054857-i15nhvtthlho7chm
2013-09-03 05:48:57 +00:00
Fabien Pinckaers 9eb29913fa [IMP] removed old concept: invoice_quantity
bzr revid: fp@openerp.com-20130803190359-e3xpl2yye2u15104
2013-08-03 21:03:59 +02:00
Josse Colpaert 83e87f1102 [WIP] stock.picking.type class, yml, quant has qty instead of product_qty
bzr revid: jco@openerp.com-20130723094436-bo6r0ztkdoun68ki
2013-07-23 11:44:36 +02:00