From b3b74c1f69ba0b29aab6887d64f0ae216c411024 Mon Sep 17 00:00:00 2001
From: cosmos <pablo.bolivar@onecluster.org>
Date: Sat, 25 Jan 2025 11:33:24 -0500
Subject: [PATCH 01/13] Add brach 7.4, fields orde.line and xmls

---
 __init__.py                   |  1 +
 sale_order.py                 | 56 +++++++++++++++++++++++++++++++++++
 sale_order.xml                | 27 +++++++++++++++++
 tests/scenario_sale_order.rst |  7 +++--
 view/order_form.xml           | 14 +++++++++
 view/order_tree.xml           |  7 +++++
 6 files changed, 109 insertions(+), 3 deletions(-)
 create mode 100644 sale_order.xml
 create mode 100644 view/order_form.xml
 create mode 100644 view/order_tree.xml

diff --git a/__init__.py b/__init__.py
index 0ffc962..adfee55 100644
--- a/__init__.py
+++ b/__init__.py
@@ -7,6 +7,7 @@ __all__ = ['register']
 def register():
     Pool.register(
         sale_order.SaleOrder,
+        sale_order.OrderLine,
         module='sale_order', type_='model')
     Pool.register(
         module='sale_order', type_='wizard')
diff --git a/sale_order.py b/sale_order.py
index 0ce48ba..35f48f0 100644
--- a/sale_order.py
+++ b/sale_order.py
@@ -1,4 +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 trytond.model import ModelView, ModelSQL, fields
+from trytond.modules.currency.fields import Monetary
+from trytond.modules.product import price_digits
+from trytond.pyson import Eval
+from decimal import Decimal
 
 
 class SaleOrder(ModelView, ModelSQL):
@@ -12,3 +18,53 @@ class SaleOrder(ModelView, ModelSQL):
         [("on_site", "On Site"),
          ("at_home", "At Home")], 'Pickup Location'
     )
+    lines = fields.One2Many(
+        'order.line', 'order', 'Lines'
+    )
+
+
+class OrderLine(ModelView, ModelSQL):
+    "Order Line"
+    __name__ = 'order.line'
+
+    order = fields.Many2One(
+        'sale.order', "Sale"
+    )
+    product = fields.Many2One(
+        'product.product', 'Product', required=True
+    )
+    unit = fields.Many2One(
+        'product.uom', 'Unit',
+        domain=[
+            ('category', '=', Eval('product_uom_category')),
+        ],
+        depends=['product_uom_category']
+    )
+    product_uom_category = fields.Function(
+        fields.Many2One('product.uom.category', 'Product UOM Category'),
+        'on_change_with_product_uom_category'
+    )
+    quantity = fields.Float(
+        "Quantity", digits=('unit')
+    )
+    unitprice = Monetary(
+        "Unit Price", digits=price_digits, currency='currency'
+    )
+    total_amount = fields.Function(
+        Monetary("Total Amount", currency='currency', digits='currency'),
+        'get_total_amount'
+    )
+
+    @fields.depends('product')
+    def on_change_with_product_uom_category(self, name=None):
+        if self.product:
+            return self.product.default_uom.category.id
+        return None
+
+    @fields.depends('quantity', 'unitprice')
+    def on_change_with_total_amount(self):
+        total_amount = self.unitprice * Decimal(self.quantity)
+        return total_amount
+
+    def get_total_amount(self):
+        return self.on_change_with_total_amount()
diff --git a/sale_order.xml b/sale_order.xml
new file mode 100644
index 0000000..961ff6b
--- /dev/null
+++ b/sale_order.xml
@@ -0,0 +1,27 @@
+<?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. -->
+<tryton>
+  <data>
+    <record model="ir.ui.view" id="sale_order_view_tree">
+      <field name="model">sale.order</field>
+      <field name="type">tree</field>
+      <field name="name">order_tree</field>
+    </record>
+    <record model="ir.ui.view" id="sale_order_view_form">
+      <field name="model">sale.order</field>
+      <field name="type">form</field>
+      <field name="name">order_form</field>
+    </record>
+    <record model="ir.ui.view" id="order_line_view_tree">
+      <field name="model">order.line</field>
+      <field name="type">tree</field>
+      <field name="name">line_tree</field>
+    </record>
+    <record model="ir.ui.view" id="order_line_view_form">
+      <field name="model">order.line</field>
+      <field name="type">form</field>
+      <field name="name">line_form</field>
+    </record>
+   </data>
+</tryton>
diff --git a/tests/scenario_sale_order.rst b/tests/scenario_sale_order.rst
index 1d5e872..be50dca 100644
--- a/tests/scenario_sale_order.rst
+++ b/tests/scenario_sale_order.rst
@@ -37,8 +37,9 @@ Create order::
   >>> order.save()
   >>> line1 = order.lines.new()
   >>> line1.product = product
-  >>> line1.quantity = 4
-  >>> line1.unitprice = 8400 
-  >>> line1.total_amount = 33600
+  >>> line1.unit = unit
+  >>> line1.quantity = 4.0
+  >>> line1.unitprice = Decimal('8400') 
+  >>> line1.total_amount = Decimal('33600')
   >>> order.save()
   
\ No newline at end of file
diff --git a/view/order_form.xml b/view/order_form.xml
new file mode 100644
index 0000000..f228a57
--- /dev/null
+++ b/view/order_form.xml
@@ -0,0 +1,14 @@
+<?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. -->
+<form>
+  <label name="party"/>
+  <field name="party"/>
+  <label name="pickup_location"/>
+  <field name="pickup_location"/>
+  <notebook colspan="4">
+    <page string="Order Lines" col="1" id="line"> 
+      <field name=""/>     
+    </page>   
+  </notebook>
+</form>
diff --git a/view/order_tree.xml b/view/order_tree.xml
new file mode 100644
index 0000000..5350c1e
--- /dev/null
+++ b/view/order_tree.xml
@@ -0,0 +1,7 @@
+<?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. -->
+<tree keyword_open="1">
+    <field name="party" expand="1"/>
+    <field name="pickup_location" expand="1"/>
+</tree>
-- 
2.45.2


From 05bcb54779d8b9d3bce645a1371653db119abd64 Mon Sep 17 00:00:00 2001
From: Rodia <alejandro.ayala@onecluster.org>
Date: Sat, 25 Jan 2025 22:14:29 -0500
Subject: [PATCH 02/13] Fix: Correccion Tests

---
 sale_order.py      | 39 ++++++++++++++++++++++++++-------------
 tryton.cfg         |  1 +
 view/line_form.xml |  5 +++++
 view/line_tree.xml |  5 +++++
 4 files changed, 37 insertions(+), 13 deletions(-)
 create mode 100644 view/line_form.xml
 create mode 100644 view/line_tree.xml

diff --git a/sale_order.py b/sale_order.py
index 35f48f0..cc361bd 100644
--- a/sale_order.py
+++ b/sale_order.py
@@ -1,9 +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 trytond.model import ModelView, ModelSQL, fields
+from trytond.pool import Pool
+from trytond.transaction import Transaction
 from trytond.modules.currency.fields import Monetary
 from trytond.modules.product import price_digits
-from trytond.pyson import Eval
 from decimal import Decimal
 
 
@@ -27,19 +28,18 @@ class OrderLine(ModelView, ModelSQL):
     "Order Line"
     __name__ = 'order.line'
 
+    company = fields.Many2One(
+        'company.company', "Company", required=True)
     order = fields.Many2One(
         'sale.order', "Sale"
     )
