Merge lp:~vauxoo/addons-vauxoo/addons-vauxoo-cicsa into lp:addons-vauxoo/7.0

[hbto [Vauxoo] http://www.vauxoo.com]

Weekly MP

[lp:~vauxoo/addons-vauxoo/addons-vauxoo-cicsa]

1099. By hbto [Vauxoo] http://www.vauxoo.com on 2014-08-22

[FIX] Stupid me Typo

[hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha)]

Runbot has gone green!
Let's merge!
https://docs.google.com/a/vauxoo.com/file/d/0B1w9gokcJL9hSXJMX2RVM2FsVmc/edit?usp=drivesdk

review: Approve

=== added directory 'account_anglo_saxon_stock_move'
=== added file 'account_anglo_saxon_stock_move/__init__.py'
--- account_anglo_saxon_stock_move/__init__.py	1970-01-01 00:00:00 +0000
+++ account_anglo_saxon_stock_move/__init__.py	2014-08-22 20:04:28 +0000
@@ -0,0 +1,27 @@
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+###############################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>).
+#    All Rights Reserved
+############# Credits #########################################################
+#    Coded by: Humberto Arocha <[e-mail]>
+#    Planified by: Humberto Arocha <[e-mail]>
+#    Audited by: Humberto Arocha <[e-mail]>
+###############################################################################
+#    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 model
+import wizard

=== added file 'account_anglo_saxon_stock_move/__openerp__.py'
--- account_anglo_saxon_stock_move/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_anglo_saxon_stock_move/__openerp__.py	2014-08-22 20:04:28 +0000
@@ -0,0 +1,51 @@
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+###############################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>).
+#    All Rights Reserved
+############# Credits #########################################################
+#    Coded by: Humberto Arocha <[e-mail]>
+#    Planified by: Humberto Arocha <[e-mail]>
+#    Audited by: Humberto Arocha <[e-mail]>
+###############################################################################
+#    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': 'Account Anglo-Saxon Stock Move',
+    'version': '1.0',
+    'author': 'Vauxoo',
+    'website': 'http://www.vauxoo.com/',
+    'category': '',
+    'description': '''
+Account Anglo-Saxon Stock Move
+------------------------------
+    This module adds an attribute to the Account Invoice Line object
+    and in the case of creating invoice from shipments attach the Stock Move
+    Record on the regarding Invoice Line
+''',
+    'depends': [
+        'account_anglo_saxon',
+        ],
+    'data': [
+        ],
+    'demo': [],
+    'test': [],
+    'qweb': [],
+    'js': [],
+    'css': [],
+    'active': False,
+    'installable': True,
+}

=== added directory 'account_anglo_saxon_stock_move/data'
=== added directory 'account_anglo_saxon_stock_move/demo'
=== added directory 'account_anglo_saxon_stock_move/doc'
=== added directory 'account_anglo_saxon_stock_move/doc/images'
=== added directory 'account_anglo_saxon_stock_move/i18n'
=== added directory 'account_anglo_saxon_stock_move/model'
=== added file 'account_anglo_saxon_stock_move/model/__init__.py'
--- account_anglo_saxon_stock_move/model/__init__.py	1970-01-01 00:00:00 +0000
+++ account_anglo_saxon_stock_move/model/__init__.py	2014-08-22 20:04:28 +0000
@@ -0,0 +1,27 @@
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+###############################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>).
+#    All Rights Reserved
+############# Credits #########################################################
+#    Coded by: Yanina Aular <[e-mail]>
+#    Planified by: Humberto Arocha <[e-mail]>
+#    Audited by: Humberto Arocha <[e-mail]>
+###############################################################################
+#    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 stock
+import invoice

