Commit Graph

74 Commits

Author SHA1 Message Date
Denis Ledoux c5714135c2 [MERGE] forward port of branch 7.0 up to 922a52d 2014-11-14 17:59:00 +01:00
Martin Trigaux 0a7633c11e [FIX] purchase: keep PO currency on picking
The delivery of a purchase order was not keeping the currency and cost price
from the purchase order for the reception. This was problematic for orders where
the invoice was generated from the picking (Invoicing Control: Based on incoming
shipments). The currency of the purchase order was kept while the cost was the
one in the company's currency.
It's better to keep the currency of the purchase order to make the invoice as
it's usually the one expected (and not convert everything to the currency of the
company). opw 615555
2014-11-14 17:29:40 +01:00
Martin Trigaux c82bd1365c Forward port of 7.0 up to rev 9b87d6f 2014-09-19 15:28:02 +02:00
Martin Trigaux 9b87d6f371 [FIX] purchase: keep fallback behaviour that was removed at rev 8973217
If no valid invocie is found on the purchase order line, use the price and currency of the line (coherent with help message)
2014-09-19 14:47:33 +02:00
Denis Ledoux 5bd0249515 [MERGE] forward port of branch 7.0 up to a218a9e 2014-09-18 16:05:34 +02:00
qdp-odoo 8973217ea7 [FIX] stock/purchase: dates and currency rates
Use the currency rate of the purchase date instead of the one of at the reception time (opw 610430)
2014-09-17 18:04:41 +02:00
Christophe Simonis 8f13e8320e [MERGE] forward port of branch 7.0 up to d0a0b7d 2014-08-20 17:45:05 +02:00
Guewen Baconnier d0a0b7d91d [FIX] purchase: skip move if not linked to a purchase order
When this situation happens. the 'cost' is None and the web interface cannot handle this value, provoking a JS error. Thus, prefer to fallback on the standard way to get the cost: based on the current standard price of the product.
Fixes #1032
2014-08-20 15:13:36 +02:00
Denis Ledoux f8d5ef0f80 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 4174 revid:dle@openerp.com-20140415130732-bud8xb3pzgxw2imr
bzr revid: dle@openerp.com-20140415101427-a6r7lgy50x9bdah3
bzr revid: dle@openerp.com-20140415130951-ckuv8nsl17qkb300
2014-04-15 15:09:51 +02:00
Denis Ledoux a701934ac7 [FIX] purchase: invoiced based on invoiced bool of purchase order line, instead of rate
invoiced bool of purchase order line is set to true on invoice validation, not on invoice creation

bzr revid: dle@openerp.com-20140415081211-jz6if0vzgq3inzzw
2014-04-15 10:12:11 +02:00
Denis Ledoux 7f00274384 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9691 rev-id: dle@openerp.com-20131211134120-fco4rlqjh258ba36
bzr revid: dle@openerp.com-20131210184409-cd9wy856v5bg0f17
bzr revid: dle@openerp.com-20131211134317-f0ev1vbinhrkgjf4
2013-12-11 14:43:17 +01:00
Denis Ledoux b2eb65f04e [FIX] purchase: set readonly on warehouse_id related field in stock.picking.in
bzr revid: dle@openerp.com-20131210165627-7uy323jt6k1302kz
2013-12-10 17:56:27 +01:00
Randhir Mayatra (OpenERP) dc36531d7c [IMP] change currency for diffrent invoice methods
bzr revid: rma@tinyerp.com-20130523122045-zy0nf24nkbepymd8
2013-05-23 17:50:45 +05:30
Vo Minh Thu e69326ee3b [REF] removed explicit model instanciations.
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
2013-04-15 12:23:49 +02:00
Vo Minh Thu e7f4891d46 [IMP] use the openerp namespace.
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
Quentin (OpenERP) a68e5f9041 [MERGE] merged the branch with supplier payment term from alexis de Lattre (Akretion). Thanks for the nice proposal
bzr revid: qdp-launchpad@openerp.com-20121130171130-dugntyqmjunwr20m
2012-11-30 18:11:30 +01:00
Alexis de Lattre 41c31b08fa FIX the key in the context
Add a comment

bzr revid: alexis@via.ecp.fr-20120804214800-ktq2yps1meefyx7x
2012-08-04 23:48:00 +02:00
Alexis de Lattre c11754eaa9 Merge with addons-trunk revno 7150
Adapt views accordingly

