Skip to content

Commit b007494

Browse files
committed
Merge PR #3784 into 16.0
Signed-off-by rvalyi
2 parents 2bbfadd + 06675b1 commit b007494

File tree

3 files changed

+40
-3
lines changed

3 files changed

+40
-3
lines changed

l10n_br_sale/models/sale_order.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ def _default_copy_note(self):
2323

2424
@api.model
2525
def _fiscal_operation_domain(self):
26-
domain = [("state", "=", "approved")]
26+
domain = [
27+
("fiscal_operation_type", "=", "out"),
28+
("state", "=", "approved"),
29+
("fiscal_type", "not ilike", "%refund%"),
30+
]
2731
return domain
2832

2933
company_country_id = fields.Many2one(related="company_id.country_id")

l10n_br_sale/models/sale_order_line.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@ def _default_fiscal_operation(self):
1515

1616
@api.model
1717
def _fiscal_operation_domain(self):
18-
domain = [("state", "=", "approved")]
18+
domain = [
19+
("fiscal_operation_type", "=", "out"),
20+
("state", "=", "approved"),
21+
("fiscal_type", "not ilike", "%refund%"),
22+
]
1923
return domain
2024

2125
fiscal_operation_id = fields.Many2one(

l10n_br_sale/views/sale_view.xml

+30-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,30 @@
2020
</field>
2121
</record>
2222

23+
<record id="l10n_br_sale_quotation_tree" model="ir.ui.view">
24+
<field name="name">l10n_br_sale.quotation.form</field>
25+
<field name="model">sale.order</field>
26+
<field name="inherit_id" ref="sale.view_quotation_tree" />
27+
<field name="priority">99</field>
28+
<field name="arch" type="xml">
29+
<field name="partner_id" position="after">
30+
<field name="fiscal_operation_id" readonly="1" optional="show" />
31+
</field>
32+
</field>
33+
</record>
34+
35+
<record id="l10n_br_sale_order_tree" model="ir.ui.view">
36+
<field name="name">l10n_br_sale.order.form</field>
37+
<field name="model">sale.order</field>
38+
<field name="inherit_id" ref="sale.view_order_tree" />
39+
<field name="priority">99</field>
40+
<field name="arch" type="xml">
41+
<field name="partner_id" position="after">
42+
<field name="fiscal_operation_id" readonly="1" optional="show" />
43+
</field>
44+
</field>
45+
</record>
46+
2347
<record id="l10n_br_sale_order_form" model="ir.ui.view">
2448
<field name="name">l10n_br_sale.order.form</field>
2549
<field name="model">sale.order</field>
@@ -83,7 +107,7 @@
83107
<group name="sale_shipping" position="inside">
84108
<field name="force_compute_delivery_costs_by_total" />
85109
</group>
86-
<field name="validity_date" position="after">
110+
<field name="show_update_fpos" position="before">
87111
<field name="company_country_id" invisible="True" />
88112
<field
89113
name="fiscal_operation_id"
@@ -166,6 +190,11 @@
166190
expr="//field[@name='order_line']/tree/field[@name='price_unit']"
167191
position="after"
168192
>
193+
<field
194+
name="fiscal_operation_id"
195+
options="{'no_create': True}"
196+
attrs="{'readonly': [('state', 'in', ('sale', 'done', 'cancel'))], 'required': [('parent.fiscal_operation_id', '!=', False)], 'invisible': [('parent.fiscal_operation_id', '=', False)]}"
197+
/>
169198
<field
170199
name="discount"
171200
groups="!l10n_br_sale.group_discount_per_value"

0 commit comments

Comments
 (0)