=== added file 'account_anglo_saxon_stock_move/model/invoice.py'
--- account_anglo_saxon_stock_move/model/invoice.py	1970-01-01 00:00:00 +0000
+++ account_anglo_saxon_stock_move/model/invoice.py	2014-08-22 20:04:28 +0000
@@ -0,0 +1,32 @@
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C)
+#    2004-2010 Tiny SPRL (<http://tiny.be>).
+#    2009-2010 Veritos (http://veritos.nl).
+#    All Rights Reserved
+#
+#    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 openerp.osv import osv, fields
+
+class account_invoice_line(osv.osv):
+    _inherit = "account.invoice.line"
+
+    _columns = {
+        'move_id': fields.many2one('stock.move', string="Move line", help="If the invoice was generated from a stock.picking, reference to the related move line."),
+    }
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_anglo_saxon_stock_move/model/stock.py'
--- account_anglo_saxon_stock_move/model/stock.py	1970-01-01 00:00:00 +0000
+++ account_anglo_saxon_stock_move/model/stock.py	2014-08-22 20:04:28 +0000
@@ -0,0 +1,39 @@
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+###############################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>).
+#    All Rights Reserved
+############# Credits #########################################################
+#    Coded by: Humberto Arocha <[e-mail]>
+#    Planified by: Humberto Arocha <[e-mail]>
+#    Audited by: Humberto Arocha <[e-mail]>
+###############################################################################
+#    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 openerp.osv import osv
+
+class stock_picking(osv.osv):
+    _inherit = "stock.picking"
+    _description = "Picking List"
+
+    def _prepare_invoice_line(self, cr, uid, group, picking, move_line, invoice_id,
+        invoice_vals, context=None):
+        """Overwrite to add move_id reference"""
+        res = super(stock_picking, self)._prepare_invoice_line(cr, uid, group, picking, move_line, invoice_id, invoice_vals, context=context)
+        res.update({
+            'move_id': move_line.id,
+        })
+        return res

=== added directory 'account_anglo_saxon_stock_move/report'
=== added directory 'account_anglo_saxon_stock_move/security'
=== added directory 'account_anglo_saxon_stock_move/static'
=== added directory 'account_anglo_saxon_stock_move/static/description'
=== added file 'account_anglo_saxon_stock_move/static/description/index.html'
=== added directory 'account_anglo_saxon_stock_move/static/src'
=== added directory 'account_anglo_saxon_stock_move/static/src/css'
=== added directory 'account_anglo_saxon_stock_move/static/src/img'
=== added file 'account_anglo_saxon_stock_move/static/src/img/icon.png'
Binary files account_anglo_saxon_stock_move/static/src/img/icon.png	1970-01-01 00:00:00 +0000 and account_anglo_saxon_stock_move/static/src/img/icon.png	2014-08-22 20:04:28 +0000 differ
=== added directory 'account_anglo_saxon_stock_move/static/src/js'
=== added directory 'account_anglo_saxon_stock_move/static/src/xml'
=== added directory 'account_anglo_saxon_stock_move/test'
=== added directory 'account_anglo_saxon_stock_move/view'
=== added directory 'account_anglo_saxon_stock_move/wizard'
=== added file 'account_anglo_saxon_stock_move/wizard/__init__.py'
--- account_anglo_saxon_stock_move/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ account_anglo_saxon_stock_move/wizard/__init__.py	2014-08-22 20:04:28 +0000
@@ -0,0 +1,25 @@
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+###############################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>).
+#    All Rights Reserved
+############# Credits #########################################################
+#    Coded by: Humberto Arocha <[e-mail]>
+#    Planified by: Humberto Arocha <[e-mail]>
+#    Audited by: Humberto Arocha <[e-mail]>
+###############################################################################
+#    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/>.
+###############################################################################
+

=== added directory 'account_anglo_saxon_stock_move/workflow'
=== modified file 'account_move_line_extended/view/account_move_line_view.xml'
--- account_move_line_extended/view/account_move_line_view.xml	2014-08-04 19:15:36 +0000
+++ account_move_line_extended/view/account_move_line_view.xml	2014-08-22 20:04:28 +0000
@@ -1,6 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
+        <record id="aml_extended_search" model="ir.ui.view">
+            <field name="name">Journal Entries Extended Search</field>
+            <field name="model">account.move.line</field>
+            <field name="inherit_id" ref="account.view_account_move_line_filter"/>
+            <field name="arch" type="xml">
+                <xpath expr="//search" position="inside">
+                    <field name="currency_id"/>
+                </xpath>
+                <xpath expr="//group" position="inside">
+                    <filter string="Currency" icon="terp-folder-orange" domain="[]" context="{'group_by':'currency_id'}"/>
+                </xpath>
+            </field>
+        </record>
+
         <record id="aml_extended_tree" model="ir.ui.view">
             <field name="name">Journal Entries Extended</field>
             <field name="model">account.move.line</field>

