odoo order positions

This commit is contained in:
Janik von Rotz committed 2021-11-15 09:54:54 +01:00
1 parent d0e172765d
commit 6755dee45e
8 files changed
+35 -19

No files matched your search

@@ -7,21 +7,22 @@
<span>Pos</span>
</th>
</t>
<t t-if="o.is_sale_document">
<t t-if="o.invoice_line_ids.purchase_line_id">
<th>
<span>Pos</span>
</th>
</t>
</xpath>
<xpath expr="//table/tbody/t[3]/tr/t[1]/td[1]" position="before">
<t t-if="o.sale_order_id">
<td>
<span t-esc="o.sale_order_id.get_position(line.product_id)"/>
<span t-esc="line.position"/>
</td>
</t>
<t t-if="line.purchase_order_id">
<td>
<span t-esc="line.purchase_order_id.get_position(line.product_id)"/>
<span t-esc="line.position"/>
</td>
</t>
</xpath>
@@ -0,0 +1,15 @@
<?xml version="1.0"?>
<data inherit_id="purchase.report_purchasequotation_document" priority="50">
<xpath expr="//table/thead/tr/th[1]" position="before">
<th>
<span>Pos</span>
</th>
</xpath>
<xpath expr="//table/tbody/t/tr/t[1]/td[1]" position="before">
<td>
<span t-esc="order_line.position"/>
</td>
</xpath>
</data>
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<data inherit_id="sale.report_saleorder_document" priority="50">
<xpath expr="/t/t/div/table/thead/tr/th[1]" position="before">
<xpath expr="//table/thead/tr/th[1]" position="before">
<th>
<span>Pos</span>
</th>
</xpath>
<xpath expr="/t/t/div/table/tbody/t[2]/tr/t[1]/td[1]" position="before">
<xpath expr="//table/tbody/t[2]/tr/t[1]/td[1]" position="before">
<td>
<span t-field="line.position"/>
</td>
@@ -30,12 +30,12 @@
<xpath expr="//table[1]/tbody/tr/td[1]" position="before">
<t t-if="o.sale_id">
<td>
<span t-esc="o.sale_id.get_position(move.product_id)"/>
<span t-esc="move.position"/>
</td>
</t>
<t t-if="o.purchase_id">
<td>
<span t-esc="o.purchase_id.get_position(move.product_id)"/>
<span t-esc="move.position"/>
</td>
</t>
</xpath>
@@ -16,12 +16,12 @@
<xpath expr="//table[1]/tbody/t/t/tr/td[1]" position="before">
<t t-if="o.sale_id">
<td>
<span t-esc="o.sale_id.get_position(ml.product_id)"/>
<span t-esc="o.sale_id.get_position(ml.product_id, ml.product_uom_qty)"/>
</td>
</t>
<t t-if="o.purchase_id">
<td>
<span t-esc="o.purchase_id.get_position(ml.product_id)"/>
<span t-esc="o.purchase_id.get_position(ml.product_id, ml.product_uom_qty)"/>
</td>
</t>
</xpath>
@@ -4,12 +4,12 @@
<xpath expr="/t/tr/td[1]" position="before">
<t t-if="o.sale_id">
<td>
<span t-esc="o.sale_id.get_position(aggregated_lines[line]['product'])"/>
<span t-esc="o.sale_id.get_position(aggregated_lines[line]['product'], aggregated_lines[line]['product_uom_qty'])"/>
</td>
</t>
<t t-if="o.purchase_id">
<td>
<span t-esc="o.purchase_id.get_position(aggregated_lines[line]['product'])"/>
<span t-esc="o.purchase_id.get_position(aggregated_lines[line]['product'], aggregated_lines[line]['product_uom_qty'])"/>
</td>
</t>
</xpath>
+6 -6
View File
@@ -382,7 +382,7 @@ function change-uuid() {
}
function update-odoo-view() {
function update-snippet() {
if test -z "$1"; then echo "\$1 is empty"; exit; fi
if test -z "$2"; then echo "\$2 is empty"; exit; fi
@@ -395,7 +395,7 @@ function update-odoo-view() {
scripts/odooctl --model 'ir.ui.view' --domain "['name', '=', '$NAME']" --field 'arch_base' --value "'''$(cat $2)'''"
}
function install-odoo-view() {
function install-snippet() {
if test -z "$1"; then echo "\$1 is empty"; exit; fi
if test -z "$2"; then echo "\$2 is empty"; exit; fi
@@ -640,11 +640,11 @@ case "$1" in
git-list-submodules)
git-list-submodules
;;
update-odoo-view)
update-odoo-view $2 $3
update-snippet)
update-snippet $2 $3
;;
install-odoo-view)
install-odoo-view $2 $3
install-snippet)
install-snippet $2 $3
;;
update-app-list)
update-app-list $2
+2 -2
View File
@@ -35,8 +35,8 @@
| update-config | | Update odoo config. |
| update-app-list | [db] | Update app list. |
| update-module | [db] [name,path] | Update target Odoo module. |
| update-odoo-view | [env] [path] | Update view xml definition. |
| install-odoo-view | [env] [path] | Install view xml definition. |
| update-snippet | [env] [path] | Update snippet xml definition. |
| install-snippet | [env] [path] | Install snippet xml definition. |
| upload-module | [env] [path] | Zip and upload Odoo module. |
| zip-module | [path] | Create zip file for module. |
| update-docs | | Update project docs. |