+    currency = fields.Many2One(
+        'currency.currency', 'Currency', required=True)
     product = fields.Many2One(
         'product.product', 'Product', required=True
     )
     unit = fields.Many2One(
-        'product.uom', 'Unit',
-        domain=[
-            ('category', '=', Eval('product_uom_category')),
-        ],
-        depends=['product_uom_category']
-    )
+        'product.uom', 'Unit')
     product_uom_category = fields.Function(
         fields.Many2One('product.uom.category', 'Product UOM Category'),
         'on_change_with_product_uom_category'
@@ -52,9 +52,23 @@ class OrderLine(ModelView, ModelSQL):
     )
     total_amount = fields.Function(
         Monetary("Total Amount", currency='currency', digits='currency'),
-        'get_total_amount'
+        'on_change_with_total_amount'
     )
 
+    @staticmethod
+    def default_company():
+        return Transaction().context.get('company')
+
+    @classmethod
+    def default_currency(cls, **pattern):
+        pool = Pool()
+        Company = pool.get('company.company')
+        company = pattern.get('company')
+        if not company:
+            company = cls.default_company()
+        if company:
+            return Company(company).currency.id
+
     @fields.depends('product')
     def on_change_with_product_uom_category(self, name=None):
         if self.product:
@@ -62,9 +76,8 @@ class OrderLine(ModelView, ModelSQL):
         return None
 
     @fields.depends('quantity', 'unitprice')
-    def on_change_with_total_amount(self):
-        total_amount = self.unitprice * Decimal(self.quantity)
-        return total_amount
+    def on_change_with_total_amount(self, name=None):
+        if self.unitprice and self.quantity:
+            total_amount = self.unitprice * Decimal(self.quantity)
 
-    def get_total_amount(self):
-        return self.on_change_with_total_amount()
+            return total_amount
diff --git a/tryton.cfg b/tryton.cfg
index e539420..7f44b41 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -5,3 +5,4 @@ depends:
     party
     product
 xml:
+    sale_order.xml
diff --git a/view/line_form.xml b/view/line_form.xml
new file mode 100644
index 0000000..68843d4
--- /dev/null
+++ b/view/line_form.xml
@@ -0,0 +1,5 @@
+<?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. -->
+<form>
+</form>
diff --git a/view/line_tree.xml b/view/line_tree.xml
new file mode 100644
index 0000000..3b1cd8d
--- /dev/null
+++ b/view/line_tree.xml
@@ -0,0 +1,5 @@
+<?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. -->
+<tree>
+</tree>
-- 
2.45.2


From 7b8bf8e8d524d4807891867d2b7b9553b95438a9 Mon Sep 17 00:00:00 2001
From: Rodia <alejandro.ayala@onecluster.org>
Date: Sat, 25 Jan 2025 22:17:21 -0500
Subject: [PATCH 03/13] File: .gitignore

---
 .gitignore | 185 +++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 166 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 63d810d..ad4a1f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,29 +1,176 @@
-# See https://help.github.com/ignore-files/ for more about ignoring files.
+# Created by https://www.toptal.com/developers/gitignore/api/python
+# Edit at https://www.toptal.com/developers/gitignore?templates=python
 
-# dependencies
-/build
-/dist
-*egg-info
+### Python ###
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
 
+# C extensions
+*.so
 
-/node_modules
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
 
-# testing
-/coverage
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
 
-# production
-/build
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
 
-# misc
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
 
-.DS_Store
+# Translations
+*.mo
+*.pot
 
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
 
-package-lock*
+# Flask stuff:
+instance/
+.webassets-cache
 
-/__pycache__
-/app/__pycache__
-/app/commons/__pycache__
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .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
+
+# poetry
+#   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.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/#use-with-ide
+.pdm.toml
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/
+
+### Python Patch ###
+# Poetry local configuration file - https://python-poetry.org/docs/configuration/#local-configuration
+poetry.toml
+
+# ruff
+.ruff_cache/
+
+# LSP config files
+pyrightconfig.json
+
+# End of https://www.toptal.com/developers/gitignore/api/python
-- 
2.45.2


From 0487da7a65c1dcd748227762500d8b7d3de766fd Mon Sep 17 00:00:00 2001
From: Rodia <alejandro.ayala@onecluster.org>
Date: Sat, 25 Jan 2025 22:17:56 -0500
Subject: [PATCH 04/13] Fix: unnecesarie files

---
 tests/__pycache__/test_module.cpython-311.pyc   | Bin 541 -> 0 bytes
 tests/__pycache__/test_scenario.cpython-311.pyc | Bin 470 -> 0 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 tests/__pycache__/test_module.cpython-311.pyc
 delete mode 100644 tests/__pycache__/test_scenario.cpython-311.pyc

