Fix: Se agrega sale_date

Merge branch 'main' of ssh://gitea.onecluster.org:6666/OneTeam/trytondo-sale_line_delete_log
Fix: Deleted Lines
2024-08-28 15:48:10 -05:00 · 2024-08-28 15:30:30 -05:00 · 2024-08-28 15:30:11 -05:00 · 2024-08-22 10:26:47 -05:00 · 2024-08-15 20:06:15 -05:00 · 2024-08-15 20:04:39 -05:00
7 changed files with 287 additions and 257 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,229 +1,218 @@
-# ---> Python
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-*.bk
-
-/.vscode
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-bin/
-include/
-wheels/
-__pycache__
-trytond_miac.egg-info/
-pip-wheel-metadata/
-share/python-wheels/
-*.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
-
-# PyInstaller
-#  Usually these files are written by a python script fkrom a template
+!*.svg  # comment out if you don't need vector files
+!.vscode/*.code-snippets
+!.vscode/extensions.json
+!.vscode/launch.json
+!.vscode/settings.json
+!.vscode/tasks.json
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   For a library or package, you might want to ignore these files since the code is
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   https://pdm.fming.dev/#use-with-ide
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#   in version control.
+#   install all needed dependencies.
+#   intended to run in multiple environments; otherwise, check them in:
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  Usually these files are written by a python script from a template
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+# -*- mode: gitignore; -*-
+# ---> Emacs
+# ---> Java
+# ---> Python
+# ---> Vim
+# ---> VisualStudioCode
+# .python-version
+# AUCTeX auto folder
+# Auto-generated tag files
+# BlueJ files
+# Built Visual Studio Code Extensions
+# Byte-compiled / optimized / DLL files
+# C extensions
+# Celery stuff
+# Compiled class file
+# Cython debug symbols
+# Distribution / packaging
+# Django stuff:
+# Environments
+# Flask stuff:
+# Flycheck
+IPython
 # Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
+# Jupyter Notebook
+# Local History for Visual Studio Code
+# Log file
+# Mobile Tools for Java (J2ME)
+# Org-mode
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+# Package Files #
+# Persistent undo
+# PyBuilder
+# PyCharm
+# PyInstaller
+# Pyre type checker
+# Rope project settings
+# SageMath parsed files
+# Scrapy stuff:
+# Session
+# Sphinx documentation
+# Spyder project settings
+# Swap
+# Temporary
+# Translations
 # Unit test / coverage reports
-htmlcov/
-.tox/
-.nox/
+# cask packages
+# directory configuration
+# elpa packages
+# eshell files
+# flymake-mode
+# mkdocs documentation
+# mypy
+# network security
+# pdm
+# pipenv
+# poetry
+# projectiles files
+pyenv
+# pytype static type analyzer
+# reftex files
+# server auth directory
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+#.idea/
+#Pipfile.lock
+#pdm.lock
+#poetry.lock
+*$py.class
+*.class
+*.cover
+*.ctxt
+*.db
+*.ear
+*.egg
+*.egg-info/
+*.elc
+*.jar
+*.log
+*.manifest
+*.mo
+*.nar
+*.pot
+*.py,cover
+*.py[cod]
+*.rar
+*.rel
+*.sage.py
+*.so
+*.spec
+*.tar.gz
+*.vsix
+*.war
+*.zip
+*_archive
+*_flymake.*
+*~
+.Python
+.\#*
+.cache
+.cask/
 .coverage
 .coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-*.py,cover
-.hypothesis/
-.pytest_cache/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-db.sqlite3
-db.sqlite3-journal
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-target/
-
-# Jupyter Notebook
-.ipynb_checkpoints
-
-# IPython
-profile_default/
-ipython_config.py
-
-# pyenv
-.python-version
-
-# pipenv
-#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
-#   However, in case of collaboration, if having platform-specific dependencies or dependencies
-#   having no cross-platform support, pipenv may install dependencies that don't work, or not
-#   install all needed dependencies.
-#Pipfile.lock
-
-# PEP 582; used by e.g. github.com/David-OConnor/pyflow
-__pypackages__/
-
-# Celery stuff
-celerybeat-schedule
-celerybeat.pid
-
-# SageMath parsed files
-*.sage.py
-
-# Environments
+.dir-locals.el
+.dmypy.json
+.eggs/
 .env
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
-# Spyder project settings
+.history/
+.hypothesis/
+.installed.cfg
+.ipynb_checkpoints
+.mtj.tmp/
+.mypy_cache/
+.netrwhist
+.nox/
+.org-id-locations
+.pdm.toml
+.projectile
+.pybuilder/
+.pyre/
+.pytest_cache/
+.pytype/
+.ropeproject
+.scrapy
 .spyderproject
 .spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/
-.dmypy.json
-dmypy.json
-
-# Pyre type checker
-.pyre/
-
-# ---> Emacs
-# -*- mode: gitignore; -*-
-*~
-.~*
-*#
-\#*\#
+.tox/
+.venv
+.venv/
+.vscode/*
+.web
+.webassets-cache
 /.emacs.desktop
 /.emacs.desktop.lock
-*.elc
-auto-save-list
-tramp
-.\#*
-
-# Org-mode
-.org-id-locations
-*_archive
-
-# flymake-mode
-*_flymake.*
-
-# eshell files
+/auto/
+/elpa/
 /eshell/history
 /eshell/lastdir
-
-# elpa packages
-/elpa/
-
-# reftex files
-*.rel
-
-# AUCTeX auto folder
-/auto/
-
-# cask packages
-.cask/
-dist/
-
-# Flycheck
-flycheck_*.el
-
-# server auth directory
-/server/
-
-# projectiles files
-.projectile
-
-# directory configuration
-.dir-locals.el
-
-# network security
 /network-security.data
-
-
-# ---> Vim
-# Swap
+/server/
+/site
+ENV/
+MANIFEST
+Session.vim
+Sessionx.vim
 [._]*.s[a-v][a-z]
-!*.svg  # comment out if you don't need vector files
 [._]*.sw[a-p]
+[._]*.un~
 [._]s[a-rt-v][a-z]
 [._]ss[a-gi-z]
 [._]sw[a-p]
-
-# Session
-Session.vim
-Sessionx.vim
-
-# Temporary
-.netrwhist
-*~
-# Auto-generated tag files
+\#*\#
+__pycache__/
+__pypackages__/
+auto-save-list
+build/
+celerybeat-schedule
+celerybeat.pid
+cover/
+coverage.xml
+cython_debug/
+db.sqlite3
+db.sqlite3-journal
+develop-eggs/
+dist/
+dmypy.json
+docs/_build/
+downloads/
+eggs/
+env.bak/
+env/
+flycheck_*.el
+hs_err_pid*
+htmlcov/
+instance/
+ipython_config.py
+lib/
+lib64/
+local_settings.py
+nosetests.xml
+parts/
+pip-delete-this-directory.txt
+pip-log.txt
+profile_default/
+replay_pid*
+sdist/
+share/python-wheels/
 tags
-# Persistent undo
-[._]*.un~
-
-# ---> VirtualEnv
-# Virtualenv
-# http://iamzed.com/2009/05/07/a-primer-on-virtualenv/
-.Python
-[Bb]in
-[Ii]nclude
-[Ll]ib
-[Ll]ib64
-[Ll]ocal
-[Ss]cripts
-pyvenv.cfg
-.venv
-pip-selfcheck.json
-
-.tdd_cache
-app
+target/
+tramp
+var/
+venv.bak/
+wheels/

--- a/locale/es.po
+++ b/locale/es.po
@@ -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"
--- a/sale.py
+++ b/sale.py
@@ -1,6 +1,5 @@
 from trytond.pool import PoolMeta, Pool
 from trytond.model import fields, ModelSQL, ModelView
-from trytond.pyson import Eval
 from trytond.transaction import Transaction


@@ -8,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': Eval('state') != 'draft'
-        }
-    )
+            '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):
@@ -41,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)
--- a/sale.xml
+++ b/sale.xml
@@ -1,5 +1,11 @@
 <tryton>
-   <data>
+    <data>
+      <record model="ir.ui.view" id="sale_view_form">
+          <field name="model">sale.sale</field>
+          <field name="inherit" ref="sale.sale_view_form"/>
+          <field name="name">sale_form</field>
+      </record>
+
      <record model="ir.ui.view" id="sale_line_deleted_view_form">
         <field name="model">sale.line_deleted</field>
         <field name="type">form</field>
@@ -32,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>
-
--- a/tests/scenario_sale_line_delete_log.rst
+++ b/tests/scenario_sale_line_delete_log.rst
@@ -20,7 +20,7 @@ Imports::

 Activate modules::

-    >>> config = activate_modules('sale_line_delete_log')
+  >>> config = activate_modules('sale_line_delete_log')

 Initial data::

@@ -179,7 +179,4 @@ Delete a sale line::
  >>> 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"
-  
-
-
-
+  ;
--- a/view/sale_form.xml
+++ b/view/sale_form.xml
@@ -0,0 +1,8 @@
+<?xml version="1.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. -->
+<data>
+  <xpath expr="//field[@name='lines']" position="after">
+    <field name="delete_lines" colspan="4"/>
+  </xpath>
+</data>
--- a/view/sale_line_deleted_list.xml
+++ b/view/sale_line_deleted_list.xml
@@ -3,10 +3,10 @@
 this repository contains the full copyright notices and license terms. -->

 <tree>
-   <field name="sale"/>
+   <field name="user"/>
+   <field name="sale_date"/>
+   <field name="product"/>
   <field name="quantity"/>
   <field name="unit"/>
-   <field name="product"/>
-   <field name="sale_date"/>
-   <field name="user"/>
+   <field name="sale"/>
 </tree>
Author	SHA1	Message	Date
sinergia	64939ee99c	Fix: Se agrega sale_date	2024-08-28 15:48:10 -05:00
sinergia	166260707b	Merge branch 'main' of ssh://gitea.onecluster.org:6666/OneTeam/trytondo-sale_line_delete_log	2024-08-28 15:30:30 -05:00
sinergia	43e32c3209	Fix: Deleted Lines	2024-08-28 15:30:11 -05:00
Mongar28	c38e7fbb32	Se agrega el munu de sale_line_deleted al grupo admin	2024-08-22 10:26:47 -05:00
sinergia	43315bcdb4	Fix: se cambia id del menu	2024-08-15 20:06:15 -05:00
sinergia	e62b4b50b7	Feat: Se agregan traducciones	2024-08-15 20:04:39 -05:00
sinergia	830f65df91	Merge	2024-08-15 19:44:30 -05:00
Mongar28	dca30aa932	Feat:Se agrega vista a 'sale_form' 2	2024-08-15 11:53:49 -05:00
Mongar28	a97bf69aca	Feat:Se agrega vista a 'sale_form	2024-08-15 11:38:20 -05:00
Mongar28	77c5fd858e	Feat:Se agrega vista a 'sale_form	2024-08-15 11:03:50 -05:00