Commit Graph

139 Commits

Author SHA1 Message Date
Quentin (OpenERP) 753f7541db [MERGE] main trunk
bzr revid: qdp-launchpad@openerp.com-20140203173000-mk092iw2wz3y0e3e
2014-02-03 18:30:00 +01:00
Quentin (OpenERP) 3f8ec15bbe [MERGE] stock, sale, sale_stock: several usability problem fixed.
lp bug: https://launchpad.net/bugs/1269045 fixed

bzr revid: qdp-launchpad@openerp.com-20140120160303-v5hmfmb6roeg56v6
2014-01-20 17:03: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
Cedric Snauwaert d0cea6ac39 [FIX]rename group_stock_production_lot to match correct group, remove few extra spaces to match standard.
Fix traceback on onchange: product_packaging_change and remove setting default package when creating SOL

lp bug: https://launchpad.net/bugs/1269045 fixed

bzr revid: csn@openerp.com-20140115130123-3ragkt93ukfrfhmq
2014-01-15 14:01:23 +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
Denis Ledoux 64c0ff21d5 [FIX]sale_stock: do not raise if not able to find any warehouse (for the get default warehouse), it can prevent the user of doing anything (if he does an upgrade of sale_stock module while having no warehouse set, the user will not be able to sign in in his instance again).
bzr revid: dle@openerp.com-20131203095544-i5vmow007dgjbiza
2013-12-03 10:55:44 +01:00
Christophe Simonis 0ac4a8f696 [MERGE] forward port of branch 7.0 up to revid 9668 launchpad_translations_on_behalf_of_openerp-20131130053134-6u83vcd1133xs8yf
bzr revid: chs@openerp.com-20131130130014-hi5h5a00kjx0dbvp
2013-11-30 14:00:14 +01:00
Olivier Dony 2cba6a5355 [MERGE] Forward-port of latest 7.0 fixes up to rev 9629 rev-id odo@openerp.com-20131121153230-keie85rmes2zh2o8
bzr revid: chs@openerp.com-20131121112139-aw2ara1i1xymue62
bzr revid: odo@openerp.com-20131121154205-ul9hf9tz3h0x2n7m
2013-11-21 16:42:05 +01:00
Christophe Simonis 6b9822626b [FIX] sale_stock: procuremenr.order object does not have a `property_ids` field. This field is added by `mrp` module, which we do not depend of.
bzr revid: chs@openerp.com-20131112115635-tgbdeocn9awtbxkq
2013-11-12 12:56:35 +01:00
Quentin (OpenERP) d2d0184587 [IMP] pocurement, stock, purchase, sale_stock, stock_account: misc changes in usabilty, code refactoring and new option on procurement group propagation.
1) form view of procurement.order and procurement.rule reviewed
2) added buttons on procurement.order to jump on other procurements or pickings of same procurement.group
3) tracked some fields on procurement.order
4) used the short name of warehouse for the rule names
5) added a new choice for the procurement.group propagation in order to allow having only one reception picking for several po lines grouped in the same PO but belonging to different procurement.group at first
6) some code refactored for easiness, modularity, clarity and other obvious reasons