bzr revid: alexis@via.ecp.fr-20120802134012-fjk20wld5rv9v45i
2012-08-02 15:40:12 +02:00
Quentin (OpenERP) 0193e070e8 [IMP] pruchase, stock: usability imp
bzr revid: qdp-launchpad@openerp.com-20120716121310-ul37v4slifh38aa2
2012-07-16 14:13:10 +02:00
Harry (OpenERP) 2c6c733b5f [MERGE] upstream
bzr revid: hmo@tinyerp.com-20120716054710-awgpnr6hdqy2altj
2012-07-16 11:17:10 +05:30
Fabien Pinckaers 6eaa79227e [IMP] merge note&name on purchase lines
bzr revid: fp@openerp.com-20120714205150-c5qjjjyuovbyxac5
2012-07-14 22:51:50 +02:00
Alexis de Lattre 42ffccfa96 Add a "Supplier Payment Term" on res.partner
Add payment term on purchase.order

bzr revid: alexis@via.ecp.fr-20120711111434-ih20ohy81bynn1wd
2012-07-11 13:14:34 +02:00
Amit Patel (OpenERP) 1ca5472d75 [IMP]:purchase:Incoming Shipment: add a field warehouse below the company (the field warehouse is filled with the one in rlated PO)
bzr revid: apa@tinyerp.com-20120629103000-kr5ugo7ej2wx75su
2012-06-29 16:00:00 +05:30
Quentin (OpenERP) d1282d2ad5 [REF] sale/purchase: added reference to lp bug for the workaround to delete when the framework is improved in order to be more modular towards the use of _inherit and _name on the same class
bzr revid: qdp-launchpad@openerp.com-20120508224213-ztdx8tv8mo0o02i4
2012-05-09 00:42:13 +02:00
Quentin (OpenERP) 7e84b4c1ce [FIX] stock: fixed error in yaml test. sale, purchase: fixed error on module installation with a temporary workaround that duplicates the reference of new fields on stock.picking.in/out classes (these lines should be removed as soon as the bug in the framework that prevent the orm of knowing the new columns on inhertied class is fired)
bzr revid: qdp-launchpad@openerp.com-20120508163204-hjg6ztjr38m1cydl
2012-05-08 18:32:04 +02:00
Bhumika (OpenERP) 879ddb6130 [IMP]: remove unused field
bzr revid: sbh@tinyerp.com-20120307102445-m12lvui331hy0ov2
2012-03-07 15:54:45 +05:30
Olivier Dony 0c71b22f81 [FIX] purchase: remove incorrect PO-based stock move valuation for incoming shipments
As discussed on bug 923191, the current override
is incorrect because it will silently replace the cost
of incoming stock moves with PO prices for products w/
standard costing - this should only concern products
with average costing for which no cost was manually
provided.
And in fact we can completely remove this override
because even for products with average costing,
the PO prices are already provided as default cost 
prices in the picking/move reception wizard, so
the PO price is already taken into account and the
cost will never be missing.
Thanks to Graeme Gellatly for the excellent
analysis!

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

bzr revid: odo@openerp.com-20120201113724-y18fna1v7z6kxka4
2012-02-01 12:37:24 +01:00
Raphael Collet eea68d6981 [MERGE] sale, purchase, stock: refactoring of invoice creation (Alexis de Lattre, Raphael Valyi)
bzr revid: rco@openerp.com-20120131105322-80x7fp2u1z5fyo6o
2012-01-31 11:53:22 +01:00
Raphaël Valyi b21c412764 [FIX] purchase: completed invoice line hook to set purchase order line as invoice and relate it properly to the invoice lines
lp bug: https://launchpad.net/bugs/922442 fixed

bzr revid: rvalyi@gmail.com-20120127053807-4r31khr8jt7anpv4
2012-01-27 03:38:07 -02:00
Alexis de Lattre 7b6622a2eb Document the new methods I introduced with the standard @param and @return syntax
Remove a print

bzr revid: alexis@via.ecp.fr-20120119214053-8tf189abeszi208b
2012-01-19 22:40:53 +01:00
Alexis de Lattre da9d506349 Override values even when they are empty (a user may empty a value on a sale order or purchase order and would like the empty field to be "copied" on the invoice).
bzr revid: alexis@via.ecp.fr-20120116141643-boglddgratoro59p
2012-01-16 15:16:43 +01:00
Alexis de Lattre 1f9401bf41 Add _get_partner_to_invoice() to purchase module.
Inheritance of _prepare_invoice() now replaces the functions _get_payment_term() and _get_address_invoice(). I have checked that these two functions are not used elsewere in the addons and extra-addons.

bzr revid: alexis@via.ecp.fr-20120105214230-3wetu0v1foyeate3
2012-01-05 22:42:30 +01:00
Kirti Savalia (OpenERP) 7c2cb8d659 [FIX]:in stock real time accounting wrong values for stock moves with purchase unit
lp bug: https://launchpad.net/bugs/889093 fixed

