← Back to team overview

avanzosc team mailing list archive

[Merge] lp:~avanzosc-security-team/avanzosc/72h_dos_mrp_production into lp:~avanzosc-security-team/avanzosc/72horas

 

Oihane (Avanzosc) has proposed merging lp:~avanzosc-security-team/avanzosc/72h_dos_mrp_production 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_mrp_production/+merge/225994

Corregidos errores al instalar
-- 
https://code.launchpad.net/~avanzosc-security-team/avanzosc/72h_dos_mrp_production/+merge/225994
Your team Avanzosc_security is subscribed to branch lp:~avanzosc-security-team/avanzosc/72horas.
=== added file 'dos_mrp_production/models/__init__.py'
--- dos_mrp_production/models/__init__.py	1970-01-01 00:00:00 +0000
+++ dos_mrp_production/models/__init__.py	2014-07-08 15:18:02 +0000
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 DOS (<http://www.dos-sl.es>).
+#
+#    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 mrp_procurement
+from . import mrp_production

=== 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:18:02 +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>


Follow ups