bzr revid: qdp-launchpad@openerp.com-20131107112053-knracfslqkfitg8b
2013-11-07 12:20:53 +01:00
Quentin (OpenERP) fcbfec1519 [FIX] sale_stock, warning: fixed inheritancy of product_id_change in order to be more modular with other modules
bzr revid: qdp-launchpad@openerp.com-20131023085758-1kz7r8kepmuhthr3
2013-10-23 10:57:58 +02:00
Quentin (OpenERP) 441d0bc009 [FIX] stock, sale_stock: changed the way the procurements look for a suitable rule => Added a m2o field warehouse_id on procurement.order, procurement.rule and stock.move. There was a problem with MTO products because they weren't following the route of the chosen warehouse at all (since all warehouse were creating their rule in the same route, there was no garantee that the route chosen was included in the warehouse selected on the SO)
bzr revid: qdp-launchpad@openerp.com-20131022120605-3dj65nm5yc96sj5r
2013-10-22 14:06:05 +02:00
Quentin (OpenERP) eddd2f3575 [MERGE] merged with main feature branch
bzr revid: qdp-launchpad@openerp.com-20131017121349-xyip1fn6j0itiz56
2013-10-17 14:13:49 +02:00
Quentin (OpenERP) c3fd943ac4 [MERGE] merged with main feature branch
bzr revid: qdp-launchpad@openerp.com-20131016100318-52unjrqnn5xqo6eg
2013-10-16 12:03:18 +02:00
Quentin (OpenERP) 75a9f5323f [FIX] sale, sale_stock: fixing problems and workflow related to the shipping_except state
bzr revid: qdp-launchpad@openerp.com-20131015150035-ccdbua7e881adwx7
2013-10-15 17:00:35 +02:00
jke-openerp 66b0500f3c Task misc -Step 2
bzr revid: jke@openerp.com-20131014142540-udu9mn3lu99alir2
2013-10-14 16:25:40 +02:00
Quentin (OpenERP) d06b99370c [FIX] sale_stock: fix onchange product to raise a warning more precisely + fixed inheritancy of views that wasn't taken into account
bzr revid: qdp-launchpad@openerp.com-20131010081442-belp4gu1w75ml3fs
2013-10-10 10:14:42 +02:00
jke-openerp b3f1ce57be try catch added
bzr revid: jke@openerp.com-20131009153120-pr721kyv1y7zcv56
2013-10-09 17:31:20 +02:00
jke-openerp 71ed45ba7e merge with the copy on launchpad
bzr revid: jke@openerp.com-20131009143817-j0ow1jhj3ofwg99h
2013-10-09 16:38:17 +02:00
jke-openerp 9473209b7d fixed - v1
bzr revid: jke@openerp.com-20131009140728-zavf5amo5xjbpim4
2013-10-09 16:07:28 +02:00
jke-openerp d86e8623a3 merge sale stock loc
bzr revid: jke@openerp.com-20131008143231-6l30g8z2bju8z4cu
2013-10-08 16:32:31 +02:00
jke-openerp a178177f45 optimize - no float_compare if mto true
bzr revid: jke@openerp.com-20131007134831-oc2p68rxol49l7eb
2013-10-07 15:48:31 +02:00
jke-openerp 7589873b35 optimize - no float_compare if mto true
bzr revid: jke@openerp.com-20131007134831-ne0w1h9xnv4n6pmw
2013-10-07 15:48:31 +02:00
jke-openerp 6d1fba2754 remove stock warning on mto product
bzr revid: jke@openerp.com-20131007134123-ukaif43i2dj7ms8a
2013-10-07 15:41:23 +02:00
jke-openerp 2930e50b08 remove stock warning on mto product
bzr revid: jke@openerp.com-20131007134123-mu4h0sw7oc5o1d4i
2013-10-07 15:41:23 +02:00
Quentin (OpenERP) d5a9dfd30b [IMP] sale_stock, stock: change the 'view delivery orders' in order to see all the pcikings related and not only the deliveries (include pick and pack operations)
bzr revid: qdp-launchpad@openerp.com-20131004090152-wmlgx9npiuus1z43
2013-10-04 11:01:52 +02:00
Quentin (OpenERP) e12c9ab5ec [FIX] sale, project_mrp, sale_stock: fixed problems related to the procurement workflow
bzr revid: qdp-launchpad@openerp.com-20130917064359-jwque36uwouac61p
2013-09-17 08:43:59 +02:00
Cedric Snauwaert 212be5e67c [WIP]fix sale workflow in the case we only have sale and not stock installed.
bzr revid: csn@openerp.com-20130913093815-m6luad9cnhykbcha
2013-09-13 11:38:15 +02:00
Josse Colpaert d207edc369 [IMP] Move sale_stock_workflow towards sale_workflow and make sure project_mrp tests pass
bzr revid: jco@openerp.com-20130910154822-u2if98d4r32rtibi
2013-09-10 17:48:22 +02:00
Quentin (OpenERP) 15dd2573d5 [FIX] better split of onshipping invoice (some code needed to be moved in sale_stock\!) + misc fixes in delivery (yaml test fixed as well)
bzr revid: qdp-launchpad@openerp.com-20130909142350-axvodv298wnmm7ox
2013-09-09 16:23:50 +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
Cedric Snauwaert e87465208b [FIX]sale: fix button view delivery order, set correct default picking type id in action view context
bzr revid: csn@openerp.com-20130905130234-siefa3ibdxmxsayl
2013-09-05 15:02:34 +02:00
Josse Colpaert 1a1338fa41 [IMP] Add invoice_state on move in stock_account and make sure it gets passed through procurement on the move
bzr revid: jco@openerp.com-20130830081648-mmfxshzl9cuk3jg6
2013-08-30 10:16:48 +02:00
Bharat R. Devnani (OpenERP) b97a9da42d [REVERT] reverted the changes in _get_orders method
bzr revid: bde@tinyerp.com-20130826071405-yax8hqw0esrll766
2013-08-26 12:44:05 +05:30
Martin Trigaux 4bc20f2e2f [MERGE] backport of revision 8862
mrp, sale_stock: minor usability improvements + properties in sale order lines

