Commit Graph

649 Commits

Author SHA1 Message Date
Thibault Delavallée dea05e6a84 [FIX] sale_stock: product_id_change_with_wh should not call another method (product_id_change) using super, but self. Otherwise some overrides are lost, leading to issues with event-related products. 2014-08-08 16:57:32 +02:00
Olivier Dony f1d5dfa85b [IMP] sale_stock: do not verify inventory for non-stockable products (sale.order.line onchange) 2014-08-08 14:37:14 +02:00
Jitendra Prajapati 240e042363 [FIX] sale_stock: invoice createde from picking was not using the prive list from the bom components 2014-08-05 09:49:42 +02:00
Denis Ledoux 0c48520a8d [FIX] stock, sale_stock: product.packaging, product_id renamed to product_tmpl_id
Some domains have not been altered according to this rename
2014-08-04 18:12:29 +02:00
Lionel Sausin (Numérigraphe) 57ad75b08d [IMP] sale_stock Show the button 'view delivery order' as soon as a picking exists
The button should appear no matter the state of the sale order, to be consistent with the rest of the application.
This makes it much faster for the sales person to find out about orders in shipping exceptions or already processed.
Fixes #256
2014-07-22 17:46:46 +02:00
Josse Colpaert 3b636a5df0 [WIP] Simplify procurement check and sales order workflow and that way phantom boms will work 2014-07-15 18:38:06 +02:00
Raphael Collet 33eb3dffb2 [REM] models: remove the magic methods signal_XXX() 2014-07-07 11:50:30 +02:00
Raphael Collet cbe2dbb672 [MERGE] new v8 api by rco
A squashed merge is required as the conversion of the apiculture branch from
bzr to git was not correctly done. The git history contains irrelevant blobs
and commits. This branch brings a lot of changes and fixes, too many to list
exhaustively.