diff --git a/tests/__pycache__/test_module.cpython-311.pyc b/tests/__pycache__/test_module.cpython-311.pyc
deleted file mode 100644
index b04ed108e42c80cf767d86e34c60dbcfd6271657..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 541
zcmZWlze~eF6n>XWY6(qIghHiY*MKw*j^ZLH2*#mKaX3Qna7mkbmkxEx;O^M|1&WCO
zOUIH)aB{2Esgw63wTSO>-+k|UFW)=v+4EeGv5y~b-{kqBl65#GSsqF<0SXi)&_@wM
zV8J<1>j5Zc=m`V7%55UDZV<J*;5(m6@KI5}Oz9|L*Gy!mv0%NjQ6H#GmJLZJz#u{t
zB8#F3Q!BD5mPU55(~T2$#VO-!llz8ZZKbz$q21R*3Rg&pq^dXcouW#}Anr3l3YQSm
zB6*FFyHT8!l`TSO+LLm{G`zr4-D-6Z#KU1=G!blkgG`PV8cWO0aLm<XX;4HoCFH+r
zZntK3Ywk7kGqt$4?hSohG&4TV(gE#gTaCm>Ts^8Wt|_K}t4p@39-C{O@NJo@M-&$l
j78oJ)4o9=U-=bony#@S-Y5hy7-<y&P&Tby&p`P^vScr+-

diff --git a/tests/__pycache__/test_scenario.cpython-311.pyc b/tests/__pycache__/test_scenario.cpython-311.pyc
deleted file mode 100644
index aef1f1e0a88affb44f4142c12829a51f12cae5a3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 470
zcmZWlu};G<5WP!6D2-ZHx>Zcgl1K<722@ri2H3h-Q5~v?w25p3s?>pj8Q40pAP}(e
zDV-xRF|kGJ)`_#5NJyN{&+pF9cW1w~T1_B(bRR}N1o+lLZB|8=J4EKdfny3|93TR>
z?qFbX`y71dN6UOH+G!SX#<L+)u~c$c-8S0>;Wn-1A;BCJwW>|kZ789fItwteX7G$>
zkiZOI@E)lZp8B@1Nm4Wzn?&Q7G0iTLl$dW7P9#RMa4&E4E_K~*cNK(Do`>U%U!}1O
zWklLc@K}UqN`p)e<4GivEXb!t(>%i*3jH^mwB#<qEqr;Mr{3$y!t1{)g0+8MSJde*
zNd+`x(NSWmvI!4N8G~${GUJ=NA0RxEi!Fjx<7ho#U$iOIza#euN*fW&2H?R0_Wye6
LA|99UA56_(IaG0a

-- 
2.45.2


From 096386d8f736afc82270bb5219330077aa6117d8 Mon Sep 17 00:00:00 2001
From: cosmos <pablo.bolivar@onecluster.org>
Date: Wed, 29 Jan 2025 15:19:19 -0500
Subject: [PATCH 05/13] Fix: Add field date, xmls

---
 sale_order.py       |  6 ++++++
 sale_order.xml      | 22 ++++++++++++++++++++++
 tryton.cfg          |  2 +-
 view/line_form.xml  |  8 ++++++++
 view/line_tree.xml  |  5 ++++-
 view/order_form.xml |  9 ++++-----
 view/order_tree.xml |  5 +++--
 7 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/sale_order.py b/sale_order.py
index cc361bd..55cb201 100644
--- a/sale_order.py
+++ b/sale_order.py
@@ -6,6 +6,7 @@ from trytond.transaction import Transaction
 from trytond.modules.currency.fields import Monetary
 from trytond.modules.product import price_digits
 from decimal import Decimal
+from datetime import date
 
 
 class SaleOrder(ModelView, ModelSQL):
@@ -22,6 +23,11 @@ class SaleOrder(ModelView, ModelSQL):
     lines = fields.One2Many(
         'order.line', 'order', 'Lines'
     )
+    date = fields.Date("Date", required=True)
+
+    @staticmethod
+    def default_date():
+        return date.today()
 
 
 class OrderLine(ModelView, ModelSQL):
diff --git a/sale_order.xml b/sale_order.xml
index 961ff6b..ae2ddc0 100644
--- a/sale_order.xml
+++ b/sale_order.xml
@@ -23,5 +23,27 @@ this repository contains the full copyright notices and license terms. -->
       <field name="type">form</field>
       <field name="name">line_form</field>
     </record>
+    <record model="ir.action.act_window" id="act_sale_order">
+      <field name="name">Order</field>
+      <field name="res_model">sale.order</field>
+    </record>
+    <record model="ir.action.act_window.view"
+	    id="act_sale_order_view1">
+      <field name="sequence" eval="1"/>
+      <field name="view" ref="sale_order_view_tree"/>
+      <field name="act_window" ref="act_sale_order"/>
+    </record>
+    <record model="ir.action.act_window.view"
+	    id="act_sale_order_view2">
+      <field name="sequence" eval="2"/>
+      <field name="view" ref="sale_order_view_form"/>
+      <field name="act_window" ref="act_sale_order"/>
+    </record>
+    <menuitem
+      name="Order"
+      action="act_sale_order"
+      sequence="80"
+      id="menu_order"
+      icon="tryton-folder"/>
    </data>
 </tryton>
diff --git a/tryton.cfg b/tryton.cfg
index 7f44b41..cf9eb2d 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=7.4
+version=7.4.0
 depends:
     ir
     party
diff --git a/view/line_form.xml b/view/line_form.xml
index 68843d4..1286d69 100644
--- a/view/line_form.xml
+++ b/view/line_form.xml
@@ -2,4 +2,12 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <form>
+    <group col="2" id="line">
+        <label name="product"/>
+        <field name="product"/>
+        <label name="quantity"/>
+        <field name="quantity"/>
+        <label name="total_amount"/>
+        <field name="total_amount"/>
+    </group>
 </form>
diff --git a/view/line_tree.xml b/view/line_tree.xml
index 3b1cd8d..e1f0a85 100644
--- a/view/line_tree.xml
+++ b/view/line_tree.xml
@@ -2,4 +2,7 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <tree>
-</tree>
+    <field name="product"/>
+    <field name="quantity"/>
+    <field name="total_amount"/>
+</tree>
\ No newline at end of file
diff --git a/view/order_form.xml b/view/order_form.xml
index f228a57..062bf4b 100644
--- a/view/order_form.xml
+++ b/view/order_form.xml
@@ -6,9 +6,8 @@ this repository contains the full copyright notices and license terms. -->
   <field name="party"/>
   <label name="pickup_location"/>
   <field name="pickup_location"/>
-  <notebook colspan="4">
-    <page string="Order Lines" col="1" id="line"> 
-      <field name=""/>     
-    </page>   
-  </notebook>
+  <label name="date"/>
+  <field name="date"/>
+  <field name="lines" colspan="4"
+    view_ids="sale_order.order_line_view_tree,sale_order.order_line_view_form"/>
 </form>
diff --git a/view/order_tree.xml b/view/order_tree.xml
index 5350c1e..279a68a 100644
--- a/view/order_tree.xml
+++ b/view/order_tree.xml
@@ -2,6 +2,7 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <tree keyword_open="1">
-    <field name="party" expand="1"/>
-    <field name="pickup_location" expand="1"/>
+    <field name="party"/>
+    <field name="pickup_location"/>
+    <field name="date"/>
 </tree>
-- 
2.45.2


From 12e42a67d0b46adf32a76815059d5a21355cbefb Mon Sep 17 00:00:00 2001
From: cosmos <pablo.bolivar@onecluster.org>
Date: Wed, 29 Jan 2025 16:21:40 -0500
Subject: [PATCH 06/13] Fix: Add field total_order

---
 sale_order.py                 | 45 +++++++++++++++++++++++++++++++----
 tests/scenario_sale_order.rst |  3 +++
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/sale_order.py b/sale_order.py
index 55cb201..549ef2b 100644
--- a/sale_order.py
+++ b/sale_order.py
@@ -13,6 +13,9 @@ class SaleOrder(ModelView, ModelSQL):
     "Sale Order"
     __name__ = 'sale.order'
 
+    company = fields.Many2One(
+        'company.company', "Company", required=True
+    )
     party = fields.Many2One(
         'party.party', "Party", required=True
     )
@@ -23,29 +26,63 @@ class SaleOrder(ModelView, ModelSQL):
     lines = fields.One2Many(
         'order.line', 'order', 'Lines'
     )
-    date = fields.Date("Date", required=True)
+    date = fields.Date("Date", required=True
+    )
+    currency = fields.Many2One(
+        'currency.currency', 'Currency', required=True
+    )
+    total_order = fields.Function(
+        Monetary("Total", currency='currency', digits='currency'),
+        'on_change_with_total_order'
+    )
+
+    @staticmethod
+    def default_company():
+        return Transaction().context.get('company')
 
     @staticmethod
     def default_date():
         return date.today()
 
+    @fields.depends('lines')
+    def on_change_with_total_order(self, name=None):
+        total = Decimal('0.0')
+        if self.lines:
+            for line in self.lines:
+                if line.total_amount:
+                    total += Decimal(line.total_amount)
+        return total
+
+    @classmethod
+    def default_currency(cls, **pattern):
+        pool = Pool()
+        Company = pool.get('company.company')
+        company = pattern.get('company')
+        if not company:
+            company = cls.default_company()
+        if company:
+            return Company(company).currency.id
+
 
 class OrderLine(ModelView, ModelSQL):
     "Order Line"
     __name__ = 'order.line'
 
     company = fields.Many2One(
-        'company.company', "Company", required=True)
+        'company.company', "Company", required=True
+    )
     order = fields.Many2One(
         'sale.order', "Sale"
     )
     currency = fields.Many2One(
-        'currency.currency', 'Currency', required=True)
+        'currency.currency', 'Currency', required=True
+    )
     product = fields.Many2One(
         'product.product', 'Product', required=True
     )
     unit = fields.Many2One(
-        'product.uom', 'Unit')
+        'product.uom', 'Unit'
+    )
     product_uom_category = fields.Function(
         fields.Many2One('product.uom.category', 'Product UOM Category'),
         'on_change_with_product_uom_category'
diff --git a/tests/scenario_sale_order.rst b/tests/scenario_sale_order.rst
index be50dca..b304633 100644
--- a/tests/scenario_sale_order.rst
+++ b/tests/scenario_sale_order.rst
@@ -41,5 +41,8 @@ Create order::
   >>> line1.quantity = 4.0
   >>> line1.unitprice = Decimal('8400') 
   >>> line1.total_amount = Decimal('33600')
+  >>> order.total_order = Decimal('33600')
   >>> order.save()
+
+
   
\ No newline at end of file
-- 
2.45.2


From 9237671048cdc825e557fd6a337cf6b47a6876ff Mon Sep 17 00:00:00 2001
From: cosmos <pablo.bolivar@onecluster.org>
Date: Wed, 29 Jan 2025 17:27:10 -0500
Subject: [PATCH 07/13] Fix: change xml

---
 view/line_form.xml  | 2 ++
 view/line_tree.xml  | 1 +
 view/order_form.xml | 4 +++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/view/line_form.xml b/view/line_form.xml
index 1286d69..c7fcaea 100644
--- a/view/line_form.xml
+++ b/view/line_form.xml
@@ -7,6 +7,8 @@ this repository contains the full copyright notices and license terms. -->
         <field name="product"/>
         <label name="quantity"/>
         <field name="quantity"/>
+        <label name="unitprice"/>
+        <field name="unitprice"/>
         <label name="total_amount"/>
         <field name="total_amount"/>
     </group>
diff --git a/view/line_tree.xml b/view/line_tree.xml
index e1f0a85..c1fc90f 100644
--- a/view/line_tree.xml
+++ b/view/line_tree.xml
@@ -4,5 +4,6 @@ this repository contains the full copyright notices and license terms. -->
 <tree>
     <field name="product"/>
     <field name="quantity"/>
+    <field name="unitprice"/>
     <field name="total_amount"/>
 </tree>
\ No newline at end of file
diff --git a/view/order_form.xml b/view/order_form.xml
index 062bf4b..437cb90 100644
--- a/view/order_form.xml
+++ b/view/order_form.xml
@@ -10,4 +10,6 @@ this repository contains the full copyright notices and license terms. -->
   <field name="date"/>
   <field name="lines" colspan="4"
     view_ids="sale_order.order_line_view_tree,sale_order.order_line_view_form"/>
-</form>
+  <label name="total_order"/>
+  <field name="total_order"/>
+</form>
\ No newline at end of file
-- 
2.45.2


From 394364de8105d01f1ff431b895e7715c2299866f Mon Sep 17 00:00:00 2001
From: cosmos <pablo.bolivar@onecluster.org>
Date: Sun, 2 Feb 2025 12:42:34 -0500
Subject: [PATCH 08/13] Fix: Add fields adress mobile

---
 sale_order.py       | 20 ++++++++++++++++++++
 view/line_tree.xml  |  2 +-
 view/order_form.xml |  4 ++++
 view/order_tree.xml |  7 ++++---
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/sale_order.py b/sale_order.py
index 549ef2b..0ca3aed 100644
--- a/sale_order.py
+++ b/sale_order.py
@@ -23,6 +23,13 @@ class SaleOrder(ModelView, ModelSQL):
         [("on_site", "On Site"),
          ("at_home", "At Home")], 'Pickup Location'
     )
