Merge lp:~vauxoo/addons-vauxoo/7.0-dev-incoterm_delivery_type-kty into lp:addons-vauxoo/7.0

[Katherine Zaoral (Vauxoo)]

Module that adds a new delivery type in incoterm model

[Katherine Zaoral (Vauxoo) (kathy-zaoral)]

I think this module meets the requirements

review: Approve

[Katherine Zaoral (Vauxoo) (kathy-zaoral)]

missing traduction template

review: Needs Fixing

[lp:~vauxoo/addons-vauxoo/7.0-dev-incoterm_delivery_type-kty]

931. By Katherine Zaoral (Vauxoo) on 2013-11-11

[ADD] add the translate template for this module.

[Katherine Zaoral (Vauxoo) (kathy-zaoral)]

Ready. translate template file added.

review: Approve

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

El runbot al parecer todo marca bien

http://agrinosrunbot.openerp.la/agrinos-7-0-agrinos-amx-bioderpac-mp-194749-89/logs/test-all.txt

review: Approve

=== added directory 'incoterm_delivery_type'
=== added file 'incoterm_delivery_type/__init__.py'
--- incoterm_delivery_type/__init__.py	1970-01-01 00:00:00 +0000
+++ incoterm_delivery_type/__init__.py	2013-11-11 21:22:35 +0000
@@ -0,0 +1,26 @@
+#!/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: Katherine Zaoral <[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 'incoterm_delivery_type/__openerp__.py'
--- incoterm_delivery_type/__openerp__.py	1970-01-01 00:00:00 +0000
+++ incoterm_delivery_type/__openerp__.py	2013-11-11 21:22:35 +0000
@@ -0,0 +1,45 @@
+#!/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: Katherine Zaoral <[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': 'Incoterm Delivery Type',
+    'version': '1.0',
+    'author': 'Vauxoo',
+    'website': 'http://www.vauxoo.com/',
+    'category': '',
+    'description': '''
+Incoterm Delivery Type
+======================
+This module add a delivery type boolan field in the incoterms model.
+''',
+    'depends': ['base', 'mail', 'stock'],
+    'data': [
+        'view/incoterm_delivery_type_view.xml',
+    ],
+    'demo': [],
+    'test': [],
+    'active': False,
+    'installable': True,
+}

=== added directory 'incoterm_delivery_type/data'
=== added directory 'incoterm_delivery_type/demo'
=== added directory 'incoterm_delivery_type/doc'
=== added directory 'incoterm_delivery_type/doc/images'
=== added directory 'incoterm_delivery_type/i18n'
=== added file 'incoterm_delivery_type/i18n/incoterm_delivery_type.pot'
--- incoterm_delivery_type/i18n/incoterm_delivery_type.pot	1970-01-01 00:00:00 +0000
+++ incoterm_delivery_type/i18n/incoterm_delivery_type.pot	2013-11-11 21:22:35 +0000
@@ -0,0 +1,32 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* incoterm_delivery_type
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-11-11 21:15+0000\n"
+"PO-Revision-Date: 2013-11-11 21:15+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: incoterm_delivery_type
+#: model:ir.model,name:incoterm_delivery_type.model_stock_incoterms
+msgid "Incoterms"
+msgstr ""
+
+#. module: incoterm_delivery_type
+#: field:stock.incoterms,is_delivery:0
+msgid "This incoterm implies a delivery action"
+msgstr ""
+
+#. module: incoterm_delivery_type
+#: help:stock.incoterms,is_delivery:0
+msgid "This option will be tell in the incoterms would be delivery or will be picked up by the customer"
+msgstr ""
+

=== added directory 'incoterm_delivery_type/model'
=== added file 'incoterm_delivery_type/model/__init__.py'
--- incoterm_delivery_type/model/__init__.py	1970-01-01 00:00:00 +0000
+++ incoterm_delivery_type/model/__init__.py	2013-11-11 21:22:35 +0000
@@ -0,0 +1,26 @@
+#!/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: Katherine Zaoral <[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 incoterm_delivery_type

=== added file 'incoterm_delivery_type/model/incoterm_delivery_type.py'
--- incoterm_delivery_type/model/incoterm_delivery_type.py	1970-01-01 00:00:00 +0000
+++ incoterm_delivery_type/model/incoterm_delivery_type.py	2013-11-11 21:22:35 +0000
@@ -0,0 +1,45 @@
+#!/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: Katherine Zaoral <[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 fields, osv, orm
+from openerp.tools.translate import _
+from openerp import tools
+
+
+class stock_incoterms(osv.Model):
+
+    _inherit = 'stock.incoterms'
+
+    _columns = {
+        'is_delivery': fields.boolean(
+            'This incoterm implies a delivery action',
+            help=('This option will be tell in the incoterms would be delivery'
+                  ' or will be picked up by the customer')),
+    }
+
+    _defaults = {
+        'is_delivery': False,
+    }
+

=== added directory 'incoterm_delivery_type/report'
=== added directory 'incoterm_delivery_type/security'
=== added directory 'incoterm_delivery_type/static'
=== added directory 'incoterm_delivery_type/static/description'
=== added file 'incoterm_delivery_type/static/description/index.html'
=== added directory 'incoterm_delivery_type/static/src'
=== added directory 'incoterm_delivery_type/static/src/css'
=== added directory 'incoterm_delivery_type/static/src/img'
=== added file 'incoterm_delivery_type/static/src/img/icon.png'
Binary files incoterm_delivery_type/static/src/img/icon.png	1970-01-01 00:00:00 +0000 and incoterm_delivery_type/static/src/img/icon.png	2013-11-11 21:22:35 +0000 differ
=== added directory 'incoterm_delivery_type/static/src/js'
=== added directory 'incoterm_delivery_type/static/src/xml'
=== added directory 'incoterm_delivery_type/test'
=== added directory 'incoterm_delivery_type/view'
=== added file 'incoterm_delivery_type/view/incoterm_delivery_type_view.xml'
--- incoterm_delivery_type/view/incoterm_delivery_type_view.xml	1970-01-01 00:00:00 +0000
+++ incoterm_delivery_type/view/incoterm_delivery_type_view.xml	2013-11-11 21:22:35 +0000
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="stock_incoterm_delivery_type_form_view" model="ir.ui.view">
+            <field name="name">stock.incoterm.delivery.type.form.view</field>
+            <field name="model">stock.incoterms</field>
+            <field name="inherit_id" ref="stock.stock_incoterms_form"/>
+            <field name="arch" type="xml">
+
+                <xpath expr="//form//group" position="inside">
+                    <field name="is_delivery"/>
+                </xpath>
+
+            </field>
+        </record>
+
+    </data>
+</openerp>

=== added directory 'incoterm_delivery_type/wizard'
=== added file 'incoterm_delivery_type/wizard/__init__.py'
--- incoterm_delivery_type/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ incoterm_delivery_type/wizard/__init__.py	2013-11-11 21:22:35 +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: Katherine Zaoral <[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 'incoterm_delivery_type/workflow'