Merge lp:~zikzak/oosalespromotions/sale_promotions into lp:oosalespromotions

[Raimon Esteve (www.zikzakmedia.com)]

[IMP] Sale Promotions: Translate and redefine Selection values for translate
[IMP] Security rules and views form expression and condition

[Sharoon Thomas http://openlabs.co.in (sharoonthomas)]

Hello Raimon,

Line 1486 - 1523

Using globals is a bad idea for the following reasons:

1. It will not allow new modules to add types of operations. So new modules written will not even be able to disallow or allow certain operations.
2. Makes program slower because of the way python does attribute access. (insignificant but still valid when you consider the application of e-commerce)

Hence, could you please fix that and propose a merge. Thanks...

review: Needs Fixing

[Raimon Esteve (www.zikzakmedia.com) (resteve)]

2011/3/14 Sharoon Thomas http://openlabs.co.in <email address hidden>:
> Using globals is a bad idea for the following reasons:

Selection fields at def don't have translation.

We have tolk this morning howto translated this fields and only is
avaible about list (similar a pwemail template engine ;) )

Spekers not english, design rules in English is very heavy (less than,...)

Are you another idea/design this fields are translated selection fields?

--
Raimon Esteve
// OpenERP Partner. www.openerp.com/node/682
// e-sale: Zoook 100% OpenERP / Magento
// AulaERP, formació online www.aulaerp.com
www.zikzakmedia.com