+    order_adress = fields.Many2One(
+        'party.address', 'Address'
+    )
+    order_mobile = fields.Function(
+        fields.Char('Mobile'),
+        'on_change_with_order_mobile'
+    )
     lines = fields.One2Many(
         'order.line', 'order', 'Lines'
     )
@@ -63,6 +70,19 @@ class SaleOrder(ModelView, ModelSQL):
         if company:
             return Company(company).currency.id
 
+    @fields.depends('party')
+    def on_change_with_order_mobile(self, name=None):
+        if self.party:
+            pool = Pool()
+            ContactMechanism = pool.get('party.contact_mechanism')
+            mechanisms = ContactMechanism.search([
+                ('party', '=', self.party.id),
+                ('type', '=', 'mobile')
+            ])
+            if mechanisms:
+                return mechanisms[0].value
+        return None
+
 
 class OrderLine(ModelView, ModelSQL):
     "Order Line"
diff --git a/view/line_tree.xml b/view/line_tree.xml
index c1fc90f..07a2a31 100644
--- a/view/line_tree.xml
+++ b/view/line_tree.xml
@@ -5,5 +5,5 @@ this repository contains the full copyright notices and license terms. -->
     <field name="product"/>
     <field name="quantity"/>
     <field name="unitprice"/>
-    <field name="total_amount"/>
+    <field name="total_amount" />
 </tree>
\ No newline at end of file
diff --git a/view/order_form.xml b/view/order_form.xml
index 437cb90..d11858d 100644
--- a/view/order_form.xml
+++ b/view/order_form.xml
@@ -6,6 +6,10 @@ this repository contains the full copyright notices and license terms. -->
   <field name="party"/>
   <label name="pickup_location"/>
   <field name="pickup_location"/>
+  <label name="order_adress"/>
+  <field name="order_adress"/>
+  <label name="order_mobile"/>
+  <field name="order_mobile"/>
   <label name="date"/>
   <field name="date"/>
   <field name="lines" colspan="4"
diff --git a/view/order_tree.xml b/view/order_tree.xml
index 279a68a..2d7354a 100644
--- a/view/order_tree.xml
+++ b/view/order_tree.xml
@@ -1,8 +1,9 @@
 <?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. -->
-<tree keyword_open="1">
-    <field name="party"/>
+<tree>
+    <field name="party" />
     <field name="pickup_location"/>
-    <field name="date"/>
+    <field name="date" />
+    <field name="total_order" width="200" />
 </tree>
-- 
2.45.2


From 317bf7081386fb9e5a27af203cc31605510cb713 Mon Sep 17 00:00:00 2001
From: cosmos <pablo.bolivar@onecluster.org>
Date: Sun, 9 Feb 2025 14:38:39 -0500
Subject: [PATCH 09/13] Fix: Add buttons with error

---
 sale_order.py                 | 51 ++++++++++++++++++++++++++++++++---
 sale_order.xml                | 15 +++++++++++
 tests/scenario_sale_order.rst | 11 +++++---
 view/order_form.xml           |  6 +++--
 4 files changed, 74 insertions(+), 9 deletions(-)

diff --git a/sale_order.py b/sale_order.py
index 0ca3aed..04faa88 100644
--- a/sale_order.py
+++ b/sale_order.py
@@ -1,6 +1,6 @@
 # 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.model import ModelView, ModelSQL, fields
+from trytond.model import ModelView, ModelSQL, fields, Workflow
 from trytond.pool import Pool
 from trytond.transaction import Transaction
 from trytond.modules.currency.fields import Monetary
@@ -9,7 +9,7 @@ from decimal import Decimal
 from datetime import date
 
 
-class SaleOrder(ModelView, ModelSQL):
+class SaleOrder (Workflow, ModelView, ModelSQL):
     "Sale Order"
     __name__ = 'sale.order'
 
@@ -23,7 +23,7 @@ class SaleOrder(ModelView, ModelSQL):
         [("on_site", "On Site"),
          ("at_home", "At Home")], 'Pickup Location'
     )
