openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #03299
[Merge] lp:~openerp-dev/openobject-addons/trunk-bug-722961-ksa into lp:openobject-addons
Kirti Savalia(OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-722961-ksa into lp:openobject-addons.
Requested reviews:
Mustufa Rangwala (Open ERP) (mra-tinyerp)
Related bugs:
#722961 Stock Input account record only a cost price
https://bugs.launchpad.net/bugs/722961
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-722961-ksa/+merge/50739
do changes as per your suggestion.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-722961-ksa/+merge/50739
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-722961-ksa.
=== modified file 'purchase/stock.py'
--- purchase/stock.py 2011-01-19 01:17:24 +0000
+++ purchase/stock.py 2011-02-22 13:01:55 +0000
@@ -40,8 +40,8 @@
# no average price costing or cost not specified during picking validation, we will
# plug the purchase line values if they are found.
if move.purchase_line_id and move.picking_id.purchase_id.pricelist_id:
- reference_amount, reference_currency_id = move.purchase_line_id.price_unit, move.picking_id.purchase_id.pricelist_id.currency_id.id
- return reference_amount, reference_currency_id
+ reference_amount, reference_currency_id = move.purchase_line_id.price_unit * move.product_qty, move.picking_id.purchase_id.pricelist_id.currency_id.id
+ return reference_amount , reference_currency_id
stock_move()
=== modified file 'stock/stock.py'
--- stock/stock.py 2011-01-24 16:13:46 +0000
+++ stock/stock.py 2011-02-22 13:01:55 +0000
@@ -1463,7 +1463,7 @@
_description = "Stock Move"
_order = 'date_expected desc, id'
_log_create = False
-
+
def action_partial_move(self, cr, uid, ids, context=None):
if context is None: context = {}
partial_id = self.pool.get("stock.partial.move").create(
@@ -1481,7 +1481,7 @@
'domain': '[]',
'context': context
}
-
+
def name_get(self, cr, uid, ids, context=None):
res = []
Follow ups