openerp-dev-web team mailing list archive

["ARA\(OpenERP\)" <ara@xxxxxxxxxxx>]

ARA(OpenERP) has proposed merging lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-ara into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #649029 [sale] incoterm field poorly implemented [direct sql / not translatable]
  https://bugs.launchpad.net/bugs/649029


Hello Sir,

    I Fix the Sale module incoterm and translation problem.

regard,
ara
-- 
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-ara/+merge/40506
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-ara into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

=== modified file 'sale/i18n/ar.po'
--- sale/i18n/ar.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/ar.po	2010-11-10 09:16:06 +0000
@@ -1386,7 +1386,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "Incoterms"
 msgstr ""
 
 #. module: sale

=== modified file 'sale/i18n/bg.po'
--- sale/i18n/bg.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/bg.po	2010-11-10 09:16:06 +0000
@@ -1393,7 +1393,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "Incoterms"
 msgstr "Инкотермс"
 
 #. module: sale

=== modified file 'sale/i18n/bs.po'
--- sale/i18n/bs.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/bs.po	2010-11-10 09:16:06 +0000
@@ -1390,7 +1390,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "Incoterms"
 msgstr "Incoterm"
 
 #. module: sale

=== modified file 'sale/i18n/ca.po'
--- sale/i18n/ca.po	2010-10-31 05:05:24 +0000
+++ sale/i18n/ca.po	2010-11-10 09:16:06 +0000
@@ -1398,7 +1398,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "Incoterms"
 msgstr "Incoterm"
 
 #. module: sale

=== modified file 'sale/i18n/cs.po'
--- sale/i18n/cs.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/cs.po	2010-11-10 09:16:06 +0000
@@ -1386,7 +1386,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "Incoterms"
 msgstr ""
 
 #. module: sale

=== modified file 'sale/i18n/de.po'
--- sale/i18n/de.po	2010-11-09 04:49:59 +0000
+++ sale/i18n/de.po	2010-11-10 09:16:06 +0000
@@ -1444,7 +1444,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "Incoterms"
 msgstr "Lieferbedingungen"
 
 #. module: sale

=== modified file 'sale/i18n/el.po'
--- sale/i18n/el.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/el.po	2010-11-10 09:16:06 +0000
@@ -1397,7 +1397,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "Incoterms"
 msgstr "Incoterm"
 
 #. module: sale

=== modified file 'sale/i18n/es.po'
--- sale/i18n/es.po	2010-10-31 05:05:24 +0000
+++ sale/i18n/es.po	2010-11-10 09:16:06 +0000
@@ -1397,7 +1397,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "incoterms"
 msgstr "Incoterm"
 
 #. module: sale

=== modified file 'sale/i18n/es_AR.po'
--- sale/i18n/es_AR.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/es_AR.po	2010-11-10 09:16:06 +0000
@@ -1395,7 +1395,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "Incoterms"
 msgstr "Incoterm"
 
 #. module: sale

=== modified file 'sale/i18n/es_EC.po'
--- sale/i18n/es_EC.po	2010-11-08 05:13:19 +0000
+++ sale/i18n/es_EC.po	2010-11-10 09:16:06 +0000
@@ -1471,7 +1471,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "Incoterms"
 msgstr "Incoterm"
 
 #. module: sale

=== modified file 'sale/i18n/et.po'
--- sale/i18n/et.po	2010-10-31 05:05:24 +0000
+++ sale/i18n/et.po	2010-11-10 09:16:06 +0000
@@ -1418,7 +1418,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "incoterms"
 msgstr "Tarneklausel"
 
 #. module: sale

=== modified file 'sale/i18n/fi.po'
--- sale/i18n/fi.po	2010-10-31 05:05:24 +0000
+++ sale/i18n/fi.po	2010-11-10 09:16:06 +0000
@@ -1393,7 +1393,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "incoterms"
 msgstr "Incoterm"
 
 #. module: sale

=== modified file 'sale/i18n/fr.po'
--- sale/i18n/fr.po	2010-10-31 05:05:24 +0000
+++ sale/i18n/fr.po	2010-11-10 09:16:06 +0000
@@ -1409,7 +1409,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "incoterms"
 msgstr "Incoterm"
 
 #. module: sale

=== modified file 'sale/i18n/hr.po'
--- sale/i18n/hr.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/hr.po	2010-11-10 09:16:06 +0000
@@ -1391,7 +1391,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "incoterms"
 msgstr "Inkoterm"
 
 #. module: sale

=== modified file 'sale/i18n/hu.po'
--- sale/i18n/hu.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/hu.po	2010-11-10 09:16:06 +0000
@@ -1386,7 +1386,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "incoterms"
 msgstr ""
 
 #. module: sale