=== added directory 'account_move_line_grouping'
=== added file 'account_move_line_grouping/__init__.py'
=== added file 'account_move_line_grouping/__openerp__.py'
--- account_move_line_grouping/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_move_line_grouping/__openerp__.py	2014-08-22 20:04:28 +0000
@@ -0,0 +1,52 @@
+# -*- encoding: utf-8 -*-
+#
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2013 Vauxoo - http://www.vauxoo.com/
+#    All Rights Reserved.
+#    info Vauxoo ([e-mail])
+#
+#    Coded by: Jorge Angel Naranjo ([e-mail])
+#
+#
+#    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": "Account Move Line Grouping",
+    "version": "1.0",
+    "author": "Vauxoo",
+    "category": "Accounting",
+    "description" : """
+Account Reconcile Grouping
+==========================
+
+This module allows you to group your journal items by Journal Entry with a new filter in the search view.
+
+
+    """,
+    "website": "http://www.vauxoo.com/",
+    "license": "AGPL-3",
+    "depends": [
+            "account",
+                ],
+    "demo": [
+    ],
+    "data": [
+        'view/account_move_view.xml',
+    ],
+    "installable": True,
+    "active": False,
+}

=== added directory 'account_move_line_grouping/data'
=== added directory 'account_move_line_grouping/demo'
=== added directory 'account_move_line_grouping/i18n'
=== added directory 'account_move_line_grouping/model'
=== added directory 'account_move_line_grouping/security'
=== added directory 'account_move_line_grouping/view'
=== added file 'account_move_line_grouping/view/account_move_view.xml'
--- account_move_line_grouping/view/account_move_view.xml	1970-01-01 00:00:00 +0000
+++ account_move_line_grouping/view/account_move_view.xml	2014-08-22 20:04:28 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="account_move_line_grouping_reconcile_search" model="ir.ui.view">
+            <field name="name">account_move_line_grouping_reconcile_search</field>
+            <field name="model">account.move.line</field>
+            <field name="inherit_id" ref="account.view_account_move_line_filter"/>
+            <field name="arch" type="xml">
+                <xpath expr="//filter[@string='Period']" position="after">
+                    <filter string="Journal Entry" icon="terp-go-month" domain="[]" context="{'group_by':'move_id'}"/>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>

=== added directory 'account_move_line_grouping/workflow'
=== modified file 'account_reconcile_grouping/__openerp__.py'
--- account_reconcile_grouping/__openerp__.py	2014-07-11 19:16:18 +0000
+++ account_reconcile_grouping/__openerp__.py	2014-08-22 20:04:28 +0000
@@ -40,7 +40,8 @@
     "website": "http://www.vauxoo.com/",
     "license": "AGPL-3",
     "depends": [
-            "account",
+        "account",
+        "account_move_line_grouping",
                 ],
     "demo": [
     ],

=== modified file 'stock_move_entries/model/stock_move_entries.py'
--- stock_move_entries/model/stock_move_entries.py	2014-08-14 03:41:10 +0000
+++ stock_move_entries/model/stock_move_entries.py	2014-08-22 20:04:28 +0000
@@ -36,9 +36,9 @@
     _columns = {
         'sm_id': fields.many2one('stock.move', 'Stock move ID'),
         'location_id':fields.related('sm_id', 'location_id', string='Source Location',
-            relation='stock.location', store=True, help='Location Move Source'),
+            type='many2one', relation='stock.location', store=True, help='Location Move Source'),
         'location_dest_id':fields.related('sm_id', 'location_dest_id',
-            string='Destination Location', relation='stock.location', store=True,
+            type='many2one', string='Destination Location', relation='stock.location', store=True,
             help="Location Move Destination")
     }
 
@@ -110,3 +110,79 @@
         for line in res:
             line[2]['sm_id'] = move.id
         return res
