diff --git a/product.py b/product.py index ec9afdb..39f7c72 100644 --- a/product.py +++ b/product.py @@ -1,10 +1,10 @@ # This file is part of Tryton. The COPYRIGHT file at the top level of # this repository contains the full copyright notices and license terms. -from decimal import Decimal from trytond.model import fields from trytond.pool import PoolMeta, Pool from trytond.modules.product import price_digits + class Product(metaclass=PoolMeta): __name__ = 'product.product' last_cost = fields.Function(fields.Numeric('Last Cost', digits=price_digits, diff --git a/purchase.fodt b/purchase.fodt new file mode 100644 index 0000000..6c56c7f Binary files /dev/null and b/purchase.fodt differ diff --git a/purchase.py b/purchase.py index f3629f3..4127132 100644 --- a/purchase.py +++ b/purchase.py @@ -8,13 +8,16 @@ from trytond.model import fields, ModelView from trytond.exceptions import UserError from trytond.transaction import Transaction from trytond.report import Report -from trytond.wizard import Wizard, StateView, Button, StateReport, StateTransition +from trytond.wizard import ( + Wizard, StateView, Button, StateReport, StateTransition +) class Configuration(metaclass=PoolMeta): __name__ = 'purchase.configuration' reference_required = fields.Boolean('Reference Required') - all_warehouse = fields.Boolean('All Warehouse', 'See quantity in all warehouse') + all_warehouse = fields.Boolean('All Warehouse', + help='See quantity in all warehouse') class Purchase(metaclass=PoolMeta): @@ -264,7 +267,7 @@ class PurchaseAnalyticReport(Report): 'analytic_accounts.account.name', 'analytic_accounts.account.code', 'taxes', 'invoice_lines.unit_price', 'moves.quantity', 'amount', 'purchase.warehouse.name', 'purchase.number' - + ] lines = PurchaseLine.search_read([ @@ -342,7 +345,7 @@ class PurchasesDetailedReport(Report): ] fields_names_detailed = [ - 'product.rec_name', 'product.type', 'product.categories.name', 'quantity', 'unit_price', + 'product.rec_name', 'product.type', 'product.categories.name', 'quantity', 'unit_price', ] fields = Purchase.fields_get(fields_names=['operation_center']) @@ -367,7 +370,7 @@ class PurchasesDetailedReport(Report): else: fields_add=['invoice_date', 'purchases.description', 'purchases.number'] fields_names.extend(fields_add) - + dom_ = [ ('company', '=', data['company']), ('invoice_date', '>=', data['start_date']), @@ -381,7 +384,7 @@ class PurchasesDetailedReport(Report): if 'operation_center' in fields.keys(): fields_names_detailed.append('purchase.operation_center.name') fields_names.append('operation_center.name') - + if data['detailed']: fields_add = ['purchase.party.name', 'purchase.party.id_number', 'purchase.number', 'purchase.purchase_date'] @@ -405,10 +408,10 @@ class PurchasesDetailedReport(Report): ('purchase_date', 'ASC') ]) - states = { + states = { 'posted': 'contabilizado', - 'paid': 'pagada', - 'draft': 'borrador', + 'paid': 'pagada', + 'draft': 'borrador', 'done': 'finalizado', 'processing': 'procesada', 'quotation': 'cotizacion', diff --git a/purchase.xml b/purchase.xml index 67e8b11..79f1b71 100644 --- a/purchase.xml +++ b/purchase.xml @@ -4,6 +4,22 @@ this repository contains the full copyright notices and license terms. --> + + + + + + Purchase + purchase.purchase + purchase.purchase + purchase_co/purchase.fodt + + + form_print + purchase.purchase,-1 + + + purchase.configuration diff --git a/setup.py b/setup.py index 239ba5f..43add46 100644 --- a/setup.py +++ b/setup.py @@ -62,7 +62,7 @@ if minor_version % 2: setup(name=name, version=version, - description='Module add for see duration of purchase of products on inventory.', + description='Module add to purchase new features for Colombia.', long_description=read('README'), author='Presik Technologies', author_email='gerente@presik.com', @@ -108,4 +108,4 @@ setup(name=name, test_suite='tests', test_loader='trytond.test_loader:Loader', tests_require=tests_require, - ) +) diff --git a/tryton.cfg b/tryton.cfg index 51ab75b..1c4d42f 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=6.0.4 +version=6.0.5 depends: product purchase