Aprobado
El 26/10/2012 19:24, "Juan Carlos Hernandez Funes" <email address hidden>
escribió:
> Juan Carlos Hernandez Funes has proposed merging
> lp:~vauxoo/addons-vauxoo/addons-vauxoo-6.1-group_production_stock_move_dev_carlos
> into lp:addons-vauxoo/6.1.
>
> Requested reviews:
> Rodolfo Lopez - http://www.vauxoo.com (el-rodo-1)
> Isaac López Zúñiga - http://www.vauxoo.com (isaako34)
> Moisés López - http://www.vauxoo.com (moylop260)
>
> For more details, see:
>
> https://code.launchpad.net/~vauxoo/addons-vauxoo/addons-vauxoo-6.1-group_production_stock_move_dev_carlos/+merge/131712
>
> Se agrupo por campo production_id y stock_move_id en account_move_line
> search y vista tree
> --
>
> https://code.launchpad.net/~vauxoo/addons-vauxoo/addons-vauxoo-6.1-group_production_stock_move_dev_carlos/+merge/131712
> You are requested to review the proposed merge of
> lp:~vauxoo/addons-vauxoo/addons-vauxoo-6.1-group_production_stock_move_dev_carlos
> into lp:addons-vauxoo/6.1.
>
> === added directory 'account_move_line_group_by_extend'
> === added file 'account_move_line_group_by_extend/__init__.py'
> --- account_move_line_group_by_extend/__init__.py 1970-01-01
> 00:00:00 +0000
> +++ account_move_line_group_by_extend/__init__.py 2012-10-27
> 00:23:23 +0000
> @@ -0,0 +1,23 @@
> +#!/usr/bin/python
> +# -*- encoding: utf-8 -*-
>
> +###########################################################################
> +# Module Writen to OpenERP, Open Source Management Solution
> +# Copyright (C) Vauxoo (<http://vauxoo.com>).
> +# All Rights Reserved
>
> +###############Credits######################################################
> +# Coded by: Juan Carlos Funes(<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/
> >.
>
> +################################################################################
> +import account_move_line
>
> === added file 'account_move_line_group_by_extend/__openerp__.py'
> --- account_move_line_group_by_extend/__openerp__.py 1970-01-01
> 00:00:00 +0000
> +++ account_move_line_group_by_extend/__openerp__.py 2012-10-27
> 00:23:23 +0000
> @@ -0,0 +1,41 @@
> +#!/usr/bin/python
> +# -*- encoding: utf-8 -*-
>
> +###########################################################################
> +# Module Writen to OpenERP, Open Source Management Solution
> +# Copyright (C) Vauxoo (<http://vauxoo.com>).
> +# All Rights Reserved
>
> +###############Credits######################################################
> +# Coded by: Juan Carlos Funes(<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/
> >.
>
> +################################################################################
> +{
> + "name" : "Grouped by production and stock move in model
> account_move_line",
> + "version" : "1.0",
> + "depends" : ['account_relation_move'],
> + "author" : "Vauxoo",
> + #"license" : "AGPL-3",
> + "description" : """Grouped by production and stock move in model
> account_move_line
> + """,
> + "website" : "http://vauxoo.com",
> + "category" : "Generic Modules",
> + "init_xml" : [],
> + "demo_xml" : [],
> + "test": [],
> + "update_xml" : ['account_move_line.xml',
> + ],
> + "active": False,
> + "installable": True,
> +}
> +
>
> === added file 'account_move_line_group_by_extend/account_move_line.py'
> --- account_move_line_group_by_extend/account_move_line.py 1970-01-01
> 00:00:00 +0000
> +++ account_move_line_group_by_extend/account_move_line.py 2012-10-27
> 00:23:23 +0000
> @@ -0,0 +1,48 @@
> +#!/usr/bin/python
> +# -*- encoding: utf-8 -*-
>
> +###########################################################################
> +# Module Writen to OpenERP, Open Source Management Solution
> +# Copyright (C) Vauxoo (<http://vauxoo.com>).
> +# All Rights Reserved
>
> +###############Credits######################################################
> +# Coded by: Juan Carlos Funes(<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, orm
> +from lxml import etree
> +import tools
> +
> +class account_move_line(osv.osv):
> + _inherit = 'account.move.line'
> + _columns = {
> +
> + }
> +
> + def fields_view_get(self, cr, uid, view_id=None, view_type='form',
> context=None, toolbar=False, submenu=False):
> + result = super(account_move_line, self).fields_view_get(cr, uid,
> view_id, view_type, context=context, toolbar=toolbar, submenu=submenu)
> + #fields_get = self.fields_get(cr, uid, ['stock_move_id'], context)
> + xml_form = etree.fromstring(result['arch'])
> + placeholder = xml_form.xpath("//field[@name='period_id']")
> + placeholder[0].addnext(etree.Element('field', {'name':
> 'stock_move_id'}))
> + placeholder[0].addnext(etree.Element('field', {'name':
> 'production_id'}))
> + result['arch'] = etree.tostring(xml_form)
> + result['fields'].update({
> + 'stock_move_id':{'domain': [], 'string': u'Stock Move',
> 'readonly': False, 'relation': 'stock.move', 'context': {}, 'selectable':
> True, 'type': 'many2one', 'select': 2},
> + 'production_id':{'domain': [], 'string': u'Production',
> 'readonly': False, 'relation': 'mrp.production', 'context': {},
> 'selectable': True, 'type': 'many2one', 'select': 2}})
> + return result
> +
> +account_move_line()
> +
>
> === added file 'account_move_line_group_by_extend/account_move_line.xml'
> --- account_move_line_group_by_extend/account_move_line.xml 1970-01-01
> 00:00:00 +0000
> +++ account_move_line_group_by_extend/account_move_line.xml 2012-10-27
> 00:23:23 +0000
> @@ -0,0 +1,18 @@
> +<?xml version="1.0" encoding="utf-8"?>
> +<openerp>
> + <data>
> + <record id="view_account_move_line_group_production_stock_move"
> model="ir.ui.view">
> + <field
> name="name">account.move.line.group.production.stock.move</field>
> + <field name="model">account.move.line</field>
> + <field name="type">search</field>
> + <field name="inherit_id"
> ref="account.view_account_move_line_filter"/>
> + <field name="arch" type="xml">
> + <xpath expr="/search/group[@string='Group
> By...']/filter[@string='Period']" position="after">
> + <filter string="Stock Move" icon="terp-stock"
> domain="[]" context="{'group_by':'stock_move_id'}"/>
> + <filter string="Production" icon="terp-mrp"
> domain="[]" context="{'group_by':'production_id'}"/>
> + </xpath>
> + </field>
> + </record>
> +
> + </data>
> +</openerp>
>
>
>
Aprobado
El 26/10/2012 19:24, "Juan Carlos Hernandez Funes" <email address hidden>
escribió:
> Juan Carlos Hernandez Funes has proposed merging www.vauxoo. com (el-rodo-1) www.vauxoo. com (isaako34) www.vauxoo. com (moylop260) /code.launchpad .net/~vauxoo/ addons- vauxoo/ addons- vauxoo- 6.1-group_ production_ stock_move_ dev_carlos/ +merge/ 131712 /code.launchpad .net/~vauxoo/ addons- vauxoo/ addons- vauxoo- 6.1-group_ production_ stock_move_ dev_carlos/ +merge/ 131712 move_line_ group_by_ extend' move_line_ group_by_ extend/ __init_ _.py' move_line_ group_by_ extend/ __init_ _.py 1970-01-01 move_line_ group_by_ extend/ __init_ _.py 2012-10-27 ####### ####### ####### ####### ####### ####### ####### ####### ####### ###### vauxoo. com>). ####### ##Credits# ####### ####### ####### ####### ####### ####### ####### #### ####### ####### ####### ####### ####### ####### ####### ####### ####### ####### # www.gnu. org/licenses/ ####### ####### ####### ####### ####### ####### ####### ####### ####### ####### #### move_line_ group_by_ extend/ __openerp_ _.py' move_line_ group_by_ extend/ __openerp_ _.py 1970-01-01 move_line_ group_by_ extend/ __openerp_ _.py 2012-10-27 ####### ####### ####### ####### ####### ####### ####### ####### ####### ###### vauxoo. com>). ####### ##Credits# ####### ####### ####### ####### ####### ####### ####### #### ####### ####### ####### ####### ####### ####### ####### ####### ####### ####### # www.gnu. org/licenses/ ####### ####### ####### ####### ####### ####### ####### ####### ####### ####### #### relation_ move'], vauxoo. com", move_line. xml', move_line_ group_by_ extend/ account_ move_line. py' move_line_ group_by_ extend/ account_ move_line. py 1970-01-01 move_line_ group_by_ extend/ account_ move_line. py 2012-10-27 ####### ####### ####### ####### ####### ####### ####### ####### ####### ###### vauxoo. com>). ####### ##Credits# ####### ####### ####### ####### ####### ####### ####### #### ####### ####### ####### ####### ####### ####### ####### ####### ####### ####### # www.gnu. org/licenses/ ####### ####### ####### ####### ####### ####### ####### ####### ####### ####### #### move_line( osv.osv) : view_get( self, cr, uid, view_id=None, view_type='form', move_line, self).fields_ view_get( cr, uid, g(result[ 'arch'] ) xpath(" //field[ @name=' period_ id']") 0].addnext( etree.Element( 'field' , {'name': 0].addnext( etree.Element( 'field' , {'name': xml_form) 'fields' ].update( { move_id' :{'domain' : [], 'string': u'Stock Move', id':{'domain' : [], 'string': u'Production', move_line( ) move_line_ group_by_ extend/ account_ move_line. xml' move_line_ group_by_ extend/ account_ move_line. xml 1970-01-01 move_line_ group_by_ extend/ account_ move_line. xml 2012-10-27 account_ move_line_ group_productio n_stock_ move" >account. move.line. group.productio n.stock. move</field> >account. move.line< /field> >search< /field> view_account_ move_line_ filter" /> search/ group[@ string= 'Group /filter[ @string= 'Period' ]" position="after"> "{'group_ by':'stock_ move_id' }"/> "{'group_ by':'production _id'}"/ >
> lp:~vauxoo/addons-vauxoo/addons-vauxoo-6.1-group_production_stock_move_dev_carlos
> into lp:addons-vauxoo/6.1.
>
> Requested reviews:
> Rodolfo Lopez - http://
> Isaac López Zúñiga - http://
> Moisés López - http://
>
> For more details, see:
>
> https:/
>
> Se agrupo por campo production_id y stock_move_id en account_move_line
> search y vista tree
> --
>
> https:/
> You are requested to review the proposed merge of
> lp:~vauxoo/addons-vauxoo/addons-vauxoo-6.1-group_production_stock_move_dev_carlos
> into lp:addons-vauxoo/6.1.
>
> === added directory 'account_
> === added file 'account_
> --- account_
> 00:00:00 +0000
> +++ account_
> 00:23:23 +0000
> @@ -0,0 +1,23 @@
> +#!/usr/bin/python
> +# -*- encoding: utf-8 -*-
>
> +######
> +# Module Writen to OpenERP, Open Source Management Solution
> +# Copyright (C) Vauxoo (<http://
> +# All Rights Reserved
>
> +######
> +# Coded by: Juan Carlos Funes(<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://
> >.
>
> +######
> +import account_move_line
>
> === added file 'account_
> --- account_
> 00:00:00 +0000
> +++ account_
> 00:23:23 +0000
> @@ -0,0 +1,41 @@
> +#!/usr/bin/python
> +# -*- encoding: utf-8 -*-
>
> +######
> +# Module Writen to OpenERP, Open Source Management Solution
> +# Copyright (C) Vauxoo (<http://
> +# All Rights Reserved
>
> +######
> +# Coded by: Juan Carlos Funes(<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://
> >.
>
> +######
> +{
> + "name" : "Grouped by production and stock move in model
> account_move_line",
> + "version" : "1.0",
> + "depends" : ['account_
> + "author" : "Vauxoo",
> + #"license" : "AGPL-3",
> + "description" : """Grouped by production and stock move in model
> account_move_line
> + """,
> + "website" : "http://
> + "category" : "Generic Modules",
> + "init_xml" : [],
> + "demo_xml" : [],
> + "test": [],
> + "update_xml" : ['account_
> + ],
> + "active": False,
> + "installable": True,
> +}
> +
>
> === added file 'account_
> --- account_
> 00:00:00 +0000
> +++ account_
> 00:23:23 +0000
> @@ -0,0 +1,48 @@
> +#!/usr/bin/python
> +# -*- encoding: utf-8 -*-
>
> +######
> +# Module Writen to OpenERP, Open Source Management Solution
> +# Copyright (C) Vauxoo (<http://
> +# All Rights Reserved
>
> +######
> +# Coded by: Juan Carlos Funes(<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://
> >.
>
> +######
> +
> +from osv import osv, fields, orm
> +from lxml import etree
> +import tools
> +
> +class account_
> + _inherit = 'account.move.line'
> + _columns = {
> +
> + }
> +
> + def fields_
> context=None, toolbar=False, submenu=False):
> + result = super(account_
> view_id, view_type, context=context, toolbar=toolbar, submenu=submenu)
> + #fields_get = self.fields_get(cr, uid, ['stock_move_id'], context)
> + xml_form = etree.fromstrin
> + placeholder = xml_form.
> + placeholder[
> 'stock_move_id'}))
> + placeholder[
> 'production_id'}))
> + result['arch'] = etree.tostring(
> + result[
> + 'stock_
> 'readonly': False, 'relation': 'stock.move', 'context': {}, 'selectable':
> True, 'type': 'many2one', 'select': 2},
> + 'production_
> 'readonly': False, 'relation': 'mrp.production', 'context': {},
> 'selectable': True, 'type': 'many2one', 'select': 2}})
> + return result
> +
> +account_
> +
>
> === added file 'account_
> --- account_
> 00:00:00 +0000
> +++ account_
> 00:23:23 +0000
> @@ -0,0 +1,18 @@
> +<?xml version="1.0" encoding="utf-8"?>
> +<openerp>
> + <data>
> + <record id="view_
> model="ir.ui.view">
> + <field
> name="name"
> + <field name="model"
> + <field name="type"
> + <field name="inherit_id"
> ref="account.
> + <field name="arch" type="xml">
> + <xpath expr="/
> By...']
> + <filter string="Stock Move" icon="terp-stock"
> domain="[]" context=
> + <filter string="Production" icon="terp-mrp"
> domain="[]" context=
> + </xpath>
> + </field>
> + </record>
> +
> + </data>
> +</openerp>
>
>
>