From e1b79001d2ec8381868f5160d62073d5785ff91d Mon Sep 17 00:00:00 2001 From: Leonardo Donelli Date: Wed, 5 Aug 2015 12:01:50 +0200 Subject: [PATCH] Follow OCA guidelines for module structure https://github.com/OCA/maintainer-tools/blob/master/CONTRIBUTING.md --- crm_claim_rma/__init__.py | 6 +-- crm_claim_rma/__openerp__.py | 39 ++++++++++--------- .../crm_claim_rma.xml} | 0 crm_claim_rma/models/__init__.py | 3 ++ crm_claim_rma/{ => models}/account_invoice.py | 0 crm_claim_rma/{ => models}/crm_claim_rma.py | 0 crm_claim_rma/{ => models}/stock.py | 0 .../account_invoice.xml} | 0 .../crm_claim_rma.xml} | 0 .../res_partner.xml} | 0 crm_claim_rma/{wizard => wizards}/__init__.py | 0 .../account_invoice_refund.py | 0 .../{wizard => wizards}/claim_make_picking.py | 0 .../claim_make_picking.xml} | 0 14 files changed, 26 insertions(+), 22 deletions(-) rename crm_claim_rma/{crm_claim_rma_data.xml => data/crm_claim_rma.xml} (100%) create mode 100644 crm_claim_rma/models/__init__.py rename crm_claim_rma/{ => models}/account_invoice.py (100%) rename crm_claim_rma/{ => models}/crm_claim_rma.py (100%) rename crm_claim_rma/{ => models}/stock.py (100%) rename crm_claim_rma/{account_invoice_view.xml => views/account_invoice.xml} (100%) rename crm_claim_rma/{crm_claim_rma_view.xml => views/crm_claim_rma.xml} (100%) rename crm_claim_rma/{res_partner_view.xml => views/res_partner.xml} (100%) rename crm_claim_rma/{wizard => wizards}/__init__.py (100%) rename crm_claim_rma/{wizard => wizards}/account_invoice_refund.py (100%) rename crm_claim_rma/{wizard => wizards}/claim_make_picking.py (100%) rename crm_claim_rma/{wizard/claim_make_picking_view.xml => wizards/claim_make_picking.xml} (100%) diff --git a/crm_claim_rma/__init__.py b/crm_claim_rma/__init__.py index 258c6d7c..0c21c9f9 100644 --- a/crm_claim_rma/__init__.py +++ b/crm_claim_rma/__init__.py @@ -22,7 +22,5 @@ # ############################################################################## -from . import wizard -from . import crm_claim_rma -from . import account_invoice -from . import stock +from . import models +from . import wizards diff --git a/crm_claim_rma/__openerp__.py b/crm_claim_rma/__openerp__.py index 1c8a63be..4f922f03 100644 --- a/crm_claim_rma/__openerp__.py +++ b/crm_claim_rma/__openerp__.py @@ -76,25 +76,28 @@ Contributors: 'website': 'http://www.akretion.com, http://www.camptocamp.com, ' 'http://www.eezee-it.com', 'license': 'AGPL-3', - 'depends': ['sale', - 'stock', - 'crm_claim', - 'crm_claim_code', - 'product_warranty', - ], - 'data': ['wizard/claim_make_picking_view.xml', - 'crm_claim_rma_view.xml', - 'security/ir.model.access.csv', - 'account_invoice_view.xml', - 'res_partner_view.xml', - 'crm_claim_rma_data.xml', - ], + 'depends': [ + 'sale', + 'stock', + 'crm_claim', + 'crm_claim_code', + 'product_warranty', + ], + 'data': [ + 'wizards/claim_make_picking.xml', + 'views/crm_claim_rma.xml', + 'views/account_invoice.xml', + 'views/res_partner.xml', + 'data/crm_claim_rma.xml', + 'security/ir.model.access.csv', + ], 'test': ['test/test_invoice_refund.yml'], - 'images': ['images/product_return.png', - 'images/claim.png', - 'images/return_line.png', - 'images/exchange.png', - ], + 'images': [ + 'images/product_return.png', + 'images/claim.png', + 'images/return_line.png', + 'images/exchange.png', + ], 'installable': True, 'auto_install': False, } diff --git a/crm_claim_rma/crm_claim_rma_data.xml b/crm_claim_rma/data/crm_claim_rma.xml similarity index 100% rename from crm_claim_rma/crm_claim_rma_data.xml rename to crm_claim_rma/data/crm_claim_rma.xml diff --git a/crm_claim_rma/models/__init__.py b/crm_claim_rma/models/__init__.py new file mode 100644 index 00000000..e65150a8 --- /dev/null +++ b/crm_claim_rma/models/__init__.py @@ -0,0 +1,3 @@ +from . import crm_claim_rma +from . import account_invoice +from . import stock diff --git a/crm_claim_rma/account_invoice.py b/crm_claim_rma/models/account_invoice.py similarity index 100% rename from crm_claim_rma/account_invoice.py rename to crm_claim_rma/models/account_invoice.py diff --git a/crm_claim_rma/crm_claim_rma.py b/crm_claim_rma/models/crm_claim_rma.py similarity index 100% rename from crm_claim_rma/crm_claim_rma.py rename to crm_claim_rma/models/crm_claim_rma.py diff --git a/crm_claim_rma/stock.py b/crm_claim_rma/models/stock.py similarity index 100% rename from crm_claim_rma/stock.py rename to crm_claim_rma/models/stock.py diff --git a/crm_claim_rma/account_invoice_view.xml b/crm_claim_rma/views/account_invoice.xml similarity index 100% rename from crm_claim_rma/account_invoice_view.xml rename to crm_claim_rma/views/account_invoice.xml diff --git a/crm_claim_rma/crm_claim_rma_view.xml b/crm_claim_rma/views/crm_claim_rma.xml similarity index 100% rename from crm_claim_rma/crm_claim_rma_view.xml rename to crm_claim_rma/views/crm_claim_rma.xml diff --git a/crm_claim_rma/res_partner_view.xml b/crm_claim_rma/views/res_partner.xml similarity index 100% rename from crm_claim_rma/res_partner_view.xml rename to crm_claim_rma/views/res_partner.xml diff --git a/crm_claim_rma/wizard/__init__.py b/crm_claim_rma/wizards/__init__.py similarity index 100% rename from crm_claim_rma/wizard/__init__.py rename to crm_claim_rma/wizards/__init__.py diff --git a/crm_claim_rma/wizard/account_invoice_refund.py b/crm_claim_rma/wizards/account_invoice_refund.py similarity index 100% rename from crm_claim_rma/wizard/account_invoice_refund.py rename to crm_claim_rma/wizards/account_invoice_refund.py diff --git a/crm_claim_rma/wizard/claim_make_picking.py b/crm_claim_rma/wizards/claim_make_picking.py similarity index 100% rename from crm_claim_rma/wizard/claim_make_picking.py rename to crm_claim_rma/wizards/claim_make_picking.py diff --git a/crm_claim_rma/wizard/claim_make_picking_view.xml b/crm_claim_rma/wizards/claim_make_picking.xml similarity index 100% rename from crm_claim_rma/wizard/claim_make_picking_view.xml rename to crm_claim_rma/wizards/claim_make_picking.xml