-    order_adress = fields.Many2One(
+    order_address = fields.Many2One(
         'party.address', 'Address'
     )
     order_mobile = fields.Function(
@@ -42,6 +42,51 @@ class SaleOrder(ModelView, ModelSQL):
         Monetary("Total", currency='currency', digits='currency'),
         'on_change_with_total_order'
     )
+    number = fields.Char(
+        "Number", readonly=True
+    )
+    state = fields.Selection([
+        ('draft', 'Draft'),
+        ('confirmed', 'Confirmed')], "State"
+    )
+
+    @classmethod
+    def __setup__(cls):
+        super(SaleOrder, cls).__setup__()
+        cls._buttons.update({
+            'confirm': {},
+        })
+        cls._transitions |= set((
+            ('draft', 'confirmed'),
+        ))
+
+    @classmethod
+    @ModelView.button
+    @Workflow.transition('confirmed')
+    def confirm(cls, orders):
+        for order in orders:
+            if order.number:
+                continue
+            else:
+                cls.set_code([order])
+
+    @classmethod
+    def set_code(cls, orders):
+        for order in orders:
+            order.number = cls.get_number()[0].get()
+            order.save()
+
+    @classmethod
+    def get_number(cls):
+        pool = Pool()
+        Sequence = pool.get('ir.sequence')
+        order_sequence = Sequence.search([(
+            'sequence_type', '=', "sale.order")])
+        return order_sequence
+
+    @staticmethod
+    def default_state():
+        return 'draft'
 
     @staticmethod
     def default_company():
diff --git a/sale_order.xml b/sale_order.xml
index ae2ddc0..a07ea6c 100644
--- a/sale_order.xml
+++ b/sale_order.xml
@@ -39,6 +39,21 @@ this repository contains the full copyright notices and license terms. -->
       <field name="view" ref="sale_order_view_form"/>
       <field name="act_window" ref="act_sale_order"/>
     </record>
+  
+    <record model="ir.sequence.type" id="sequence_type_order">
+      <field name="name">Order</field>
+    </record>
+    <record model="ir.sequence" id="sequence_sale_order">
+      <field name="name">Sale Order Number Sequence</field>
+      <field name="sequence_type" ref="sequence_type_order"/>
+      <field name="prefix">SO</field>
+      <field name="padding">5</field>
+    </record>
+    <record model="ir.model.button" id="confirm_order_button">
+	    <field name="name">confirm</field>
+	    <field name="string">Confirm</field>
+	    <field name="model" search="[('model', '=', 'sale_order.order')]"/>
+	</record>
     <menuitem
       name="Order"
       action="act_sale_order"
diff --git a/tests/scenario_sale_order.rst b/tests/scenario_sale_order.rst
index b304633..0f67a8d 100644
--- a/tests/scenario_sale_order.rst
+++ b/tests/scenario_sale_order.rst
@@ -34,7 +34,6 @@ Create order::
   >>> order = SaleOrder()
   >>> order.party = party
   >>> order.pickup_location = "on_site"
-  >>> order.save()
   >>> line1 = order.lines.new()
   >>> line1.product = product
   >>> line1.unit = unit
@@ -43,6 +42,10 @@ Create order::
   >>> line1.total_amount = Decimal('33600')
   >>> order.total_order = Decimal('33600')
   >>> order.save()
-
-
-  
\ No newline at end of file
+  >>> order.state
+  'draft'
+  >>> order.click('confirm')
+  >>> order.state
+  'confirmed'
+  >>> order.number
+  'SO00001'
\ No newline at end of file
diff --git a/view/order_form.xml b/view/order_form.xml
index d11858d..61cfa6b 100644
--- a/view/order_form.xml
+++ b/view/order_form.xml
@@ -4,10 +4,12 @@ this repository contains the full copyright notices and license terms. -->
 <form>
   <label name="party"/>
   <field name="party"/>
+  <label name="number"/>
+  <field name="number"/>
   <label name="pickup_location"/>
   <field name="pickup_location"/>
-  <label name="order_adress"/>
-  <field name="order_adress"/>
+  <label name="order_address"/>
+  <field name="order_address"/>
   <label name="order_mobile"/>
   <field name="order_mobile"/>
   <label name="date"/>
-- 
2.45.2


From c8e12c7350378c6a812edf83c2e4b9359ba5dc6f Mon Sep 17 00:00:00 2001
From: cosmos <pablo.bolivar@onecluster.org>
Date: Sun, 9 Feb 2025 15:26:22 -0500
Subject: [PATCH 10/13] Fix: Add button Draft error

---
 sale_order.py       |  7 ++++++-
 sale_order.xml      | 25 ++++++++++++++++++++++++-
 view/order_form.xml |  4 ++++
 view/order_tree.xml |  9 ++++++---
 4 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/sale_order.py b/sale_order.py
index 04faa88..5417df2 100644
--- a/sale_order.py
+++ b/sale_order.py
@@ -60,6 +60,11 @@ class SaleOrder (Workflow, ModelView, ModelSQL):
             ('draft', 'confirmed'),
         ))
 
+    @classmethod
+    @ModelView.button
+    def draft(cls, orders):
+        pass
+
     @classmethod
     @ModelView.button
     @Workflow.transition('confirmed')
@@ -81,7 +86,7 @@ class SaleOrder (Workflow, ModelView, ModelSQL):
         pool = Pool()
         Sequence = pool.get('ir.sequence')
         order_sequence = Sequence.search([(
-            'sequence_type', '=', "sale.order")])
+            'sequence_type.name', '=', "Order")])
         return order_sequence
 
     @staticmethod
diff --git a/sale_order.xml b/sale_order.xml
index a07ea6c..3eeb624 100644
--- a/sale_order.xml
+++ b/sale_order.xml
@@ -49,11 +49,34 @@ this repository contains the full copyright notices and license terms. -->
       <field name="prefix">SO</field>
       <field name="padding">5</field>
     </record>
+    <record model="ir.model.button" id="confirm_order_draft">
+	    <field name="name">draft</field>
+	    <field name="string">Draft</field>
+	    <field name="model">sale.order</field>
+	</record>
+  <record model="ir.action.act_window.domain" id="act_order_form_domain_draft">
+      <field name="name">Draft</field>
+      <field name="sequence" eval="10"/>
+      <field name="domain"
+          eval="[('state', '=', 'draft')]"
+          pyson="1"/>
+      <field name="count" eval="True"/>
+      <field name="act_window" ref="act_order_form"/>
+  </record>
     <record model="ir.model.button" id="confirm_order_button">
 	    <field name="name">confirm</field>
 	    <field name="string">Confirm</field>
-	    <field name="model" search="[('model', '=', 'sale_order.order')]"/>
+	    <field name="model">sale.order</field>
 	</record>
+  <record model="ir.action.act_window.domain" id="act_order_form_domain_confirm">
+      <field name="name">Confirm</field>
+      <field name="sequence" eval="10"/>
+      <field name="domain"
+          eval="[('state', '=', 'confirmed')]"
+          pyson="1"/>
+      <field name="count" eval="True"/>
+      <field name="act_window" ref="act_order_form"/>
+  </record>
     <menuitem
       name="Order"
       action="act_sale_order"
diff --git a/view/order_form.xml b/view/order_form.xml
index 61cfa6b..ae6a24d 100644
--- a/view/order_form.xml
+++ b/view/order_form.xml
@@ -18,4 +18,8 @@ this repository contains the full copyright notices and license terms. -->
     view_ids="sale_order.order_line_view_tree,sale_order.order_line_view_form"/>
   <label name="total_order"/>
   <field name="total_order"/>
+  <group col="-1" colspan="3" id="buttons">
+    <button name="draft" string="Draft" icon="tryton-go-previous"/>
+    <button name="confirm" string="Confirm" icon="tryton-forward"/>
+  </group>
 </form>
\ No newline at end of file
diff --git a/view/order_tree.xml b/view/order_tree.xml
index 2d7354a..d22d68f 100644
--- a/view/order_tree.xml
+++ b/view/order_tree.xml
@@ -2,8 +2,11 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <tree>
-    <field name="party" />
+    <field name="party"/>
+    <field name="number"/>
     <field name="pickup_location"/>
-    <field name="date" />
-    <field name="total_order" width="200" />
+    <field name="order_address"/>
+    <field name="date"/>
+    <field name="total_order"/>
+    <field name="state"/>
 </tree>
-- 
2.45.2


From cc8e71fe60a37bf0910c3cd764a8852b50c83aaf Mon Sep 17 00:00:00 2001
From: Rodia <alejandro.ayala@onecluster.org>
Date: Sun, 9 Feb 2025 15:36:26 -0500
Subject: [PATCH 11/13] Fix: Act window domain

---
 sale_order.py       |  5 -----
 sale_order.xml      | 38 +++++++++++++++++++-------------------
 view/order_form.xml |  3 +--
 3 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/sale_order.py b/sale_order.py
index 5417df2..4575b70 100644
--- a/sale_order.py
+++ b/sale_order.py
@@ -60,11 +60,6 @@ class SaleOrder (Workflow, ModelView, ModelSQL):
             ('draft', 'confirmed'),
         ))
 
-    @classmethod
-    @ModelView.button
-    def draft(cls, orders):
-        pass
-
     @classmethod
     @ModelView.button
     @Workflow.transition('confirmed')
