Merge lp:~inddiana/sisb/josbel-sisb-fix-stock-journal into lp:sisb

[Josbel Caraballo]

[ADD] Inserta el numero correlativo al diario
de inventario, en el 'name' de los asientos contables,
al procesarse un albaran.

[Aristóbulo Meneses (aristobulo)]

Concatenar la referencia/descripción del albarán junto a la secuencia que corresponde.

Ej. [INVT-000001] Albarán: IN/0000532

review: Needs Fixing

Unmerged revisions

207. By Josbel Caraballo on 2012-05-16

[ADD] Inserta el numero correlativo al diario
de inventario, en el 'name' de los asientos contables,
al procesarse un albaran.

=== added directory 'sisb_fix_stock_journal'
=== added file 'sisb_fix_stock_journal/__init__.py'
--- sisb_fix_stock_journal/__init__.py	1970-01-01 00:00:00 +0000
+++ sisb_fix_stock_journal/__init__.py	2012-05-16 15:45:23 +0000
@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+import model
 
=== added file 'sisb_fix_stock_journal/__openerp__.py'
--- sisb_fix_stock_journal/__openerp__.py	1970-01-01 00:00:00 +0000
+++ sisb_fix_stock_journal/__openerp__.py	2012-05-16 15:45:23 +0000
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+{
+    'name' : 'SISB Fix Stock Journal',
+    'version' : '0.1',
+    'author' : 'Industrias Diana, C.A. <[e-mail]>',
+    'description' : """
+		Inserta el numero correlativo al diario
+		de inventario, en el 'name' de los asientos contables,
+		al procesarse un albaran.
+                    """,
+    'category' : 'accounting',
+    'website' : 'www.industriasdiana.gob.ve',
+    'depends' : ['account','stock'],
+    'update_xml' : [
+    ],
+    'active' : False,
+    'installable' : True,
+    'data' : [],
+    
+}
 
=== added directory 'sisb_fix_stock_journal/model'
=== added file 'sisb_fix_stock_journal/model/__init__.py'
--- sisb_fix_stock_journal/model/__init__.py	1970-01-01 00:00:00 +0000
+++ sisb_fix_stock_journal/model/__init__.py	2012-05-16 15:45:23 +0000
@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+import stock_move
 
=== added file 'sisb_fix_stock_journal/model/stock_move.py'
--- sisb_fix_stock_journal/model/stock_move.py	1970-01-01 00:00:00 +0000
+++ sisb_fix_stock_journal/model/stock_move.py	2012-05-16 15:45:23 +0000
@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+from osv import osv, fields
+import netsvc
+import pooler
+from tools.translate import _
+
+class stock_move(osv.osv):
+
+    _inherit = "stock.move"
+    
+    def _create_product_valuation_moves(self, cr, uid, move, context=None):
+        """
+        Generate the appropriate accounting moves if the product being moves is subject
+        to real_time valuation tracking, and the source or destination location is
+        a transit location or is outside of the company.
+        """
+	
+        if move.product_id.valuation == 'real_time': # FIXME: product valuation should perhaps be a property?
+            if context is None:
+                context = {}
+            src_company_ctx = dict(context,force_company=move.location_id.company_id.id)
+            dest_company_ctx = dict(context,force_company=move.location_dest_id.company_id.id)
+            account_moves = []
+            # Outgoing moves (or cross-company output part)
+            if move.location_id.company_id \
+                and (move.location_id.usage == 'internal' and move.location_dest_id.usage != 'internal'\
+                     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, src_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_variation, acc_dest, reference_amount, reference_currency_id, context))]
+
+            # Incoming moves (or cross-company input part)
+            if move.location_dest_id.company_id \
+                and (move.location_id.usage != 'internal' and move.location_dest_id.usage == 'internal'\
+                     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))]
+
+	    obj_sequence = self.pool.get('ir.sequence')
+            move_obj = self.pool.get('account.move')
+	    ids_account_moves = []
+            for j_id, move_lines in account_moves:
+                id_acc_move = move_obj.create(cr, uid,
+                        {'name': move.name,
+                         'journal_id': j_id,
+                         'line_id': move_lines,
+                         'ref': move.picking_id and move.picking_id.name})
+		ids_account_moves.append(id_acc_move)
+	    acc_moves = move_obj.browse(cr,uid,ids_account_moves)
+	    for n in acc_moves:
+		c = {'fiscalyear_id': n.period_id.fiscalyear_id.id}
+		new_name = obj_sequence.get_id(cr, uid, n.journal_id.sequence_id.id, context=c)
+		move_obj.write(cr, uid, [n.id], {'name':new_name})
+	return True
+	
+stock_move()