- New orm api, objects are now used instead of ids
- Environements to encapsulates cr uid context while maintaining backward compatibility
- Field compute attribute is a new object oriented way to define function fields
- Shared browse record cache
- New onchange protocol
- Optional copy flag on fields
- Documentation update
- Dead code cleanup
- Lots of fixes
2014-07-06 17:05:41 +02:00
Thibault Delavallée 27fa618882 [REV] Partial revert of search view changes: indeed the graph view is not already capable of handling group_by on any field, declaring them is still necessary. 2014-07-04 16:44:55 +02:00
Thibault Delavallée 44a5268c00 [IMP] addons: search view cleaning / improvements due to the new search view display 2014-07-01 11:28:08 +02:00
Yannick Vaucher 2542992c24 Fix sale_id on stock.picking.out view
View inheritance is on the wrong model after model change of stock.picking.
Here we just fix the model.
2014-06-19 14:10:24 +02:00
Josse Colpaert ef228f273f Merge remote-tracking branch 'odoo/master' into master-wmsstaging3-jco 2014-06-18 15:23:39 +02:00
Amit Vora b0a5e9286d [IMP]rename project_mrp to sale_service 2014-06-17 17:12:49 +02:00
Josse Colpaert eb13d3ee5f [IMP] Make sure there is a link between purchase order invoice and purchase order 2014-06-16 16:04:04 +02:00
Olivier Dony ad4c6caecf [MERGE] Forward-port of saas-3 bugfixes up to 9f0ecb3 2014-06-12 13:52:35 +02:00
Olivier Dony 9f0ecb3572 [MERGE] Forward-port of 7.0 bugfixes up to 4d3a5df 2014-06-12 13:49:32 +02:00
Denis Ledoux 4d3a5df001 [FIX] sale_order: set state field track_visibility
sale_order module override state field of sale.oder (sale.sale.py) and forgot to reset the track_visibility, therefore sale orders state changes are no longer tracked once this module installed.
2014-06-12 12:37:11 +02:00
Christophe Matthieu 36cdac48b7 [IMP] product: move product packaging field from product.product to product.template 2014-06-03 11:53:41 +02:00
Christophe Simonis a756b82372 [MERGE] forward port of branch saas-4 up to revid bb26dea 2014-05-20 20:19:55 +02:00
Launchpad Translations on behalf of openerp c2584c8cb0 Launchpad automatic translations update. 2014-05-18 05:53:48 +00:00
Launchpad Translations on behalf of openerp 6ab0f645bc Launchpad automatic translations update. 2014-05-17 07:10:37 +00:00
Martin Trigaux 583fe74ba2 Forward-port of latest saas-3, up to revision 9455 (rev-id mat@openerp.com-20140514080416-m4t23y0rxx2ot7y6) 2014-05-14 10:37:54 +02:00
Martin Trigaux 8ea4f581ed Forward-port of latest 7.0, up to rev. 10046 (rev-id: launchpad_translations_on_behalf_of_openerp-20140514062049-vjclnuxlkbto0tsj) 2014-05-14 10:04:16 +02:00
Martin Trigaux 7dbfcede36 [FIX] sale_stock: when checkign the available quantity, do not include uom as it is already present in the context and will be included in the computation of product_obj.virtual_available (opw 607150)
fixing error message that does not match chosen units when not enough stock
2014-05-13 17:02:13 +02:00
Anael Closson 5bc76f63e9 [FIX] sale_stock: error message does not match chosen units when not enough stock. 2014-05-13 14:19:45 +02:00
Anael Closson 11a9c2d409 [FIX] sale_stock: new product uom is done twice in sale order line on change - opw 607150
[FIX] sale_stock: comparing stock and sale order line qty is always done with default uom rounding precision
2014-05-13 14:00:06 +02:00
Launchpad Translations on behalf of openerp 1397b7aa34 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140510075539-empsrh7k5l6q44ln
bzr revid: launchpad_translations_on_behalf_of_openerp-20140510075505-nu0zmfg57i2352lz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140511070820-8xp1e2jxonp4i750
bzr revid: launchpad_translations_on_behalf_of_openerp-20140503064840-v6n2wyrm1l162bh4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140504062728-9tmsk2r01vvs3avi
bzr revid: launchpad_translations_on_behalf_of_openerp-20140506072722-8xpshoxb4um6ef30
bzr revid: launchpad_translations_on_behalf_of_openerp-20140511070841-lboiasc73m8h3fb2
2014-05-11 07:08:41 +00:00
Olivier Dony 74d2f592bf [IMP] Minor spellchecking/cleanup/nitpicking while reviewing new v8 WMS
bzr revid: odo@openerp.com-20140508143940-itpazj4eatznerw7
2014-05-08 16:39:40 +02:00
Denis Ledoux 79d4c57877 [MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 9439 revid:dle@openerp.com-20140429112147-hqfqd0y487s817n7
bzr revid: dle@openerp.com-20140429112738-y2el246dmd2o2zy9
2014-04-29 13:27:38 +02:00
Denis Ledoux 2832d2ddc9 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10016 revid:dle@openerp.com-20140425125507-njfyl1r6wn11vqwx
bzr revid: dle@openerp.com-20140425125926-5nchz1tcq4fx18jx
2014-04-25 14:59:26 +02:00
Quentin (OpenERP) b96b904b2c [REF] stock_account: refactoring of do_change_standard_price() + removal of TODO statements
bzr revid: qdp-launchpad@openerp.com-20140425121810-tp2caagu1rnzpgcg
2014-04-25 14:18:10 +02:00
Denis Ledoux a28832dc62 [FIX] sale_stock: recreate delivery order generates only the remaining products to deliver
Like it should do, the feature was broken
Moreover, it resolves a performance issue (do with 100 lines took up to 10 minutes)

bzr revid: dle@openerp.com-20140424155141-qtp5o5nrp0whlk9t
2014-04-24 17:51:41 +02:00
Christophe Simonis 7a7d7febf8 [MERGE] forward port of branch saas-3 up to revid 9429 chs@openerp.com-20140424123538-rxk9got9k2on1ki1
bzr revid: chs@openerp.com-20140424131824-4ksluvhnegp7kplb
bzr revid: chs@openerp.com-20140424134533-lhhcd32n3s0m9cqk
2014-04-24 15:45:33 +02:00
Denis Ledoux b6255eb55d [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10005 revid:dle@openerp.com-20140422150710-mr9x3vyq0wcg31l5
bzr revid: dle@openerp.com-20140422162028-2icoebrb5q4tg3t3
2014-04-22 18:20:28 +02:00
Martin Trigaux 322eebf3f7 [FIX] sale: move demo data from sale to sale_stock
A better fix would be to create a sale_procurement module (sale_stock has sale, procurement and stock as dependecies) but a bit overkill for simple demo data

bzr revid: mat@openerp.com-20140422105039-vqvxejd123cmtc0s
2014-04-22 12:50:39 +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
Olivier Dony 410c82bd6a [MERGE] Sync with trunk
bzr revid: odo@openerp.com-20140411094018-zqw3ac1br991qsnp
2014-04-11 11:40:18 +02: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
Quentin (OpenERP) fe0e95d29b [IMP] procurement: removed the schedule_range field on res.company which was error prone and not really usefull + made the scheduler run in SUPERUSER to avoid intercompany and access rights issues + made the run of procurement as SUPERUSER too for the same reasons
bzr revid: qdp-launchpad@openerp.com-20140403071010-5mrox75rkufur2nw
2014-04-03 09:10:10 +02:00
Launchpad Translations on behalf of openerp 16ce262c33 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140329073038-m7q4sxpb8tprh00r
bzr revid: launchpad_translations_on_behalf_of_openerp-20140330061549-r3t0pecngy76c2rw
bzr revid: launchpad_translations_on_behalf_of_openerp-20140331064021-x3wjc8s4oa0ncq95
bzr revid: launchpad_translations_on_behalf_of_openerp-20140401065325-w3viflz7c33n4uis
bzr revid: launchpad_translations_on_behalf_of_openerp-20140402064459-d7e3d8nwo8famjh6
2014-04-02 06:44:59 +00:00
Quentin (OpenERP) 18dc2ee653 [FIX] stock: packages menuitem hidden by the right group. sale_stock: fixed bug (keyError when no group assigned to picking)
bzr revid: qdp-launchpad@openerp.com-20140328082416-3sdk30wonka2j680
2014-03-28 09:24:16 +01:00
Quentin (OpenERP) 522f87f03f [MERGE] stock reports in Qweb
bzr revid: qdp-launchpad@openerp.com-20140327174228-6beohyphca58nb00
2014-03-27 18:42:28 +01:00
Quentin (OpenERP) b8b22532a6 [FIX] stock, sale_stock, purchase: fixed the dropshipping flow
bzr revid: qdp-launchpad@openerp.com-20140327121140-18yxvp8wcdlqvaa5
2014-03-27 13:11:40 +01: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
Josse Colpaert af1d4acba3 [MERGE] Merge from trunk-wms
bzr revid: jco@openerp.com-20140326155150-4y47ny5gyvjezlm9
2014-03-26 16:51:50 +01:00
Josse Colpaert 56af6792b5 [MERGE] Merge from trunk-wms-loconopreport-jco
bzr revid: jco@openerp.com-20140326155041-rryzcotazkzjcq8j
2014-03-26 16:50:41 +01:00
Quentin (OpenERP) e0b27b4ee8 [MERGE] merged trunk up to revision 9251
bzr revid: qdp-launchpad@openerp.com-20140326152751-b6bo0fawrzmd71f0
2014-03-26 16:27:51 +01:00
Josse Colpaert 90b2be3676 [IMP] Delivery module report implementation in the existing picking report
bzr revid: jco@openerp.com-20140318121823-12d36hihg7yyfejl
2014-03-18 13:18:23 +01:00
Quentin (OpenERP) e202c84b27 [REF] stock: assign picking by batch on confirmation of stock moves. This new version will work for confirmed move from elsewhere than the sale order
bzr revid: qdp-launchpad@openerp.com-20140318115746-fixnxghkrlth38ze
2014-03-18 12:57:46 +01:00
Josse Colpaert 8ed31b881b [MERGE] Merge from trunk-wms and resolve conflicts
bzr revid: jco@openerp.com-20140313095746-1pvwjlc0z25ln1wn
2014-03-13 10:57:46 +01:00
Josse Colpaert 8c49378527 [MERGE] Merge from trunk-wms
bzr revid: jco@openerp.com-20140312123434-c6je2o30w3tmtez9
2014-03-12 13:34:34 +01:00
Quentin (OpenERP) 5298db0f06 [FIX] sale_stock: location_id and location_dest_id are now required on stock.pack.operation
bzr revid: qdp-launchpad@openerp.com-20140312110653-5dfjcmt9ahgu5ich
2014-03-12 12:06:53 +01:00
Christophe Simonis d504764eff [MERGE] forward port of branch saas-3 up to revid 9298 chm@openerp.com-20140311130852-3ft0v1mc9ht1any6
bzr revid: chs@openerp.com-20140311145205-s56fj113fsrnisc3
2014-03-11 15:52:05 +01:00
Quentin (OpenERP) da210e4b5e [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20140311132813-0gmbof2u8nmgv9p3
2014-03-11 14:28:13 +01:00
Olivier Dony 1b66087ed8 [FIX] sale_order_dates: fixes + deduplication of _get_planned_date()/_order_line_move_date() methods on sale.order
bzr revid: odo@openerp.com-20140306225009-f0jk43x5qpovurxi
2014-03-06 23:50:09 +01:00
Olivier Dony 499e0e323d [MERGE] sale_order_dates: several improvements to usability and planned date computing, courtesy of Lionel Sausin (Numerigraphe)
bzr revid: odo@openerp.com-20140306202430-aw45sqw6og8ezcni
2014-03-06 21:24:30 +01:00
Denis Ledoux 6deae9e9ea [FIX] *: replace various widgets selection by option no_create, as the purpose of these widgets selection were to actually hide the create and edit and quick create
bzr revid: dle@openerp.com-20140306113021-r280g41vkdyf5ew8
2014-03-06 12:30:21 +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
Josse Colpaert 6694c3a094 [MERGE] Merge from trunk-wms
bzr revid: jco@openerp.com-20140303083411-wg6ilg9mft9qx3td
2014-03-03 09:34:11 +01:00
Quentin (OpenERP) e36b32a661 [MERGE] merged with main trunk (revision 9186)
bzr revid: qdp-launchpad@openerp.com-20140228131516-ihigousbe5p1nt68
2014-02-28 14:15:16 +01:00
Josse Colpaert f39d00a5ed [IMP] Do picking assign in group at the end of confirming all procurements for a sales order
bzr revid: jco@openerp.com-20140225162211-7elk2pj4r8q8sx04
2014-02-25 17:22:11 +01:00
Josse Colpaert 4b57fc6465 [IMP] Check if procurements are done before calling get shipped
bzr revid: jco@openerp.com-20140224110413-o4wvbnch90yxxt2i
2014-02-24 12:04:13 +01:00
Simon Lejeune 35b64811e9 [MERGE] trunk
bzr revid: sle@openerp.com-20140221095425-9043pbzjy7rtbxd1
2014-02-21 10:54:25 +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
openerp-sle 271f350268 [FIX] Sale Stock: remove print sale order test
bzr revid: openerp-sle@openerp-sle.home-20140212221254-whmb4uw3ztl6g34w
2014-02-12 23:12:54 +01: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
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
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
Denis Ledoux 0043f81e33 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9824 revid:dle@openerp.com-20140210134603-ck0jr56xhl8xgzg2
bzr revid: dle@openerp.com-20140210141704-sjzjwhe7fh5gszxr
2014-02-10 15:17:04 +01:00
Denis Ledoux 6e3d193517 [FIX] sale, sale_stock: send by email button visible when sent, progress or manual
+ remove 'invoiced' from statusbar_visible, as there is no such state
+ proper inherit in sale_stock form view

bzr revid: dle@openerp.com-20140210134603-ck0jr56xhl8xgzg2
2014-02-10 14:46:03 +01:00
Cedric Snauwaert 9502276166 [FIX]work on view for better usability
bzr revid: csn@openerp.com-20140210100727-1q2q61t3c3nxfd10
2014-02-10 11:07:27 +01:00
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
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
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) 753f7541db [MERGE] main trunk
bzr revid: qdp-launchpad@openerp.com-20140203173000-mk092iw2wz3y0e3e
2014-02-03 18:30:00 +01:00
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
Antony Lesuisse 033c38c304 [MERGE] trunk
bzr revid: al@openerp.com-20140129021916-ckb3rplmcpjbqel3
2014-01-29 03:19:16 +01:00
Olivier Dony 39c27c72d0 [MERGE] Sync with trunk rev. 9064 rev-id ged@openerp.com-20140127161718-uo6pperke86pqq5v
bzr revid: odo@openerp.com-20140128175835-jannyh3cv3gi1sxn
2014-01-28 18:58:35 +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
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
Launchpad Translations on behalf of openerp c5dd038011 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140124062506-2xq1lhj82n923dbl
2014-01-24 06:25:06 +00:00
Denis Ledoux 27224c9b9e [FIX] sale, purchase, sale_stock: on orders lines, on product changed, change the uom (even if the uom is in the same category)
bzr revid: dle@openerp.com-20140123103505-7pm9526ot2f5u7wa
2014-01-23 11:35:05 +01:00
Launchpad Translations on behalf of openerp 805d3757e9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140123055732-ggft6ftma1kfpaq6
2014-01-23 05:57:32 +00: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
Quentin (OpenERP) c3f087f795 [FIX] sale_stock: fixed yaml test
bzr revid: qdp-launchpad@openerp.com-20140121080433-cx7zbrhzr7546msm
2014-01-21 09:04:33 +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
Gery Debongnie 00c6d55ac9 [MERGE] merge trunk into local branch
bzr revid: ged@openerp.com-20140116144326-8kwqab71zp8s7a8e
2014-01-16 15:43:26 +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
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
Christophe Matthieu 320a0bc28c [IMP] website/website_sale: Use group to display shipping address in frontend like the backend. Use group for product facet caracteristique (backend/frontend). Customize templates is displayed function of groups of ir.ui.view templates.
bzr revid: chm@openerp.com-20140115110547-v0nllq0f800tlhpg
2014-01-15 12:05:47 +01:00
Denis Ledoux 4305522776 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9728 rev-id: dle@openerp.com-20140102161149-x268xj7bzvvsit2h
bzr revid: dle@openerp.com-20140102164522-og7f932e50kzz7z6
2014-01-02 17:45:22 +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
Gery Debongnie 9477cacd5f [IMP] removes old tree view in reporting (sales, sales_crm, sales_stock) and replaces them by the new graph view in pivot mode by default (addon sale, sale_crm, sale_stock)
bzr revid: ged@openerp.com-20131231111824-1altk73m9l4iszkq
2013-12-31 12:18:24 +01:00
Thibault Delavallée 327f0fdb40 [MERGE] [FIX] sale_stock: invoice services when invoicing on delivery order
bzr revid: tde@openerp.com-20131226100605-wk4nht7msupkyuj9
2013-12-26 11:06:05 +01:00
Jitendra Prajapati (OpenERP) 5d8de88af3 [IMP]improve code
bzr revid: prajapatijitendra7969@gmail.com-20131216115111-s2122jbg5t93ctez
2013-12-16 17:21:11 +05:30
Jitendra Prajapati (OpenERP) 1f3d9f056c [IMP]remove the attrs in sale setting
bzr revid: prajapatijitendra7969@gmail.com-20131216082036-d834kd7xxmyg0xjv
2013-12-16 13:50:36 +05:30
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
Jitendra Prajapati (OpenERP) ebf0c80a00 [MERGE]with main
bzr revid: prajapatijitendra7969@gmail.com-20131212084543-j15w6z4y0osluijw
2013-12-12 14:15:43 +05:30
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) dfd33f6229 [FIX] sale_stock: wrong model name in the action definition. Bug introduced with the latest merge with trunk
bzr revid: qdp-launchpad@openerp.com-20131211141418-1fx7g42dislaaiw1
2013-12-11 15:14:18 +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
Launchpad Translations on behalf of openerp 767207aa23 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131211062724-zxcigdht6w71xy7v
bzr revid: launchpad_translations_on_behalf_of_openerp-20131211062802-mh61vodnsw0sr8im
bzr revid: launchpad_translations_on_behalf_of_openerp-20131211062808-o9fkpg2cg9cb403z
2013-12-11 06:28:08 +00:00
Jitendra Prajapati (OpenERP) 73046d5674 [FIX/IMP]runbot and No Rule matching this procurement. add access rights
bzr revid: prajapatijitendra7969@gmail.com-20131210061106-5uqo57njddem6tld
2013-12-10 11:41:06 +05:30
Thibault Delavallée 4b96e85a30 [MERGE] [FORWARD] Forward port of saas-2 branch until revision 9036 (revid tde@openerp.com-20131209102019-kjeg0rx2au1d5e5v)
bzr revid: tde@openerp.com-20131209105031-17920wsidpqrwmxj
2013-12-09 11:50:31 +01:00
Denis Ledoux 2888ad5772 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9677 rev-id: dle@openerp.com-20131206111336-dg01y92jvjnxy5oi
bzr revid: dle@openerp.com-20131206112312-g5vzrrna05iit5ka
2013-12-06 12:23:12 +01:00
Denis Ledoux ac0e22bd6c [FIX] sale_stock,stock: change model to stock.picking.out of deliveries to invoice view in sales
Deliveries to invoice in sales menu should display delivery order only (no incoming shipment). This was already the case thanks to the domain [('type','=','out')], but since the refactor of the module stock, and the division of stock.picking to stock.picking.in and stock.picking.out, the model of this view should be stock.picking.out instead of stock.picking (for instance, to get the actions binding (ir.values) of stock.picking.out model).
+ typo fix in action binding

bzr revid: dle@openerp.com-20131206111336-dg01y92jvjnxy5oi
2013-12-06 12:13:36 +01:00
Thibault Delavallée f28d5f47b8 [MERGE] Sync with trunk, notably for bootstrap that landed in trunk
bzr revid: tde@openerp.com-20131205102352-ncx6whb8r0fejgcc
2013-12-05 11:23:52 +01:00
Christophe Simonis 4ab77759cc [MERGE] forward port of branch saas-2 up to revid 9029 chs@openerp.com-20131204125051-dexejzwigpu0z1yy
bzr revid: chs@openerp.com-20131204130023-lgravuoxwlt39pek
2013-12-04 14:00:23 +01:00
Launchpad Translations on behalf of openerp 379dc8bf98 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131201054445-5fy8zd7lvnn9mjp2
bzr revid: launchpad_translations_on_behalf_of_openerp-20131202055138-hq05otjnuktjpa48
bzr revid: launchpad_translations_on_behalf_of_openerp-20131204055601-tbzqqhperzffjbjt
bzr revid: launchpad_translations_on_behalf_of_openerp-20131204055642-0rwynvhgvs0r14b3
2013-12-04 05:56:42 +00: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
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
Christophe Simonis 289023d92f [MERGE] forward port of branch saas-2 up to revid 9024 chs@openerp.com-20131130130014-hi5h5a00kjx0dbvp
It’s over NINE THOUSAAAAAAAND!

bzr revid: chs@openerp.com-20131130130725-9ntxdr5r7r04uoht
2013-11-30 14:07:25 +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
Quentin (OpenERP) df2d5e148e [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20131129165644-fx0m3ok07l41o507
2013-11-29 17:56:44 +01:00
Denis Ledoux fc4eca01e7 [FIX] {account, sale_stock}: res_config: set_default as SUPERUSER_ID. check user group to avoid passthrough access rights security
bzr revid: dle@openerp.com-20131129154714-pogix71b73nz11qp
2013-11-29 16:47:14 +01:00
Martin Trigaux 791d43714f [MERGE] [FIX] sale_stock: pass missing context when retrieving product uom (opw 594350)
bzr revid: mat@openerp.com-20131128114019-6rfcq9z235kh7ot7
2013-11-28 12:40:19 +01:00
Turkesh Patel (Open ERP) b08503e373 [MRG] merge with lp:openobject-addons
bzr revid: tpa@tinyerp.com-20131126052924-xn4qn67lehe6x2pj
2013-11-26 10:59:24 +05:30
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 5f21b4bff9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131123062620-6obt60lwob64hi98
bzr revid: launchpad_translations_on_behalf_of_openerp-20131124054757-4w9nik6wieeqf0yg
bzr revid: launchpad_translations_on_behalf_of_openerp-20131125060111-rf445xxiinvazinv
2013-11-25 06:01:11 +00: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
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
Christophe Simonis 82da5541e2 [MERGE] remove warnings
bzr revid: chs@openerp.com-20131120161051-pk7n0itjcxx06uwm
2013-11-20 17:10:51 +01: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
Quentin (OpenERP) 9c0381416d [FIX] stock: fixing the redbot: outdated references to 'do_partial' + security access rights for new object stock.move.operation.link
bzr revid: qdp-launchpad@openerp.com-20131118134701-is7gp517r3q5nex2
2013-11-18 14:47:01 +01:00
Christophe Simonis 05378ede0b [FIX] {project_mrp,sale_stock}: attach common process node xmlid to nearest common module, procurement.
We need this change to allow update of project_mrp module if sale_stock is not installed.

bzr revid: chs@openerp.com-20131115235815-zm4wgqxrsk7iiqpp
2013-11-16 00:58:15 +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
Christophe Simonis 636ac0f61e merge upstream
bzr revid: chs@openerp.com-20131108215612-e5f01a1kvyevlry9
2013-11-08 22:56:12 +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) cd543d96e0 [IMP] misc usability improvements
bzr revid: qdp-launchpad@openerp.com-20131108165217-wk9b079p7jladswm
2013-11-08 17:52:17 +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
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
Martin Trigaux 1fe9b19c83 [FIX] sale_stock: take into account the value of the customer reference on grouped invoice (opw #599716)
bzr revid: mat@openerp.com-20131115134335-qsu8ceyx86zyfj8j
2013-11-15 14:43:35 +01:00
jke-openerp 5308a926d2 [IMP] Improve and fix according to review FP
bzr revid: jke@openerp.com-20131105161517-zm1ks2m8fkcf7v7i
2013-11-05 17:15:17 +01:00
Olivier Dony 0f7099bb30 [FIX] sale,sale_stock: sales analysis view using incorrect JOIN and group by clause
Similarly to the recent fixes in Purchase Analysis,
the Sales Analysis view must not group on the quantity
field. It is one of the columns that must be aggregated,
not used to fold PO lines into the same
result row.
The line count was also incorrect because of this, and
had to be corrected to actually count() the underlying
SO lines.

In addition, the JOINs were done in the wrong order,
which could cause problems (e.g. if an empty SO ever
landed in the database, all the SO line columns
would be empty in the JOIN, and cause errors)

bzr revid: odo@openerp.com-20131105103011-vkix07lsb6q3y9fd
2013-11-05 11:30:11 +01: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
Chandni Machchhar (OpenERP) a5a4a81391 [FIX] [sale_stock]: When we create group invoice from delivery order, it is taking customer reference only one which is defined while creating sale order.
bzr revid: cac@openerp.com-20131031054756-qgx2wmyf5o0cs2fp
2013-10-31 11:17:56 +05:30
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
Turkesh Patel (Open ERP) c3bc021516 [MRG] merge with parent branch
bzr revid: tpa@tinyerp.com-20131029133339-v12s3wgyn1b1j4wg
2013-10-29 19:03:39 +05:30
Launchpad Translations on behalf of openerp 8bc457816f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131024052057-4ai7sltsmuoke8l5
bzr revid: launchpad_translations_on_behalf_of_openerp-20131025060100-ua2rf6g9urivk8bm
2013-10-25 06:01:00 +00:00
Quentin (OpenERP) 7cf0f92277 [FIX] sale_stock: fixed inheritancy of product_id_change in order to be more modular with other modules
bzr revid: qdp-launchpad@openerp.com-20131023094025-rkcf0ccs8j95d4su
2013-10-23 11:40:25 +02: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) 52cfccf2ce [FIX] sale_stock: onchange_product_id parameters fixed in form view (warehouse_id wasn't passed)
bzr revid: qdp-launchpad@openerp.com-20131022120100-t4d0y7q80sjmafnw
2013-10-22 14:01:00 +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