diff --git a/sale_order.xml b/sale_order.xml
index 3eeb624..9fe61b5 100644
--- a/sale_order.xml
+++ b/sale_order.xml
@@ -39,20 +39,16 @@ this repository contains the full copyright notices and license terms. -->
       <field name="view" ref="sale_order_view_form"/>
       <field name="act_window" ref="act_sale_order"/>
     </record>
-  
-    <record model="ir.sequence.type" id="sequence_type_order">
-      <field name="name">Order</field>
-    </record>
-    <record model="ir.sequence" id="sequence_sale_order">
-      <field name="name">Sale Order Number Sequence</field>
-      <field name="sequence_type" ref="sequence_type_order"/>
-      <field name="prefix">SO</field>
-      <field name="padding">5</field>
-    </record>
+
     <record model="ir.model.button" id="confirm_order_draft">
 	    <field name="name">draft</field>
 	    <field name="string">Draft</field>
 	    <field name="model">sale.order</field>
+	  </record>
+    <record model="ir.model.button" id="confirm_order_button">
+	    <field name="name">confirm</field>
+	    <field name="string">Confirm</field>
+	    <field name="model">sale.order</field>
 	</record>
   <record model="ir.action.act_window.domain" id="act_order_form_domain_draft">
       <field name="name">Draft</field>
@@ -61,13 +57,8 @@ this repository contains the full copyright notices and license terms. -->
           eval="[('state', '=', 'draft')]"
           pyson="1"/>
       <field name="count" eval="True"/>
-      <field name="act_window" ref="act_order_form"/>
+      <field name="act_window" ref="act_sale_order"/>
   </record>
-    <record model="ir.model.button" id="confirm_order_button">
-	    <field name="name">confirm</field>
-	    <field name="string">Confirm</field>
-	    <field name="model">sale.order</field>
-	</record>
   <record model="ir.action.act_window.domain" id="act_order_form_domain_confirm">
       <field name="name">Confirm</field>
       <field name="sequence" eval="10"/>
@@ -75,13 +66,22 @@ this repository contains the full copyright notices and license terms. -->
           eval="[('state', '=', 'confirmed')]"
           pyson="1"/>
       <field name="count" eval="True"/>
-      <field name="act_window" ref="act_order_form"/>
+      <field name="act_window" ref="act_sale_order"/>
   </record>
-    <menuitem
+  <menuitem
       name="Order"
       action="act_sale_order"
       sequence="80"
       id="menu_order"
       icon="tryton-folder"/>
-   </data>
+  <record model="ir.sequence.type" id="sequence_type_order">
+    <field name="name">Order</field>
+  </record>
+  <record model="ir.sequence" id="sequence_sale_order">
+    <field name="name">Sale Order Number Sequence</field>
+    <field name="sequence_type" ref="sequence_type_order"/>
+    <field name="prefix">SO</field>
+    <field name="padding">5</field>
+  </record>
+  </data>
 </tryton>
diff --git a/view/order_form.xml b/view/order_form.xml
index ae6a24d..6f32923 100644
--- a/view/order_form.xml
+++ b/view/order_form.xml
@@ -19,7 +19,6 @@ this repository contains the full copyright notices and license terms. -->
   <label name="total_order"/>
   <field name="total_order"/>
   <group col="-1" colspan="3" id="buttons">
-    <button name="draft" string="Draft" icon="tryton-go-previous"/>
     <button name="confirm" string="Confirm" icon="tryton-forward"/>
   </group>
-</form>
\ No newline at end of file
+</form>
-- 
2.45.2


From 7870747ba58737f599943d96db1c93d749ab2386 Mon Sep 17 00:00:00 2001
From: Rodia <alejandro.ayala@onecluster.org>
Date: Sun, 9 Feb 2025 20:05:22 -0500
Subject: [PATCH 12/13] Fix: Sale Order

---
 sale_order.py       | 170 ++++++++++++++++++++++++--------------------
 sale_order.xml      |  17 +++--
 view/line_form.xml  |   4 +-
 view/order_form.xml |  22 ++++--
 view/order_tree.xml |   4 +-
 5 files changed, 122 insertions(+), 95 deletions(-)

diff --git a/sale_order.py b/sale_order.py
index 4575b70..84de9f7 100644
--- a/sale_order.py
+++ b/sale_order.py
@@ -5,6 +5,7 @@ from trytond.pool import Pool
 from trytond.transaction import Transaction
 from trytond.modules.currency.fields import Monetary
 from trytond.modules.product import price_digits
+from trytond.pyson import Eval
 from decimal import Decimal
 from datetime import date
 
@@ -13,63 +14,53 @@ class SaleOrder (Workflow, ModelView, ModelSQL):
     "Sale Order"
     __name__ = 'sale.order'
 
+    _states = {
+        'readonly': Eval('state').in_(['confirmed'])
+    }
+
     company = fields.Many2One(
-        'company.company', "Company", required=True
-    )
-    party = fields.Many2One(
-        'party.party', "Party", required=True
-    )
-    pickup_location = fields.Selection(
-        [("on_site", "On Site"),
-         ("at_home", "At Home")], 'Pickup Location'
-    )
-    order_address = fields.Many2One(
-        'party.address', 'Address'
-    )
-    order_mobile = fields.Function(
-        fields.Char('Mobile'),
-        'on_change_with_order_mobile'
-    )
-    lines = fields.One2Many(
-        'order.line', 'order', 'Lines'
-    )
-    date = fields.Date("Date", required=True
-    )
+        'company.company', "Company", states={
+            'readonly': True,
+            'required': True
+        })
     currency = fields.Many2One(
-        'currency.currency', 'Currency', required=True
-    )
+        'currency.currency', 'Currency', states={
+            'readonly': True,
+            'required': True
+        })
+    number = fields.Char(
+        "Number", readonly=True)
+    party = fields.Many2One(
+        'party.party', "Party", required=True, states=_states)
+    order_address = fields.Many2One(
+        'party.address', 'Address', required=True, states=_states)
+    pickup_location = fields.Selection([
+        ("on_site", "On Site"),
+        ("at_home", "At Home")], 'Pickup Location')
+    order_mobile = fields.Char('Mobile')
+    date = fields.Date("Date", required=True, states=_states)
+    lines = fields.One2Many(
+        'order.line', 'order', 'Lines', states=_states)
     total_order = fields.Function(
         Monetary("Total", currency='currency', digits='currency'),
-        'on_change_with_total_order'
-    )
-    number = fields.Char(
-        "Number", readonly=True
-    )
+        'on_change_with_total_order')
     state = fields.Selection([
         ('draft', 'Draft'),
-        ('confirmed', 'Confirmed')], "State"
-    )
+        ('confirmed', 'Confirmed')], "State", readonly=True)
 
     @classmethod
     def __setup__(cls):
         super(SaleOrder, cls).__setup__()
         cls._buttons.update({
-            'confirm': {},
+            'confirm': {
+                'readonly': Eval('state').in_(['confirmed']),
+                'invisible': Eval('state').in_(['confirmed'])
+            }
         })
         cls._transitions |= set((
             ('draft', 'confirmed'),
         ))
 
-    @classmethod
-    @ModelView.button
-    @Workflow.transition('confirmed')
-    def confirm(cls, orders):
-        for order in orders:
-            if order.number:
-                continue
-            else:
-                cls.set_code([order])
-
     @classmethod
     def set_code(cls, orders):
         for order in orders:
@@ -84,27 +75,10 @@ class SaleOrder (Workflow, ModelView, ModelSQL):
             'sequence_type.name', '=', "Order")])
         return order_sequence
 
-    @staticmethod
-    def default_state():
-        return 'draft'
-
     @staticmethod
     def default_company():
         return Transaction().context.get('company')
 
