Commit Graph

3454 Commits

Author SHA1 Message Date
Pooja Zankhariya (OpenERP) 980b9a2a64 [MERGE]Merge with Trunk
bzr revid: pza@tinyerp.com-20131205124259-va6s0v55892snnaz
2013-12-05 17:42:59 +05:00
Quentin (OpenERP) 0e4c7431b4 [FIX] purchase: fixed wrong reference in yml test
bzr revid: qdp-launchpad@openerp.com-20131205100044-c9gvra6hd3i9z4m8
2013-12-05 11:00:44 +01:00
Pooja Zankhariya (OpenERP) b0953ddcf7 [IMP]Changed option string to 'Manage dropshipping' instead 'Manage dropship route'
bzr revid: pza@tinyerp.com-20131204073402-yq279p2jajzc7k09
2013-12-04 12:34:02 +05:00
Pooja Zankhariya (OpenERP) 093f489b06 [IMP]Rename stock_complex_route to stock_dropshipping. Added option for stock_dropshipping on warehouse configuration as well as purchase configuration
bzr revid: pza@tinyerp.com-20131203134448-v7stzse4y5upx3c1
2013-12-03 18:44:48 +05:00
Quentin (OpenERP) 20a7040163 [FIX] purchase: wrong reference in yaml test fixed
bzr revid: qdp-launchpad@openerp.com-20131202093556-ceku06io0th7s800
2013-12-02 10:35:56 +01:00
Quentin (OpenERP) df2d5e148e [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20131129165644-fx0m3ok07l41o507
2013-11-29 17:56:44 +01:00
Quentin (OpenERP) 2a4b4808d6 [FIX] purchase: wrong reference in yaml file
bzr revid: qdp-launchpad@openerp.com-20131128133302-k42hufxxpd281c4o
2013-11-28 14:33:02 +01:00
Christophe Simonis 0521d1aab3 [MERGE] forward port of branch saas-2 up to revid 9017 chs@openerp.com-20131127110552-3u2nxwu01gxj9i7m
bzr revid: chs@openerp.com-20131127111208-iclt7a9ib7oucumh
2013-11-27 12:12:08 +01:00
Christophe Simonis 0d13df5a57 [MERGE] remove warnings
bzr revid: chs@openerp.com-20131127110552-3u2nxwu01gxj9i7m
2013-11-27 12:05:52 +01:00
Christophe Simonis 6b05beecc1 [MERGE] forward port of branch 7.0 up to revid 9651 chs@openerp.com-20131127104459-jb77x7quwcvtifm7
bzr revid: dle@openerp.com-20131126171210-jovr7e7efehuq3s2
bzr revid: chs@openerp.com-20131127110046-4ow36dkuuyzgf1pl
2013-11-27 12:00:46 +01:00
Christophe Simonis 370b4df6f3 [MERGE] {purchase,purchase_requisition}: choose the right warehouse when creating purchase orders from purchase order/requisition
bzr revid: chs@openerp.com-20131127104459-jb77x7quwcvtifm7
2013-11-27 11:44:59 +01:00
Quentin (OpenERP) 7c0c95b1a4 [FIX] sale, purchase: don't copy the customer/supplier reference when copying a SO/PO
bzr revid: qdp-launchpad@openerp.com-20131127084625-dqgoloz4q47zlpti
2013-11-27 09:46:25 +01:00
Christophe Simonis 49fa5cab61 [FIX] purchase_requisition: copy method _get_warehouse from purchase module to avoid crash if purchase_requisition is updated but not purchase
bzr revid: chs@openerp.com-20131126180726-ng0gue9pedmuykj9
2013-11-26 19:07:26 +01:00
Quentin (OpenERP) 34832b4694 [FIX] purchase: at the validation of the PO, force the company in the context as the company on the PO in order to read property fields correctly. This patch is necessary to allow a user to confirm a PO belonging to another company (if he has the rights to do so).
bzr revid: qdp-launchpad@openerp.com-20131126170505-ttzuiaujpl1k24rg
2013-11-26 18:05:05 +01:00
Christophe Simonis b81c3897ee [FIX] purchase: choose the right warehouse when creating purchase orders from procurement orders
bzr revid: chs@openerp.com-20131126135026-echb4fq37229g637
2013-11-26 14:50:26 +01:00
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
Launchpad Translations on behalf of openerp bba9e86c41 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131123060118-7bayd565wi4mh8nk
bzr revid: launchpad_translations_on_behalf_of_openerp-20131125053223-t2rb928yzma23a29
bzr revid: launchpad_translations_on_behalf_of_openerp-20131125053248-reb9oruqgxx0v61c
2013-11-25 05:32:48 +00:00
Christophe Simonis 0244543c71 [MERGE] forward port of branch 7.0 up to revid 9636 mat@openerp.com-20131122165504-tmbg0ixhqed4kdkz
bzr revid: chs@openerp.com-20131122193122-wpdfsfn24ezj1qrp
2013-11-22 20:31:22 +01:00
Martin Trigaux 56d579b1e0 [FIX] email.template: add missing parenthesis to filter all data on email and not the last one
bzr revid: mat@openerp.com-20131122104509-g2pii4m5rj8qpk7w
2013-11-22 11:45:09 +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
Martin Trigaux c3063778ce [FIX] email.template: add safe filter over email address to allow emails to be sent in the format 'Name <name@company.com>' and avoid escaping
bzr revid: mat@openerp.com-20131121151305-t5je12s4w5uctu0k
2013-11-21 16:13:05 +01:00
Christophe Simonis 6f67143908 [FIX] *: do not call deprecated method LocalService()
bzr revid: chs@openerp.com-20131121120611-06h1pki3460tzj1s
2013-11-21 13:06:11 +01:00
Quentin (OpenERP) ffff06c24c [FIX] purchase: fixed forgotten reference to 'code_id' (field previously renamed into 'code' to reflect its selection nature)
bzr revid: qdp-launchpad@openerp.com-20131121071552-lk2xxv8mxdzcy79b
2013-11-21 08:15:52 +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
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
Launchpad Translations on behalf of openerp 08abc4345a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131112054140-gta82n1b3iww6qy5
bzr revid: launchpad_translations_on_behalf_of_openerp-20131031051733-nnutbi7hidixsxsb
bzr revid: launchpad_translations_on_behalf_of_openerp-20131102055746-d0emb2aocq3sq1d1
bzr revid: launchpad_translations_on_behalf_of_openerp-20131103052149-y4usleohxatdgczx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131105052928-1izkptj5zusflrvb
bzr revid: launchpad_translations_on_behalf_of_openerp-20131108054204-hrtuxxze2u1ivvez
bzr revid: launchpad_translations_on_behalf_of_openerp-20131110055420-zl5ang9w8lbcvt9d
bzr revid: launchpad_translations_on_behalf_of_openerp-20131111051738-smtttsszytn06ld4
bzr revid: launchpad_translations_on_behalf_of_openerp-20131112054158-7ewd3oxiyxg8s4zw
2013-11-12 05:41: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 eaa917bef9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131120054418-15be15rhz84vk0et
2013-11-20 05:44:18 +00:00
Launchpad Translations on behalf of openerp 523b10fe44 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131119055635-19g4i058ihed0ivz
2013-11-19 05:56:35 +00:00
Martin Trigaux e093000ef8 [MERGE] [FIX] purchase: set pricelist action in pricelist submenu instead of top (opw 592320)
bzr revid: mat@openerp.com-20131118124921-dla3fed1ode5zw7y
2013-11-18 13:49:21 +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
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) 588507c071 [FIX] stock: reconfiguration of warehouse was buggy when the default resupply warehouse was removed from both the m2o and the m2m, the rules were also wrongly created (not in MTO) and the code was not clean. The renaming of a warehouse is also fixed and the buy/manufacture pull rules are now treated as well
bzr revid: qdp-launchpad@openerp.com-20131105154923-sl8ei71aa123t108
2013-11-05 16:49:23 +01:00
Olivier Dony 4cf2887153 [FIX] purchase: analysis view must not group by quantity, otherwise identical PO lines are counted only once
The product quantity is one of the columns that must be
aggregated, not used to fold PO lines into the same
result row.
This, combined with missing aggregation operators
was causing multiple identical PO lines from the
same PO to be merged together and only counted once
in some aggregations.

