Merge lp:~vauxoo/addons-vauxoo/7.0-purchase_requisition_incoterms-dev-2394-kty into lp:~vauxoo/addons-vauxoo/addons-vauxoo-cicsa

[Katherine Zaoral (Vauxoo)]

[MERGE] new module purchase_requisition_incoterms.

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

waiting for runbot

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

runbot is green.
I will proceed with the merge.
Regards

review: Approve

=== added directory 'purchase_requisition_incoterms'
=== added file 'purchase_requisition_incoterms/__init__.py'
--- purchase_requisition_incoterms/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_requisition_incoterms/__init__.py	2014-10-17 19:23:29 +0000
@@ -0,0 +1,28 @@
+#!/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 . import model
+from . import wizard

=== added file 'purchase_requisition_incoterms/__openerp__.py'
--- purchase_requisition_incoterms/__openerp__.py	1970-01-01 00:00:00 +0000
+++ purchase_requisition_incoterms/__openerp__.py	2014-10-17 19:23:29 +0000
@@ -0,0 +1,52 @@
+#!/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': 'Purchase Requisition Incoterms',
+    'version': '1.0',
+    'author': 'Vauxoo',
+    'website': 'http://www.vauxoo.com/',
+    'category': '',
+    'description': '''
+Purchase Requisition Incoterms
+==============================
+
+Add the delivery field to the purchase.requisition model, this to make a
+relationship with the stock.incotermns model.
+''',
+    'depends': [
+        'purchase_requisition',
+        'stock',
+        ],
+    'data': [],
+    'demo': [],
+    'test': [],
+    'qweb': [],
+    'js': [],
+    'css': [],
+    'active': False,
+    'installable': True,
+}

=== added directory 'purchase_requisition_incoterms/data'
=== added directory 'purchase_requisition_incoterms/demo'
=== added directory 'purchase_requisition_incoterms/doc'
=== added directory 'purchase_requisition_incoterms/doc/images'
=== added directory 'purchase_requisition_incoterms/i18n'
=== added directory 'purchase_requisition_incoterms/model'
=== added file 'purchase_requisition_incoterms/model/__init__.py'
--- purchase_requisition_incoterms/model/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_requisition_incoterms/model/__init__.py	2014-10-17 19:23:29 +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: 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 . import purchase_requisition

=== added file 'purchase_requisition_incoterms/model/purchase_requisition.py'
--- purchase_requisition_incoterms/model/purchase_requisition.py	1970-01-01 00:00:00 +0000
+++ purchase_requisition_incoterms/model/purchase_requisition.py	2014-10-17 19:23:29 +0000
@@ -0,0 +1,42 @@
+#!/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
+
+
+class purchase_requisition(osv.Model):
+    """
+    Extend the purchase.requisition  model to add a new field m2o to
+    stock.incoterm model named 'delivery'.
+    """
+
+    _inherit = 'purchase.requisition'
+    _columns = {
+        'delivery': fields.many2one(
+            'stock.incoterms',
+            string='Delivery',
+            help='Delivery'),
+    }

=== added directory 'purchase_requisition_incoterms/report'
=== added directory 'purchase_requisition_incoterms/security'
=== added directory 'purchase_requisition_incoterms/static'
=== added directory 'purchase_requisition_incoterms/static/description'
=== added file 'purchase_requisition_incoterms/static/description/index.html'
=== added directory 'purchase_requisition_incoterms/static/src'
=== added directory 'purchase_requisition_incoterms/static/src/css'
=== added directory 'purchase_requisition_incoterms/static/src/img'
=== added file 'purchase_requisition_incoterms/static/src/img/icon.png'
Binary files purchase_requisition_incoterms/static/src/img/icon.png	1970-01-01 00:00:00 +0000 and purchase_requisition_incoterms/static/src/img/icon.png	2014-10-17 19:23:29 +0000 differ
=== added directory 'purchase_requisition_incoterms/static/src/js'
=== added directory 'purchase_requisition_incoterms/static/src/xml'
=== added directory 'purchase_requisition_incoterms/test'
=== added directory 'purchase_requisition_incoterms/view'
=== added directory 'purchase_requisition_incoterms/wizard'
=== added file 'purchase_requisition_incoterms/wizard/__init__.py'
--- purchase_requisition_incoterms/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_requisition_incoterms/wizard/__init__.py	2014-10-17 19:23:29 +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/>.
+###############################################################################
+

=== added directory 'purchase_requisition_incoterms/workflow'