bzr revid: mat@openerp.com-20130823092231-w5aet41ivk4f7nd9
2013-08-23 11:22:31 +02:00
Bharat R. Devnani (OpenERP) b42f8b53db [IMP] improved _get_orders method and added _get_orders_procurements method to complete the flow of Sale Order
bzr revid: bde@tinyerp.com-20130823065119-6yje7t9nyfi3r5fl
2013-08-23 12:21:19 +05:30
Josse Colpaert 349833452a [IMP] Change test_state according to procurement_ids, do not allow running a procurement twice when it was successful and adapt view in sale_journal
bzr revid: jco@openerp.com-20130816102734-j4xrxqbz26q942ps
2013-08-16 12:27:34 +02:00
Josse Colpaert 2642c4a379 [IMP] procurement state == done instead of != for test_state
bzr revid: jco@openerp.com-20130816074846-di9cajwmylsvsg3s
2013-08-16 09:48:46 +02:00
Fabien Pinckaers 16cb4f8b2a [IMP] cleaning in progress: invoice on picking
bzr revid: fp@openerp.com-20130804134014-0xrkwlzhd6zfd6em
2013-08-04 15:40:14 +02:00
Fabien Pinckaers c522a3d440 [IMP] Invoice on picking cleaned
bzr revid: fp@openerp.com-20130804115325-ejsbn2qoawnrgaic
2013-08-04 13:53:25 +02: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
Fabien Pinckaers b3f49d4b74 [IMP] removing bad code
bzr revid: fp@openerp.com-20130803174320-a3hhtypmfwge8a48
2013-08-03 19:43:20 +02:00
Fabien Pinckaers 0f80a45eb8 [IMP] misc fixes in sale_stock
bzr revid: fp@openerp.com-20130803074236-379hhg5s3o26i003
2013-08-03 09:42:36 +02:00
Fabien Pinckaers 6485a68609 [IMP] sale stock
bzr revid: fp@openerp.com-20130803072546-52eeu2a4sd0so57i
2013-08-03 09:25:46 +02:00
Quentin (OpenERP) 56cbc9421d [FIX] fixing misc bugs due to the removal of stock in the dependancies of sale
bzr revid: qdp-launchpad@openerp.com-20130802113308-nicou96ebqtcgdm0
2013-08-02 13:33:08 +02:00
Josse Colpaert 15f509178b [WIP] remove stock.picking.in and stock.picking.out and replace by picking_type_id
bzr revid: jco@openerp.com-20130723164755-39wldz6jdjkqjvkk
2013-07-23 18:47:55 +02:00
Josse Colpaert a3cc2f8fdc [WIP] Link sale and procurement group, run procurement when creating from sale, view delivery order button with shipped field as a calculated field, quants search view, change yml tests in stock_location
bzr revid: jco@openerp.com-20130722143747-l680354are7bo0ow
2013-07-22 16:37:47 +02:00
Josse Colpaert 37ab5c83f7 [WIP] Move back packaging from sale to sale_stock, add module sale_stock_location for route on sale order, add route on warehouse
bzr revid: jco@openerp.com-20130716153336-irauxby6fd7gs0w2
2013-07-16 17:33:36 +02:00
Cedric Snauwaert 30fb888bc1 [FIX]sale_stock: add field function (one2many) picking_ids on sale_order object
bzr revid: csn@openerp.com-20130711134044-8k9t0o5b93k6h736
2013-07-11 15:40:44 +02:00
Josse Colpaert bcf77893af [WIP] Move from sale_stock what has only to do with procurement to sale and remove stock_location_sale
bzr revid: jco@openerp.com-20130710150207-imvyte86hftdd3pq
2013-07-10 17:02:07 +02:00