openobject-italia-core-devs team mailing list archive
-
openobject-italia-core-devs team
-
Mailing list archive
-
Message #01941
[Merge] lp:~enlightx/openobject-italia/7.0_l10n_it_sale_ext into lp:openobject-italia/7.0
Davide Corio @ LS has proposed merging lp:~enlightx/openobject-italia/7.0_l10n_it_sale_ext into lp:openobject-italia/7.0.
Requested reviews:
OpenERP Italia core devs (openobject-italia-core-devs)
For more details, see:
https://code.launchpad.net/~enlightx/openobject-italia/7.0_l10n_it_sale_ext/+merge/203035
Ho rivisto alcune cose su l10n_it_sale.
In primis ho aggiunto la voce per "trasporto a mezzo", siccome anche altri hanno ammesso di aggiungere sempre il campo nei moduli custom del cliente.
Inoltre ho aggiunto la selezione dei campi (causale, trasporto, etc etc) anche sull'ordine di vendita.
Selezionando il partner, l'onchange popola questi campi che possono eventualmente essere variati prima della conferma.
Inoltre ho cambiato il widget di questi campi mettendo il selection, siccome spesso i clienti duplicano per errore i valori e si trovano "PORTO FRANCO", "Porto Franco", etc etc...
Sarebbero migliorie da trunk, ma immagino che trunk prenderà vita non troppo a breve.
--
https://code.launchpad.net/~enlightx/openobject-italia/7.0_l10n_it_sale_ext/+merge/203035
Your team OpenERP Italia core devs is requested to review the proposed merge of lp:~enlightx/openobject-italia/7.0_l10n_it_sale_ext into lp:openobject-italia/7.0.
=== modified file 'l10n_it_sale/__openerp__.py'
--- l10n_it_sale/__openerp__.py 2013-03-14 11:11:29 +0000
+++ l10n_it_sale/__openerp__.py 2014-01-24 11:04:03 +0000
@@ -38,8 +38,10 @@
'stock/picking_view.xml',
'stock/carriage_condition_view.xml',
'stock/transportation_reason_view.xml',
+ 'stock/transportation_method_view.xml',
'stock/goods_description_view.xml',
'stock/transportation_reason_data.xml',
+ 'stock/transportation_method_data.xml',
'stock/goods_description_data.xml',
'stock/carriage_condition_data.xml',
'stock/sequence.xml',
=== modified file 'l10n_it_sale/account/invoice.py'
--- l10n_it_sale/account/invoice.py 2013-03-14 11:11:29 +0000
+++ l10n_it_sale/account/invoice.py 2014-01-24 11:04:03 +0000
@@ -30,10 +30,10 @@
_inherit = 'account.invoice'
_columns = {
-# 'order_id':fields.many2one('sale.order','Sale Order'),
'carriage_condition_id': fields.many2one('stock.picking.carriage_condition', 'Carriage condition'),
'goods_description_id': fields.many2one('stock.picking.goods_description', 'Description of goods'),
'transportation_reason_id': fields.many2one('stock.picking.transportation_reason', 'Reason for transportation'),
+ 'transportation_method_id': fields.many2one('stock.picking.transportation_method', 'Method of transportation'),
}
def onchange_partner_id(self, cr, uid, ids, type, partner_id,
@@ -45,7 +45,5 @@
result['value']['carriage_condition_id'] = partner.carriage_condition_id.id
result['value']['goods_description_id'] = partner.goods_description_id.id
result['value']['transportation_reason_id'] = partner.transportation_reason_id.id
+ result['value']['transportation_method_id'] = partner.transportation_method_id.id
return result
-
-account_invoice()
-
=== modified file 'l10n_it_sale/account/invoice_view.xml'
--- l10n_it_sale/account/invoice_view.xml 2013-12-11 11:44:35 +0000
+++ l10n_it_sale/account/invoice_view.xml 2014-01-24 11:04:03 +0000
@@ -9,9 +9,10 @@
<page string="Payments" position="after">
<page string="Shipping">
<group colspan="2">
- <field name="carriage_condition_id" string="Carriage condition"/>
- <field name="goods_description_id" string="Description of goods"/>
- <field name="transportation_reason_id" string="Reason for transportation"/>
+ <field name="carriage_condition_id" widget="selection"/>
+ <field name="goods_description_id" widget="selection"/>
+ <field name="transportation_reason_id" widget="selection"/>
+ <field name="transportation_method_id" widget="selection"/>
</group>
</page>
=== modified file 'l10n_it_sale/i18n/it.po'
--- l10n_it_sale/i18n/it.po 2013-03-13 08:21:42 +0000
+++ l10n_it_sale/i18n/it.po 2014-01-24 11:04:03 +0000
@@ -1,30 +1,41 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
-# * l10n_it_sale
+# * l10n_it_sale
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.2\n"
-"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2011-05-12 20:12+0000\n"
-"PO-Revision-Date: 2011-05-12 22:18+0100\n"
-"Last-Translator: Lorenzo Battistini <lorenzo.battistini@xxxxxxxxxxx>\n"
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-23 16:08+0000\n"
+"PO-Revision-Date: 2014-01-23 17:18+0100\n"
+"Last-Translator: Davide Corio <davide.corio@xxxxxxxx>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: it_IT\n"
+"X-Generator: Poedit 1.6.3\n"
#. module: l10n_it_sale
-#: field:account.invoice,goods_description_id:0
+#: view:account.invoice:0 field:account.invoice,goods_description_id:0
#: field:res.partner,goods_description_id:0
#: field:stock.picking,goods_description_id:0
+#: field:stock.picking.out,goods_description_id:0
msgid "Description of goods"
msgstr "Aspetto dei Beni"
#. module: l10n_it_sale
+#: model:ir.actions.act_window,name:l10n_it_sale.action_transportation_method_tree
+#: model:ir.ui.menu,name:l10n_it_sale.menu_action_transportation_method_tree
+#: view:stock.picking.transportation_method:0
+msgid "Methods of transportation"
+msgstr "Trasporto a mezzo"
+
+#. module: l10n_it_sale
#: field:stock.picking.carriage_condition,note:0
#: field:stock.picking.goods_description,note:0
+#: field:stock.picking.transportation_method,note:0
#: field:stock.picking.transportation_reason,note:0
msgid "Note"
msgstr "Note"
@@ -37,26 +48,35 @@
msgstr "Causale del trasporto"
#. module: l10n_it_sale
+#: view:res.partner:0
+msgid "Default shipping conditions"
+msgstr "Dati DDT"
+
+#. module: l10n_it_sale
#: model:ir.model,name:l10n_it_sale.model_stock_picking
msgid "Picking List"
msgstr "Picking List"
#. module: l10n_it_sale
+#: view:account.invoice:0 field:account.invoice,transportation_method_id:0
+#: model:ir.model,name:l10n_it_sale.model_stock_picking_transportation_method
+#: field:res.partner,transportation_method_id:0
+#: field:stock.picking,transportation_method_id:0
+#: field:stock.picking.out,transportation_method_id:0
+#: view:stock.picking.transportation_method:0
+msgid "Method of transportation"
+msgstr "Trasporto a mezzo"
+
+#. module: l10n_it_sale
#: model:ir.actions.act_window,name:l10n_it_sale.action_wizard_assign_ddt
-#: view:stock.picking:0
-#: view:wizard.assign.ddt:0
+#: view:stock.picking.out:0 view:wizard.assign.ddt:0
msgid "Assign DDT"
msgstr "Assegna DDT"
#. module: l10n_it_sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr "Il riferimento ordine deve essere unico!"
-
-#. module: l10n_it_sale
-#: model:ir.module.module,shortdesc:l10n_it_sale.module_meta_information
-msgid "Italian Localisation - Sale"
-msgstr "Localizzazione Italiana - Vendite"
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "Vendite e Acquisti"
#. module: l10n_it_sale
#: field:sale.order,validity:0
@@ -69,22 +89,17 @@
msgstr "wizard.assign.ddt"
#. module: l10n_it_sale
-#: view:res.partner:0
-msgid "Notes"
-msgstr "Note"
-
-#. module: l10n_it_sale
#: view:account.invoice:0
msgid "Shipping"
msgstr "Trasporto"
#. module: l10n_it_sale
-#: field:stock.picking,ddt_number:0
+#: field:stock.picking,ddt_number:0 field:stock.picking.out,ddt_number:0
msgid "DDT"
msgstr "DDT"
#. module: l10n_it_sale
-#: field:stock.picking,ddt_date:0
+#: field:stock.picking,ddt_date:0 field:stock.picking.out,ddt_date:0
msgid "DDT date"
msgstr "Data DDT"
@@ -101,10 +116,11 @@
msgstr "Resa merce"
#. module: l10n_it_sale
-#: field:account.invoice,transportation_reason_id:0
+#: view:account.invoice:0 field:account.invoice,transportation_reason_id:0
#: model:ir.model,name:l10n_it_sale.model_stock_picking_transportation_reason
#: field:res.partner,transportation_reason_id:0
#: field:stock.picking,transportation_reason_id:0
+#: field:stock.picking.out,transportation_reason_id:0
#: view:stock.picking.transportation_reason:0
msgid "Reason for transportation"
msgstr "Causale del trasporto"
@@ -120,7 +136,7 @@
msgstr "Questo assegnerà il numero del DDT"
#. module: l10n_it_sale
-#: code:addons/l10n_it_sale/wizard/assign_ddt.py:32
+#: code:addons/l10n_it_sale/wizard/assign_ddt.py:34
#, python-format
msgid "DTT number already assigned"
msgstr "Numero DDT già assegnato"
@@ -138,6 +154,11 @@
msgstr "Aspetto dei Beni"
#. module: l10n_it_sale
+#: field:stock.picking.transportation_method,name:0
+msgid "Method of Transportation"
+msgstr "Trasporto a Mezzo"
+
+#. module: l10n_it_sale
#: model:ir.model,name:l10n_it_sale.model_stock_picking_goods_description
#: view:stock.picking.goods_description:0
#: field:stock.picking.goods_description,name:0
@@ -157,9 +178,10 @@
msgstr "Fattura"
#. module: l10n_it_sale
-#: field:account.invoice,carriage_condition_id:0
+#: view:account.invoice:0 field:account.invoice,carriage_condition_id:0
#: field:res.partner,carriage_condition_id:0
#: field:stock.picking,carriage_condition_id:0
+#: field:stock.picking.out,carriage_condition_id:0
msgid "Carriage condition"
msgstr "Resa merce"
@@ -179,24 +201,6 @@
msgstr "Ordine di vendita"
#. module: l10n_it_sale
-#: view:res.partner:0
-msgid "Default shipping conditions"
-msgstr "Dati DDT"
-
-#. module: l10n_it_sale
-#: model:ir.module.module,description:l10n_it_sale.module_meta_information
-msgid ""
-"OpenERP Italian Localization - Sale version\n"
-"\n"
-"Functionalities:\n"
-"\n"
-"- Documento di trasporto\n"
-"\n"
-msgstr ""
-"Localizzazione Italiana - Versione Sale\n"
-"\n"
-"Funzionalità:\n"
-"\n"
-"- Documento di trasporto\n"
-"\n"
-
+#: model:ir.model,name:l10n_it_sale.model_stock_picking_out
+msgid "Delivery Orders"
+msgstr "Ordini di Consegna"
=== modified file 'l10n_it_sale/i18n/l10n_it_sale.pot'
--- l10n_it_sale/i18n/l10n_it_sale.pot 2013-03-13 08:21:42 +0000
+++ l10n_it_sale/i18n/l10n_it_sale.pot 2014-01-24 11:04:03 +0000
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.2\n"
-"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2011-05-12 20:12+0000\n"
-"PO-Revision-Date: 2011-05-12 20:12+0000\n"
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-23 16:07+0000\n"
+"PO-Revision-Date: 2014-01-23 16:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,15 +16,25 @@
"Plural-Forms: \n"
#. module: l10n_it_sale
+#: view:account.invoice:0
#: field:account.invoice,goods_description_id:0
#: field:res.partner,goods_description_id:0
#: field:stock.picking,goods_description_id:0
+#: field:stock.picking.out,goods_description_id:0
msgid "Description of goods"
msgstr ""
#. module: l10n_it_sale
+#: model:ir.actions.act_window,name:l10n_it_sale.action_transportation_method_tree
+#: model:ir.ui.menu,name:l10n_it_sale.menu_action_transportation_method_tree
+#: view:stock.picking.transportation_method:0
+msgid "Methods of transportation"
+msgstr ""
+
+#. module: l10n_it_sale
#: field:stock.picking.carriage_condition,note:0
#: field:stock.picking.goods_description,note:0
+#: field:stock.picking.transportation_method,note:0
#: field:stock.picking.transportation_reason,note:0
msgid "Note"
msgstr ""
@@ -37,25 +47,36 @@
msgstr ""
#. module: l10n_it_sale
+#: view:res.partner:0
+msgid "Default shipping conditions"
+msgstr ""
+
+#. module: l10n_it_sale
#: model:ir.model,name:l10n_it_sale.model_stock_picking
msgid "Picking List"
msgstr ""
#. module: l10n_it_sale
+#: view:account.invoice:0
+#: field:account.invoice,transportation_method_id:0
+#: model:ir.model,name:l10n_it_sale.model_stock_picking_transportation_method
+#: field:res.partner,transportation_method_id:0
+#: field:stock.picking,transportation_method_id:0
+#: field:stock.picking.out,transportation_method_id:0
+#: view:stock.picking.transportation_method:0
+msgid "Method of transportation"
+msgstr ""
+
+#. module: l10n_it_sale
#: model:ir.actions.act_window,name:l10n_it_sale.action_wizard_assign_ddt
-#: view:stock.picking:0
+#: view:stock.picking.out:0
#: view:wizard.assign.ddt:0
msgid "Assign DDT"
msgstr ""
#. module: l10n_it_sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr ""
-
-#. module: l10n_it_sale
-#: model:ir.module.module,shortdesc:l10n_it_sale.module_meta_information
-msgid "Italian Localisation - Sale"
+#: view:res.partner:0
+msgid "Sales & Purchases"
msgstr ""
#. module: l10n_it_sale
@@ -69,22 +90,19 @@
msgstr ""
#. module: l10n_it_sale
-#: view:res.partner:0
-msgid "Notes"
-msgstr ""
-
-#. module: l10n_it_sale
#: view:account.invoice:0
msgid "Shipping"
msgstr ""
#. module: l10n_it_sale
#: field:stock.picking,ddt_number:0
+#: field:stock.picking.out,ddt_number:0
msgid "DDT"
msgstr ""
#. module: l10n_it_sale
#: field:stock.picking,ddt_date:0
+#: field:stock.picking.out,ddt_date:0
msgid "DDT date"
msgstr ""
@@ -101,10 +119,12 @@
msgstr ""
#. module: l10n_it_sale
+#: view:account.invoice:0
#: field:account.invoice,transportation_reason_id:0
#: model:ir.model,name:l10n_it_sale.model_stock_picking_transportation_reason
#: field:res.partner,transportation_reason_id:0
#: field:stock.picking,transportation_reason_id:0
+#: field:stock.picking.out,transportation_reason_id:0
#: view:stock.picking.transportation_reason:0
msgid "Reason for transportation"
msgstr ""
@@ -120,7 +140,7 @@
msgstr ""
#. module: l10n_it_sale
-#: code:addons/l10n_it_sale/wizard/assign_ddt.py:32
+#: code:addons/l10n_it_sale/wizard/assign_ddt.py:34
#, python-format
msgid "DTT number already assigned"
msgstr ""
@@ -138,6 +158,11 @@
msgstr ""
#. module: l10n_it_sale
+#: field:stock.picking.transportation_method,name:0
+msgid "Method of Transportation"
+msgstr ""
+
+#. module: l10n_it_sale
#: model:ir.model,name:l10n_it_sale.model_stock_picking_goods_description
#: view:stock.picking.goods_description:0
#: field:stock.picking.goods_description,name:0
@@ -157,9 +182,11 @@
msgstr ""
#. module: l10n_it_sale
+#: view:account.invoice:0
#: field:account.invoice,carriage_condition_id:0
#: field:res.partner,carriage_condition_id:0
#: field:stock.picking,carriage_condition_id:0
+#: field:stock.picking.out,carriage_condition_id:0
msgid "Carriage condition"
msgstr ""
@@ -179,18 +206,7 @@
msgstr ""
#. module: l10n_it_sale
-#: view:res.partner:0
-msgid "Default shipping conditions"
-msgstr ""
-
-#. module: l10n_it_sale
-#: model:ir.module.module,description:l10n_it_sale.module_meta_information
-msgid "OpenERP Italian Localization - Sale version\n"
-"\n"
-"Functionalities:\n"
-"\n"
-"- Documento di trasporto\n"
-"\n"
-""
+#: model:ir.model,name:l10n_it_sale.model_stock_picking_out
+msgid "Delivery Orders"
msgstr ""
=== modified file 'l10n_it_sale/partner/partner.py'
--- l10n_it_sale/partner/partner.py 2013-03-14 11:11:29 +0000
+++ l10n_it_sale/partner/partner.py 2014-01-24 11:04:03 +0000
@@ -27,5 +27,5 @@
'carriage_condition_id': fields.many2one('stock.picking.carriage_condition', 'Carriage condition'),
'goods_description_id': fields.many2one('stock.picking.goods_description', 'Description of goods'),
'transportation_reason_id': fields.many2one('stock.picking.transportation_reason', 'Reason for transportation'),
+ 'transportation_method_id': fields.many2one('stock.picking.transportation_method', 'Method of transportation'),
}
-res_partner()
=== modified file 'l10n_it_sale/partner/partner_view.xml'
--- l10n_it_sale/partner/partner_view.xml 2013-06-16 12:44:11 +0000
+++ l10n_it_sale/partner/partner_view.xml 2014-01-24 11:04:03 +0000
@@ -12,6 +12,7 @@
<field name="carriage_condition_id" groups="base.group_sale_salesman"/>
<field name="goods_description_id" groups="base.group_sale_salesman"/>
<field name="transportation_reason_id" groups="base.group_sale_salesman"/>
+ <field name="transportation_method_id" groups="base.group_sale_salesman"/>
</group>
</page>
</field>
=== modified file 'l10n_it_sale/sale/sale.py'
--- l10n_it_sale/sale/sale.py 2013-03-14 11:11:29 +0000
+++ l10n_it_sale/sale/sale.py 2014-01-24 11:04:03 +0000
@@ -26,34 +26,45 @@
_inherit = "sale.order"
_columns = {
'validity': fields.date('Validity'),
+ 'transportation_method_id': fields.many2one('stock.picking.transportation_method', 'Trasporto a mezzo'),
+ 'carriage_condition_id': fields.many2one('stock.picking.carriage_condition', 'Carriage condition'),
+ 'goods_description_id': fields.many2one('stock.picking.goods_description', 'Description of goods'),
+ 'transportation_reason_id': fields.many2one('stock.picking.transportation_reason', 'Reason for transportation'),
}
+ def onchange_partner_id(self, cr, uid, ids, partner_id, context=None):
+ result = super(sale_order, self).onchange_partner_id(cr, uid, ids, partner_id, context=context)
+ if partner_id:
+ partner = self.pool.get('res.partner').browse(cr, uid, partner_id)
+ result['value']['carriage_condition_id'] = partner.carriage_condition_id.id
+ result['value']['goods_description_id'] = partner.goods_description_id.id
+ result['value']['transportation_reason_id'] = partner.transportation_reason_id.id
+ result['value']['transportation_method_id'] = partner.transportation_method_id.id
+ return result
+
def _make_invoice(self, cr, uid, order, lines, context={}):
inv_id = super(sale_order, self)._make_invoice(cr, uid, order, lines, context)
- partner = self.pool.get('res.partner').browse(cr , uid, order.partner_id.id)
self.pool.get('account.invoice').write(cr, uid, inv_id, {
-# 'order_id': order.id,
- 'carriage_condition_id': partner.carriage_condition_id.id,
- 'goods_description_id': partner.goods_description_id.id,
- 'transportation_reason_id': partner.transportation_reason_id.id,
+ 'carriage_condition_id': order.carriage_condition_id.id,
+ 'goods_description_id': order.goods_description_id.id,
+ 'transportation_reason_id': order.transportation_reason_id.id,
+ 'transportation_method_id': order.transportation_method_id.id,
})
return inv_id
def action_ship_create(self, cr, uid, ids, *args):
super(sale_order, self).action_ship_create(cr, uid, ids, *args)
for order in self.browse(cr, uid, ids, context={}):
- partner = self.pool.get('res.partner').browse(cr , uid, order.partner_id.id)
picking_obj = self.pool.get('stock.picking')
picking_ids = picking_obj.search(cr, uid, [('sale_id', '=', order.id)])
for picking_id in picking_ids:
picking_obj.write(cr, uid, picking_id, {
# 'order_id': order.id,
- 'carriage_condition_id': partner.carriage_condition_id.id,
- 'goods_description_id': partner.goods_description_id.id,
- 'transportation_reason_id': partner.transportation_reason_id.id,
+ 'carriage_condition_id': order.carriage_condition_id.id,
+ 'goods_description_id': order.goods_description_id.id,
+ 'transportation_reason_id': order.transportation_reason_id.id,
+ 'transportation_method_id': order.transportation_method_id.id,
})
return True
-
-sale_order()
=== modified file 'l10n_it_sale/sale/sale_view.xml'
--- l10n_it_sale/sale/sale_view.xml 2013-03-13 08:21:42 +0000
+++ l10n_it_sale/sale/sale_view.xml 2014-01-24 11:04:03 +0000
@@ -8,6 +8,10 @@
<field name="arch" type="xml">
<field name="fiscal_position" position="after">
<field name="validity"/>
+ <field name="goods_description_id" widget="selection"/>
+ <field name="transportation_reason_id" widget="selection"/>
+ <field name="carriage_condition_id" widget="selection"/>
+ <field name="transportation_method_id" widget="selection"/>
</field>
</field>
</record>
=== modified file 'l10n_it_sale/security/ir.model.access.csv'
--- l10n_it_sale/security/ir.model.access.csv 2013-03-13 08:21:42 +0000
+++ l10n_it_sale/security/ir.model.access.csv 2014-01-24 11:04:03 +0000
@@ -5,3 +5,5 @@
"access_stock_picking_goods_description_user","stock.picking.goods_description.user","model_stock_picking_goods_description","base.group_user",1,0,0,0
"access_stock_picking_carriage_condition_manager","stock.picking.carriage_condition manager","model_stock_picking_carriage_condition","stock.group_stock_manager",1,1,1,1
"access_stock_picking_goods_description_user","stock.picking.carriage_condition user","model_stock_picking_carriage_condition","base.group_user",1,0,0,0
+"access_stock_picking_transportation_method_manager","stock.picking.transportation_method manager","model_stock_picking_transportation_method","stock.group_stock_manager",1,1,1,1
+"access_stock_picking_transportation_method_user","stock.picking.transportation_method user","model_stock_picking_transportation_method","base.group_user",1,0,0,0
=== modified file 'l10n_it_sale/stock/picking.py'
--- l10n_it_sale/stock/picking.py 2013-06-16 13:00:19 +0000
+++ l10n_it_sale/stock/picking.py 2014-01-24 11:04:03 +0000
@@ -59,12 +59,25 @@
'note': fields.text('Note'),
}
+class stock_picking_method(orm.Model):
+ """
+ Method of Transportation
+ """
+ _name = 'stock.picking.transportation_method'
+ _description = 'Method of transportation'
+
+ _columns = {
+ 'name':fields.char('Method of Transportation', size=64, required=True, readonly=False),
+ 'note': fields.text('Note'),
+ }
+
class stock_picking(orm.Model):
_inherit = "stock.picking.out"
_columns = {
'carriage_condition_id': fields.many2one('stock.picking.carriage_condition', 'Carriage condition'),
'goods_description_id': fields.many2one('stock.picking.goods_description', 'Description of goods'),
'transportation_reason_id': fields.many2one('stock.picking.transportation_reason', 'Reason for transportation'),
+ 'transportation_method_id': fields.many2one('stock.picking.transportation_method', 'Method of transportation'),
'ddt_number': fields.char('DDT', size=64),
'ddt_date': fields.date('DDT date'),
}
@@ -78,6 +91,7 @@
'carriage_condition_id': picking.carriage_condition_id.id,
'goods_description_id': picking.goods_description_id.id,
'transportation_reason_id': picking.transportation_reason_id.id,
+ 'transportation_method_id': picking.transportation_method_id.id,
})
return res
@@ -98,6 +112,7 @@
'carriage_condition_id': fields.many2one('stock.picking.carriage_condition', 'Carriage condition'),
'goods_description_id': fields.many2one('stock.picking.goods_description', 'Description of goods'),
'transportation_reason_id': fields.many2one('stock.picking.transportation_reason', 'Reason for transportation'),
+ 'transportation_method_id': fields.many2one('stock.picking.transportation_method', 'Method of transportation'),
'ddt_number': fields.char('DDT', size=64),
'ddt_date': fields.date('DDT date'),
}
=== modified file 'l10n_it_sale/stock/picking_view.xml'
--- l10n_it_sale/stock/picking_view.xml 2013-05-02 06:30:33 +0000
+++ l10n_it_sale/stock/picking_view.xml 2014-01-24 11:04:03 +0000
@@ -7,9 +7,10 @@
<field name="inherit_id" ref="stock.view_picking_out_form"/>
<field name="arch" type="xml">
<field name="move_type" position="after">
- <field name="goods_description_id"/>
- <field name="transportation_reason_id"/>
- <field name="carriage_condition_id"/>
+ <field name="goods_description_id" widget="selection"/>
+ <field name="transportation_reason_id" widget="selection"/>
+ <field name="transportation_method_id" widget="selection"/>
+ <field name="carriage_condition_id" widget="selection"/>
<field name="ddt_date"/>
</field>
</field>
=== added file 'l10n_it_sale/stock/transportation_method_data.xml'
--- l10n_it_sale/stock/transportation_method_data.xml 1970-01-01 00:00:00 +0000
+++ l10n_it_sale/stock/transportation_method_data.xml 2014-01-24 11:04:03 +0000
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+ <data>
+ <record id="transportation_method_COR" model="stock.picking.transportation_method">
+ <field name="name">CORRIERE</field>
+ </record>
+ <record id="transportation_method_MIT" model="stock.picking.transportation_method">
+ <field name="name">MITTENTE</field>
+ </record>
+ <record id="transportation_method_DES" model="stock.picking.transportation_method">
+ <field name="name">DESTINATARIO</field>
+ </record>
+ </data>
+</openerp>
=== added file 'l10n_it_sale/stock/transportation_method_view.xml'
--- l10n_it_sale/stock/transportation_method_view.xml 1970-01-01 00:00:00 +0000
+++ l10n_it_sale/stock/transportation_method_view.xml 2014-01-24 11:04:03 +0000
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+ <data>
+
+ # -------------------------------------------------------------
+ # Transportation Method
+ # -------------------------------------------------------------
+ <record id="view_transportation_method_tree" model="ir.ui.view">
+ <field name="name">stock.picking.transportation_method.tree</field>
+ <field name="model">stock.picking.transportation_method</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <tree string="Methods of transportation">
+ <field name="name" select="1"/>
+ </tree>
+ </field>
+ </record>
+ <record id="view_transportation_method_form" model="ir.ui.view">
+ <field name="name">stock.picking.transportation_method.form</field>
+ <field name="model">stock.picking.transportation_method</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <form string="Method of transportation">
+ <field name="name" select="1"/>
+ <newline/>
+ <field name="note"/>
+ </form>
+ </field>
+ </record>
+
+ <record id="action_transportation_method_tree" model="ir.actions.act_window">
+ <field name="name">Methods of transportation</field>
+ <field name="res_model">stock.picking.transportation_method</field>
+ <field name="type">ir.actions.act_window</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form</field>
+ </record>
+
+ <menuitem action="action_transportation_method_tree" id="menu_action_transportation_method_tree" parent="stock.menu_stock_configuration"/>
+
+ </data>
+</openerp>
Follow ups
-
[Merge] lp:~enlightx/openobject-italia/7.0_l10n_it_sale_ext into lp:openobject-italia/7.0
From: Davide Corio @ LS, 2014-05-21
-
Re: [Merge] lp:~enlightx/openobject-italia/7.0_l10n_it_sale_ext into lp:openobject-italia/7.0
From: Lorenzo Battistini - Agile BG, 2014-05-21
-
Re: [Merge] lp:~enlightx/openobject-italia/7.0_l10n_it_sale_ext into lp:openobject-italia/7.0
From: Andrea Cometa, 2014-05-21
-
Re: [Merge] lp:~enlightx/openobject-italia/7.0_l10n_it_sale_ext into lp:openobject-italia/7.0
From: Davide Corio @ LS, 2014-05-21
-
Re: [Merge] lp:~enlightx/openobject-italia/7.0_l10n_it_sale_ext into lp:openobject-italia/7.0
From: Lorenzo Battistini - Agile BG, 2014-05-21
-
Re: [Merge] lp:~enlightx/openobject-italia/7.0_l10n_it_sale_ext into lp:openobject-italia/7.0
From: Davide Corio @ LS, 2014-05-21
-
Re: [Merge] lp:~enlightx/openobject-italia/7.0_l10n_it_sale_ext into lp:openobject-italia/7.0
From: Davide Corio @ LS, 2014-05-21
-
Re: [Merge] lp:~enlightx/openobject-italia/7.0_l10n_it_sale_ext into lp:openobject-italia/7.0
From: Davide Corio @ LS, 2014-05-21
-
Re: [Merge] lp:~enlightx/openobject-italia/7.0_l10n_it_sale_ext into lp:openobject-italia/7.0
From: andrea_cg, 2014-05-21
-
Re: [Merge] lp:~enlightx/openobject-italia/7.0_l10n_it_sale_ext into lp:openobject-italia/7.0
From: Andrea Cometa, 2014-05-21
-
Re: [Merge] lp:~enlightx/openobject-italia/7.0_l10n_it_sale_ext into lp:openobject-italia/7.0
From: Davide Corio @ LS, 2014-05-21
-
Re: [Merge] lp:~enlightx/openobject-italia/7.0_l10n_it_sale_ext into lp:openobject-italia/7.0
From: Davide Corio @ LS, 2014-05-19
-
Re: [Merge] lp:~enlightx/openobject-italia/7.0_l10n_it_sale_ext into lp:openobject-italia/7.0
From: Leonardo Pistone - camptocamp, 2014-05-19
-
Re: [Merge] lp:~enlightx/openobject-italia/7.0_l10n_it_sale_ext into lp:openobject-italia/7.0
From: Lorenzo Battistini - Agile BG, 2014-05-19
-
Re: [Merge] lp:~enlightx/openobject-italia/7.0_l10n_it_sale_ext into lp:openobject-italia/7.0
From: Davide Corio @ LS, 2014-05-19
-
Re: [Merge] lp:~enlightx/openobject-italia/7.0_l10n_it_sale_ext into lp:openobject-italia/7.0
From: Andrea Cometa, 2014-05-19
-
Re: [Merge] lp:~enlightx/openobject-italia/7.0_l10n_it_sale_ext into lp:openobject-italia/7.0
From: Andrea Cometa, 2014-05-19
-
Re: [Merge] lp:~enlightx/openobject-italia/7.0_l10n_it_sale_ext into lp:openobject-italia/7.0
From: Lorenzo Battistini - Agile BG, 2014-02-07
-
Re: [Merge] lp:~enlightx/openobject-italia/7.0_l10n_it_sale_ext into lp:openobject-italia/7.0
From: Alessandro Camilli, 2014-01-24