-    @staticmethod
-    def default_date():
-        return date.today()
-
-    @fields.depends('lines')
-    def on_change_with_total_order(self, name=None):
-        total = Decimal('0.0')
-        if self.lines:
-            for line in self.lines:
-                if line.total_amount:
-                    total += Decimal(line.total_amount)
-        return total
-
     @classmethod
     def default_currency(cls, **pattern):
         pool = Pool()
@@ -115,6 +89,29 @@ class SaleOrder (Workflow, ModelView, ModelSQL):
         if company:
             return Company(company).currency.id
 
+    @staticmethod
+    def default_date():
+        return date.today()
+
+    @staticmethod
+    def default_state():
+        return 'draft'
+
+    @fields.depends('party')
+    def on_change_party(self):
+        if self.party:
+            self.order_address =\
+                self.party.addresses[0].id if self.party.addresses else None
+
+    @fields.depends('lines')
+    def on_change_with_total_order(self, name=None):
+        total = Decimal('0.0')
+        if self.lines:
+            for line in self.lines:
+                if line.total_amount:
+                    total += Decimal(line.total_amount)
+        return total
+
     @fields.depends('party')
     def on_change_with_order_mobile(self, name=None):
         if self.party:
@@ -126,42 +123,54 @@ class SaleOrder (Workflow, ModelView, ModelSQL):
             ])
             if mechanisms:
                 return mechanisms[0].value
-        return None
+        return
+
+    @classmethod
+    @ModelView.button
+    @Workflow.transition('confirmed')
+    def confirm(cls, orders):
+        for order in orders:
+            if order.number:
+                continue
+            else:
+                cls.set_code([order])
 
 
 class OrderLine(ModelView, ModelSQL):
     "Order Line"
     __name__ = 'order.line'
 
-    company = fields.Many2One(
-        'company.company', "Company", required=True
-    )
+    _states = {
+        'readonly': Eval('_parent_order.state').in_(['confirmed'])
+    }
     order = fields.Many2One(
-        'sale.order', "Sale"
-    )
+        'sale.order', "Sale")
+    company = fields.Many2One(
+        'company.company', "Company", states={
+            'readonly': True,
+            'required': True
+        })
     currency = fields.Many2One(
-        'currency.currency', 'Currency', required=True
-    )
+        'currency.currency', 'Currency', states={
+            'readonly': True,
+            'required': True
+        })
     product = fields.Many2One(
-        'product.product', 'Product', required=True
-    )
+        'product.product', 'Product', required=True, states=_states)
     unit = fields.Many2One(
-        'product.uom', 'Unit'
-    )
+        'product.uom', 'Unit', required=True, readonly=True)
     product_uom_category = fields.Function(
         fields.Many2One('product.uom.category', 'Product UOM Category'),
-        'on_change_with_product_uom_category'
-    )
+        'on_change_with_product_uom_category')
     quantity = fields.Float(
-        "Quantity", digits=('unit')
-    )
+        "Quantity", digits=('unit'), required=True, states=_states)
     unitprice = Monetary(
-        "Unit Price", digits=price_digits, currency='currency'
-    )
+        "Unit Price",
+        digits=price_digits,
+        currency='currency', required=True, states=_states)
     total_amount = fields.Function(
         Monetary("Total Amount", currency='currency', digits='currency'),
-        'on_change_with_total_amount'
-    )
+        'on_change_with_total_amount')
 
     @staticmethod
     def default_company():
@@ -177,6 +186,11 @@ class OrderLine(ModelView, ModelSQL):
         if company:
             return Company(company).currency.id
 
+    @fields.depends('product')
+    def on_change_product(self):
+        if self.product:
+            self.unit = self.product.default_uom.id
+
     @fields.depends('product')
     def on_change_with_product_uom_category(self, name=None):
         if self.product:
diff --git a/sale_order.xml b/sale_order.xml
index 9fe61b5..57470ed 100644
--- a/sale_order.xml
+++ b/sale_order.xml
@@ -39,12 +39,6 @@ this repository contains the full copyright notices and license terms. -->
       <field name="view" ref="sale_order_view_form"/>
       <field name="act_window" ref="act_sale_order"/>
     </record>
-
-    <record model="ir.model.button" id="confirm_order_draft">
-	    <field name="name">draft</field>
-	    <field name="string">Draft</field>
-	    <field name="model">sale.order</field>
-	  </record>
     <record model="ir.model.button" id="confirm_order_button">
 	    <field name="name">confirm</field>
 	    <field name="string">Confirm</field>
@@ -61,13 +55,22 @@ this repository contains the full copyright notices and license terms. -->
   </record>
   <record model="ir.action.act_window.domain" id="act_order_form_domain_confirm">
       <field name="name">Confirm</field>
-      <field name="sequence" eval="10"/>
+      <field name="sequence" eval="20"/>
       <field name="domain"
           eval="[('state', '=', 'confirmed')]"
           pyson="1"/>
       <field name="count" eval="True"/>
       <field name="act_window" ref="act_sale_order"/>
   </record>
+  <record model="ir.action.act_window.domain" id="act_order_form_domain_done">
+    <field name="name">Done</field>
+    <field name="sequence" eval="20"/>
+    <field name="domain"
+           eval="[('state', '=', 'done')]"
+           pyson="1"/>
+    <field name="count" eval="True"/>
+    <field name="act_window" ref="act_sale_order"/>
+  </record>
   <menuitem
       name="Order"
       action="act_sale_order"
diff --git a/view/line_form.xml b/view/line_form.xml
index c7fcaea..090603a 100644
--- a/view/line_form.xml
+++ b/view/line_form.xml
@@ -2,9 +2,11 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <form>
-    <group col="2" id="line">
+    <group id="line">
         <label name="product"/>
         <field name="product"/>
+        <label name="unit"/>
+        <field name="unit"/>
         <label name="quantity"/>
         <field name="quantity"/>
         <label name="unitprice"/>
diff --git a/view/order_form.xml b/view/order_form.xml
index 6f32923..eb31e3f 100644
--- a/view/order_form.xml
+++ b/view/order_form.xml
@@ -1,23 +1,31 @@
 <?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. -->
-<form>
+<form col="6">
   <label name="party"/>
   <field name="party"/>
   <label name="number"/>
   <field name="number"/>
-  <label name="pickup_location"/>
-  <field name="pickup_location"/>
+  <newline/>
   <label name="order_address"/>
   <field name="order_address"/>
   <label name="order_mobile"/>
   <field name="order_mobile"/>
+  <newline/>
   <label name="date"/>
   <field name="date"/>
-  <field name="lines" colspan="4"
-    view_ids="sale_order.order_line_view_tree,sale_order.order_line_view_form"/>
-  <label name="total_order"/>
-  <field name="total_order"/>
+  <label name="pickup_location"/>
+  <field name="pickup_location"/>
+  <notebook colspan="6">
+    <page string="Order" id="Orders">
+      <field name="lines" colspan="4"
+             view_ids="sale_order.order_line_view_tree,sale_order.order_line_view_form"/>
+      <label name="total_order"/>
+      <field name="total_order"/>
+    </page>
+  </notebook>
+  <label name="state"/>
+  <field name="state"/>
   <group col="-1" colspan="3" id="buttons">
     <button name="confirm" string="Confirm" icon="tryton-forward"/>
   </group>
diff --git a/view/order_tree.xml b/view/order_tree.xml
index d22d68f..6301d9f 100644
--- a/view/order_tree.xml
+++ b/view/order_tree.xml
@@ -2,11 +2,11 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <tree>
-    <field name="party"/>
     <field name="number"/>
-    <field name="pickup_location"/>
+    <field name="party"/>
     <field name="order_address"/>
     <field name="date"/>
+    <field name="pickup_location"/>
     <field name="total_order"/>
     <field name="state"/>
 </tree>
-- 
2.45.2


