Amit Dodiya (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/6.0-opw-51082-ado into
lp:openobject-addons/6.0.
Requested reviews:
Vinay Rana (openerp) (vra-openerp)
Priyesh (OpenERP) (pso-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-51082-ado/+merge/85434
Hello,
" [FIX] : Update real stock creates journal entries with wrong accounts"
Thanks,
Amit
--
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-51082-ado/+merge/85434
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/6.0-opw-51082-ado.
=== modified file 'stock/product.py'
--- stock/product.py 2011-04-08 13:32:12 +0000
+++ stock/product.py 2011-12-13 06:28:23 +0000
@@ -39,9 +39,9 @@
if not stock_input_acc:
stock_input_acc = product_obj.categ_id.property_stock_account_input_categ and product_obj.categ_id.property_stock_account_input_categ.id or False
- stock_output_acc = product_obj.property_stock_account_output and product_obj.property_stock_account_output.id or False
+ stock_output_acc = product_obj.property_account_creditor_price_difference and product_obj.property_account_creditor_price_difference.id or False
if not stock_output_acc:
- stock_output_acc = product_obj.categ_id.property_stock_account_output_categ and product_obj.categ_id.property_stock_account_output_categ.id or False
+ stock_output_acc = product_obj.categ_id.property_account_creditor_price_difference_categ and product_obj.categ_id.property_account_creditor_price_difference_categ.id or False
journal_id = product_obj.categ_id.property_stock_journal and product_obj.categ_id.property_stock_journal.id or False
account_variation = product_obj.categ_id.property_stock_variation and product_obj.categ_id.property_stock_variation.id or False
=== modified file 'stock/stock.py'
--- stock/stock.py 2011-12-12 15:26:41 +0000
+++ stock/stock.py 2011-12-13 06:28:23 +0000
@@ -2103,7 +2103,7 @@
or move.location_id.company_id != move.location_dest_id.company_id):
journal_id, acc_src, acc_dest, acc_variation = self._get_accounting_data_for_valuation(cr, uid, move, dest_company_ctx)
reference_amount, reference_currency_id = self._get_reference_accounting_values_for_valuation(cr, uid, move, src_company_ctx)
- account_moves += [(journal_id, self._create_account_move_line(cr, uid, move, acc_src, acc_variation, reference_amount, reference_currency_id, context))]
+ account_moves += [(journal_id, self._create_account_move_line(cr, uid, move, acc_dest, acc_variation, reference_amount, reference_currency_id, context))]
move_obj = self.pool.get('account.move')
for j_id, move_lines in account_moves:
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