=== modified file 'sale/i18n/id.po'
--- sale/i18n/id.po	2010-10-31 05:05:24 +0000
+++ sale/i18n/id.po	2010-11-10 09:16:06 +0000
@@ -1391,7 +1391,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "incoterms"
 msgstr ""
 
 #. module: sale

=== modified file 'sale/i18n/it.po'
--- sale/i18n/it.po	2010-11-02 04:51:23 +0000
+++ sale/i18n/it.po	2010-11-10 09:16:06 +0000
@@ -1427,7 +1427,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "incoterms"
 msgstr "Incoterm"
 
 #. module: sale

=== modified file 'sale/i18n/ko.po'
--- sale/i18n/ko.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/ko.po	2010-11-10 09:16:06 +0000
@@ -1387,7 +1387,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "incoterms"
 msgstr "인코텀"
 
 #. module: sale

=== modified file 'sale/i18n/lt.po'
--- sale/i18n/lt.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/lt.po	2010-11-10 09:16:06 +0000
@@ -1394,7 +1394,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "Incoterms"
 msgstr ""
 
 #. module: sale

=== modified file 'sale/i18n/lv.po'
--- sale/i18n/lv.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/lv.po	2010-11-10 09:16:06 +0000
@@ -1387,7 +1387,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "Incoterms"
 msgstr "Inkoterms"
 
 #. module: sale

=== modified file 'sale/i18n/mn.po'
--- sale/i18n/mn.po	2010-11-08 05:13:19 +0000
+++ sale/i18n/mn.po	2010-11-10 09:16:06 +0000
@@ -1457,7 +1457,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "Incoterms"
 msgstr "Худалдааны нөхцөл"
 
 #. module: sale

=== modified file 'sale/i18n/nl.po'
--- sale/i18n/nl.po	2010-10-31 05:05:24 +0000
+++ sale/i18n/nl.po	2010-11-10 09:16:06 +0000
@@ -1391,7 +1391,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "Incoterms"
 msgstr "Leveringsconditie"
 
 #. module: sale

=== modified file 'sale/i18n/nl_BE.po'
--- sale/i18n/nl_BE.po	2010-08-10 09:37:25 +0000
+++ sale/i18n/nl_BE.po	2010-11-10 09:16:06 +0000
@@ -1000,7 +1000,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "Incoterms"
 msgstr ""
 
 #. module: sale

=== modified file 'sale/i18n/pl.po'
--- sale/i18n/pl.po	2010-11-06 04:53:16 +0000
+++ sale/i18n/pl.po	2010-11-10 09:16:06 +0000
@@ -1429,7 +1429,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "Incoterms"
 msgstr "Incoterm"
 
 #. module: sale

=== modified file 'sale/i18n/pt.po'
--- sale/i18n/pt.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/pt.po	2010-11-10 09:16:06 +0000
@@ -1390,7 +1390,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "Incoterms"
 msgstr "Incoterm"
 
 #. module: sale

=== modified file 'sale/i18n/pt_BR.po'
--- sale/i18n/pt_BR.po	2010-10-31 05:05:24 +0000
+++ sale/i18n/pt_BR.po	2010-11-10 09:16:06 +0000
@@ -1399,7 +1399,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "Incoterms"
 msgstr "Forma de Entrega"
 
 #. module: sale

=== modified file 'sale/i18n/ro.po'
--- sale/i18n/ro.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/ro.po	2010-11-10 09:16:06 +0000
@@ -1386,7 +1386,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "Incoterms"
 msgstr ""
 
 #. module: sale

=== modified file 'sale/i18n/ru.po'
--- sale/i18n/ru.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/ru.po	2010-11-10 09:16:06 +0000
@@ -1461,7 +1461,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "Incoterms"
 msgstr "Инкотерм"
 
 #. module: sale

=== modified file 'sale/i18n/sk.po'
--- sale/i18n/sk.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/sk.po	2010-11-10 09:16:06 +0000
@@ -1387,7 +1387,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "Incoterms"
 msgstr ""
 
 #. module: sale

=== modified file 'sale/i18n/sl.po'
--- sale/i18n/sl.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/sl.po	2010-11-10 09:16:06 +0000
@@ -1387,7 +1387,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "Incoterms"
 msgstr "Incoterm"
 
 #. module: sale

=== modified file 'sale/i18n/sq.po'
--- sale/i18n/sq.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/sq.po	2010-11-10 09:16:06 +0000
@@ -1387,7 +1387,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "Incoterms"
 msgstr ""
 
 #. module: sale

