Skip to content

IMP migrate to 8.0 #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 23, 2015
Merged

IMP migrate to 8.0 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f1d767
IMP migrate to 8.0
Sep 23, 2015
170efc2
MERGE
Sep 23, 2015
15115cf
FIX data folder
Sep 23, 2015
f172162
FIX
Sep 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 13 additions & 33 deletions logistic/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,16 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# Logistic
# Copyright (C) 2014 No author.
# No email
#
# 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/>.
#
# For copyright and license notices, see __openerp__.py file in module root
# directory
##############################################################################


import product
import waybill_expense
import waybill
import travel
import requirement
import waybill_driver_payment
import location
import vehicle
import partner
import wizard
import report

# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
from . import waybill
from . import wizard
from . import travel
from . import vehicle
from . import location
from . import product
from . import requirement
from . import res_partner
from . import waybill_expense
from . import waybill_driver_payment
from . import account_invoice
106 changes: 55 additions & 51 deletions logistic/__openerp__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# Logistic
# Copyright (C) 2014 No author.
# No email
# Copyright (C) 2015 ADHOC SA (http://www.adhoc.com.ar)
# 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
Expand All @@ -21,56 +20,61 @@
##############################################################################


{ 'active': False,
'author': 'No author.',
'category': u'base.module_category_knowledge_management',
'demo_xml': [],
'depends': [ u'purchase',
u'account',
u'product',
u'sale',
u'fleet',
u'mail'],
'description': u'Logistic',
'init_xml': [],
{'active': False,
'author': 'ADHOC.',
'category': 'base.module_category_knowledge_management',
'demo': [
'data/demo/res.partner.csv',
'data/demo/logistic.location.csv',
'data/demo/product.product.csv',
'data/demo/fleet.vehicle.csv',
'data/demo/logistic.waybill.csv',
'data/demo/logistic.travel.csv',
# 'data/demo/product.supplierinfo.csv',
'data/demo/documents/logistic.requirement.csv',
'data/demo/maintenances/logistic.requirement.csv',
'data/demo/logistic.requirement.xml',
],
'depends': ['purchase',
'account',
'product',
'sale',
'fleet',
'mail'],
'description': """
Logistic
""",
'installable': True,
'license': 'AGPL-3',
'name': u'Logistic',
'name': 'Logistic',
'test': [],
'update_xml': [ u'security/logistic_group.xml',
u'view/product_view.xml',
u'view/waybill_expense_view.xml',
u'view/waybill_view.xml',
u'view/travel_view.xml',
u'view/requirement_view.xml',
u'view/waybill_driver_payment_view.xml',
u'view/location_view.xml',
u'view/vehicle_view.xml',
u'view/partner_view.xml',
u'view/logistic_menuitem.xml',
u'data/product_properties.xml',
u'data/waybill_expense_properties.xml',
u'data/waybill_properties.xml',
u'data/travel_properties.xml',
u'data/requirement_properties.xml',
u'data/waybill_driver_payment_properties.xml',
u'data/location_properties.xml',
u'data/vehicle_properties.xml',
u'data/partner_properties.xml',
u'data/product_track.xml',
u'data/waybill_expense_track.xml',
u'data/waybill_track.xml',
u'data/travel_track.xml',
u'data/requirement_track.xml',
u'data/waybill_driver_payment_track.xml',
u'data/location_track.xml',
u'data/vehicle_track.xml',
u'data/partner_track.xml',
u'workflow/waybill_workflow.xml',
u'workflow/requirement_workflow.xml',
u'workflow/waybill_driver_payment_workflow.xml',
'security/ir.model.access.csv'],
'version': 'No version',
'website': ''}
'data': [
# 'wizard/travel_sale_order.xml',
'security/logistic_group.xml',
'wizard/travel_make_invoice.xml',
'wizard/expense_make_invoice.xml',
'view/partner_view.xml',
'view/waybill_view.xml',
'view/product_view.xml',
'view/travel_view.xml',
'view/waybill_expense_view.xml',
'view/fleet_view.xml',
'view/requirement_view.xml',
'view/purchase_order.xml',
'view/waybill_driver_payment_view.xml',
'view/location_view.xml',
'view/logistic_menuitem.xml',
'data/waybill_sequence.xml',
'data/cron.xml',
'workflow/waybill_workflow.xml',
'workflow/requirement_workflow.xml',
'workflow/waybill_driver_payment_workflow.xml',
'security/ir.model.access.csv',
],
'version': '8.0.0.1.1',
'css': [
'static/src/css/logistic.css',
],
'website': 'www.adhoc.com.ar'}

# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
0 logistic_x/account_invoice.py → logistic/account_invoice.py
View file
Open in desktop
File renamed without changes.
Empty file removed logistic/data/README
View file
Open in desktop
Empty file.
0 logistic_x/data/cron.xml → logistic/data/cron.xml
View file
Open in desktop
File renamed without changes.
0 ...a/demo/documents/logistic.requirement.csv → ...a/demo/documents/logistic.requirement.csv
View file
Open in desktop
File renamed without changes.
0 logistic_x/data/demo/fleet.vehicle.csv → logistic/data/demo/fleet.vehicle.csv
View file
Open in desktop
File renamed without changes.
0 logistic_x/data/demo/logistic.location.csv → logistic/data/demo/logistic.location.csv
View file
Open in desktop
File renamed without changes.
72 changes: 36 additions & 36 deletions ...stic_x/data/demo/logistic.requirement.xml → logistic/data/demo/logistic.requirement.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,43 +3,43 @@
<data noupdate="1">

<!-- Confirm requirements-->
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic_x.logistic_requirement_01"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic_x.logistic_requirement_02"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic_x.logistic_requirement_03"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic_x.logistic_requirement_04"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic_x.logistic_requirement_05"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic_x.logistic_requirement_06"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic_x.logistic_requirement_07"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic_x.logistic_requirement_08"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic_x.logistic_requirement_09"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic_x.logistic_requirement_10"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic_x.logistic_requirement_11"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic_x.logistic_requirement_12"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic_x.logistic_requirement_13"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic_x.logistic_requirement_14"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic_x.logistic_requirement_15"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic_x.logistic_requirement_16"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic_x.logistic_requirement_17"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic_x.logistic_requirement_18"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic_x.logistic_requirement_19"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic_x.logistic_requirement_20"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic.logistic_requirement_01"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic.logistic_requirement_02"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic.logistic_requirement_03"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic.logistic_requirement_04"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic.logistic_requirement_05"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic.logistic_requirement_06"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic.logistic_requirement_07"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic.logistic_requirement_08"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic.logistic_requirement_09"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic.logistic_requirement_10"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic.logistic_requirement_11"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic.logistic_requirement_12"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic.logistic_requirement_13"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic.logistic_requirement_14"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic.logistic_requirement_15"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic.logistic_requirement_16"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic.logistic_requirement_17"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic.logistic_requirement_18"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic.logistic_requirement_19"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic.logistic_requirement_20"/>

<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic_x.logistic_requirement_main_01"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic_x.logistic_requirement_main_02"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic_x.logistic_requirement_main_03"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic_x.logistic_requirement_main_04"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic_x.logistic_requirement_main_05"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic_x.logistic_requirement_main_06"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic_x.logistic_requirement_main_07"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic_x.logistic_requirement_main_08"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic_x.logistic_requirement_main_09"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic_x.logistic_requirement_main_10"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic_x.logistic_requirement_main_11"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic_x.logistic_requirement_main_12"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic_x.logistic_requirement_main_13"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic_x.logistic_requirement_main_14"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic_x.logistic_requirement_main_15"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic_x.logistic_requirement_main_16"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic.logistic_requirement_main_01"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic.logistic_requirement_main_02"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic.logistic_requirement_main_03"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic.logistic_requirement_main_04"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic.logistic_requirement_main_05"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic.logistic_requirement_main_06"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic.logistic_requirement_main_07"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic.logistic_requirement_main_08"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic.logistic_requirement_main_09"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic.logistic_requirement_main_10"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic.logistic_requirement_main_11"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic.logistic_requirement_main_12"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic.logistic_requirement_main_13"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic.logistic_requirement_main_14"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic.logistic_requirement_main_15"/>
<workflow action="sgn_set_ok" model="logistic.requirement" ref="logistic.logistic_requirement_main_16"/>

</data>
</openerp>
0 logistic_x/data/demo/logistic.travel.csv → logistic/data/demo/logistic.travel.csv
View file
Open in desktop
File renamed without changes.
0 logistic_x/data/demo/logistic.waybill.csv → logistic/data/demo/logistic.waybill.csv
View file
Open in desktop
File renamed without changes.
0 ...emo/maintenances/logistic.requirement.csv → ...emo/maintenances/logistic.requirement.csv
View file
Open in desktop
File renamed without changes.
0 logistic_x/data/demo/product.product.csv → logistic/data/demo/product.product.csv
View file
Open in desktop
File renamed without changes.
0 ...stic_x/data/demo/product.supplierinfo.csv → logistic/data/demo/product.supplierinfo.csv
View file
Open in desktop
File renamed without changes.
0 logistic_x/data/demo/res.partner.csv → logistic/data/demo/res.partner.csv
View file
Open in desktop
File renamed without changes.
10 changes: 0 additions & 10 deletions logistic/data/location_properties.xml
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions logistic/data/location_track.xml
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions logistic/data/partner_properties.xml
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions logistic/data/partner_track.xml
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions logistic/data/product_properties.xml
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions logistic/data/product_track.xml
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions logistic/data/requirement_properties.xml
View file
Open in desktop

This file was deleted.

Loading