Compare commits

..

9 Commits

20 changed files with 70 additions and 342 deletions

Binary file not shown.

View File

@@ -1,18 +0,0 @@
# 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 trytond.pool import Pool
from . import sale
__all__ = ['register']
def register():
Pool.register(
sale.Sale,
sale.SaleLine,
sale.SaleLineDeleted,
module='sale_line_delete_log', type_='model')
Pool.register(
module='sale_line_delete_log', type_='wizard')
Pool.register(
module='sale_line_delete_log', type_='report')

View File

@@ -1,2 +0,0 @@
# This file is part of Tryton. The COPYRIGHT file at the top level of
# this repository contains the full copyright notices and license terms.

View File

@@ -1,185 +0,0 @@
=============================
Sale Line Delete Log Scenario
=============================
Imports::
>>> from decimal import Decimal
>>> from proteus import Model, Wizard
>>> from trytond.tests.tools import activate_modules
>>> from trytond.modules.company.tests.tools import create_company, get_company
>>> from trytond.modules.account.tests.tools import (
... create_chart, create_fiscalyear, create_tax, get_accounts)
>>> from trytond.modules.account_invoice.tests.tools import (
... create_payment_term, set_fiscalyear_invoice_sequences)
>>> import datetime as dt
>>> today = dt.date.today()
>>> from trytond.tests.tools import set_user
>>> from trytond.modules.sale_line_delete_log.sale import SaleLineDeleted
Activate modules::
>>> config = activate_modules('sale_line_delete_log')
Initial data::
>>> User = Model.get('res.user')
>>> Party = Model.get('party.party')
>>> Employee = Model.get('company.employee')
>>> Journal = Model.get('account.journal')
>>> PaymentMethod = Model.get('account.invoice.payment.method')
>>> Party = Model.get('party.party')
>>> ProductUom = Model.get('product.uom')
>>> ProductTemplate = Model.get('product.template')
>>> Sale = Model.get('sale.sale')
>>> SaleLine = Model.get('sale.line')
Create company::
>>> _ = create_company()
>>> company = get_company()
Set employee::
>>> employee_party = Party(name="Employee")
>>> employee_party.save()
>>> employee = Employee(party=employee_party)
>>> employee.save()
>>> user = User(config.user)
>>> user.employees.append(employee)
>>> user.employee = employee
>>> user.save()
>>> set_user(user.id)
Create fiscal year::
>>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear(company, today))
>>> fiscalyear.click('create_period')
Create chart of accounts::
>>> _ = create_chart(company)
>>> accounts = get_accounts(company)
>>> revenue = accounts['revenue']
>>> expense = accounts['expense']
>>> cash = accounts['cash']
>>> cash_journal, = Journal.find([('type', '=', 'cash')])
>>> cash_journal.save()
>>> payment_method = PaymentMethod()
>>> payment_method.name = 'Cash'
>>> payment_method.journal = cash_journal
>>> payment_method.credit_account = cash
>>> payment_method.debit_account = cash
>>> payment_method.save()
Create tax::
>>> tax = create_tax(Decimal('.10'))
>>> tax.save()
Create parties::
>>> supplier = Party(name='Supplier')
>>> supplier.save()
>>> customer = Party(name='Customer')
>>> customer.save()
Create account categories::
>>> ProductCategory = Model.get('product.category')
>>> account_category = ProductCategory(name="Account Category")
>>> account_category.accounting = True
>>> account_category.account_expense = expense
>>> account_category.account_revenue = revenue
>>> account_category.save()
>>> account_category_tax, = account_category.duplicate()
>>> account_category_tax.customer_taxes.append(tax)
>>> account_category_tax.save()
Create product::
>>> unit, = ProductUom.find([('name', '=', 'Unit')])
>>> template = ProductTemplate()
>>> template.name = 'product'
>>> template.default_uom = unit
>>> template.type = 'goods'
>>> template.salable = True
>>> template.list_price = Decimal('10')
>>> template.account_category = account_category_tax
>>> template.save()
>>> product, = template.products
>>> template = ProductTemplate()
>>> template.name = 'service'
>>> template.default_uom = unit
>>> template.type = 'service'
>>> template.salable = True
>>> template.list_price = Decimal('30')
>>> template.account_category = account_category
>>> template.save()
>>> service, = template.products
Create payment term::
>>> payment_term = create_payment_term()
>>> payment_term.save()
Create an Inventory::
>>> Inventory = Model.get('stock.inventory')
>>> Location = Model.get('stock.location')
>>> storage, = Location.find([
... ('code', '=', 'STO'),
... ])
>>> inventory = Inventory()
>>> inventory.location = storage
>>> inventory_line = inventory.lines.new(product=product)
>>> inventory_line.quantity = 100.0
>>> inventory_line.expected_quantity = 0.0
>>> inventory.click('confirm')
>>> inventory.state
'done'
Sale 5 products::
>>> sale = Sale()
>>> sale.party = customer
>>> sale.payment_term = payment_term
>>> sale.invoice_method = 'order'
>>> sale_line = SaleLine()
>>> sale.lines.append(sale_line)
>>> sale_line.product = product
>>> sale_line.quantity = 2.0
>>> sale_line = SaleLine()
>>> sale.lines.append(sale_line)
>>> sale_line.type = 'comment'
>>> sale_line.description = 'Comment'
>>> sale_line = SaleLine()
>>> sale.lines.append(sale_line)
>>> sale_line.product = product
>>> sale_line.quantity = 3.0
>>> sale.save()
>>> len(sale.lines)
3
>>> sale.untaxed_amount, sale.tax_amount, sale.total_amount
(Decimal('50.00'), Decimal('5.00'), Decimal('55.00'))
Delete a sale line::
>>> sale.lines[0].delete()
>>> sale.save()
>>> len(sale.lines)
2
>>> sale.reload()
>>> sale.delete_lines[0]
proteus.Model.get('sale.line_deleted')(1)
>>> assert isinstance(sale.delete_lines[0], Model.get('sale.line_deleted')), "it's not instance SaleLineDeleted"