bzr revid: odo@openerp.com-20131105101930-f2qbcp12luom08je
2013-11-05 11:19:30 +01:00
Olivier Dony aac6fede99 [FIX] purchase: Purchase Analysis view was using incorrect JOIN order
The starting table for Purchase Analysis is purchase_order_line
not purchase_order. The previous code was using a wrong JOIN
combination starting from purchase_order, which resulted in
a crash if an empty PO was created.
In order to prevent this an extra  WHERE clause on product_id
being NOT NULL was added, but this was incorrect too as it
prevented PO lines with no product_id value from appearing
in the Purchase Analysis results, while being perfectly valid.

bzr revid: odo@openerp.com-20131104165826-kltuzlh4i8q89sk0
2013-11-04 17:58:26 +01:00
Launchpad Translations on behalf of openerp 15062bdffe Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131105060056-7xuq20lqt1upcdc6
2013-11-05 06:00:56 +00:00
Quentin (OpenERP) b5645d2386 [FIX] stock_account, purchase: the standard price of a product may not be compatible with the decimal precision 'Account' or the coinage of the main currency, so we need to take care of that when creating the stock valuation entries
bzr revid: qdp-launchpad@openerp.com-20131104164939-jupkxy1zrqqq3lpq
2013-11-04 17:49:39 +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
Denis Ledoux 0cf57bdee2 [MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8800 rev-id: dle@openerp.com-20131031162241-goga1hsvwgyqigzd
bzr revid: chs@openerp.com-20131031142325-vo84hk5co2e2phg0
bzr revid: dle@openerp.com-20131031143133-wfus2hag57e73by2
bzr revid: dle@openerp.com-20131031162928-8gpom1ralccy07uc
2013-10-31 17:29:28 +01:00
Olivier Dony 465c241338 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9567 rev-id: odo@openerp.com-20131105103011-vkix07lsb6q3y9fd
bzr revid: dle@openerp.com-20131031142609-jinks18n2ju7usm4
bzr revid: dle@openerp.com-20131031162241-goga1hsvwgyqigzd
bzr revid: odo@openerp.com-20131105122634-joau6mg9jqpvbauz
2013-11-05 13:26:34 +01: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
Martin Trigaux 7f9b84150f [FIX] purchase: apply same fix to invoice paid
bzr revid: mat@openerp.com-20131029093404-hw95lpcjsnok2wxa
2013-10-29 10:34:04 +01:00
Martin Trigaux 44d117398a [FIX] purchase: post message on purchase order as admin if have no read access (would block validating invoice, opw #596294)
bzr revid: mat@openerp.com-20131029092353-yg0wxl42352yu2rb
2013-10-29 10:23:53 +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
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
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) 86d58ed2dd [FIX] purchase: the location of the buy pull rule has to be the default_location_dest_id of the in_type_id of the warehouse, and not its input location which can be inactive (if reception is in 1 step)
bzr revid: qdp-launchpad@openerp.com-20131024080325-pkphb3n426gaizmi
2013-10-24 10:03:25 +02:00