Lot invocing + Fee
This commit is contained in:
@@ -5044,7 +5044,7 @@ class LotInvoicingFee(ModelView):
|
|||||||
('standard', 'Standard invoice'),
|
('standard', 'Standard invoice'),
|
||||||
('dn_cn', 'DN/CN'),
|
('dn_cn', 'DN/CN'),
|
||||||
('already_invoiced', 'Already invoiced'),
|
('already_invoiced', 'Already invoiced'),
|
||||||
], "Invoice action"), 'on_change_with_invoice_action')
|
], "Planned action"), 'on_change_with_invoice_action')
|
||||||
to_invoice = fields.Boolean("To invoice", states={
|
to_invoice = fields.Boolean("To invoice", states={
|
||||||
'readonly': Eval('invoice_action') == 'already_invoiced',
|
'readonly': Eval('invoice_action') == 'already_invoiced',
|
||||||
}, depends=['invoice_action'])
|
}, depends=['invoice_action'])
|
||||||
|
|||||||
@@ -21,8 +21,8 @@
|
|||||||
<label name="amount_s"/>
|
<label name="amount_s"/>
|
||||||
<field name="amount_s"/>
|
<field name="amount_s"/>
|
||||||
<newline/>
|
<newline/>
|
||||||
<field name="fee_pur" colspan="2" mode="tree" view_ids="purchase_trade.invoicing_fee_view_tree"/>
|
<field name="fee_pur" colspan="3" mode="tree" view_ids="purchase_trade.invoicing_fee_view_tree"/>
|
||||||
<field name="pp_pur" colspan="2"/>
|
<field name="pp_pur" colspan="1"/>
|
||||||
<field name="fee_sale" colspan="2" mode="tree" view_ids="purchase_trade.invoicing_fee_view_tree"/>
|
<field name="fee_sale" colspan="3" mode="tree" view_ids="purchase_trade.invoicing_fee_view_tree"/>
|
||||||
<field name="pp_sale" colspan="2"/>
|
<field name="pp_sale" colspan="1"/>
|
||||||
</form>
|
</form>
|
||||||
|
|||||||
@@ -5,6 +5,6 @@
|
|||||||
<field name="fee_price" width="80"/>
|
<field name="fee_price" width="80"/>
|
||||||
<field name="fee_amount" width="100"/>
|
<field name="fee_amount" width="100"/>
|
||||||
<field name="fee_landed_cost" width="80"/>
|
<field name="fee_landed_cost" width="80"/>
|
||||||
<field name="invoice_action" width="110"/>
|
<field name="invoice_action" width="120"/>
|
||||||
<field name="to_invoice" width="60"/>
|
<field name="to_invoice" width="60"/>
|
||||||
</tree>
|
</tree>
|
||||||
|
|||||||
Reference in New Issue
Block a user