Commit Graph

248 Commits

Author SHA1 Message Date
Denis Ledoux a6024a6376 [MERGE] forward port of branch 7.0 up to 00ec786 2014-10-28 13:40:17 +01:00
Martin Trigaux fcc59f12fc [FIX] product_visible_discount: use on_change result for product value
At the end of the onchange call product_id_change, the uom may have changed (e.g. if product in different category).
To compute the quantity, we need to use the new uom and not the first one (that may be Unit, default value)
2014-10-27 13:59:41 +01:00
Martin Trigaux 9f5e989d5d Forward port of branch 7.0 up to 42bf0a5 2014-10-27 11:21:41 +01:00
Martin Trigaux 42bf0a5670 [FIX] product_visible_discount: discount with different unit of measures
The computation of the price without pricelist should take care of the unit of measure.
e.g. if computing discount for objects in dozen (on a product with price in unit), returned unit price should be (price*12) where 12 is the factor to go from dozen to unit.
Otherwise the compared prices (with and without pricelist) would not use the same unit of measure and the comparaison would be inconsistent. (opw 599727)
2014-10-24 17:21:42 +02:00
Christophe Simonis ada9724655 [MERGE] forward port of branch 7.0 up to 3509e15 2014-08-28 16:12:55 +02:00
Daniel Dico 180c4734a6 [FIX] product_visible_discount: use order date to compute currency instead of current date 2014-08-25 17:53:47 +02:00
Olivier Dony 85d2b45aaa [I18N] Update 7.0 translations with latest changes on Launchpad
See also https://github.com/odoo/odoo/wiki/GitHub-Transition#translations
2014-08-14 03:38:58 +02:00
Olivier Dony 96c36e895c [I18N] Update all 7.0 translation templates with latest terms and annotations
Total new terms: 168
Total deleted terms: 95
Total identical terms: 16329
(Some modules skipped, typically all l10n_* modules)
2014-08-14 02:24:24 +02:00
Olivier Dony b6acdc4a74 [MERGE] Forward-port 7.0 up to 2493395 2014-08-04 01:36:31 +02:00
Olivier Dony 2493395962 [FIX] product_visible_discount: no crash when no pricelist passed or product without company
Fixes an error introduced in f6fb2b6
2014-08-04 01:31:44 +02:00
Olivier Dony 5a0a500994 [MERGE] Forward-port 7.0 up to 9411a2da 2014-08-01 23:01:57 +02:00
Martin Trigaux f6fb2b69df [FIX] product_visible_discount: multicurrency pricelists
When we compute the discount of a product to display (result of product_id_change), we compare prices in the currency of the product while we expect prices in the currency of the pricelist. opw 606188
2014-08-01 15:48:24 +02:00
Launchpad Translations on behalf of openerp 2d32d9e89c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140430070150-8jkf4uv0z6lbfjik
2014-04-30 07:01:50 +00:00
Antony Lesuisse 033c38c304 [MERGE] trunk
bzr revid: al@openerp.com-20140129021916-ckb3rplmcpjbqel3
2014-01-29 03:19:16 +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
Launchpad Translations on behalf of openerp d9cdc8564c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140122061252-9jm03vlbr13ofqo9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140123055652-0p71divui34v1c1q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140124062440-hx0z2e4sd6nz7exc
bzr revid: launchpad_translations_on_behalf_of_openerp-20140126051449-rlunde7qysqsh1b1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140125064003-v340hiykcngjg9ue
bzr revid: launchpad_translations_on_behalf_of_openerp-20140126051541-9fnyw12nex5poeth
bzr revid: launchpad_translations_on_behalf_of_openerp-20140127054606-1jb6usf6pj7gy1xl
2014-01-27 05:46:06 +00:00
Fabien Pinckaers 66e85ee1e0 [IMP] Product visible discount: discount is expressed based in Public Price
bzr revid: fp@tinyerp.com-20131209142203-20l555dfdyvb60xe
2013-12-09 15:22:03 +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 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
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
Martin Trigaux 12883df3bc [MERGE] sync with 7.0
bzr revid: mat@openerp.com-20131114151811-i1rgk3clwb49dp45
2013-11-14 16:18:11 +01:00
Launchpad Translations on behalf of openerp 30e141708b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131031054753-45rivp2vcydq7cv3
2013-10-31 05:47:53 +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
Launchpad Translations on behalf of openerp 34564de66d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131029044955-h0ron953y69al1el
bzr revid: launchpad_translations_on_behalf_of_openerp-20131030051655-3tm5sadb2tmkl8c4
2013-10-30 05:16:55 +00:00
Martin Trigaux d2042182b4 [FIX] product_visible_discount: don't compute negative discount, also prevent zero division
bzr revid: mat@openerp.com-20131023132646-8l760d4swsq42zzo
2013-10-23 15:26:46 +02:00
Martin Trigaux 80e142cca3 [FIX] product_visible_discount: don't change the behaviour of account.invoice to be consistent with the normal behaviour (don't use pricelists)
bzr revid: mat@openerp.com-20131023114233-74rtyy5vdsdcy4cl
2013-10-23 13:42:33 +02:00
Launchpad Translations on behalf of openerp 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
Ravish (Open ERP) a98bd87122 [FIX] unit_price should be on other_pricelist
bzr revid: rmu@tinyerp.com-20131014100746-inm1snk2hgdc7i98
2013-10-14 15:37:46 +05:30
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
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
Launchpad Translations on behalf of openerp d1a4e0aef0 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130711062622-v4muic3uqckueux5
bzr revid: launchpad_translations_on_behalf_of_openerp-20130712063505-m63repwd0zokfibu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130713063525-b30s09rh63t3zox4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130714055943-xf6jvk2dpoemt6qx
bzr revid: launchpad_translations_on_behalf_of_openerp-20130715051357-59o0nkhplh3e58mi
bzr revid: launchpad_translations_on_behalf_of_openerp-20130704054706-ace1fcr1vtruoc4s
bzr revid: launchpad_translations_on_behalf_of_openerp-20130705061311-4735gtnj7xjmuprg
bzr revid: launchpad_translations_on_behalf_of_openerp-20130712063510-g2yq0kxqgrx9x1df
bzr revid: launchpad_translations_on_behalf_of_openerp-20130713063533-7mjj5a7226xhtob6
bzr revid: launchpad_translations_on_behalf_of_openerp-20130714055945-h6jn755mtdcubvei
bzr revid: launchpad_translations_on_behalf_of_openerp-20130715051400-rra06yzfd7zw4bt0
2013-07-15 05:14:00 +00:00
Christophe Simonis 6a9adbca62 [MERGE] forward port of branch 7.0 up to revid 9236 mat@openerp.com-20130613160953-itt79mu5xrl7suv4
bzr revid: chs@openerp.com-20130613181503-82234mo34wxb0oap
2013-06-13 20:15:03 +02:00
Launchpad Translations on behalf of openerp 3a296f5386 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608070127-tu3wr0ejaojeuizk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061554-vunz3dsqv73j8io4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608074839-suk66wcjidodrzyu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061704-e1t9mv2alygf4g38
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608075116-643xgspj93t8g1y9
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061708-y08i6exqm5v36qg7
2013-06-09 06:17:08 +00:00
Olivier Dony b4976938d2 [MERGE] [I18N] Many translation bugfixes + resync of translation templates with latest source
lp bug: https://launchpad.net/bugs/1165321 fixed

