Merge lp:~sandi-dirntis/openerpsl/openerpsl_20140319_2 into lp:openerpsl/7.0

[Aleksander Dirntiš]

[FIX] account_slovenian: Fixed creation of double accounting lines
[FIX] purchase_recalculation: Fixed bug when confirming supplier invoice

=== modified file 'account_slovenian/account_invoice.py'
--- account_slovenian/account_invoice.py	2014-03-17 07:50:11 +0000
+++ account_slovenian/account_invoice.py	2014-03-19 13:59:06 +0000
@@ -20,27 +20,27 @@
 #
 ##############################################################################
 
-from openerp.osv import osv
-
-class account_invoice(osv.Model):
-    _inherit = "account.invoice"
-
-    def _prepare_refund(self, cr, uid, invoice, date=None, period_id=None, description=None, journal_id=None, context=None):
-        invoice_data = super(account_invoice, self)._prepare_refund(cr, uid, invoice, date, period_id,
-                                                                    description, journal_id, context=context)
-        if invoice.type == 'in_invoice':
-            fiscal_position = self.pool.get('account.fiscal.position')
-            for _, _, line_dict in invoice_data['invoice_line']:
-                if line_dict.get('product_id'):
-                    product = self.pool.get('product.product').browse(cr, uid, line_dict['product_id'], context=context)
-                    counterpart_acct_id = product.property_stock_account_output and \
-                            product.property_stock_account_output.id
-                    if not counterpart_acct_id:
-                        counterpart_acct_id = product.categ_id.property_stock_account_output_categ and \
-                                product.categ_id.property_stock_account_output_categ.id
-                    if counterpart_acct_id:
-                        fpos = invoice.fiscal_position or False
-                        line_dict['account_id'] = fiscal_position.map_account(cr, uid,
-                                                                              fpos,
-                                                                              counterpart_acct_id)
-        return invoice_data
+# from openerp.osv import osv
+# 
+# class account_invoice(osv.Model):
+#     _inherit = "account.invoice"
+# 
+#     def _prepare_refund(self, cr, uid, invoice, date=None, period_id=None, description=None, journal_id=None, context=None):
+#         invoice_data = super(account_invoice, self)._prepare_refund(cr, uid, invoice, date, period_id,
+#                                                                     description, journal_id, context=context)
+#         if invoice.type == 'in_invoice':
+#             fiscal_position = self.pool.get('account.fiscal.position')
+#             for _, _, line_dict in invoice_data['invoice_line']:
+#                 if line_dict.get('product_id'):
+#                     product = self.pool.get('product.product').browse(cr, uid, line_dict['product_id'], context=context)
+#                     counterpart_acct_id = product.property_stock_account_output and \
+#                             product.property_stock_account_output.id
+#                     if not counterpart_acct_id:
+#                         counterpart_acct_id = product.categ_id.property_stock_account_output_categ and \
+#                                 product.categ_id.property_stock_account_output_categ.id
+#                     if counterpart_acct_id:
+#                         fpos = invoice.fiscal_position or False
+#                         line_dict['account_id'] = fiscal_position.map_account(cr, uid,
+#                                                                               fpos,
+#                                                                               counterpart_acct_id)
+#         return invoice_data

=== modified file 'purchase_recalculation/__openerp__.py'
--- purchase_recalculation/__openerp__.py	2014-03-19 08:55:42 +0000
+++ purchase_recalculation/__openerp__.py	2014-03-19 13:59:06 +0000
@@ -33,12 +33,12 @@
 - change values on customer shipments (outgoing and returns) manually (date of delivery, quantity)\n
 - change values on supplier shipments (incoming and returns) shipment automatically via supplier invoice or refund (unit price)\n
 
-Methods:
-- cost price recalculation for period
+Methods:\n
+- cost price recalculation for period\n
 
-TODO:
+TODO:\n
 - change values option on inventory stock moves (date, quantity, unit price)\n
-- add inventory values to product cost recalculation
+- add inventory values to product cost recalculation\n
  
     """,
     'author': 'Mentis d.o.o.',

=== modified file 'purchase_recalculation/account_invoice.py'
--- purchase_recalculation/account_invoice.py	2014-03-17 07:50:11 +0000
+++ purchase_recalculation/account_invoice.py	2014-03-19 13:59:06 +0000
@@ -39,7 +39,6 @@
                 ctx = {}
                 _costs_installed = self.pool.get('stock.picking.in').fields_get(cr, uid, ['landing_costs_line_ids'], context) != {}
                 _picking_ids = []
-                _return_ids = []
                 for _invoice in self.browse(cr, uid, _invoice_ids, context):
                     if _invoice.type == 'in_invoice':
                         _src_usage = 'supplier'
@@ -81,16 +80,9 @@
                                             ctx['move%s' % (_stock_move.id)] = {'price_unit': _line.price_unit}
                                             _updated = True
                                     if _updated:
-                                        if _invoice.type == 'in_invoice':
-                                            if _stock_move.picking_id.id not in _picking_ids:
-                                                _picking_ids.append(_stock_move.picking_id.id)
-                                        elif _invoice.type == 'in_refund':
-                                            if _stock_move.picking_id.id not in _return_ids:
-                                                _return_ids.append(_stock_move.picking_id.id)
+                                        _picking_ids.append(_stock_move.picking_id.id)
                     if _picking_ids:
-                        self.pool.get('stock.picking.in')._picking_update(cr, uid, _picking_ids, ctx)
-                    if _return_ids:
-                        self.pool.get('stock.picking.out')._picking_update(cr, uid, _return_ids, ctx)
+                        self.pool.get('stock.picking')._picking_update(cr, uid, _picking_ids, ctx)
         return res
                 
 account_invoice()
\ No newline at end of file