+
+class stock_picking_out(osv.Model):
+    _inherit = "stock.picking.out"
+
+    def show_entry_lines(self, cr, uid, ids, context=None):
+        ids = isinstance(ids, (int,long)) and [ids] or ids
+        context = context or {}
+        res =[]
+        for picking_brw in self.browse(cr, uid, ids, context=context):
+            res += [aml_brw.id for move in picking_brw.move_lines if move.am_id for aml_brw in move.am_id.line_id]
+        return {
+            'domain': "[('id','in',\
+                ["+','.join(map(str, res))+"])]",
+            'name': _('Journal Entries'),
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'account.move.line',
+            'view_id': False,
+            'type': 'ir.actions.act_window'
+        }
+
+    def show_journal_entries(self, cr, uid, ids, context=None):
+        ids = isinstance(ids, (int,long)) and [ids] or ids
+        context = context or {}
+        res =[]
+        for picking_brw in self.browse(cr, uid, ids, context=context):
+            res += [move.am_id.id for move in picking_brw.move_lines]
+        return {
+            'domain': "[('id','in',\
+                ["+','.join(map(str, res))+"])]",
+            'name': _('Journal Entries'),
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'account.move',
+            'view_id': False,
+            'type': 'ir.actions.act_window'
+        }
+
+
+class stock_picking_in(osv.Model):
+    _inherit = "stock.picking.in"
+
+    def show_entry_lines(self, cr, uid, ids, context=None):
+        ids = isinstance(ids, (int,long)) and [ids] or ids
+        context = context or {}
+        res =[]
+        for picking_brw in self.browse(cr, uid, ids, context=context):
+            res += [aml_brw.id for move in picking_brw.move_lines if move.am_id for aml_brw in move.am_id.line_id]
+        return {
+            'domain': "[('id','in',\
+                ["+','.join(map(str, res))+"])]",
+            'name': _('Journal Entries'),
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'account.move.line',
+            'view_id': False,
+            'type': 'ir.actions.act_window'
+        }
+
+    def show_journal_entries(self, cr, uid, ids, context=None):
+        ids = isinstance(ids, (int,long)) and [ids] or ids
+        context = context or {}
+        res =[]
+        for picking_brw in self.browse(cr, uid, ids, context=context):
+            res += [move.am_id.id for move in picking_brw.move_lines]
+        return {
+            'domain': "[('id','in',\
+                ["+','.join(map(str, res))+"])]",
+            'name': _('Journal Entries'),
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'account.move',
+            'view_id': False,
+            'type': 'ir.actions.act_window'
+        }
+

=== modified file 'stock_move_entries/view/stock_move_entries_view.xml'
--- stock_move_entries/view/stock_move_entries_view.xml	2014-05-09 21:51:34 +0000
+++ stock_move_entries/view/stock_move_entries_view.xml	2014-08-22 20:04:28 +0000
@@ -15,11 +15,11 @@
                 </xpath>
         </field>
     </record>
-    
+
 <!--
     Account Move Extension
   -->
-  
+
     <record id="view_stock_move_form_inherit" model="ir.ui.view">
         <field name="name">stock.move.form.inherit</field>
         <field name="model">stock.move</field>
@@ -30,5 +30,37 @@
                 </xpath>
         </field>
     </record>
+
+    <record id="view_stock_move_entries_picking_in_form" model="ir.ui.view">
+        <field name="name">stock.picking.in.entries</field>
+        <field name="model">stock.picking.in</field>
+        <field name="inherit_id" ref="stock.view_picking_in_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//page[@string='Additional Info']" position="inside">
+                <group>
+                    <group>
+                        <button string="Show Journal Entries" name="show_journal_entries" type="object" states="done"/>
+                        <button string="Show Entry Lines" name="show_entry_lines" type="object" states="done"/>
+                    </group>
+                </group>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="view_stock_move_entries_picking_out_form" model="ir.ui.view">
+        <field name="name">stock.picking.out.entries</field>
+        <field name="model">stock.picking.out</field>
+        <field name="inherit_id" ref="stock.view_picking_out_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//page[@string='Additional Info']" position="inside">
+                <group>
+                    <group>
+                        <button string="Show Journal Entries" name="show_journal_entries" type="object" states="done"/>
+                        <button string="Show Entry Lines" name="show_entry_lines" type="object" states="done"/>
+                    </group>
+                </group>
+            </xpath>
+        </field>
+    </record>
   </data>
-</openerp>
\ No newline at end of file
+</openerp>