=== modified file 'sale/i18n/sr.po'
--- sale/i18n/sr.po	2010-11-06 04:53:16 +0000
+++ sale/i18n/sr.po	2010-11-10 09:16:06 +0000
@@ -1464,7 +1464,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "Incoterms"
 msgstr "Incoterm"
 
 #. module: sale

=== modified file 'sale/i18n/sv.po'
--- sale/i18n/sv.po	2010-10-31 05:05:24 +0000
+++ sale/i18n/sv.po	2010-11-10 09:16:06 +0000
@@ -1389,7 +1389,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "Incoterms"
 msgstr "Internationella villkor"
 
 #. module: sale

=== modified file 'sale/i18n/tlh.po'
--- sale/i18n/tlh.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/tlh.po	2010-11-10 09:16:06 +0000
@@ -1386,7 +1386,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "Incoterms"
 msgstr ""
 
 #. module: sale

=== modified file 'sale/i18n/tr.po'
--- sale/i18n/tr.po	2010-10-31 05:05:24 +0000
+++ sale/i18n/tr.po	2010-11-10 09:16:06 +0000
@@ -1388,7 +1388,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "Incoterms"
 msgstr "Teslim Sekli"
 
 #. module: sale

=== modified file 'sale/i18n/uk.po'
--- sale/i18n/uk.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/uk.po	2010-11-10 09:16:06 +0000
@@ -1387,7 +1387,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "Incoterms"
 msgstr "Incoterm"
 
 #. module: sale

=== modified file 'sale/i18n/vi.po'
--- sale/i18n/vi.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/vi.po	2010-11-10 09:16:06 +0000
@@ -1389,7 +1389,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "Incoterms"
 msgstr ""
 
 #. module: sale

=== modified file 'sale/i18n/zh_CN.po'
--- sale/i18n/zh_CN.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/zh_CN.po	2010-11-10 09:16:06 +0000
@@ -1386,7 +1386,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "Incoterms"
 msgstr "贸易术语"
 
 #. module: sale

=== modified file 'sale/i18n/zh_TW.po'
--- sale/i18n/zh_TW.po	2010-10-30 05:55:00 +0000
+++ sale/i18n/zh_TW.po	2010-11-10 09:16:06 +0000
@@ -1386,7 +1386,7 @@
 
 #. module: sale
 #: field:sale.order,incoterm:0
-msgid "Incoterm"
+msgid "Incoterms"
 msgstr ""
 
 #. module: sale

=== modified file 'sale/sale.py'
--- sale/sale.py	2010-11-10 04:21:43 +0000
+++ sale/sale.py	2010-11-10 09:16:06 +0000
@@ -45,12 +45,6 @@
 
 sale_shop()
 
-def _incoterm_get(self, cr, uid, context=None):
-    if context is None:
-        context = {}
-    cr.execute('select code, code||\', \'||name from stock_incoterms where active')
-    return cr.fetchall()
-
 class sale_order(osv.osv):
     _name = "sale.order"
     _description = "Sale Order"
@@ -232,8 +226,7 @@
         'partner_invoice_id': fields.many2one('res.partner.address', 'Invoice Address', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Invoice address for current sale order"),
         'partner_order_id': fields.many2one('res.partner.address', 'Ordering Contact', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="The name and address of the contact who requested the order or quotation."),
         'partner_shipping_id': fields.many2one('res.partner.address', 'Shipping Address', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Shipping address for current sale order"),
-
-        'incoterm': fields.selection(_incoterm_get, 'Incoterm', size=3, help="Incoterm which stands for 'International Commercial terms' implies its a series of sales terms which are used in the commercial transaction"),
+        'incoterm': fields.many2one('stock.incoterms', 'Incoterms', help="Incoterm which stands for 'International Commercial terms' implies its a series of sales terms which are used in the commercial transaction"),
         'picking_policy': fields.selection([('direct', 'Partial Delivery'), ('one', 'Complete Delivery')],
             'Picking Policy', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="""If you don't have enough stock available to deliver all at once, do you accept partial shipments or not?"""),
         'order_policy': fields.selection([

=== modified file 'sale/sale_view.xml'
--- sale/sale_view.xml	2010-11-04 09:05:35 +0000
+++ sale/sale_view.xml	2010-11-10 09:16:06 +0000
@@ -219,7 +219,7 @@
                         <page string="Other Information">
                             <group colspan="2" col="2" groups="base.group_extended" name="logistic">
                                 <separator string="Logistic" colspan="2"/>
-                                <field name="incoterm"/>
+                                <field name="incoterm" widget="selection"/>
                                 <field name="picking_policy" required="True"/>
                                 <field name="order_policy" on_change="shipping_policy_change(order_policy)"/>
                                 <field name="invoice_quantity" attrs="{'readonly':[('order_policy','=','prepaid'),('order_policy','=','picking')]}"/>