bzr revid: ksa@tinyerp.com-20111117100752-774f7kkcfr1wtajg
2011-11-17 15:37:52 +05:30
Harry (OpenERP) d53d6c0fe7 [IMP] purchase: clear stuff
bzr revid: hmo@tinyerp.com-20111020073004-voidg0oilufqo22q
2011-10-20 13:00:04 +05:30
Olivier Dony e45e0b75d8 [IMP] stock: cleanup stock.partial.{picking,move} wizards and fix dependencies and tests
bzr revid: odo@openerp.com-20110926003612-0wa6sghmlwbezwzk
2011-09-26 02:36:12 +02:00
Fabien Pinckaers 4032453c02 merge
bzr revid: fp@tinyerp.com-20110918141920-arvrkm6l3261g1w3
2011-09-18 16:19:20 +02:00
Jordi Esteve 3330dcc20b [FIX] Purchase:Invoice is create when outgoing picking list from a sale order including service products
lp bug: https://launchpad.net/bugs/737786 fixed

bzr revid: aag@tinyerp.com-20110811100015-rpjxhqbg30qk8ss0
2011-08-11 15:30:15 +05:30
ron@tinyerp.com ff90f21812 [FIX]purchase:invoice_line have wrong unit price when PO made =>from picking
lp bug: https://launchpad.net/bugs/779064 fixed

bzr revid: ron@tinyerp.com-20110517084337-f39957zqveqpa2u4
2011-05-17 14:13:37 +05:30
Quentin (OpenERP) 45f264dca7 [MERGE] merged bugfix 722961
bzr revid: qdp-launchpad@openerp.com-20110225145347-p4x82nevh09nnhdr
2011-02-25 15:53:47 +01:00
ksa (Open ERP) 65590cba92 [IMP]: improve code
bzr revid: ksa@tinyerp.co.in-20110222132345-up4ybvm1tgthvk24
2011-02-22 18:53:45 +05:30
ksa (Open ERP) ad12d2f19d [IMP]: improve wrong commit
bzr revid: ksa@tinyerp.co.in-20110222125519-o50p1iewblowh9k8
2011-02-22 18:25:19 +05:30
ksa (Open ERP) fe2d13fc52 [FIX]:stock input account record only a cost price
bzr revid: ksa@tinyerp.co.in-20110222114358-vnft4wxroi9ybs3d
2011-02-22 17:13:58 +05:30
qdp-launchpad@tinyerp.com 2fbecc4238 [FIX] purchase: default value of partial picking wizard was crashing because of deprecated code
lp bug: https://launchpad.net/bugs/704652 fixed

bzr revid: qdp-launchpad@tinyerp.com-20110119011724-mrn0xam9cs0gmyc7
2011-01-19 02:17:24 +01:00
rpa (Open ERP) 62e8c0eba0 [MERGE]: Merge with lp:~openerp-dev/openobject-addons/ksa-addons2
bzr revid: rpa@tinyerp.com-20110106124845-fi83ya2dyzpk0p0j
2011-01-06 18:18:45 +05:30
ksa (Open ERP) a722db2cc7 [IMP]:bug 690700 Wrong Partner used when invoicing from picking coming from a puchase with sent_to_address
bzr revid: ksa@tinyerp.co.in-20110104103048-2gwkh19mmac5e9y6
2011-01-04 16:00:48 +05:30
uco (OpenERP) b1cf433ecc [MERGE]: Merged with trunk-addons.
bzr revid: uco@tinyerp.com-20101206131102-z2xzz8eshkswo00q
2010-12-06 18:41:02 +05:30
P. Christeas 7c5d0e6aba delivery, purchase, sale, stock_location: minor fixes, mutable args
bzr revid: p_christ@hol.gr-20101127201616-fq46x1c2uo7s7b62
2010-11-27 22:16:16 +02:00
uco (OpenERP) 6dd290e824 [REF]: Replace the condition 'if not context' with 'if context is None'.
bzr revid: uco@tinyerp.com-20101123070505-9i2lrqhgxzaii3zn
2010-11-23 12:35:05 +05:30
uco (OpenERP) 8035df3e11 [IMP]: Added context=None in function argument for rest modules.
bzr revid: uco@tinyerp.com-20101122103753-idv9fdaqc28rvugu
2010-11-22 16:07:53 +05:30
ksa (Open ERP) b12bcdc384 [FIX]:bug-670905 stock partial move wizard
bzr revid: ksa@tinyerp.co.in-20101110073228-6f2a1xfpiaq3l4r0
2010-11-10 13:02:28 +05:30