bzr revid: odo@openerp.com-20130607194733-27oiskc6q4fnp476
2013-06-07 21:47:33 +02:00
Olivier Dony 8c33eb76e1 [I18N] Synchronize translation templates with latest source code
bzr revid: odo@openerp.com-20130607194309-eysyrkxpr0dukm07
2013-06-07 21:43:09 +02:00
Vo Minh Thu e69326ee3b [REF] removed explicit model instanciations.
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
2013-04-15 12:23:49 +02:00
Ravi Gohil (OpenERP) 562f79c963 [FIX] pass 'uom_id' argument to product_id_change() to avoid traceback which is faced when we create invoice from Sale Orders with option 'Percentage' or 'Fixed Price (deposit)': (Maintenance Case: 584499)
bzr revid: rgo@tinyerp.com-20130402163015-m7w291wgegpckny9
2013-04-02 22:00:15 +05:30
Launchpad Translations on behalf of openerp fc04522286 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130328060500-yc40z00ubsz154vw
2013-03-28 06:05:00 +00:00
Launchpad Translations on behalf of openerp 4ce8d2697d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130316055338-ogfw01ap8fh1hlaj
bzr revid: launchpad_translations_on_behalf_of_openerp-20130317045918-zi1230lgxjbkqw3x
bzr revid: launchpad_translations_on_behalf_of_openerp-20130318044640-ts2tr31y2gl25rev
2013-03-18 04:46:40 +00:00
Launchpad Translations on behalf of openerp 72f29d98b8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130315055412-luy9qg1pkdjnqlud
2013-03-15 05:54:12 +00:00
Launchpad Translations on behalf of openerp b46c9dae1b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130302045718-19m5dowwcweyf3fy
bzr revid: launchpad_translations_on_behalf_of_openerp-20130303050056-i10g2vgmvxm9l392
bzr revid: launchpad_translations_on_behalf_of_openerp-20130305050744-svuruvv63292prwx
2013-03-05 05:07:44 +00:00
Launchpad Translations on behalf of openerp b390a5697c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130126050355-xxot322zn826zr96
bzr revid: launchpad_translations_on_behalf_of_openerp-20130127043627-b85ckledrtpdd73m
bzr revid: launchpad_translations_on_behalf_of_openerp-20130128051345-a31wsrx74u1w228d
bzr revid: launchpad_translations_on_behalf_of_openerp-20130129052015-doewhw7byebeeijs
bzr revid: launchpad_translations_on_behalf_of_openerp-20130130043841-h15p02at1d6o2clr
2013-01-30 04:38:41 +00:00
Ravi Gohil (OpenERP) e01cf4614a [FIX] pass 'uom_id' argument to product_id_change() to avoid traceback which is faced when we create invoice from Sale Orders with option 'Percentage' or 'Fixed Price (deposit)': (Maintenance Case: 584499)
bzr revid: rgo@tinyerp.com-20130125070952-v9fuss7htkl9ilnb
2013-01-25 12:39:52 +05:30
Ravi Gohil (OpenERP) 6ad3f2c835 [FIX] pass 'uom_id' argument to product_id_change() to avoid traceback which is faced when we create invoice from Sale Orders with option 'Percentage' or 'Fixed Price (deposit)': (Maintenance Case: 584499)
bzr revid: rgo@tinyerp.com-20130125063213-2u08rex66cmtt9o1
2013-01-25 12:02:13 +05:30
Launchpad Translations on behalf of openerp d4f857862e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130123045622-jd5o94i33no0nnsi
bzr revid: launchpad_translations_on_behalf_of_openerp-20130124043608-u0b4h66yzuolu3da
bzr revid: launchpad_translations_on_behalf_of_openerp-20130125052442-7i6q4mn2z3pnb5ip
2013-01-25 05:24:42 +00:00
Launchpad Translations on behalf of openerp 7a49719d46 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130118071051-e8wytix67wlb17yd
2013-01-18 07:10:51 +00:00
Launchpad Translations on behalf of openerp 7212971359 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121222062604-dkriii8eozvsup5y
bzr revid: launchpad_translations_on_behalf_of_openerp-20121223044904-96hdn6ba6yrv4f9j
bzr revid: launchpad_translations_on_behalf_of_openerp-20121226044702-qvjpmsxaacy1cg43
bzr revid: launchpad_translations_on_behalf_of_openerp-20121229050621-bg925wq3m04p2g71
bzr revid: launchpad_translations_on_behalf_of_openerp-20121229050125-ezgc0pyinpf7cjpa
bzr revid: launchpad_translations_on_behalf_of_openerp-20121231044027-9ufahl14z8fnhu6p
bzr revid: launchpad_translations_on_behalf_of_openerp-20130101044603-wg53ihk00q2059zn
bzr revid: launchpad_translations_on_behalf_of_openerp-20130103044748-vijpm6xa5a4wkx8s
bzr revid: launchpad_translations_on_behalf_of_openerp-20130104044725-gnjicg5umjgca6x4
bzr revid: launchpad_translations_on_behalf_of_openerp-20121227052240-6m8i7kropwavbcnh
bzr revid: launchpad_translations_on_behalf_of_openerp-20121228051144-leldhj31i0soxbew
bzr revid: launchpad_translations_on_behalf_of_openerp-20121229050213-cxzd31aqqltp6q2x
bzr revid: launchpad_translations_on_behalf_of_openerp-20121230052006-x87nblyyoe179wg8
bzr revid: launchpad_translations_on_behalf_of_openerp-20121231044049-m31tcl22nog279qx
bzr revid: launchpad_translations_on_behalf_of_openerp-20130101044622-7p5h1mf14m4tlue5
bzr revid: launchpad_translations_on_behalf_of_openerp-20130102043722-j7bk1uojgtgsz7u1
bzr revid: launchpad_translations_on_behalf_of_openerp-20130103044815-xswvowa7jeizv4jk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130104044801-0v8fmmv0jl7itv9b
2013-01-04 04:48:01 +00:00
Launchpad Translations on behalf of openerp fca02afad3 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130101051924-2q3t0sbo83ti3ooe
bzr revid: launchpad_translations_on_behalf_of_openerp-20130102052612-z5wooakbv4fnww9x
2013-01-02 05:26:12 +00:00
Launchpad Translations on behalf of openerp f49cf3ad50 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121222073731-s1qift4p97f9s1zf
bzr revid: launchpad_translations_on_behalf_of_openerp-20121223050857-vzu6pl7ttzy10603
bzr revid: launchpad_translations_on_behalf_of_openerp-20121224051043-oxj4lz3tpjhai7hn
2012-12-24 05:10:43 +00:00