avanzosc team mailing list archive

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

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

Corregidos los errores al instalar
-- 
https://code.launchpad.net/~avanzosc-security-team/avanzosc/72h_dos_sale_commissioncalc/+merge/226082
Your team Avanzosc_security is subscribed to branch lp:~avanzosc-security-team/avanzosc/72horas.

=== modified file 'dos_sale_commissioncalc/__init__.py'
--- dos_sale_commissioncalc/__init__.py	2014-07-03 15:52:36 +0000
+++ dos_sale_commissioncalc/__init__.py	2014-07-09 09:03:41 +0000
@@ -21,6 +21,5 @@
 ##############################################################################
 
 from . import models
-from . import report
+from . import reports
 from . import wizard
-

=== modified file 'dos_sale_commissioncalc/views/invoice_view.xml'
--- dos_sale_commissioncalc/views/invoice_view.xml	2014-07-03 15:52:36 +0000
+++ dos_sale_commissioncalc/views/invoice_view.xml	2014-07-09 09:03:41 +0000
@@ -1,22 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-		<record id="invoice_form_add_agent_settled_field" model="ir.ui.view">
-            <field name="name">account.invoice.form.add_agent_field</field>
+        <record id="invoice_form_add_agent_settled_field" model="ir.ui.view">
+            <field name="name">account.invoice.form.add_agent_field
+            </field>
             <field name="model">account.invoice</field>
-            <field name="inherit_id" ref="account.invoice_form"/>
+            <field name="inherit_id" ref="account.invoice_form" />
             <field name="arch" type="xml">
-                <field name="address_contact_id" position="after">
-					<field name="decorator_discount"/>
-					<field name="agent_id"/>
-					<field name="agent2_id"/>
-					<field name="agent1_percentage_distribution_commission" readonly="1" />
-					<field name="agent2_percentage_distribution_commission" on_change="onchange_ag_pctage_dist_comm2(agent2_percentage_distribution_commission)" />
-					<field name="commission_settled" readonly="1"/>
-					<field name="commission_settled_date" readonly="1"/>
-					<field name="commission_total" readonly="1"/>
+                <field name="partner_id" position="after">
+                    <field name="decorator_discount" />
+                    <field name="agent_id" />
+                    <field name="agent2_id" />
+                    <field name="agent1_percentage_distribution_commission"
+                        readonly="1" />
+                    <field name="agent2_percentage_distribution_commission"
+                        on_change="onchange_ag_pctage_dist_comm2(agent2_percentage_distribution_commission)" />
+                    <field name="commission_settled" readonly="1" />
+                    <field name="commission_settled_date"
+                        readonly="1" />
+                    <field name="commission_total" readonly="1" />
                 </field>
             </field>
         </record>
-	</data>
+    </data>
 </openerp>
\ No newline at end of file

=== modified file 'dos_sale_commissioncalc/wizard/dos_sale_commission_report_wizard.py'
--- dos_sale_commissioncalc/wizard/dos_sale_commission_report_wizard.py	2014-07-03 15:52:36 +0000
+++ dos_sale_commissioncalc/wizard/dos_sale_commission_report_wizard.py	2014-07-09 09:03:41 +0000
@@ -20,7 +20,7 @@
 ##############################################################################
 
 import time
-from openerp.orm import orm, fields
+from openerp.osv import orm, fields
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
 from openerp.tools.translate import _