diff options
| author | IT Fixcomart <it@fixcomart.co.id> | 2022-09-12 16:07:33 +0700 |
|---|---|---|
| committer | IT Fixcomart <it@fixcomart.co.id> | 2022-09-12 16:07:33 +0700 |
| commit | 4f6ce90c0dc42ae95bb95479098c0e686b042f70 (patch) | |
| tree | b378a212b536e9c0fc69aca7a0898ed72f46a3f6 | |
| parent | ed5b7ed656e9b4d790317612459a6b12197d136b (diff) | |
| parent | 8fcc5cb618d189c3fd85d5cdf8860b893f89de88 (diff) | |
Merge branch 'development' of bitbucket.org:altafixco/indoteknik-addons into development
# Conflicts:
# indoteknik_custom/models/stock_picking.py
# indoteknik_custom/views/stock_picking.xml
| -rw-r--r-- | indoteknik_custom/models/stock_picking.py | 7 | ||||
| -rw-r--r-- | indoteknik_custom/views/stock_picking.xml | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py index 179faadd..7fb22023 100644 --- a/indoteknik_custom/models/stock_picking.py +++ b/indoteknik_custom/models/stock_picking.py @@ -1,14 +1,13 @@ from odoo import fields, models, api -from datetime import datetime class StockPicking(models.Model): _inherit = 'stock.picking' is_internal_use = fields.Boolean('Internal Use', help='flag which is internal use or not') account_id = fields.Many2one('account.account', string='Account') - efaktur_id = fields.Many2one('vit.efaktur', string='Faktur Pajak') - is_efaktur_exported = fields.Boolean(string='Is eFaktur Exported') - date_efaktur_exported = fields.Datetime(string='eFaktur Exported Date') + # efaktur_id = fields.Many2one('vit.efaktur', string='Faktur Pajak') + # is_efaktur_exported = fields.Boolean(string='Is eFaktur Exported') + # date_efaktur_exported = fields.Datetime(string='eFaktur Exported Date') # Delivery Order driver_departure_date = fields.Datetime(string='Driver Departure Date', readonly=True) diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml index 4ac8f2ed..6ad2e4cd 100644 --- a/indoteknik_custom/views/stock_picking.xml +++ b/indoteknik_custom/views/stock_picking.xml @@ -23,6 +23,7 @@ }" /> </field> + <page name="note" position="after"> <page string="E-Faktur" name="efaktur" attrs="{'invisible': [['is_internal_use', '=', False]]}"> <group> @@ -45,6 +46,7 @@ </group> </page> </page> + </field> </record> </data> |