View File

@@ -1,11 +0,0 @@
# 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 trytond.tests.test_tryton import ModuleTestCase
class SaleLineDeleteLogTestCase(ModuleTestCase):
"Test Sale Line Delete Log module"
module = 'sale_line_delete_log'
del ModuleTestCase

View File

@@ -1,8 +0,0 @@
# 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 trytond.tests.test_tryton import load_doc_tests
def load_tests(*args, **kwargs):
return load_doc_tests(__name__, __file__, *args, **kwargs)

35
locale/es.po Normal file
View File

@@ -0,0 +1,35 @@
#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:sale.sale,delete_lines:"
msgid "Delete lines"
msgstr "Lineas Eliminadas"
msgctxt "field:sale.line_deleted,user:"
msgid "User"
msgstr "Usuario"
msgctxt "field:sale.line_deleted,sale:"
msgid "Sale"
msgstr "Venta"
msgctxt "field:sale.line_deleted,product:"
msgid "Product"
msgstr "Producto"
msgctxt "field:sale.line_deleted,unit:"
msgid "Unit"
msgstr "Unidad"
msgctxt "field:sale.line_deleted,quantity:"
msgid "Quantity"
msgstr "Cantidad"
msgctxt "field:sale.line_deleted,sale_date:"
msgid "Sale Date"
msgstr "Fecha Venta"
msgctxt "model:ir.ui.menu,name:menu_sale_line_deleted_form"
msgid "Sale Line Deleted"
msgstr "Linea de Venta Eliminadas"

60
sale.py
View File