[Sharoon Thomas http://openlabs.co.in (sharoonthomas)]

Can you not use the _(x) method inside the function which returns the list of tuples ?

globals are added to namespace with the classes and methods but the methods will be only be cached at that time. So executing this like:

class XYZ(..):

...
   def method(self, ...):
       return [
          ('a', _('a'))
          ]

should work? or am i missing something?

[Raimon Esteve (www.zikzakmedia.com) (resteve)]

2011/3/14 Sharoon Thomas http://openlabs.co.in <email address hidden>:
>   def method(self, ...):
>       return [
>          ('a', _('a'))
>          ]

Yes! First I try testing this code but nothing. OpenERP don't
translated (I don't remember if it's avaible translated fields in po
or only when show view).
We tested versions 5.0.15 and 6.0.1 and translated fields are not
avaible. Now, I'm retested another time = not translated fields.

After, we decided a list global. Now, This selection field are avaible
translated.

You understand what user design rules (conditions or actions) only
English is difficult Spekears not English.

But this option it's than slowly? do you have some test?

--
Raimon Esteve
// OpenERP Partner. www.openerp.com/node/682
// e-sale: Zoook 100% OpenERP / Magento
// AulaERP, formació online www.aulaerp.com
www.zikzakmedia.com

[Sharoon Thomas http://openlabs.co.in (sharoonthomas)]

I completely agree on the fact that fields need to be translated. But I am almost sure that it can be done within the function too as i dont see how it will not work.

If it doesnt work, i think its a serious framework issue. Dont you think so?

[Raimon Esteve (www.zikzakmedia.com) (resteve)]

2011/3/15, Sharoon Thomas http://openlabs.co.in <email address hidden>:
> I completely agree on the fact that fields need to be translated. But I am
> almost sure that it can be done within the function too as i dont see how it
> will not work.

please, test it and feedback. we tested 5.0.15 and 6.0.1 and same result.

> If it doesnt work, i think its a serious framework issue. Dont you think so?

Of course

--
Raimon Esteve
// OpenERP Partner. www.openerp.com/node/682
// e-sale: Zoook 100% OpenERP / Magento
// AulaERP, formació online www.aulaerp.com
www.zikzakmedia.com

[lp:~zikzak/oosalespromotions/sale_promotions]

11. By Raimon Esteve (www.zikzakmedia.com) on 2011-11-30

[IMP] Security Rules [FIX] Promo Rule. Coupon Code required

Unmerged revisions

11. By Raimon Esteve (www.zikzakmedia.com) on 2011-11-30

[IMP] Security Rules [FIX] Promo Rule. Coupon Code required

10. By Raimon Esteve (www.zikzakmedia.com) on 2011-03-14

[IMP] Translation and security rules

=== added file '__openerp__.py'
--- __openerp__.py	1970-01-01 00:00:00 +0000
+++ __openerp__.py	2011-11-30 12:20:28 +0000
@@ -0,0 +1,54 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution    
+#    Copyright (C) 2010, Open Labs Business Solution
+#    Copyright (C) 2011, Zikzakmedia                                        #
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    'name' : 'Promotions for OpenERP',
+    'version' : '0.1',
+    'author' : 'Open Labs Business Solutions',
+    'website': 'http://openlabs.co.in',
+    'category' : 'Generic Modules/Sales & Purchases',
+    'depends' : [
+                 "base",
+                 "sale",
+                 ],
+    'init_xml' : [],
+    'demo_xml' : [],
+    'description': """
+    Promotions on Sale Order for OpenERP
+    = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+    Features:
+    1. Promotions based on conditions and coupons
+    2. Web services API compliance
+    
+    Credits:
+        This design is based/inspired by the Magento commerce
+        Special Thanks to Yannick Buron for analysis
+        Migration Module OpenERP 6: Zikzakmedia
+    """,
+    'update_xml': [
+        'security/ir.model.access.csv',
+        'views/rule.xml',
+        'views/sale.xml',
+                ],
+    'installable': True,
+    'active': False,
+}
 
=== removed file '__terp__.py'
--- __terp__.py	2010-06-08 09:17:32 +0000
+++ __terp__.py	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution    
-#    Copyright (C) 2010, Open Labs Business Solution
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-{
-    'name' : 'Promotions for Open ERP',
-    'version' : '0.1',
-    'author' : 'Open Labs Business Solutions',
-    'website': 'http://openlabs.co.in',
-    'category' : 'Customised Modules',
-    'depends' : [
-                 "base",
-                 "sale",
-                 ],
-    'init_xml' : [],
-    'demo_xml' : [],
-    'description': """
-    Promotions on Sale Order for Open ERP
-    = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
-    Features:
-    1. Promotions based on conditions and coupons
-    2. Web services API compliance
-    
-    Credits:
-        This design is based/inspired by the Magento commerce
-        Special Thanks to Yannick Buron for analysis
-    """,
-    'update_xml': [
-        'views/rule.xml',
-        'views/sale.xml',
-                ],
-    'installable': True,
-    'active': False,
-}
 
=== modified file 'example/xml-rpc-test.py'
--- example/xml-rpc-test.py	2010-06-08 09:17:32 +0000
+++ example/xml-rpc-test.py	2011-11-30 12:20:28 +0000
@@ -11,5 +11,5 @@
 common = xmlrpclib.ServerProxy(url + '/xmlrpc/common')
 uid = common.login(dbname, username, password)
 object = xmlrpclib.ServerProxy(url + '/xmlrpc/object')
-object.execute(dbname, uid, password,'promos.rules', 'evaluate', 1, 3)
+#object.execute(dbname, uid, password,'promos.rules', 'evaluate', 1, 3) #TODO: evaluate def need object, not ID values
 object.execute(dbname, uid, password, 'promos.rules', 'apply_promotions', 3)
 
=== added directory 'i18n'
=== added file 'i18n/ca.po'
--- i18n/ca.po	1970-01-01 00:00:00 +0000
+++ i18n/ca.po	2011-11-30 12:20:28 +0000
@@ -0,0 +1,459 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* sale_promotions
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.15\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2011-03-14 14:53+0000\n"
+"PO-Revision-Date: 2011-10-11 17:39+0100\n"
+"Last-Translator: Raimon Esteve <[e-mail]>\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"
+
+#. module: sale_promotions
+#: field:promos.rules,name:0
+msgid "Promo Name"
+msgstr "Nom"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+msgid "expressions are"
+msgstr "les expressions son"
+
+#. module: sale_promotions
+#: field:promos.rules.conditions.exps,stop_further:0
+msgid "Stop further checks"
+msgstr "Finalitzar comprovació"
+
+#. module: sale_promotions
+#: field:promos.rules,uses_per_coupon:0
+msgid "Uses per Coupon"
+msgstr "Usos per cupó"
+
+#. module: sale_promotions
+#: field:promos.rules,coupon_used:0
+msgid "Number of Coupon Uses"
+msgstr "Número d'usos per cupó"
+
+#. module: sale_promotions
+#: field:promos.rules.actions,product_code:0
+msgid "Product Code"
+msgstr "Codi producte"
+
+#. module: sale_promotions
+#: model:ir.actions.act_window,name:sale_promotions.act_promotion_rules
+#: model:ir.model,name:sale_promotions.model_promos_rules
+#: model:ir.ui.menu,name:sale_promotions.promos
+msgid "Promotion Rules"
+msgstr "Regles de promoció"
+
+#. module: sale_promotions
+#: field:sale.order,coupon_code:0
+msgid "Promo Coupon Code"
+msgstr "Codi cupó de la promoció"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+msgid "Applicable Period"
+msgstr "Període aplicable"
+
+#. module: sale_promotions
+#: field:promos.rules,stop_further:0
+msgid "Stop Checks"
+msgstr "Finalitzar procés"
+
+#. module: sale_promotions
+#: model:ir.model,name:sale_promotions.model_promos_rules_conditions_exps
+msgid "Expressions for conditions"
+msgstr "Expressions per les condicions"
+
+#. module: sale_promotions
+#: field:promos.rules,to_date:0
+msgid "To Date"
+msgstr "Fins"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:62
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "not equal to"
+msgstr "no es igual a"
+
+#. module: sale_promotions
+#: field:promos.rules.actions,arguments:0
+msgid "Arguments"
+msgstr "Arguments"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:64
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "greater than or equal to"
+msgstr "major o igual a"
+
+#. module: sale_promotions
+#: field:promos.rules,expected_logic_result:0
+msgid "Output"
+msgstr "Sortida"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Product UnitPrice combination"
+msgstr "Combinació preu unitat del producte"
+
+#. module: sale_promotions
+#: help:promos.rules,stop_further:0
+msgid "Stops further promotions being checked"
+msgstr "Finalitzar promocions"
+
+#. module: sale_promotions
+#: model:ir.model,name:sale_promotions.model_promos_rules_actions
+msgid "Promotions actions"
+msgstr "Accions de la promoció"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Product Discount combination"
+msgstr "Combinació descompte del producte"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+msgid "Conditions"
+msgstr "Condicions"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:75
+#: selection:promos.rules.actions,action_type:0
+#, python-format
+msgid "Fixed amount on Sub Total"
+msgstr "Quantitat fixa en subtotal"
+
+#. module: sale_promotions
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "Order Reference must be unique !"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+#: field:promos.rules,description:0
+msgid "Description"
+msgstr "Descripció"
+
+#. module: sale_promotions
+#: field:promos.rules.conditions.exps,serialised_expr:0
+msgid "Expression"
+msgstr "Expressió"
+
+#. module: sale_promotions
+#: field:promos.rules,coupon_code:0
+msgid "Coupon Code"
+msgstr "Codi cupó"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:68
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "is not in"
+msgstr "no està en"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Product Weight combination"
+msgstr "Combinació pes del producte"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Product SubTotal combination"
+msgstr "Combinació subtotal del producte"
+
+#. module: sale_promotions
+#: help:sale.order.line,promotion_line:0
+msgid "Indicates if the line was created by promotions"
+msgstr "Indicar si aquesta línia es creada per promocions"
+
+#. module: sale_promotions
+#: field:promos.rules,active:0
+msgid "Active"
+msgstr "Actiu"
+
+#. module: sale_promotions
+#: selection:promos.rules,expected_logic_result:0
+msgid "True"
+msgstr "Verdader"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+msgid "Coupon/Voucher Settings"
+msgstr "Configuració dels cupons"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+msgid "Promotions"
+msgstr "Promocions"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:76
+#: selection:promos.rules.actions,action_type:0
+#, python-format
+msgid "Buy X get Y free"
+msgstr "Compra X i emportis Y"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Compute sub total of products"
+msgstr "Calcula subtotal dels productes"
+
+#. module: sale_promotions
+#: field:promos.rules.conditions.exps,comparator:0
+msgid "Comparator"
+msgstr "Comparador"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Tax Amount"
+msgstr "Impostos"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:42
+#: selection:promos.rules.conditions.exps,attribute:0
+#, python-format
+msgid "Untaxed Total"
+msgstr "Base imponible"
+
+#. module: sale_promotions
+#: field:promos.rules.conditions.exps,value:0
+msgid "Value"
+msgstr "Valor"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:61
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "equals"
+msgstr "es igual a"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+#: field:promos.rules,partner_categories:0
+msgid "Partner Categories"
+msgstr "Categories de clients"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Product Quantity combination"
+msgstr "Combinació quantitat del producte"
+
+#. module: sale_promotions
+#: field:promos.rules,uses_per_partner:0
+msgid "Uses per Partner"
+msgstr "Usos per client"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Compute sub total excluding products"
+msgstr "Calcula subtotal excloent productes"
+
+#. module: sale_promotions
+#: field:promos.rules,logic:0
+msgid "Logic"
+msgstr "Lògica"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+msgid "If"
+msgstr "Si"
+
+#. module: sale_promotions
+#: field:promos.rules.actions,action_type:0
+msgid "Action"
+msgstr "Accions"
+
+#. module: sale_promotions
+#: selection:promos.rules,expected_logic_result:0
+msgid "False"
+msgstr "Fals"
+
+#. module: sale_promotions
+#: field:promos.rules.actions,promotion:0
+#: field:promos.rules.conditions.exps,promotion:0
+msgid "Promotion"
+msgstr "Promoció"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Custom domain expression"
+msgstr "Expressió personalitzada"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:74
+#: selection:promos.rules.actions,action_type:0
+#, python-format
+msgid "Discount % on Sub Total"
+msgstr "Descompte % en el subtotal"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:66
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "less than or equal to"
+msgstr "menor o igual a"
+
+#. module: sale_promotions
+#: field:sale.order.line,promotion_line:0
+msgid "Promotion Line"
+msgstr "Línia de promoció"
+
+#. module: sale_promotions
+#: field:promos.rules,shop:0
+msgid "Shop"
+msgstr "Botiga"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Total Amount"
+msgstr "Quantitat Total"
+
+#. module: sale_promotions
+#: selection:promos.rules,logic:0
+msgid "All"
+msgstr "Tot"
+
+#. module: sale_promotions
+#: model:ir.model,name:sale_promotions.model_sale_order
+msgid "Sales Order"
+msgstr "Sales Order"
+
+#. module: sale_promotions
+#: field:promos.rules,expressions:0
+msgid "Expressions/Conditions"
+msgstr "Expressions/Condicions"
+
+#. module: sale_promotions
+#: field:promos.rules,sequence:0
+#: field:promos.rules.actions,sequence:0
+#: field:promos.rules.conditions.exps,sequence:0
+msgid "Sequence"
+msgstr "Seqüència"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:67
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "is in"
+msgstr "es en"
+
+#. module: sale_promotions
+#: field:promos.rules.conditions.exps,attribute:0
+msgid "Attribute"
+msgstr "Atribut"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:65
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "less than"
+msgstr "menys de"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+#: field:promos.rules,actions:0
+msgid "Actions"
+msgstr "Accions"
+
+#. module: sale_promotions
+#: help:promos.rules,partner_categories:0
+msgid "Applicable to all if none is selected"
+msgstr "Aplicable en tot si cap es seleccionat"
+
+#. module: sale_promotions
+#: model:ir.model,name:sale_promotions.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Sales Order Line"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:63
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "greater than"
+msgstr "major que"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:72
+#: selection:promos.rules.actions,action_type:0
+#, python-format
+msgid "Discount % on Product"
+msgstr "Descompte % en el producte"
+
+#. module: sale_promotions
+#: help:promos.rules,coupon_used:0
+msgid "The number of times this coupon has been used."
+msgstr "El número de cupons ja s'ha utilitzat."
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Product Code in order"
+msgstr "Codi producte en la comanda"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:73
+#: selection:promos.rules.actions,action_type:0
+#, python-format
+msgid "Fixed amount on Product"
+msgstr "Quantitat fixe del producte"
+
+#. module: sale_promotions
+#: selection:promos.rules,logic:0
+msgid "Any"
+msgstr "Cap"
+
+#. module: sale_promotions
+#: view:sale.order:0
+msgid "Apply Promotions"
+msgstr "Aplicar promocions"
+
+#. module: sale_promotions
+#: field:promos.rules,from_date:0
+msgid "From Date"
+msgstr "Desde"
+
+#~ msgid "Rule Expressions"
+#~ msgstr "Expressió de la regla"
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nom del objecte ha de començar amb x_ i no contenir cap caràcter "
+#~ "especial!"
+#~ msgid "Promotions for Open ERP"
+#~ msgstr "Promociones per OpenERP"
+#~ msgid ""
+#~ "\n"
+#~ "    Promotions on Sale Order for Open ERP\n"
+#~ "    = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =\n"
+#~ "    Features:\n"
+#~ "    1. Promotions based on conditions and coupons\n"
+#~ "    2. Web services API compliance\n"
+#~ "    \n"
+#~ "    Credits:\n"
+#~ "        This design is based/inspired by the Magento commerce\n"
+#~ "        Special Thanks to Yannick Buron for analysis\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    Promocions en les comandes de venda d'OpenERP\n"
+#~ "    = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =\n"
+#~ "    Característiques:\n"
+#~ "    1. Promociones basades en condicions i cupons\n"
+#~ "    2. Web services API pel seu comerç electrònic\n"
+#~ "    \n"
+#~ "    Crèdits:\n"
+#~ "        Aquest mòdul està dissenyat/inspirat en Magento ecommerce\n"
+#~ "        Agraïments a Yannick Buron pel anàlisis\n"
+#~ "    "
+#~ msgid "Product NetPrice combination"
+#~ msgstr "Combinació preu net del producte"
+
 
=== added file 'i18n/ca_ES.po'
--- i18n/ca_ES.po	1970-01-01 00:00:00 +0000
+++ i18n/ca_ES.po	2011-11-30 12:20:28 +0000
@@ -0,0 +1,471 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* sale_promotions
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.15\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2011-03-14 11:44:29+0000\n"
+"PO-Revision-Date: 2011-03-14 13:21+0100\n"
+"Last-Translator: Raimon Esteve <[e-mail]>\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"
+
+#. module: sale_promotions
+#: selection:promos.rules,expected_logic_result:0
+msgid "False"
+msgstr "Fals"
+
+#. module: sale_promotions
+#: field:promos.rules,name:0
+msgid "Promo Name"
+msgstr "Nom"
+
+#. module: sale_promotions
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr "¡El nom del objecte ha de començar amb x_ i no contenir cap caràcter especial!"
+
+#. module: sale_promotions
+#: field:promos.rules.conditions.exps,stop_further:0
+msgid "Stop further checks"
+msgstr "Finalitzar comprovació"
+
+#. module: sale_promotions
+#: field:promos.rules,uses_per_coupon:0
+msgid "Uses per Coupon"
+msgstr "Usos per cupó"
+
+#. module: sale_promotions
+#: field:promos.rules,coupon_used:0
+msgid "Number of Coupon Uses"
+msgstr "Número d'usos per cupó"
+
+#. module: sale_promotions
+#: field:promos.rules.actions,product_code:0
+msgid "Product Code"
+msgstr "Codi producte"
+
+#. module: sale_promotions
+#: model:ir.actions.act_window,name:sale_promotions.act_promotion_rules
+#: model:ir.model,name:sale_promotions.model_promos_rules
+#: model:ir.ui.menu,name:sale_promotions.promos
+msgid "Promotion Rules"
+msgstr "Regles de promoció"
+
+#. module: sale_promotions
+#: field:sale.order,coupon_code:0
+msgid "Promo Coupon Code"
+msgstr "Codi cupó de la promoció"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+msgid "Applicable Period"
+msgstr "Període aplicable"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:0
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "greater than"
+msgstr "major que"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+msgid "expressions are"
+msgstr "les expressions son"
+
+#. module: sale_promotions
+#: field:promos.rules,stop_further:0
+msgid "Stop Checks"
+msgstr "Finalitzar procés"
+
+#. module: sale_promotions
+#: model:ir.model,name:sale_promotions.model_promos_rules_conditions_exps
+msgid "Expressions for conditions"
+msgstr "Expressions per les condicions"
+
+#. module: sale_promotions
+#: field:promos.rules,to_date:0
+msgid "To Date"
+msgstr "Des de"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:0
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "not equal to"
+msgstr "no es igual a"
+
+#. module: sale_promotions
+#: field:promos.rules.actions,arguments:0
+msgid "Arguments"
+msgstr "Arguments"
+
+#. module: sale_promotions
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom del model invàlid en la definició de la acció."
+
+#. module: sale_promotions
+#: field:promos.rules,expected_logic_result:0
+msgid "Output"
+msgstr "Sortida"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Product UnitPrice combination"
+msgstr "Combinació preu unitat del producte"
+
+#. module: sale_promotions
+#: help:promos.rules,stop_further:0
+msgid "Stops further promotions being checked"
+msgstr "Finalitzar promocions"
+
+#. module: sale_promotions
+#: model:ir.model,name:sale_promotions.model_promos_rules_actions
+msgid "Promotions actions"
+msgstr "Accions de la promoció"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Product Discount combination"
+msgstr "Combinació descompte del producte"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+msgid "Conditions"
+msgstr "Condicions"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:0
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "greater than or equal to"
+msgstr "major o igual a"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:0
+#: selection:promos.rules.actions,action_type:0
+#, python-format
+msgid "Fixed amount on Sub Total"
+msgstr "Quantitat fixa en subtotal"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+#: field:promos.rules,description:0
+msgid "Description"
+msgstr "Descripció"
+
+#. module: sale_promotions
+#: field:promos.rules.conditions.exps,serialised_expr:0
+msgid "Expression"
+msgstr "Expressió"
+
+#. module: sale_promotions
+#: field:promos.rules,coupon_code:0
+msgid "Coupon Code"
+msgstr "Codi cupó"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:0
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "is not in"
+msgstr "no està en"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Product Weight combination"
+msgstr "Combinació pes del producte"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Product SubTotal combination"
+msgstr "Combinació subtotal del producte"
+
+#. module: sale_promotions
+#: help:sale.order.line,promotion_line:0
+msgid "Indicates if the line was created by promotions"
+msgstr "Indicar si aquesta línia es creada per promocions"
+
+#. module: sale_promotions
+#: field:promos.rules,active:0
+msgid "Active"
+msgstr "Actiu"
+
+#. module: sale_promotions
+#: selection:promos.rules,expected_logic_result:0
+msgid "True"
+msgstr "Verdader"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Total Amount"
+msgstr "Quantitat Total"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+msgid "Coupon/Voucher Settings"
+msgstr "Configuració dels cupons"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+msgid "Promotions"
+msgstr "Promocions"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:0
+#: selection:promos.rules.actions,action_type:0
+#, python-format
+msgid "Buy X get Y free"
+msgstr "Compra X i emportis Y"
+
+#. module: sale_promotions
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "¡XML invàlid per la definició de la vista!"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Compute sub total of products"
+msgstr "Calcula subtotal dels productes"
+
+#. module: sale_promotions
+#: field:promos.rules.conditions.exps,comparator:0
+msgid "Comparator"
+msgstr "Comparador"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Tax Amount"
+msgstr "Impostos"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:0
+#: selection:promos.rules.conditions.exps,attribute:0
+#, python-format
+msgid "Untaxed Total"
+msgstr "Base imponible"
+
+#. module: sale_promotions
+#: field:promos.rules.conditions.exps,value:0
+msgid "Value"
+msgstr "Valor"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:0
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "equals"
+msgstr "es igual a"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+#: field:promos.rules,partner_categories:0
+msgid "Partner Categories"
+msgstr "Categories de clients"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Product Quantity combination"
+msgstr "Combinació quantitat del producte"
+
+#. module: sale_promotions
+#: field:promos.rules,uses_per_partner:0
+msgid "Uses per Partner"
+msgstr "Usos per client"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Compute sub total excluding products"
+msgstr "Calcula subtotal excloent productes"
+
+#. module: sale_promotions
+#: field:promos.rules,logic:0
+msgid "Logic"
+msgstr "Lògica"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+msgid "If"
+msgstr "Si"
+
+#. module: sale_promotions
+#: field:promos.rules.actions,action_type:0
+msgid "Action"
+msgstr "Accions"
+
+#. module: sale_promotions
+#: field:promos.rules,expressions:0
+msgid "Expressions/Conditions"
+msgstr "Expressions/Condicions"
+
+#. module: sale_promotions
+#: field:promos.rules.actions,promotion:0
+#: field:promos.rules.conditions.exps,promotion:0
+msgid "Promotion"
+msgstr "Promoció"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Custom domain expression"
+msgstr "Expressió personalitzada"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:0
+#: selection:promos.rules.actions,action_type:0
+#, python-format
+msgid "Discount % on Sub Total"
+msgstr "Descompte % en el subtotal"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:0
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "less than or equal to"
+msgstr "menor o igual a"
+
+#. module: sale_promotions
+#: field:sale.order.line,promotion_line:0
+msgid "Promotion Line"
+msgstr "Línia de promoció"
+
+#. module: sale_promotions
+#: field:promos.rules,shop:0
+msgid "Shop"
+msgstr "Botiga"
+
+#. module: sale_promotions
+#: model:ir.module.module,shortdesc:sale_promotions.module_meta_information
+msgid "Promotions for Open ERP"
+msgstr "Promociones per OpenERP"
+
+#. module: sale_promotions
+#: selection:promos.rules,logic:0
+msgid "All"
+msgstr "Tot"
+
+#. module: sale_promotions
+#: model:ir.module.module,description:sale_promotions.module_meta_information
+msgid ""
+"\n"
+"    Promotions on Sale Order for Open ERP\n"
+"    = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =\n"
+"    Features:\n"
+"    1. Promotions based on conditions and coupons\n"
+"    2. Web services API compliance\n"
+"    \n"
+"    Credits:\n"
+"        This design is based/inspired by the Magento commerce\n"
+"        Special Thanks to Yannick Buron for analysis\n"
+"    "
+msgstr ""
+"\n"
+"    Promocions en les comandes de venda d'OpenERP\n"
+"    = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =\n"
+"    Característiques:\n"
+"    1. Promociones basades en condicions i cupons\n"
+"    2. Web services API pel seu comerç electrònic\n"
+"    \n"
+"    Crèdits:\n"
+"        Aquest mòdul està dissenyat/inspirat en Magento ecommerce\n"
+"        Agraïments a Yannick Buron pel anàlisis\n"
+"    "
+
+#. module: sale_promotions
+#: field:promos.rules,sequence:0
+#: field:promos.rules.actions,sequence:0
+#: field:promos.rules.conditions.exps,sequence:0
+msgid "Sequence"
+msgstr "Seqüència"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:0
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "is in"
+msgstr "es en"
+
+#. module: sale_promotions
+#: field:promos.rules.conditions.exps,attribute:0
+msgid "Attribute"
+msgstr "Atribut"
+
+#. module: sale_promotions
+#: view:promos.rules.conditions.expres
+#: view:promos.rules.conditions.exps:0
+msgid "Rule Expressions"
+msgstr "Expressió de la regla"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:0
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "less than"
+msgstr "menys de"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+#: field:promos.rules,actions:0
+msgid "Actions"
+msgstr "Accions"
+
+#. module: sale_promotions
+#: help:promos.rules,partner_categories:0
+msgid "Applicable to all if none is selected"
+msgstr "Aplicable en tot si cap es seleccionat"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Product NetPrice combination"
+msgstr "Combinació preu net del producte"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:0
+#: selection:promos.rules.actions,action_type:0
+#, python-format
+msgid "Discount % on Product"
+msgstr "Descompte % en el producte"
+
+#. module: sale_promotions
+#: help:promos.rules,coupon_used:0
+msgid "The number of times this coupon has been used."
+msgstr "El número de cupons ja s'ha utilitzat."
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Product Code in order"
+msgstr "Codi producte en la comanda"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+msgid "Expressions"
+msgstr "Expressions"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:0
+#: selection:promos.rules.actions,action_type:0
+#, python-format
+msgid "Fixed amount on Product"
+msgstr "Quantitat fixe del producte"
+
+#. module: sale_promotions
+#: selection:promos.rules,logic:0
+msgid "Any"
+msgstr "Cap"
+
+#. module: sale_promotions
+#: view:sale.order:0
+msgid "Apply Promotions"
+msgstr "Aplicar promocions"
+
+#. module: sale_promotions
+#: field:promos.rules,from_date:0
+msgid "From Date"
+msgstr "Fins a"
+
 
=== added file 'i18n/es.po'
--- i18n/es.po	1970-01-01 00:00:00 +0000
+++ i18n/es.po	2011-11-30 12:20:28 +0000
@@ -0,0 +1,421 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* sale_promotions
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.15\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2011-03-14 14:53+0000\n"
+"PO-Revision-Date: 2011-10-11 17:39+0100\n"
+"Last-Translator: Raimon Esteve <[e-mail]>\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"
+
+#. module: sale_promotions
+#: field:promos.rules,name:0
+msgid "Promo Name"
+msgstr "Nombre"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+msgid "expressions are"
+msgstr "las expresiones son"
+
+#. module: sale_promotions
+#: field:promos.rules.conditions.exps,stop_further:0
+msgid "Stop further checks"
+msgstr "Finalizar comprobación"
+
+#. module: sale_promotions
+#: field:promos.rules,uses_per_coupon:0
+msgid "Uses per Coupon"
+msgstr "Usos por cupón"
+
+#. module: sale_promotions
+#: field:promos.rules,coupon_used:0
+msgid "Number of Coupon Uses"
+msgstr "Número de usos por cupón"
+
+#. module: sale_promotions
+#: field:promos.rules.actions,product_code:0
+msgid "Product Code"
+msgstr "Código producto"
+
+#. module: sale_promotions
+#: model:ir.actions.act_window,name:sale_promotions.act_promotion_rules
+#: model:ir.model,name:sale_promotions.model_promos_rules
+#: model:ir.ui.menu,name:sale_promotions.promos
+msgid "Promotion Rules"
+msgstr "Reglas de promoción"
+
+#. module: sale_promotions
+#: field:sale.order,coupon_code:0
+msgid "Promo Coupon Code"
+msgstr "Código cupón de la promoción"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+msgid "Applicable Period"
+msgstr "Periodo aplicable"
+
+#. module: sale_promotions
+#: field:promos.rules,stop_further:0
+msgid "Stop Checks"
+msgstr "Finalizar proceso"
+
+#. module: sale_promotions
+#: model:ir.model,name:sale_promotions.model_promos_rules_conditions_exps
+msgid "Expressions for conditions"
+msgstr "Expresiones para las condiciones"
+
+#. module: sale_promotions
+#: field:promos.rules,to_date:0
+msgid "To Date"
+msgstr "Hasta"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:62
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "not equal to"
+msgstr "no es igual a"
+
+#. module: sale_promotions
+#: field:promos.rules.actions,arguments:0
+msgid "Arguments"
+msgstr "Argumentos"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:64
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "greater than or equal to"
+msgstr "mayor o igual a"
+
+#. module: sale_promotions
+#: field:promos.rules,expected_logic_result:0
+msgid "Output"
+msgstr "Salida"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Product UnitPrice combination"
+msgstr "Combinación precio unidad del producto"
+
+#. module: sale_promotions
+#: help:promos.rules,stop_further:0
+msgid "Stops further promotions being checked"
+msgstr "Finalizar promociones"
+
+#. module: sale_promotions
+#: model:ir.model,name:sale_promotions.model_promos_rules_actions
+msgid "Promotions actions"
+msgstr "Acciones de la promoción"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Product Discount combination"
+msgstr "Combinación descuento del producto"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+msgid "Conditions"
+msgstr "Condiciones"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:75
+#: selection:promos.rules.actions,action_type:0
+#, python-format
+msgid "Fixed amount on Sub Total"
+msgstr "Cantidad fija en subtotal"
+
+#. module: sale_promotions
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "Order Reference must be unique !"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+#: field:promos.rules,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: sale_promotions
+#: field:promos.rules,coupon_code:0
+msgid "Coupon Code"
+msgstr "Código cupón"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:68
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "is not in"
+msgstr "no está en"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Product Weight combination"
+msgstr "Combinación peso del producto"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Product SubTotal combination"
+msgstr "Combinación subtotal del producto"
+
+#. module: sale_promotions
+#: help:sale.order.line,promotion_line:0
+msgid "Indicates if the line was created by promotions"
+msgstr "Indicar si esta línea es creada por promociones"
+
+#. module: sale_promotions
+#: field:promos.rules,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: sale_promotions
+#: selection:promos.rules,expected_logic_result:0
+msgid "True"
+msgstr "Verdadero"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+msgid "Coupon/Voucher Settings"
+msgstr "Configuración de los cupones"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+msgid "Promotions"
+msgstr "Promociones"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:76
+#: selection:promos.rules.actions,action_type:0
+#, python-format
+msgid "Buy X get Y free"
+msgstr "Compre X y llévate Y"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Compute sub total of products"
+msgstr "Calcula subtotal de los productos"
+
+#. module: sale_promotions
+#: field:promos.rules.conditions.exps,comparator:0
+msgid "Comparator"
+msgstr "Comparador"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Tax Amount"
+msgstr "Impuestos"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:42
+#: selection:promos.rules.conditions.exps,attribute:0
+#, python-format
+msgid "Untaxed Total"
+msgstr "Base imponible"
+
+#. module: sale_promotions
+#: field:promos.rules.conditions.exps,value:0
+msgid "Value"
+msgstr "Valor"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:61
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "equals"
+msgstr "es igual a"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+#: field:promos.rules,partner_categories:0
+msgid "Partner Categories"
+msgstr "Categorias de clientes"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Product Quantity combination"
+msgstr "Combinación cantidad del producto"
+
+#. module: sale_promotions
+#: field:promos.rules,uses_per_partner:0
+msgid "Uses per Partner"
+msgstr "Usos por cliente"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Compute sub total excluding products"
+msgstr "Calcula subtotal excluyendo productos"
+
+#. module: sale_promotions
+#: field:promos.rules,logic:0
+msgid "Logic"
+msgstr "Lógica"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+msgid "If"
+msgstr "Si"
+
+#. module: sale_promotions
+#: field:promos.rules.actions,action_type:0
+msgid "Action"
+msgstr "Acciones"
+
+#. module: sale_promotions
+#: selection:promos.rules,expected_logic_result:0
+msgid "False"
+msgstr "Falso"
+
+#. module: sale_promotions
+#: field:promos.rules.actions,promotion:0
+#: field:promos.rules.conditions.exps,promotion:0
+msgid "Promotion"
+msgstr "Promoción"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Custom domain expression"
+msgstr "Expresión personalizada"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:74
+#: selection:promos.rules.actions,action_type:0
+#, python-format
+msgid "Discount % on Sub Total"
+msgstr "Descuento % en el subtotal"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:66
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "less than or equal to"
+msgstr "menor o igual a"
+
+#. module: sale_promotions
+#: field:sale.order.line,promotion_line:0
+msgid "Promotion Line"
+msgstr "Línia de promoción"
+
+#. module: sale_promotions
+#: field:promos.rules,shop:0
+msgid "Shop"
+msgstr "Tienda"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Total Amount"
+msgstr "Cantidad Total"
+
+#. module: sale_promotions
+#: selection:promos.rules,logic:0
+msgid "All"
+msgstr "Todo"
+
+#. module: sale_promotions
+#: model:ir.model,name:sale_promotions.model_sale_order
+msgid "Sales Order"
+msgstr "Sales Order"
+
+#. module: sale_promotions
+#: field:promos.rules,expressions:0
+msgid "Expressions/Conditions"
+msgstr "Expresiones/Condiciones"
+
+#. module: sale_promotions
+#: field:promos.rules,sequence:0
+#: field:promos.rules.actions,sequence:0
+#: field:promos.rules.conditions.exps,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:67
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "is in"
+msgstr "es en"
+
+#. module: sale_promotions
+#: field:promos.rules.conditions.exps,attribute:0
+msgid "Attribute"
+msgstr "Atributo"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:65
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "less than"
+msgstr "menos de"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+#: field:promos.rules,actions:0
+msgid "Actions"
+msgstr "Acciones"
+
+#. module: sale_promotions
+#: help:promos.rules,partner_categories:0
+msgid "Applicable to all if none is selected"
+msgstr "Aplicable en todo si ninguno es seleccionado"
+
+#. module: sale_promotions
+#: model:ir.model,name:sale_promotions.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Sales Order Line"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:63
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "greater than"
+msgstr "mayor que"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:72
+#: selection:promos.rules.actions,action_type:0
+#, python-format
+msgid "Discount % on Product"
+msgstr "Descuento % en el producto"
+
+#. module: sale_promotions
+#: help:promos.rules,coupon_used:0
+msgid "The number of times this coupon has been used."
+msgstr "El número de cupones ya se han utilizado."
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Product Code in order"
+msgstr "Código producto en orden"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:73
+#: selection:promos.rules.actions,action_type:0
+#, python-format
+msgid "Fixed amount on Product"
+msgstr "Cantidad fija del producto"
+
+#. module: sale_promotions
+#: selection:promos.rules,logic:0
+msgid "Any"
+msgstr "Ninguno"
+
+#. module: sale_promotions
+#: view:sale.order:0
+msgid "Apply Promotions"
+msgstr "Aplicar promociones"
+
+#. module: sale_promotions
+#: field:promos.rules,from_date:0
+msgid "From Date"
+msgstr "Desde"
+
+#~ msgid "Rule Expressions"
+#~ msgstr "Expresión de la regla"
+
 
=== added file 'i18n/es_ES.po'
--- i18n/es_ES.po	1970-01-01 00:00:00 +0000
+++ i18n/es_ES.po	2011-11-30 12:20:28 +0000
@@ -0,0 +1,471 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* sale_promotions
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.15\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2011-03-14 11:44:29+0000\n"
+"PO-Revision-Date: 2011-03-14 13:17+0100\n"
+"Last-Translator: Raimon Esteve <[e-mail]>\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"
+
+#. module: sale_promotions
+#: selection:promos.rules,expected_logic_result:0
+msgid "False"
+msgstr "Falso"
+
+#. module: sale_promotions
+#: field:promos.rules,name:0
+msgid "Promo Name"
+msgstr "Nombre"
+
+#. module: sale_promotions
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter especial!"
+
+#. module: sale_promotions
+#: field:promos.rules.conditions.exps,stop_further:0
+msgid "Stop further checks"
+msgstr "Finalizar comprobación"
+
+#. module: sale_promotions
+#: field:promos.rules,uses_per_coupon:0
+msgid "Uses per Coupon"
+msgstr "Usos por cupón"
+
+#. module: sale_promotions
+#: field:promos.rules,coupon_used:0
+msgid "Number of Coupon Uses"
+msgstr "Número de usos por cupón"
+
+#. module: sale_promotions
+#: field:promos.rules.actions,product_code:0
+msgid "Product Code"
+msgstr "Código producto"
+
+#. module: sale_promotions
+#: model:ir.actions.act_window,name:sale_promotions.act_promotion_rules
+#: model:ir.model,name:sale_promotions.model_promos_rules
+#: model:ir.ui.menu,name:sale_promotions.promos
+msgid "Promotion Rules"
+msgstr "Reglas de promoción"
+
+#. module: sale_promotions
+#: field:sale.order,coupon_code:0
+msgid "Promo Coupon Code"
+msgstr "Código cupón de la promoción"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+msgid "Applicable Period"
+msgstr "Periodo aplicable"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:0
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "greater than"
+msgstr "mayor que"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+msgid "expressions are"
+msgstr "las expresiones son"
+
+#. module: sale_promotions
+#: field:promos.rules,stop_further:0
+msgid "Stop Checks"
+msgstr "Finalizar proceso"
+
+#. module: sale_promotions
+#: model:ir.model,name:sale_promotions.model_promos_rules_conditions_exps
+msgid "Expressions for conditions"
+msgstr "Expresiones para las condiciones"
+
+#. module: sale_promotions
+#: field:promos.rules,to_date:0
+msgid "To Date"
+msgstr "Desde"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:0
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "not equal to"
+msgstr "no es igual a"
+
+#. module: sale_promotions
+#: field:promos.rules.actions,arguments:0
+msgid "Arguments"
+msgstr "Argumentos"
+
+#. module: sale_promotions
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nombre del modelo inválido en la definición de la acción."
+
+#. module: sale_promotions
+#: field:promos.rules,expected_logic_result:0
+msgid "Output"
+msgstr "Salida"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Product UnitPrice combination"
+msgstr "Combinación precio unidad del producto"
+
+#. module: sale_promotions
+#: help:promos.rules,stop_further:0
+msgid "Stops further promotions being checked"
+msgstr "Finalizar promociones"
+
+#. module: sale_promotions
+#: model:ir.model,name:sale_promotions.model_promos_rules_actions
+msgid "Promotions actions"
+msgstr "Acciones de la promoción"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Product Discount combination"
+msgstr "Combinación descuento del producto"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+msgid "Conditions"
+msgstr "Condiciones"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:0
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "greater than or equal to"
+msgstr "mayor o igual a"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:0
+#: selection:promos.rules.actions,action_type:0
+#, python-format
+msgid "Fixed amount on Sub Total"
+msgstr "Cantidad fija en subtotal"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+#: field:promos.rules,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: sale_promotions
+#: field:promos.rules.conditions.exps,serialised_expr:0
+msgid "Expression"
+msgstr "Expresión"
+
+#. module: sale_promotions
+#: field:promos.rules,coupon_code:0
+msgid "Coupon Code"
+msgstr "Código cupón"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:0
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "is not in"
+msgstr "no está en"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Product Weight combination"
+msgstr "Combinación peso del producto"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Product SubTotal combination"
+msgstr "Combinación subtotal del producto"
+
+#. module: sale_promotions
+#: help:sale.order.line,promotion_line:0
+msgid "Indicates if the line was created by promotions"
+msgstr "Indicar si esta línea es creada por promociones"
+
+#. module: sale_promotions
+#: field:promos.rules,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: sale_promotions
+#: selection:promos.rules,expected_logic_result:0
+msgid "True"
+msgstr "Verdadero"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Total Amount"
+msgstr "Cantidad Total"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+msgid "Coupon/Voucher Settings"
+msgstr "Configuración de los cupones"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+msgid "Promotions"
+msgstr "Promociones"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:0
+#: selection:promos.rules.actions,action_type:0
+#, python-format
+msgid "Buy X get Y free"
+msgstr "Compre X y llévate Y"
+
+#. module: sale_promotions
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "¡XML inválido para la definición de la vista!"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Compute sub total of products"
+msgstr "Calcula subtotal de los productos"
+
+#. module: sale_promotions
+#: field:promos.rules.conditions.exps,comparator:0
+msgid "Comparator"
+msgstr "Comparador"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Tax Amount"
+msgstr "Impuestos"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:0
+#: selection:promos.rules.conditions.exps,attribute:0
+#, python-format
+msgid "Untaxed Total"
+msgstr "Base imponible"
+
+#. module: sale_promotions
+#: field:promos.rules.conditions.exps,value:0
+msgid "Value"
+msgstr "Valor"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:0
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "equals"
+msgstr "es igual a"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+#: field:promos.rules,partner_categories:0
+msgid "Partner Categories"
+msgstr "Categorias de clientes"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Product Quantity combination"
+msgstr "Combinación cantidad del producto"
+
+#. module: sale_promotions
+#: field:promos.rules,uses_per_partner:0
+msgid "Uses per Partner"
+msgstr "Usos por cliente"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Compute sub total excluding products"
+msgstr "Calcula subtotal excluyendo productos"
+
+#. module: sale_promotions
+#: field:promos.rules,logic:0
+msgid "Logic"
+msgstr "Lógica"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+msgid "If"
+msgstr "Si"
+
+#. module: sale_promotions
+#: field:promos.rules.actions,action_type:0
+msgid "Action"
+msgstr "Acciones"
+
+#. module: sale_promotions
+#: field:promos.rules,expressions:0
+msgid "Expressions/Conditions"
+msgstr "Expresiones/Condiciones"
+
+#. module: sale_promotions
+#: field:promos.rules.actions,promotion:0
+#: field:promos.rules.conditions.exps,promotion:0
+msgid "Promotion"
+msgstr "Promoción"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Custom domain expression"
+msgstr "Expresión personalizada"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:0
+#: selection:promos.rules.actions,action_type:0
+#, python-format
+msgid "Discount % on Sub Total"
+msgstr "Descuento % en el subtotal"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:0
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "less than or equal to"
+msgstr "menor o igual a"
+
+#. module: sale_promotions
+#: field:sale.order.line,promotion_line:0
+msgid "Promotion Line"
+msgstr "Línia de promoción"
+
+#. module: sale_promotions
+#: field:promos.rules,shop:0
+msgid "Shop"
+msgstr "Tienda"
+
+#. module: sale_promotions
+#: model:ir.module.module,shortdesc:sale_promotions.module_meta_information
+msgid "Promotions for Open ERP"
+msgstr "Promociones para OpenERP"
+
+#. module: sale_promotions
+#: selection:promos.rules,logic:0
+msgid "All"
+msgstr "Todo"
+
+#. module: sale_promotions
+#: model:ir.module.module,description:sale_promotions.module_meta_information
+msgid ""
+"\n"
+"    Promotions on Sale Order for Open ERP\n"
+"    = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =\n"
+"    Features:\n"
+"    1. Promotions based on conditions and coupons\n"
+"    2. Web services API compliance\n"
+"    \n"
+"    Credits:\n"
+"        This design is based/inspired by the Magento commerce\n"
+"        Special Thanks to Yannick Buron for analysis\n"
+"    "
+msgstr ""
+"\n"
+"    Promociones en los pedidos de venta de OpenERP\n"
+"    = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =\n"
+"    Características:\n"
+"    1. Promociones basadas en condiciones y cupones\n"
+"    2. Web services API para su comercio electrónico\n"
+"    \n"
+"    Créditos:\n"
+"        Este módulo se ha diseñado/inspirado de Magento ecommerce\n"
+"        Agradecimientos a Yannick Buron para el análisis\n"
+"    "
+
+#. module: sale_promotions
+#: field:promos.rules,sequence:0
+#: field:promos.rules.actions,sequence:0
+#: field:promos.rules.conditions.exps,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:0
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "is in"
+msgstr "es en"
+
+#. module: sale_promotions
+#: field:promos.rules.conditions.exps,attribute:0
+msgid "Attribute"
+msgstr "Atributo"
+
+#. module: sale_promotions
+#: view:promos.rules.conditions.expres
+#: view:promos.rules.conditions.exps:0
+msgid "Rule Expressions"
+msgstr "Expresión de la regla"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:0
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "less than"
+msgstr "menos de"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+#: field:promos.rules,actions:0
+msgid "Actions"
+msgstr "Acciones"
+
+#. module: sale_promotions
+#: help:promos.rules,partner_categories:0
+msgid "Applicable to all if none is selected"
+msgstr "Aplicable en todo si ninguno es seleccionado"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Product NetPrice combination"
+msgstr "Combinación precio neto del producto"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:0
+#: selection:promos.rules.actions,action_type:0
+#, python-format
+msgid "Discount % on Product"
+msgstr "Descuento % en el producto"
+
+#. module: sale_promotions
+#: help:promos.rules,coupon_used:0
+msgid "The number of times this coupon has been used."
+msgstr "El número de cupones ya se han utilizado."
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Product Code in order"
+msgstr "Código producto en orden"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+msgid "Expressions"
+msgstr "Expresiones"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:0
+#: selection:promos.rules.actions,action_type:0
+#, python-format
+msgid "Fixed amount on Product"
+msgstr "Cantidad fija del producto"
+
+#. module: sale_promotions
+#: selection:promos.rules,logic:0
+msgid "Any"
+msgstr "Ninguno"
+
+#. module: sale_promotions
+#: view:sale.order:0
+msgid "Apply Promotions"
+msgstr "Aplicar promociones"
+
+#. module: sale_promotions
+#: field:promos.rules,from_date:0
+msgid "From Date"
+msgstr "Hasta"
+
 
=== added file 'i18n/sale_promotions.pot'
--- i18n/sale_promotions.pot	1970-01-01 00:00:00 +0000
+++ i18n/sale_promotions.pot	2011-11-30 12:20:28 +0000
@@ -0,0 +1,431 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale_promotions
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.1\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2011-03-14 14:53+0000\n"
+"PO-Revision-Date: 2011-03-14 14:53+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: sale_promotions
+#: field:promos.rules,name:0
+msgid "Promo Name"
+msgstr "Promo Name"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+msgid "expressions are"
+msgstr "expressions are"
+
+#. module: sale_promotions
+#: field:promos.rules.conditions.exps,stop_further:0
+msgid "Stop further checks"
+msgstr "Stop further checks"
+
+#. module: sale_promotions
+#: field:promos.rules,uses_per_coupon:0
+msgid "Uses per Coupon"
+msgstr "Uses per Coupon"
+
+#. module: sale_promotions
+#: field:promos.rules,coupon_used:0
+msgid "Number of Coupon Uses"
+msgstr "Number of Coupon Uses"
+
+#. module: sale_promotions
+#: field:promos.rules.actions,product_code:0
+msgid "Product Code"
+msgstr "Product Code"
+
+#. module: sale_promotions
+#: model:ir.actions.act_window,name:sale_promotions.act_promotion_rules
+#: model:ir.model,name:sale_promotions.model_promos_rules
+#: model:ir.ui.menu,name:sale_promotions.promos
+msgid "Promotion Rules"
+msgstr "Promotion Rules"
+
+#. module: sale_promotions
+#: field:sale.order,coupon_code:0
+msgid "Promo Coupon Code"
+msgstr "Promo Coupon Code"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+msgid "Applicable Period"
+msgstr "Applicable Period"
+
+#. module: sale_promotions
+#: field:promos.rules,stop_further:0
+msgid "Stop Checks"
+msgstr "Stop Checks"
+
+#. module: sale_promotions
+#: model:ir.model,name:sale_promotions.model_promos_rules_conditions_exps
+msgid "Expressions for conditions"
+msgstr "Expressions for conditions"
+
+#. module: sale_promotions
+#: field:promos.rules,to_date:0
+msgid "To Date"
+msgstr "To Date"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:62
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "not equal to"
+msgstr "not equal to"
+
+#. module: sale_promotions
+#: field:promos.rules.actions,arguments:0
+msgid "Arguments"
+msgstr "Arguments"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:64
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "greater than or equal to"
+msgstr "greater than or equal to"
+
+#. module: sale_promotions
+#: field:promos.rules,expected_logic_result:0
+msgid "Output"
+msgstr "Output"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Product UnitPrice combination"
+msgstr "Product UnitPrice combination"
+
+#. module: sale_promotions
+#: help:promos.rules,stop_further:0
+msgid "Stops further promotions being checked"
+msgstr "Stops further promotions being checked"
+
+#. module: sale_promotions
+#: model:ir.model,name:sale_promotions.model_promos_rules_actions
+msgid "Promotions actions"
+msgstr "Promotions actions"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Product Discount combination"
+msgstr "Product Discount combination"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+msgid "Conditions"
+msgstr "Conditions"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:75
+#: selection:promos.rules.actions,action_type:0
+#, python-format
+msgid "Fixed amount on Sub Total"
+msgstr "Fixed amount on Sub Total"
+
+#. module: sale_promotions
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "Order Reference must be unique !"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+#: field:promos.rules,description:0
+msgid "Description"
+msgstr "Description"
+
+#. module: sale_promotions
+#: field:promos.rules.conditions.exps,serialised_expr:0
+msgid "Expression"
+msgstr "Expression"
+
+#. module: sale_promotions
+#: field:promos.rules,coupon_code:0
+msgid "Coupon Code"
+msgstr "Coupon Code"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:68
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "is not in"
+msgstr "is not in"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Product Weight combination"
+msgstr "Product Weight combination"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Product SubTotal combination"
+msgstr "Product SubTotal combination"
+
+#. module: sale_promotions
+#: help:sale.order.line,promotion_line:0
+msgid "Indicates if the line was created by promotions"
+msgstr "Indicates if the line was created by promotions"
+
+#. module: sale_promotions
+#: field:promos.rules,active:0
+msgid "Active"
+msgstr "Active"
+
+#. module: sale_promotions
+#: selection:promos.rules,expected_logic_result:0
+msgid "True"
+msgstr "True"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+msgid "Coupon/Voucher Settings"
+msgstr "Coupon/Voucher Settings"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+msgid "Promotions"
+msgstr "Promotions"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:76
+#: selection:promos.rules.actions,action_type:0
+#, python-format
+msgid "Buy X get Y free"
+msgstr "Buy X get Y free"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Compute sub total of products"
+msgstr "Compute sub total of products"
+
+#. module: sale_promotions
+#: field:promos.rules.conditions.exps,comparator:0
+msgid "Comparator"
+msgstr "Comparator"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Tax Amount"
+msgstr "Tax Amount"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:42
+#: selection:promos.rules.conditions.exps,attribute:0
+#, python-format
+msgid "Untaxed Total"
+msgstr "Untaxed Total"
+
+#. module: sale_promotions
+#: field:promos.rules.conditions.exps,value:0
+msgid "Value"
+msgstr "Value"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:61
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "equals"
+msgstr "equals"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+#: field:promos.rules,partner_categories:0
+msgid "Partner Categories"
+msgstr "Partner Categories"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Product Quantity combination"
+msgstr "Product Quantity combination"
+
+#. module: sale_promotions
+#: field:promos.rules,uses_per_partner:0
+msgid "Uses per Partner"
+msgstr "Uses per Partner"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Compute sub total excluding products"
+msgstr "Compute sub total excluding products"
+
+#. module: sale_promotions
+#: field:promos.rules,logic:0
+msgid "Logic"
+msgstr "Logic"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+msgid "If"
+msgstr "If"
+
+#. module: sale_promotions
+#: field:promos.rules.actions,action_type:0
+msgid "Action"
+msgstr "Action"
+
+#. module: sale_promotions
+#: selection:promos.rules,expected_logic_result:0
+msgid "False"
+msgstr "False"
+
+#. module: sale_promotions
+#: field:promos.rules.actions,promotion:0
+#: field:promos.rules.conditions.exps,promotion:0
+msgid "Promotion"
+msgstr "Promotion"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Custom domain expression"
+msgstr "Custom domain expression"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:74
+#: selection:promos.rules.actions,action_type:0
+#, python-format
+msgid "Discount % on Sub Total"
+msgstr "Discount % on Sub Total"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:66
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "less than or equal to"
+msgstr "less than or equal to"
+
+#. module: sale_promotions
+#: field:sale.order.line,promotion_line:0
+msgid "Promotion Line"
+msgstr "Promotion Line"
+
+#. module: sale_promotions
+#: field:promos.rules,shop:0
+msgid "Shop"
+msgstr "Shop"
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Total Amount"
+msgstr "Total Amount"
+
+#. module: sale_promotions
+#: selection:promos.rules,logic:0
+msgid "All"
+msgstr "All"
+
+#. module: sale_promotions
+#: model:ir.model,name:sale_promotions.model_sale_order
+msgid "Sales Order"
+msgstr "Sales Order"
+
+#. module: sale_promotions
+#: field:promos.rules,expressions:0
+msgid "Expressions/Conditions"
+msgstr "Expressions/Conditions"
+
+#. module: sale_promotions
+#: field:promos.rules,sequence:0
+#: field:promos.rules.actions,sequence:0
+#: field:promos.rules.conditions.exps,sequence:0
+msgid "Sequence"
+msgstr "Sequence"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:67
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "is in"
+msgstr "is in"
+
+#. module: sale_promotions
+#: field:promos.rules.conditions.exps,attribute:0
+msgid "Attribute"
+msgstr "Attribute"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:65
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "less than"
+msgstr "less than"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+#: field:promos.rules,actions:0
+msgid "Actions"
+msgstr "Actions"
+
+#. module: sale_promotions
+#: help:promos.rules,partner_categories:0
+msgid "Applicable to all if none is selected"
+msgstr "Applicable to all if none is selected"
+
+#. module: sale_promotions
+#: model:ir.model,name:sale_promotions.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Sales Order Line"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:63
+#: selection:promos.rules.conditions.exps,comparator:0
+#, python-format
+msgid "greater than"
+msgstr "greater than"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:72
+#: selection:promos.rules.actions,action_type:0
+#, python-format
+msgid "Discount % on Product"
+msgstr "Discount % on Product"
+
+#. module: sale_promotions
+#: help:promos.rules,coupon_used:0
+msgid "The number of times this coupon has been used."
+msgstr "The number of times this coupon has been used."
+
+#. module: sale_promotions
+#: selection:promos.rules.conditions.exps,attribute:0
+msgid "Product Code in order"
+msgstr "Product Code in order"
+
+#. module: sale_promotions
+#: view:promos.rules:0
+#: view:promos.rules.conditions.expres
+            :0
+#: view:promos.rules.conditions.exps:0
+msgid "Expressions"
+msgstr "Expressions"
+
+#. module: sale_promotions
+#: code:addons/sale_promotions/models/rules.py:73
+#: selection:promos.rules.actions,action_type:0
+#, python-format
+msgid "Fixed amount on Product"
+msgstr "Fixed amount on Product"
+
+#. module: sale_promotions
+#: selection:promos.rules,logic:0
+msgid "Any"
+msgstr "Any"
+
+#. module: sale_promotions
+#: view:sale.order:0
+msgid "Apply Promotions"
+msgstr "Apply Promotions"
+
+#. module: sale_promotions
+#: field:promos.rules,from_date:0
+msgid "From Date"
+msgstr "From Date"
+
 
=== modified file 'models/rules.py'
--- models/rules.py	2010-06-11 11:40:30 +0000
+++ models/rules.py	2011-11-30 12:20:28 +0000
@@ -6,6 +6,7 @@
 #########################################################################
 #                                                                       #
 # Copyright (C) 2010 Open Labs Business Solutions                       #
+# Copyright (C) 2011 Zikzakmedia                                        #
 # Special Credit: Yannick Buron for design evaluation                   #
 #                                                                       #
 #This program is free software: you can redistribute it and/or modify   #
@@ -27,21 +28,61 @@
     from sets import Set as set
 except:
     pass
+
 from osv import osv, fields
 from tools.misc import ustr
 import netsvc
+from tools.translate import _
 
 LOGGER = netsvc.Logger()
 DEBUG = True
 PRODUCT_UOM_ID = 1
 
+ATTRIBUTES = [
+    ('amount_untaxed', _('Untaxed Total')),
+    ('amount_tax', 'Tax Amount'),
+    ('amount_total', 'Total Amount'),
+    ('product', 'Product Code in order'),
+    ('prod_qty', 'Product Quantity combination'),
+    ('prod_unit_price', 'Product UnitPrice combination'),
+    ('prod_sub_total', 'Product SubTotal combination'),
+#    ('prod_net_price', 'Product NetPrice combination'),
+    ('prod_discount', 'Product Discount combination'),
+    ('prod_weight', 'Product Weight combination'),
+    ('comp_sub_total', 'Compute sub total of products'),
+    ('comp_sub_total_x', 'Compute sub total excluding products'),
+    #('tot_item_qty', 'Total Items Quantity'),
+    #('tot_weight', 'Total Weight'),
+    #('tot_item_qty', 'Total Items Quantity'),
+    ('custom', 'Custom domain expression'),
+]
+
+COMPARATORS = [
+    ('==', _('equals')),
+    ('!=', _('not equal to')),
+    ('>', _('greater than')),
+    ('>=', _('greater than or equal to')),
+    ('<', _('less than')),
+    ('<=', _('less than or equal to')),
+    ('in', _('is in')),
+    ('not in', _('is not in')),
+]
+
+ACTION_TYPES = [
+    ('prod_disc_perc', _('Discount % on Product')),
+    ('prod_disc_fix', _('Fixed amount on Product')),
+    ('cart_disc_perc', _('Discount % on Sub Total')),
+    ('cart_disc_fix', _('Fixed amount on Sub Total')),
+    ('prod_x_get_y', _('Buy X get Y free'))
+]
+
 class PromotionsRules(osv.osv):
     "Promotion Rules"
     _name = "promos.rules"
     _description = __doc__
     _order = 'sequence'
     
-    def _count_coupon_use(self, cursor, user, ids, 
+    def count_coupon_use(self, cursor, user, ids, 
                           name, arg, context=None):
         '''
         This function count the number of sale orders(not in cancelled state)
@@ -84,11 +125,11 @@
                   string="Partner Categories",
                   help="Applicable to all if none is selected"
                                               ),
-        'coupon_code':fields.char('Coupon Code', size=20),
+        'coupon_code':fields.char('Coupon Code', size=20, required=True),
         'uses_per_coupon':fields.integer('Uses per Coupon'),
         'uses_per_partner':fields.integer('Uses per Partner'),
         'coupon_used': fields.function(
-                    _count_coupon_use, 
+                    count_coupon_use, 
                     method=True, 
                     type='integer',
                     string='Number of Coupon Uses',
@@ -117,10 +158,11 @@
     }
     _defaults = {
         'logic':lambda * a:'and',
-        'expected_logic_result':lambda * a:'True'
+        'expected_logic_result':lambda * a:'True',
+        'active':lambda * a:'True',
     }
     
-    def _date(self, str_date):
+    def promotion_date(self, str_date):
         "Converts string date to date"
         import time
         try:
@@ -132,7 +174,7 @@
                 return str_date
             
         
-    def _check_primary_conditions(self, cursor, user,
+    def check_primary_conditions(self, cursor, user,
                                   promotion_rule, order, context):
         """
         Checks the conditions for 
@@ -161,9 +203,9 @@
             #If the codes don't match then this is not the promo 
             if not order.coupon_code == promotion_rule.coupon_code:
                 raise Exception("Coupon codes do not match")
-            # Calling _count_coupon_use to check whether no. of 
+            # Calling count_coupon_use to check whether no. of 
             # uses is greater than allowed uses.
-            count = self._count_coupon_use(cursor, user, [promotion_rule.id], 
+            count = self.count_coupon_use(cursor, user, [promotion_rule.id], 
                                            True, None, context).values()[0]
             if count > promotion_rule.uses_per_coupon:
                 raise Exception("Coupon is overused")
@@ -179,13 +221,13 @@
                     raise Exception("Customer already used coupon")
         #if a start date has been specified
         if promotion_rule.from_date and \
-            not (self._date(
-                order.date_order) >= self._date(promotion_rule.from_date)):
+            not (self.promotion_date(
+                order.date_order) >= self.promotion_date(promotion_rule.from_date)):
             raise Exception("Order before start of promotion")
         #If an end date has been specified
         if promotion_rule.to_date and \
-            not (self._date(
-                order.date_order) <= self._date(promotion_rule.to_date)):
+            not (self.promotion_date(
+                order.date_order) <= self.promotion_date(promotion_rule.to_date)):
             raise Exception("Order after end of promotion")
         #All tests have succeeded
         return True
@@ -203,7 +245,7 @@
             context = {}
         expression_obj = self.pool.get('promos.rules.conditions.exps')
         try:
-            self._check_primary_conditions(
+            self.check_primary_conditions(
                                            cursor, user,
                                            promotion_rule, order,
                                            context)
@@ -326,34 +368,7 @@
     _order = "sequence"
     _rec_name = 'serialised_expr'
     
-    def _get_attributes(self, cursor, user, ids=None, context=None):
-        """
-        Gets the attributes in predefined format
-        @param cursor: Database Cursor
-        @param user: ID of User
-        @param ids: ID of current record.
-        @param context: Context(no direct use).
-        """
-        return [
-                ('amount_untaxed', 'Untaxed Total'),
-                ('amount_tax', 'Tax Amount'),
-                ('amount_total', 'Total Amount'),
-                ('product', 'Product Code in order'),
-                ('prod_qty', 'Product Quantity combination'),
-                ('prod_unit_price', 'Product UnitPrice combination'),
-                ('prod_sub_total', 'Product SubTotal combination'),
-                ('prod_net_price', 'Product NetPrice combination'),
-                ('prod_discount', 'Product Discount combination'),
-                ('prod_weight', 'Product Weight combination'),
-                ('comp_sub_total', 'Compute sub total of products'),
-                ('comp_sub_total_x', 'Compute sub total excluding products'),
-                #('tot_item_qty', 'Total Items Quantity'),
-                #('tot_weight', 'Total Weight'),
-                #('tot_item_qty', 'Total Items Quantity'),
-                ('custom', 'Custom domain expression'),
-                ]
-        
-    def _on_change(self, cursor, user, ids=None,
+    def on_change(self, cursor, user, ids=None,
                    attribute=None, value=None, context=None):
         """
         Set the value field to the format if nothing is there
@@ -420,41 +435,17 @@
                              }
                     }
         return {}
-            
-    def _get_comparators(self, cursor, user, ids=None, context=None):
-        """
-        Gets the attributes in predefined format
-        @param cursor: Database Cursor
-        @param user: ID of User
-        @param ids: ID of current record.
-        @param context: Context(no direct use).
-        """
-        return [
-#                ('is', 'is'),
-#                ('isnot', 'is not'),
-                ('==', 'equals'),
-                ('!=', 'not equal to'),
-                ('>', 'greater than'),
-                ('>=', 'greater than or equal to'),
-                ('<', 'less than'),
-                ('<=', 'less than or equal to'),
-                ('in', 'is in'),
-                ('not in', 'is not in'),
-                ]
-    
+
     _columns = {
         'sequence':fields.integer('Sequence'),
-        'attribute':fields.selection(_get_attributes,
-                                     'Attribute', size=50, required=True),
-        'comparator':fields.selection(_get_comparators,
-                                      'Comparator', required=True),
+        'attribute':fields.selection(ATTRIBUTES,'Attribute', size=50, required=True),
+        'comparator':fields.selection(COMPARATORS, 'Comparator', required=True),
         'value':fields.char('Value', size=100),
         'serialised_expr':fields.char('Expression', size=255),
-        'promotion': fields.many2one('promos.rules',
-                                     'Promotion'),
+        'promotion': fields.many2one('promos.rules', 'Promotion'),
         'stop_further':fields.boolean('Stop further checks')
-        
     }
+
     _defaults = {
         'comparator': lambda * a:'==',
         'stop_further': lambda * a: '1'
@@ -613,9 +604,9 @@
                 prod_qty[product_code] = prod_qty.get(
                                             product_code, 0.00
                                                     ) + line.product_uom_qty
-                prod_net_price[product_code] = prod_net_price.get(
-                                                    product_code, 0.00
-                                                    ) + line.price_net
+#                prod_net_price[product_code] = prod_net_price.get(
+#                                                    product_code, 0.00
+#                                                    ) + line.price_net
                 prod_unit_price[product_code] = prod_unit_price.get(
                                                     product_code, 0.00
                                                     ) + line.price_unit
@@ -686,7 +677,7 @@
     _description = __doc__
     _rec_name = 'action_type'
 
-    def _on_change(self, cursor, user, ids=None,
+    def on_change(self, cursor, user, ids=None,
                    action_type=None, product_code=None,
                    arguments=None, context=None):
         """
@@ -743,37 +734,16 @@
                     }
         #Finally if nothing works
         return {}
-    
-    def _get_action_types(self, cursor, user, ids=None, context=None):
-        """
-        Gets the action types in predefined format
-        @param cursor: Database Cursor
-        @param user: ID of User
-        @param ids: ID current record.
-        @param context: Context(no direct use).
-        """
-        return [
-                ('prod_disc_perc', 'Discount % on Product'),
-                ('prod_disc_fix', 'Fixed amount on Product'),
-                ('cart_disc_perc', 'Discount % on Sub Total'),
-                ('cart_disc_fix', 'Fixed amount on Sub Total'),
-                ('prod_x_get_y', 'Buy X get Y free')
-                ]
             
     _columns = {
         'sequence':fields.integer('Sequence', required=True),
-        'action_type':fields.selection(_get_action_types,
-                                       'Action',
-                                       required=True),
-        'product_code':fields.char('Product Code',
-                                   size=100,
-                                   ),
+        'action_type':fields.selection(ACTION_TYPES, 'Action', required=True),
+        'product_code':fields.char('Product Code', size=100),
         'arguments':fields.char('Arguments', size=100),
-        'promotion':fields.many2one('promos.rules',
-                                    'Promotion'),
+        'promotion':fields.many2one('promos.rules', 'Promotion'),
     }
     
-    def _clear_existing_promotion_lines(self, cursor, user,
+    def clear_existing_promotion_lines(self, cursor, user,
                                         order, context=None):
         """
         Deletes existing promotion lines before applying
@@ -805,7 +775,7 @@
                                  context=context)
         return True
         
-    def _action_prod_disc_perc(self, cursor, user,
+    def action_prod_disc_perc(self, cursor, user,
                                action, order, context=None):
         """
         Action for 'Discount % on Product'
@@ -827,7 +797,7 @@
                                      context
                                      )
     
-    def _action_prod_disc_fix(self, cursor, user,
+    def action_prod_disc_fix(self, cursor, user,
                               action, order, context=None):
         """
         Action for 'Fixed amount on Product'
@@ -862,7 +832,7 @@
                               context
                               )
     
-    def _action_cart_disc_perc(self, cursor, user,
+    def action_cart_disc_perc(self, cursor, user,
                                action, order, context=None):
         """
         'Discount % on Sub Total'
@@ -887,7 +857,7 @@
                                   context
                                   )
         
-    def _action_cart_disc_fix(self, cursor, user,
+    def action_cart_disc_fix(self, cursor, user,
                               action, order, context=None):
         """
         'Fixed amount on Sub Total'
@@ -912,7 +882,7 @@
                                   context
                                   )
     
-    def _create_y_line(self, cursor, user, action,
+    def create_y_line(self, cursor, user, action,
                        order, quantity, product_id, context=None):
         """
         Create new order line for product
@@ -939,7 +909,7 @@
                               'product_uom':product_y.uom_id.id
                               }, context)
 
-    def _action_prod_x_get_y(self, cursor, user,
+    def action_prod_x_get_y(self, cursor, user,
                              action, order, context=None):
         """
         'Buy X get Y free:[Only for integers]'
@@ -1020,7 +990,7 @@
                                          {
                                     'product_uom_qty': qty_y_in_cart - tot_free_y,
                                           }, context)
-                    self._create_y_line(cursor, user, action,
+                    self.create_y_line(cursor, user, action,
                                             order,
                                             tot_free_y,
                                             product_id,
@@ -1036,7 +1006,7 @@
             #Dont create line if quantity is not there
             if not tot_free_y:
                 return True
-            return self._create_y_line(cursor, user, action,
+            return self.create_y_line(cursor, user, action,
                                        order, tot_free_y, product_id, context)
                                 
     def execute(self, cursor, user, action_id,
@@ -1049,9 +1019,9 @@
         @param order: sale order
         @param context: Context(no direct use).
         """
-        self._clear_existing_promotion_lines(cursor, user, order, context)
+        self.clear_existing_promotion_lines(cursor, user, order, context)
         action = self.browse(cursor, user, action_id, context)
-        method_name = '_action_' + action.action_type
+        method_name = 'action_' + action.action_type
         return getattr(self, method_name).__call__(cursor, user, action,
                                                    order, context)
         
 
=== added file 'security/ir.model.access.csv'
--- security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ security/ir.model.access.csv	2011-11-30 12:20:28 +0000
@@ -0,0 +1,4 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_promos_rules","sale_promotions_promos_rules","model_promos_rules","base.group_sale_manager",1,1,1,1
+"access_promos_rules_conditions_exps","sale_promotions_promos_rules_conditions_exps","model_promos_rules_conditions_exps","base.group_sale_manager",1,1,1,1
+"access_promos_rules_actions","sale_promotions_promos_rules_actions","model_promos_rules_actions","base.group_sale_manager",1,1,1,1
 
=== modified file 'views/rule.xml'
--- views/rule.xml	2010-06-09 14:44:01 +0000
+++ views/rule.xml	2011-11-30 12:20:28 +0000
@@ -21,23 +21,23 @@
                             nolabel="1" />
 
                     </group>
-			<group colspan="6">
-                    <group colspan="2">
-                        <separator colspan="4"
-                            string="Coupon/Voucher Settings" />
-                        <field name="coupon_code" />
-						<field name="coupon_used" />
-                        <field name="uses_per_coupon"
-                            attrs="{'required':[('coupon_code','!=',False)]}" />
-                        <field name="uses_per_partner"
-                            attrs="{'required':[('coupon_code','!=',False)]}" />
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator colspan="4" string="Applicable Period" />
-                        <field name="from_date" />
-                        <field name="to_date" />
-                    </group>
-</group>
+			        <group colspan="6">
+                        <group colspan="2">
+                            <separator colspan="4"
+                                string="Coupon/Voucher Settings" />
+                            <field name="coupon_code" />
+						    <field name="coupon_used" />
+                            <field name="uses_per_coupon"
+                                attrs="{'required':[('coupon_code','!=',False)]}" />
+                            <field name="uses_per_partner"
+                                attrs="{'required':[('coupon_code','!=',False)]}" />
+                        </group>
+                        <group col="2" colspan="2">
+                            <separator colspan="4" string="Applicable Period" />
+                            <field name="from_date" />
+                            <field name="to_date" />
+                        </group>
+                    </group>
                     <notebook colspan="4">
                         <page string="Conditions">
                             <group colspan="4" col="8">
@@ -55,10 +55,18 @@
                                     <field name="sequence" />
                                     <field name="stop_further" />
                                     <field name="attribute"
+                                        on_change="on_change(attribute, value)" />
+                                    <field name="comparator" />
+                                    <field name="value" />
+                                </tree>
+                                <form>
+                                    <field name="sequence" />
+                                    <field name="attribute"
                                         on_change="_on_change(attribute, value)" />
                                     <field name="comparator" />
                                     <field name="value" />
-                                </tree>
+                                    <field name="stop_further" />
+                                </form>
                             </field>
                         </page>
                         <page string="Actions">
@@ -66,10 +74,17 @@
                                 <tree editable="bottom" string="Actions">
                                     <field name="sequence" />
                                     <field name="action_type"
+                                        on_change="on_change(action_type, product_code, arguments)" />
+                                    <field name="product_code" />
+                                    <field name="arguments" />
+                                </tree>
+                                <form>
+                                    <field name="sequence" />
+                                    <field name="action_type"
                                         on_change="_on_change(action_type, product_code, arguments)" />
                                     <field name="product_code" />
                                     <field name="arguments" />
-                                </tree>
+                                </form>
                             </field>
                         </page>
                         <page string="Partner Categories">
@@ -105,14 +120,14 @@
             <field name="view_mode">tree,form</field>
         </record>
         <menuitem id="promos" action="act_promotion_rules"
-            parent="sale.menu_shop_configuration" />
+            parent="base.menu_sale_config_sales" />
 
         <record model="ir.ui.view" id="view_promotion_cond_expr_form">
             <field name="name">promos.rules.conditions.exps.form</field>
             <field name="model">promos.rules.conditions.exps</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Rule Expressions">
+                <form string="Expressions">
                     <field name="sequence" />
                     <field name="serialised_expr" />
                 </form>
@@ -125,11 +140,11 @@
             </field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Rule Expressions">
+                <tree string="Expressions">
                     <field name="sequence" />
                     <field name="serialised_expr" />
                 </tree>
             </field>
         </record>
     </data>
-</openerp>
 \ No newline at end of file
+</openerp>
 
=== modified file 'views/sale.xml'
--- views/sale.xml	2010-06-08 21:42:30 +0000
+++ views/sale.xml	2011-11-30 12:20:28 +0000
@@ -7,10 +7,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="sale.view_order_form" />
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page[@string='Other data']"
-                    position="inside">
-                    <field name='coupon_code'
-                        attrs="{'readonly':[('state','!=','draft')]}" />
+                <xpath expr="/form/notebook/page[@string='Other Information']" position="inside">
+                    <field name='coupon_code' attrs="{'readonly':[('state','!=','draft')]}" />
                 </xpath>
             </field>
         </record>
@@ -20,13 +18,12 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="sale.view_order_form" />
             <field name="arch" type="xml">
-                <xpath
-                    expr="/form/notebook/page[@string='Sale Order']/group/button[@name='order_confirm']"
-                    position="before">
-                    <button name="apply_promotions" type="object"
-                        states="draft" string="Apply Promotions" />
+                <xpath expr="/form/notebook/page[@string='Sales Order']/group/button[@name='order_confirm']" position="after">
+                    <group colspan="4" col="13">
+                        <button name="apply_promotions" type="object" states="draft" string="Apply Promotions" />
+                    </group>
                 </xpath>
             </field>
         </record>
     </data>
-</openerp>
 \ No newline at end of file
+</openerp>