8b84615de1
[MERGE] Merge from trunk test
...
bzr revid: jco@openerp.com-20140502130352-c3h1fk332eqyd78b
2014-05-02 15:03:52 +02:00
d0e9ba289f
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140429124452-5cvpmtpyz2daj8w2
2014-04-29 14:44:52 +02:00
57cebaaac6
[MERGE] merged trunk up to revision 9365.
...
bzr revid: qdp-launchpad@openerp.com-20140422092815-f4tlfmo8zj1nogbl
2014-04-22 11:28:15 +02:00
fa60b90c1f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
2014-04-22 07:52:47 +00:00
cccc7a3d0c
[MERGE]sync with trunk.
...
bzr revid: dka@tinyerp.com-20140417132329-sd2skyprb3nt88uw
2014-04-17 18:53:29 +05:30
398d96f273
[MERGE] merged trunk up to revision 9327
...
bzr revid: qdp-launchpad@openerp.com-20140414094743-hv0u7qhigv1to2uc
2014-04-14 11:47:43 +02:00
e82fbf7d91
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
2014-04-12 08:31:53 +00:00
ff4726ea7d
[MERGE] merged trunk up to revision 9281
...
bzr revid: qdp-launchpad@openerp.com-20140403081427-7xpn57wdfv08v2al
2014-04-03 10:14:27 +02:00
0bef471c79
[FIX] project_mrp: fixed dependancy (mrp_jit renamed into procurement_jit)
...
bzr revid: qdp-launchpad@openerp.com-20140327211747-bedk5qihfy6g3x55
2014-03-27 22:17:47 +01:00
51aa261b44
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
2014-03-27 07:35:04 +00:00
da210e4b5e
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20140311132813-0gmbof2u8nmgv9p3
2014-03-11 14:28:13 +01:00
9863dbe5c8
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
2014-03-04 07:52:38 +00:00
b3c6e20e36
[MERGE]sync with trunk and resolve conflicts.
...
bzr revid: dka@tinyerp.com-20140210084803-rjkt9e4rhni8nhlt
2014-02-10 14:18:03 +05:30
753f7541db
[MERGE] main trunk
...
bzr revid: qdp-launchpad@openerp.com-20140203173000-mk092iw2wz3y0e3e
2014-02-03 18:30:00 +01:00
3ce5e01eca
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
2014-01-28 06:41:39 +00:00
f5718efa6e
[MERGE] merged with trunk
...
bzr revid: qdp-launchpad@openerp.com-20131230102802-y1ux8470wxnj4yfr
2013-12-30 11:28:02 +01:00
7226e699bb
[FIX] project_mrp: removal of picked_rate as it was also removed in sale_stock module by fp's big refactoring of revision 8844. Seems like this is deprecated and useless
...
bzr revid: qdp-launchpad@openerp.com-20131220105722-qo110vpk626ge7zh
2013-12-20 11:57:22 +01:00
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
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
7486095918
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9701 rev-id: dle@openerp.com-20131217124201-kha2717b4ka51aih
...
bzr revid: dle@openerp.com-20131217142126-1lbim47d2m2x4bb0
2013-12-17 15:21:26 +01:00
df0ba6c7e8
[FIX] project_mrp: local copy of the "Procurement" process node to avoid errors during updates when sale_stock is not installed
...
The various attempts to fix this error without duplicating the node
have all caused other errors. Having a duplicate process node has
no consequence on business operations, so it is an acceptable
workaround until the node can be moved to the sale module.
bzr revid: odo@openerp.com-20131217104301-t8fsf28jgjqq9q7k
2013-12-17 11:43:01 +01:00
1af2ac6f9c
[FIX] fixed warnings in runbot
...
bzr revid: qdp-launchpad@openerp.com-20131211154840-u2nk7ztggcgewm7y
2013-12-11 16:48:40 +01:00
df2d5e148e
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20131129165644-fx0m3ok07l41o507
2013-11-29 17:56:44 +01:00
6f67143908
[FIX] *: do not call deprecated method LocalService()
...
bzr revid: chs@openerp.com-20131121120611-06h1pki3460tzj1s
2013-11-21 13:06:11 +01:00
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
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
523b10fe44
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131119055635-19g4i058ihed0ivz
2013-11-19 05:56:35 +00:00
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
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
960924195e
[MERGE]merged with main addons
...
bzr revid: dka@tinyerp.com-20131030052926-i9c25mf6wpseioh3
2013-10-30 10:59:26 +05:30
8874046c39
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131013053740-rinm5yfv4pp3toj2
bzr revid: launchpad_translations_on_behalf_of_openerp-20131015051750-ss2jdlo4w12420rv
bzr revid: launchpad_translations_on_behalf_of_openerp-20131015051826-9alld47gks4izhjq
2013-10-15 05:18:26 +00:00
65966940c8
[MERGE] merged with main trunk
...
bzr revid: qdp-launchpad@openerp.com-20131010133212-t058auv973pvvmjm
2013-10-10 15:32:12 +02:00
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
c7471d1bff
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130919045624-x71znzpi3rpnvpcs
bzr revid: launchpad_translations_on_behalf_of_openerp-20130920060145-80h8zse3uw3jg2fx
2013-09-20 06:01:45 +00:00
de01bca260
[FIX]cosmetics on different views
...
bzr revid: csn@openerp.com-20130919141319-4b2iquo74w9qcr66
2013-09-19 16:13:19 +02:00
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
4116a38181
[FIX] project_mrp: correct reference to process.node from sales process
...
The project_mrp process extends the sales process at
the procurement phase, however that part of the sales
process has now been moved to the `sale_stock` module,
which is not a dependency of `project_mrp` anymore.
There is however little reason to duplicate that
process node, so as a temporary hack, we can copy
its external ID, even though there is no direct
dependency between the two.
For next version we should fix this hack by moving
the node to a common dependency between sale_stock
and project_mrp, such as `sale`.
lp bug: https://launchpad.net/bugs/1223276 fixed
bzr revid: odo@openerp.com-20130917160337-lih7bjqastozga8w
2013-09-17 18:03:37 +02:00
bdf2395e3a
[FIX] project_mrp: revert addition in commit 9445 breaking databases withtout mrp module
...
bzr revid: mat@openerp.com-20130917160918-dohb1lb5vtqsy5lv
2013-09-17 18:09:18 +02:00
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
503f69cba3
[IMP] project_mrp: cleaning and add condition for triggering signal
...
bzr revid: mat@openerp.com-20130916100120-kuuyofh3o8e3iv8c
2013-09-16 12:01:20 +02:00
17258b6a9a
[IMP] When stock is installed and there is a rule for a product of type service, do not apply rule
...
bzr revid: jco@openerp.com-20130916093710-6gweaj5o0yp20ry5
2013-09-16 11:37:10 +02:00
ba1ee5bc87
[IMP]Improved code for multiple bom.
...
bzr revid: psa@tinyerp.com-20130913133008-z1k76sq6jkvu8e6i
2013-09-13 19:00:08 +05:30
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
2b65bbfa82
[IMP] Improved code to return product_lines.
...
bzr revid: psa@tinyerp.com-20130912135445-xf0rmbh117fznd5v
2013-09-12 19:24:45 +05:30
000ca6103d
[IMP] Added another testcase for 2 service type product
...
And improved code for bom product with service type product used in SO doesnt link the project perfectly.
bzr revid: psa@tinyerp.com-20130912110454-x9tidij14xj09joz
2013-09-12 16:34:54 +05:30
9dba69ba48
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130912064018-3vecn03jcu9fm1m8
2013-09-12 06:40:18 +00:00
2452ef4404
[FIX]_prepare_order_line_procurement should not return False (cause problem with super), instead add another function to know if the so can create a procurement or not
...
bzr revid: csn@openerp.com-20130911140034-5so2qbe4rd2m6131
2013-09-11 16:00:34 +02:00
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
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
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
Josse Colpaert
Richard Mathot (OpenERP)
Quentin (OpenERP)
Launchpad Translations on behalf of openerp
Darshan Kalola (OpenERP)
Denis Ledoux
Olivier Dony
Christophe Simonis
Cedric Snauwaert
Martin Trigaux
Paramjit Singh Sahota