avanzosc team mailing list archive

["Oihane \(Avanzosc\)" <oihanecruce@xxxxxxxxx>]

Oihane (Avanzosc) has proposed merging lp:~avanzosc-security-team/avanzosc/72h_dos_sale_group into lp:~avanzosc-security-team/avanzosc/72horas.

Requested reviews:
  Pedro Manuel Baeza (pedro.baeza)

For more details, see:
https://code.launchpad.net/~avanzosc-security-team/avanzosc/72h_dos_sale_group/+merge/225997

Corregidos errores
-- 
https://code.launchpad.net/~avanzosc-security-team/avanzosc/72h_dos_sale_group/+merge/225997
Your team Avanzosc_security is subscribed to branch lp:~avanzosc-security-team/avanzosc/72horas.

=== modified file 'dos_sale_group/__init__.py'
--- dos_sale_group/__init__.py	2014-06-20 11:36:03 +0000
+++ dos_sale_group/__init__.py	2014-07-08 15:55:15 +0000
@@ -20,6 +20,5 @@
 ##############################################################################
 
 from . import models
-from . import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'dos_sale_group/models/__init__.py'
--- dos_sale_group/models/__init__.py	1970-01-01 00:00:00 +0000
+++ dos_sale_group/models/__init__.py	2014-07-08 15:55:15 +0000
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from . import sale_group
+from . import sale_order_line

=== modified file 'dos_sale_group/models/sale_group.py'
--- dos_sale_group/models/sale_group.py	2014-07-07 09:17:11 +0000
+++ dos_sale_group/models/sale_group.py	2014-07-08 15:55:15 +0000
@@ -64,7 +64,7 @@
     _name = 'sale.group.line'
     _description = "Sale Group Line"
 
-    def _check_line_percentage(self, cr, uid, ids, context):
+    def _check_line_percentage(self, cr, uid, ids, context=None):
         sale_group_line = self.browse(cr, uid, ids, context)[0]
         if sale_group_line.percentage:
             if (sale_group_line.percentage <= 0 or
@@ -86,7 +86,7 @@
     _order = 'percentage desc'
 
     _constraints = [
-        (_check_line_percentage,  _('Error: It is necessary the sale line '
-                                    'percentage is between 0 and 100.',
-                                    ['percentage'])),
-        ]
+        (_check_line_percentage, _('Error: It is necessary the sale line '
+                                   'percentage is between 0 and 100.'),
+         ['percentage']),
+    ]

=== removed directory 'dos_sale_group/wizard'
=== modified file 'nayar_sepa_mandate/views/sdd_mandate_view.xml'
--- nayar_sepa_mandate/views/sdd_mandate_view.xml	2014-07-02 15:25:41 +0000
+++ nayar_sepa_mandate/views/sdd_mandate_view.xml	2014-07-08 15:55:15 +0000
@@ -12,9 +12,7 @@
             <field name="inherit_id"
                 ref="account_payment_sepa_direct_debit.sdd_mandate_form" />
             <field name="arch" type="xml">
-                <group colspan="4" position="replace" />
-                <field name="company_id" position="before">
-                    <field name="unique_mandate_reference" />
+                <field name="type" position="before">
                     <field name="sdd_scheme" />
                 </field>
             </field>