@@ -7,32 +7,28 @@ class Sale(metaclass=PoolMeta):
__name__ = 'sale.sale'
delete_lines = fields.One2Many(
'sale.line_deleted',
'sale',
"Delete lines",
'sale.line_deleted', 'sale', "Delete lines",
states={
'readonly': True
}
)
})
class SaleLine(metaclass=PoolMeta):
__name__ = 'sale.line'
@classmethod
def delete(cls, lines):
def _create_sale_line_deleted_log(cls, line):
pool = Pool()
SaleLineDeleted = pool.get('sale.line_deleted')
for line in lines:
SaleLineDeleted.create([{
'sale': line.sale,
'quantity': line.quantity,
'unit': line.unit,
'product': line.product,
'user': Transaction().user
}])
super(SaleLine, cls).delete(lines)
SaleLineDeleted.create([{
'sale': line.sale,
'sale_date': line.sale_date,
'quantity': line.quantity,
'unit': line.unit,
'product': line.product,
'user': Transaction().user
}])
class SaleLineDeleted(ModelSQL, ModelView):
@@ -40,26 +36,22 @@ class SaleLineDeleted(ModelSQL, ModelView):
__name__ = 'sale.line_deleted'
_state = states = {
'readonly': True
}
sale = fields.Many2One(
'sale.sale', "Sale", ondelete='CASCADE', required=True
)
'sale.sale', "Sale", ondelete='CASCADE', required=True, states=_state)
quantity = fields.Float(
"Quantity", digits='unit',
# states={
# 'invisible': Eval('type') != 'line',
# 'required': Eval('type') == 'line',
# 'readonly': Eval('sale_state') != 'draft',
# }
"Quantity", digits='unit', states=_state)
unit = fields.Many2One(
'product.uom', 'Unit', ondelete='RESTRICT', states=_state)
product = fields.Many2One(
'product.product', 'Product',
ondelete='RESTRICT', states=_state)
sale_date = fields.Date(
'Sale Date',
states=_state
)
unit = fields.Many2One('product.uom', 'Unit', ondelete='RESTRICT',)
product = fields.Many2One('product.product', 'Product',
ondelete='RESTRICT',
)
sale_date = fields.Date('Sale Date',)
user = fields.Many2One(
'res.user',
'User'
)
'res.user', 'User', states=_state)

View File

@@ -38,7 +38,11 @@
parent="sale.menu_sale"
action="act_sale_line_deleted_form"
sequence="10"
id="menu_sale_form"/>
id="menu_sale_line_deleted_form"/>
<record model="ir.ui.menu-res.group" id="menu_sale_group_sale">
<field name="menu" ref="menu_sale_line_deleted_form"/>
<field name="group" ref="sale.group_sale_admin"/>
</record>
</data>
</tryton>

View File

@@ -20,7 +20,7 @@ Imports::
Activate modules::
>>> config = activate_modules('sale_line_delete_log')
>>> config = activate_modules('sale_line_delete_log')
Initial data::
@@ -175,11 +175,4 @@ Delete a sale line::
>>> sale.save()
>>> len(sale.lines)
2
>>> sale.reload()
>>> sale.delete_lines[0]
proteus.Model.get('sale.line_deleted')(1)
>>> assert isinstance(sale.delete_lines[0], Model.get('sale.line_deleted')), "it's not instance SaleLineDeleted"

View File

@@ -1,5 +1,5 @@
[tryton]
version=6.8.0
version=7.6.0
depends:
ir
account

View File

@@ -1,59 +0,0 @@
Metadata-Version: 2.1
Name: trytondo-sale-line-delete-log
Version: 6.8.0
Home-page: http://www.tryton.org/
Download-URL: http://downloads.tryton.org/6.8/
Author: Tryton
Author-email: foundation@tryton.org
License: GPL-3
Project-URL: Bug Tracker, https://bugs.tryton.org/
Project-URL: Documentation, https://docs.tryton.org/latest/modules-sale-line-delete-log
Project-URL: Forum, https://www.tryton.org/forum
Project-URL: Source Code, https://code.tryton.org/tryton
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Chinese (Simplified)
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: Finnish
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Hungarian
Classifier: Natural Language :: Indonesian
Classifier: Natural Language :: Italian
Classifier: Natural Language :: Persian
Classifier: Natural Language :: Polish
Classifier: Natural Language :: Portuguese (Brazilian)
Classifier: Natural Language :: Romanian
Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Natural Language :: Turkish
Classifier: Natural Language :: Ukrainian
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 3
Classifier: Programming Language :: Python :: 3.8
Classifier: Programming Language :: Python :: 3.9
Classifier: Programming Language :: Python :: 3.10
Classifier: Programming Language :: Python :: 3.11
Classifier: Programming Language :: Python :: 3.12
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Topic :: Office/Business
Requires-Python: >=3.8
Provides-Extra: test
License-File: LICENSE
###########################
Sale Line Delete Log Module
###########################
.. to remove, see https://www.tryton.org/develop/guidelines/documentation#index.rst

View File

@@ -1,2 +0,0 @@
[trytond.modules]
sale_line_delete_log = trytond.modules.sale_line_delete_log

View File

@@ -1,7 +0,0 @@
trytond_account<6.9,>=6.8
trytond_company<6.9,>=6.8
trytond_sale<6.9,>=6.8
trytond<6.9,>=6.8
[test]
proteus<6.9,>=6.8

View File

@@ -1 +0,0 @@
trytond