Tecnicamente aprobado

Correo escrito desde un dispositivo móvil. Disculpa las faltas de
ortografía y la brevedad del email.
"No imprimas este email al menos que sea muy necesario, la ecología es cosa
de todos"

Moisés López - Vauxoo - moylop260
El 26/10/2012 20:00, "Julio Serna-http://www.vauxoo.com" <email address hidden>
escribió:

> Julio Serna-http://www.vauxoo.com has proposed merging
> lp:~vauxoo/addons-vauxoo/addons-vauxoo-6.1-mrp_account_variation_price-dev-julio
> into lp:addons-vauxoo/6.1.
>
> Requested reviews:
>   Moisés López - http://www.vauxoo.com (moylop260)
>
> For more details, see:
>
> https://code.launchpad.net/~vauxoo/addons-vauxoo/addons-vauxoo-6.1-mrp_account_variation_price-dev-julio/+merge/131714
>
> crea poliza de diferencia precio entre materia prima y producto terminado
> de produccione
> --
>
> https://code.launchpad.net/~vauxoo/addons-vauxoo/addons-vauxoo-6.1-mrp_account_variation_price-dev-julio/+merge/131714
> You are requested to review the proposed merge of
> lp:~vauxoo/addons-vauxoo/addons-vauxoo-6.1-mrp_account_variation_price-dev-julio
> into lp:addons-vauxoo/6.1.
>
> === modified file 'mrp_account_variation/__init__.py'
> --- mrp_account_variation/__init__.py   2012-09-18 00:35:32 +0000
> +++ mrp_account_variation/__init__.py   2012-10-27 00:59:20 +0000
> @@ -25,3 +25,4 @@
>
>  ##############################################################################
>  import stock_location
>  import mrp_account_variation
> +import mrp_account_variation_price
>
> === modified file 'mrp_account_variation/mrp_account_variation.py'
> --- mrp_account_variation/mrp_account_variation.py      2012-10-26
> 00:44:46 +0000
> +++ mrp_account_variation/mrp_account_variation.py      2012-10-27
> 00:59:20 +0000
> @@ -74,20 +74,20 @@
>          if context.get('type',False) == 'consumed':
>              if product.quantity > 0:
>                  if
> product.product_id.property_stock_production.valuation_in_account_id:
> -                    src_acc =
> product.product_id.property_stock_production.valuation_in_account_id and
> product.product_id.property_stock_production.valuation_in_account_id.idor False
> +                    src_acc =
> product.product_id.property_stock_production.valuation_in_account_id.id
>                  if product.product_id.type == 'service':
>                      dest_acc =
> product.product_id.categ_id.property_stock_valuation_account_id and
> product.product_id.categ_id.property_stock_valuation_account_id.id or
> False
>                  elif
> product.product_id.property_stock_production.variation_in_account_id:
> -                    dest_acc =
> product.product_id.property_stock_production.variation_in_account_id and
> product.product_id.property_stock_production.variation_in_account_id.idor False
> +                    dest_acc =
> product.product_id.property_stock_production.variation_in_account_id.id
>                  reference_amount = product.cost_variation
>
>              if product.quantity < 0:
>                  if product.product_id.type == 'service':
>                      src_acc =
> product.product_id.categ_id.property_stock_valuation_account_id and
> product.product_id.categ_id.property_stock_valuation_account_id.id or
> False
>                  elif
> product.product_id.property_stock_production.variation_in_account_id:
> -                    src_acc =
> product.product_id.property_stock_production.variation_in_account_id and
> product.product_id.property_stock_production.variation_in_account_id.idor False
> +                    src_acc =
> product.product_id.property_stock_production.variation_in_account_id.id
>                  if
> product.product_id.property_stock_production.valuation_in_account_id:
> -                    dest_acc =
> product.product_id.property_stock_production.valuation_in_account_id and
> product.product_id.property_stock_production.valuation_in_account_id.idor False
> +                    dest_acc =
> product.product_id.property_stock_production.valuation_in_account_id.id
>                  reference_amount = product.cost_variation*-1
>
>          if context.get('type',False) == 'produced':
>
> === added file 'mrp_account_variation/mrp_account_variation_price.py'
> --- mrp_account_variation/mrp_account_variation_price.py        1970-01-01
> 00:00:00 +0000
> +++ mrp_account_variation/mrp_account_variation_price.py        2012-10-27
> 00:59:20 +0000
> @@ -0,0 +1,124 @@
> +# -*- encoding: utf-8 -*-
>
> +###########################################################################
> +#    Module Writen to OpenERP, Open Source Management Solution
> +#
> +#    Copyright (c) 2012 Vauxoo - http://www.vauxoo.com
> +#    All Rights Reserved.
> +#    <email address hidden>
>
> +############################################################################
> +#    Coded by: julio (<email address hidden>)
>
> +############################################################################
> +#
> +#    This program is free software: you can redistribute it and/or modify
> +#    it under the terms of the GNU Affero General Public License as
> +#    published by the Free Software Foundation, either version 3 of the
> +#    License, or (at your option) any later version.
> +#
> +#    This program is distributed in the hope that it will be useful,
> +#    but WITHOUT ANY WARRANTY; without even the implied warranty of
> +#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +#    GNU Affero General Public License for more details.
> +#
> +#    You should have received a copy of the GNU Affero General Public
> License
> +#    along with this program.  If not, see <http://www.gnu.org/licenses/
> >.
> +#
>
> +##############################################################################
> +from osv import osv,fields
> +from tools.translate import _
> +import netsvc
> +import time
> +
> +class mrp_production(osv.osv):
> +    _inherit='mrp.production'
> +
> +    def action_finish(self,cr,uid,ids,context={}):
> +        res = super(mrp_production,
> self).action_finish(cr,uid,ids,context=context)
> +        self._create_move_variation_price(cr, uid, ids, context=context)
> +        return res
> +
> +    def _create_move_variation_price(self, cr, uid, ids, context={}):
> +        move_obj = self.pool.get('account.move')
> +        product_uom_pool = self.pool.get('product.uom')
> +        for production in self.browse(cr, uid, ids, context=context):
> +            account_moves = []
> +            total_product_consumed = 0.0
> +            total_product_finished = 0.0
> +            for prod_consumed in production.move_lines2:
> +                if prod_consumed.state == 'done':
> +                    product_consumed = product_uom_pool._compute_qty(cr,
> uid, prod_consumed.product_uom.id, prod_consumed.product_qty, to_uom_id=
> prod_consumed.product_id.uom_id.id)
> +                    total_product_consumed += product_consumed *
> prod_consumed.product_id.standard_price
> +            for prod_finished in production.move_created_ids2:
> +                if prod_finished.state == 'done':
> +                    product_finished = product_uom_pool._compute_qty(cr,
> uid, prod_finished.product_uom.id, prod_finished.product_qty, to_uom_id=
> prod_finished.product_id.uom_id.id)
> +                    total_product_finished += product_finished *
> prod_finished.product_id.standard_price
> +
> +            if production.product_id.property_stock_production:
> +                if total_product_consumed > total_product_finished:
> +                    if
> production.product_id.property_stock_production.property_account_in_production_price_difference:
> +                        src_account_id =
> production.product_id.property_stock_production.valuation_out_account_id.id
> +                        dest_account_id =
> production.product_id.property_stock_production.property_account_in_production_price_difference.id
> +                        reference_amount = (total_product_consumed -
> total_product_finished)
> +                        journal_id =
> production.product_id.categ_id.property_stock_journal.id
> +                        account_moves = [(journal_id,
> self._create_account_variation_price_move_line(cr, uid, production,
> src_account_id, dest_account_id, reference_amount, context=None))]
> +                if total_product_consumed < total_product_finished:
> +                    if
> production.product_id.property_stock_production.property_account_out_production_price_difference:
> +                        src_account_id =
> production.product_id.property_stock_production.property_account_out_production_price_difference.id
> +                        dest_account_id =
> production.product_id.property_stock_production.valuation_in_account_id.id
> +                        reference_amount = (total_product_consumed -
> total_product_finished)*-1
> +                        journal_id =
> production.product_id.categ_id.property_stock_journal.id
> +                        account_moves =
> [(journal_id,self._create_account_variation_price_move_line(cr, uid,
> production, src_account_id, dest_account_id, reference_amount,
> context=None))]
> +
> +            if account_moves:
> +                for j_id,move_lines in account_moves:
> +                    move_obj.create(cr, uid,
> +                        {
> +                         'journal_id': j_id,
> +                         'line_id': move_lines,
> +                         'ref': 'PROD: ' + production.name})
> +
> +        return True
> +
> +    def _create_account_variation_price_move_line(self, cr, uid,
> production, src_account_id, dest_account_id, reference_amount,
> context=None):
> +        debit_line_vals = {
> +                    'name': 'PROD: ' + production.name or '',
> +                    'date': time.strftime('%Y-%m-%d'),
> +                    'debit': reference_amount,
> +                    'account_id': dest_account_id,
> +                    'production_id' : production.id
> +        }
> +        credit_line_vals = {
> +                    'name': 'PROD: ' + production.name or '',
> +                    'date': time.strftime('%Y-%m-%d'),
> +                    'credit': reference_amount,
> +                    'account_id': src_account_id,
> +                    'production_id' : production.id
> +        }
> +
> +        return [(0, 0, debit_line_vals), (0, 0, credit_line_vals)]
> +
> +mrp_production()
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
>
> === modified file 'mrp_account_variation/stock_location.py'
> --- mrp_account_variation/stock_location.py     2012-09-18 00:35:32 +0000
> +++ mrp_account_variation/stock_location.py     2012-10-27 00:59:20 +0000
> @@ -31,6 +31,20 @@
>      _columns = {
>          'variation_in_account_id': fields.many2one('account.account',
> 'Stock Variation Account (Incoming)', domain = [('type','=','other')]),
>          'variation_out_account_id': fields.many2one('account.account',
> 'Stock Variation Account (Outgoing)', domain = [('type','=','other')]),
> +        'property_account_in_production_price_difference':
> fields.property(
> +            'account.account',
> +            type='many2one',
> +            relation = 'account.account',
> +            string = 'Price Production Variation Account (Incoming)',
> +            view_load=True,
> +            domain = [('type','=','other')]),
> +        'property_account_out_production_price_difference':
> fields.property(
> +            'account.account',
> +            type='many2one',
> +            relation = 'account.account',
> +            string = 'Price Production Variation Account (Outgoing)',
> +            view_load=True,
> +            domain = [('type','=','other')]),
>      }
>
>  stock_location()
>
> === modified file 'mrp_account_variation/stock_location_view.xml'
> --- mrp_account_variation/stock_location_view.xml       2012-09-18
> 00:35:32 +0000
> +++ mrp_account_variation/stock_location_view.xml       2012-10-27
> 00:59:20 +0000
> @@ -11,6 +11,8 @@
>                      <xpath
> expr="/form/group/field[@name='valuation_out_account_id']" position="after">
>                         <field name="variation_out_account_id"
> attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/>
>                         <field name="variation_in_account_id"
> attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/>
> +                       <field
> name="property_account_out_production_price_difference"
> attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/>
> +                       <field
> name="property_account_in_production_price_difference"
> attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/>
>                      </xpath>
>             </field>
>          </record>
>
>
>