From 674f6c9f7bdbfdcc8821da72330396a580e6fc39 Mon Sep 17 00:00:00 2001
From: Rodia <alejandro.ayala@onecluster.org>
Date: Sun, 9 Feb 2025 21:16:43 -0500
Subject: [PATCH 13/13] Fix: Sale Order, Traductions

---
 locale/es.po   | 131 +++++++++++++++++++++++++++++++++++++++++++++++++
 sale_order.py  |  20 +++++---
 sale_order.xml |   2 +-
 3 files changed, 144 insertions(+), 9 deletions(-)
 create mode 100644 locale/es.po

diff --git a/locale/es.po b/locale/es.po
new file mode 100644
index 0000000..200bd06
--- /dev/null
+++ b/locale/es.po
@@ -0,0 +1,131 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:sale.order,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:sale.order,currency:"
+msgid "Currency"
+msgstr "Moneda"
+
+msgctxt "field:sale.order,number:"
+msgid "Number"
+msgstr "Número"
+
+msgctxt "field:sale.order,party:"
+msgid "Party"
+msgstr "Tercero"
+
+msgctxt "field:sale.order,order_address:"
+msgid "Address"
+msgstr "Dirección de Envío"
+
+msgctxt "field:sale.order,pickup_location:"
+msgid "Pickup Location"
+msgstr "Lugar de Recogida"
+
+msgctxt "selection:sale.order,pickup_location:"
+msgid "On Site"
+msgstr "En el sitio"
+
+msgctxt "selection:sale.order,pickup_location:"
+msgid "At Home"
+msgstr "A Domicilio"
+
+msgctxt "field:sale.order,order_mobile:"
+msgid "Mobile"
+msgstr "Teléfono de Contacto"
+
+msgctxt "field:sale.order,date:"
+msgid "Date"
+msgstr "Fecha de la Orden"
+
+msgctxt "field:sale.order,lines:"
+msgid "Lines"
+msgstr "Líneas"
+
+msgctxt "field:sale.order,total_order:"
+msgid "Total"
+msgstr "Total"
+
+msgctxt "field:sale.order,state:"
+msgid "State"
+msgstr "Estado"
+
+msgctxt "selection:sale.order,state:"
+msgid "Draft"
+msgstr "Borrador"
+
+msgctxt "selection:sale.order,state:"
+msgid "Confirmed"
+msgstr "Confirmado"
+
+msgctxt "selection:sale.order,state:"
+msgid "Done"
+msgstr "Finalizada"
+
+msgctxt "view:sale.order:"
+msgid "Order"
+msgstr "Pedido"
+
+msgctxt "field:order.line,order:"
+msgid "Order"
+msgstr "Orden"
+
+msgctxt "field:order.line,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:order.line,currency:"
+msgid "Currency"
+msgstr "Moneda"
+
+msgctxt "field:order.line,product:"
+msgid "Product"
+msgstr "Producto"
+
+msgctxt "field:order.line,unit:"
+msgid "Unit"
+msgstr "Unidad de Medida"
+
+msgctxt "field:order.line,product_uom_category:"
+msgid "Product UOM Category"
+msgstr "Categoría de la unidad de medida"
+
+msgctxt "field:order.line,quantity:"
+msgid "Quantity"
+msgstr "Cantidad"
+
+msgctxt "field:order.line,unitprice:"
+msgid "Unit Price"
+msgstr "Precio Unitario"
+
+msgctxt "field:order.line,total_amount:"
+msgid "Total Amount"
+msgstr "Valor Total"
+
+msgctxt "model:ir.action.act_window.domain,name:act_order_form_domain_draft"
+msgid "Draft"
+msgstr "Borrador"
+
+msgctxt "model:ir.action.act_window.domain,name:act_order_form_domain_confirm"
+msgid "Confirm"
+msgstr "Confirmada"
+
+msgctxt "model:ir.action.act_window.domain,name:act_order_form_domain_done"
+msgid "Done"
+msgstr "Finalizada"
+
+msgctxt "model:ir.model.button,string:confirm_order_button"
+msgid "Confirm"
+msgstr "Confirmar"
+
+msgctxt "model:ir.ui.menu,name:menu_order"
+msgid "Order"
+msgstr "Ordenes"
+
+msgctxt "model:ir.action,name:act_sale_order"
+msgid "Order"
+msgstr "Orden"
diff --git a/sale_order.py b/sale_order.py
index 84de9f7..fe23fc4 100644
--- a/sale_order.py
+++ b/sale_order.py
@@ -5,7 +5,7 @@ from trytond.pool import Pool
 from trytond.transaction import Transaction
 from trytond.modules.currency.fields import Monetary
 from trytond.modules.product import price_digits
-from trytond.pyson import Eval
+from trytond.pyson import Eval, Bool
 from decimal import Decimal
 from datetime import date
 
@@ -15,7 +15,7 @@ class SaleOrder (Workflow, ModelView, ModelSQL):
     __name__ = 'sale.order'
 
     _states = {
-        'readonly': Eval('state').in_(['confirmed'])
+        'readonly': Eval('state').in_(['confirmed', 'done'])
     }
 
     company = fields.Many2One(
@@ -36,8 +36,8 @@ class SaleOrder (Workflow, ModelView, ModelSQL):
         'party.address', 'Address', required=True, states=_states)
     pickup_location = fields.Selection([
         ("on_site", "On Site"),
-        ("at_home", "At Home")], 'Pickup Location')
-    order_mobile = fields.Char('Mobile')
+        ("at_home", "At Home")], 'Pickup Location', states=_states)
+    order_mobile = fields.Char('Mobile', states=_states)
     date = fields.Date("Date", required=True, states=_states)
     lines = fields.One2Many(
         'order.line', 'order', 'Lines', states=_states)
@@ -46,7 +46,9 @@ class SaleOrder (Workflow, ModelView, ModelSQL):
         'on_change_with_total_order')
     state = fields.Selection([
         ('draft', 'Draft'),
-        ('confirmed', 'Confirmed')], "State", readonly=True)
+        ('confirmed', 'Confirmed'),
+        ('done', "Done")
+    ], "State", readonly=True)
 
     @classmethod
     def __setup__(cls):
@@ -54,7 +56,8 @@ class SaleOrder (Workflow, ModelView, ModelSQL):
         cls._buttons.update({
             'confirm': {
                 'readonly': Eval('state').in_(['confirmed']),
-                'invisible': Eval('state').in_(['confirmed'])
+                'invisible': Eval('state').in_(['confirmed']) | ~Bool(
+                    Eval('lines', [0]))
             }
         })
         cls._transitions |= set((
@@ -144,7 +147,7 @@ class OrderLine(ModelView, ModelSQL):
         'readonly': Eval('_parent_order.state').in_(['confirmed'])
     }
     order = fields.Many2One(
-        'sale.order', "Sale")
+        'sale.order', "Order")
     company = fields.Many2One(
         'company.company', "Company", states={
             'readonly': True,
@@ -158,7 +161,8 @@ class OrderLine(ModelView, ModelSQL):
     product = fields.Many2One(
         'product.product', 'Product', required=True, states=_states)
     unit = fields.Many2One(
-        'product.uom', 'Unit', required=True, readonly=True)
+        'product.uom', 'Unit', required=True, states=_states
+    )
     product_uom_category = fields.Function(
         fields.Many2One('product.uom.category', 'Product UOM Category'),
         'on_change_with_product_uom_category')
diff --git a/sale_order.xml b/sale_order.xml
index 57470ed..77e073d 100644
--- a/sale_order.xml
+++ b/sale_order.xml
@@ -72,7 +72,7 @@ this repository contains the full copyright notices and license terms. -->
     <field name="act_window" ref="act_sale_order"/>
   </record>
   <menuitem
-      name="Order"
+      name="Orders"
       action="act_sale_order"
       sequence="80"
       id="menu_order"
-- 
2.45.2