[FIX] correcciones y limpieza de codigo

__init__.py

@@ -1,3 +1,3 @@
-# -*- coding: utf-8 -*-
-import controllers
-import models
+# -*- coding : utf-8 -*-
+from . import controllers
+from . import models

__openerp__.py

@@ -4,9 +4,12 @@
     'author': "Eiru Software",
     'category': 'Reporte',
     'version': '0.1',
-    'depends': ['base','eiru_assets','company_set_information','invoice_credit','attachments_views','account_timbrado'],
+    'depends': ['base','eiru_assets'],
     'data': [
-    'templates.xml',
+        'templates.xml',
+        # 'views/account_invoice.xml',
+        # 'views/account_journal.xml',
+        # 'views/res_company.xml',
     ],
     'qweb': [
         'static/src/xml/*.xml',

controllers.py

@@ -1,2 +0,0 @@
-# -*- coding: utf-8 -*-
-from openerp import http

models.py

@@ -1,2 +0,0 @@
-# -*- coding: utf-8 -*-
-from openerp import models, fields, api

static/src/js/reports/report_purchases.js

@@ -59,14 +59,10 @@ function report_purchases (reporting){
                 return self.fetchAttachment();
             }).then(function(attachment){
                 self.attachment=attachment;
-                return self.fecthComanyCurrency();
+                return self.fecthComany();
             }).then(function(resCompany){
                 self.resCompany = resCompany;
-                self.inicializarBuscadorsup();
                 return self.fect_generar(self.invoice);
-            }).then(function(currency){
-                self.currency = currency;
-                // return self.fect_cabecera(self.resCompany, self.newInvoice);
             });
         },
         // Buscar Diario
@@ -105,13 +101,13 @@ function report_purchases (reporting){
             return defer;
         },
         // company_curency
-        fecthComanyCurrency: function(){
+        fecthComany: function(){
             var self = this;
             var defer = $.Deferred();
-            var currency = new instance.web.Model('res.company');
+            var company = new instance.web.Model('res.company');
             var field=['id', 'currency_id','exportador','agent_ruc','legal_agent','company_ruc','name','juridico'];
             var domain=[['id','=',1]];
-            currency.query(field).filter(domain).all().then(function(results){
+            company.query(field).filter(domain).all().then(function(results){
                 defer.resolve(results);
             });
             return defer;
@@ -160,32 +156,6 @@ function report_purchases (reporting){
             }
             return valor;
         },
-        // Buscador
-        inicializarBuscadorsup: function () {
-            var self = this;
-            var results = self.supplier;
-            results = _.map(results, function (item) {
-                return {
-                    label: item.id + '-'+ item.name + ' ' + self.valorNull(item.ruc),
-                    value: item.id + '-'+ item.name + ' ' + self.valorNull(item.ruc)
-                }
-            });
-            self.$('#customer').autocomplete({
-                source: results,
-                minLength:0,
-                search: function(event, ui) {
-                    if (!(self.$('#customer').val())){
-                        self.factSearch();
-                    }
-                },
-                close: function( event, ui ) {
-                    self.factSearch();
-                },
-                select: function(event, ui) {
-                    self.factSearch();
-                }
-            });
-        },
         getSupplier : function(partner_id){
             var self = this;
             return _.filter(self.supplier,function(item){

static/src/js/reports/report_sales.js

@@ -57,14 +57,10 @@ function report_sales (reporting){
                 return self.fetchAttachment();
             }).then(function(attachment){
                 self.attachment=attachment;
-                return self.fecthComanyCurrency();
+                return self.fecthCompany();
             }).then(function(resCompany){
                 self.resCompany = resCompany;
-                self.inicializarBuscadorsup();
                 return self.fect_generar(self.invoice);
-            }).then(function(currency){
-                self.currency = currency;
-                // return self.fect_cabecera(self.resCompany, self.invoice);
             });
         },
         // Buscar Diario
@@ -102,19 +98,19 @@ function report_sales (reporting){
             });
             return defer;
         },
-        // company_curency
-        fecthComanyCurrency: function(){
+        // company
+        fecthCompany: function(){
             var self = this;
             var defer = $.Deferred();
-            var currency = new instance.web.Model('res.company');
+            var company = new instance.web.Model('res.company');
             var field=['id', 'currency_id','exportador','agent_ruc','legal_agent','company_ruc','name','juridico'];
             var domain=[['id','=',1]];
-            currency.query(field).filter(domain).all().then(function(results){
+            company.query(field).filter(domain).all().then(function(results){
                 defer.resolve(results);
             });
             return defer;
         },
-        // Partner (Proveeedor)
+        // Clientes
         fetchCustomer: function() {
             var self = this;
             var defer = $.Deferred();
@@ -158,32 +154,6 @@ function report_sales (reporting){
             }
             return valor;
         },
-        // Buscador
-        inicializarBuscadorsup: function () {
-            var self = this;
-            var results = self.customer;
-            results = _.map(results, function (item) {
-                return {
-                        label: item.id + '-'+ item.name + ' ' + self.valorNull(item.ruc),
-                        value: item.id + '-'+ item.name + ' ' + self.valorNull(item.ruc)
-                }
-            });
-            self.$('#customer').autocomplete({
-                source: results,
-                minLength:0,
-                search: function(event, ui) {
-                    if (!(self.$('#customer').val())){
-                        self.factSearch();
-                    }
-                },
-                close: function( event, ui ) {
-                        self.factSearch();
-                },
-                select: function(event, ui) {
-                    self.factSearch();
-                }
-            });
-        },
         // Obtener el cliente
         getCustomer : function(partner_id){
             var self = this;
@@ -370,10 +340,10 @@ function report_sales (reporting){
                 datos.push(tipo);
                 datos.push('\t');
                 // Codigo Obligacion
-                datos.push(911);
+                datos.push(921);
                 datos.push('\t');
                 // Codigo Formulario
-                datos.push(211);
+                datos.push(221);
                 datos.push('\t');
                 // Ruc agente de informacion
                 datos.push(company_ruc[0]);
@@ -481,6 +451,7 @@ function report_sales (reporting){
             datos[22] = cantidad;
             datos.splice(24,0);
             datos[24] = ingreso;
+            // console.log(datos);
             self.newCabecera = new Blob(datos, {type: 'text/plain'});
         },
 

views/account_invoice.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="account_invoice_customer_credit" model="ir.ui.view">
+            <field name="name">account.invoice.credit</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_form" />
+            <field name="arch" type="xml">
+                <field name="partner_id" position="after">
+                    <field name="contado" attrs="{'readonly': [('state','!=','draft')]}"/>
+                </field>
+                <field name="contado"  position="after" >
+                    <field name="credito" attrs="{'readonly' : ['|',('state','!=','draft')]}"/>
+                </field>
+                <field name="payment_term" position="replace">
+                    <field name="payment_term" class="oe_inline" attrs="{'invisible' : [('credito', '=', False )],'required' : [ ('credito', '=', True )]}"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="account_invoice_supplier_credit" model="ir.ui.view">
+            <field name="name">account.invoice.supplier.credit</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_supplier_form" />
+            <field name="arch" type="xml">
+                <field name="journal_id" position="after">
+                    <field name="contado" attrs="{'readonly': [('state','!=','draft')]}"/>
+                </field>
+                <field name="contado"  position="after" >
+                    <field name="credito" attrs="{'readonly' : ['|',('state','!=','draft')]}"/>
+                </field>
+                <field name="payment_term" position="replace">
+                    <field name="payment_term" class="oe_inline" attrs="{'invisible' : [('credito', '=', False )],'required' : [ ('credito', '=', True )]}"/>
+                </field>
+                <field name="supplier_invoice_number" position="before">
+                    <field name="timbrado"/>
+                </field> 
+            </field>
+        </record>
+    </data>
+</openerp>

views/account_journal.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_account_journal_form" model="ir.ui.view">
+            <field name="name">account.journal.form</field>
+            <field name="model">account.journal</field>
+            <field name="inherit_id" ref="account.view_account_journal_form"/>
+            <field name="arch" type="xml">
+                <field name="company_id" position="after">
+                    <field name="timbrado" attrs=" {'required':[('type','=','sale')]}"/>
+                </field>                
+            </field>
+        </record>
+    </data>
+</openerp>

views/res_company.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="res_company_form_view_ruc">
+            <field name="name">res.company.form.view.ruc</field>
+            <field name="model">res.company</field>
+            <field name="inherit_id" ref="base.view_company_form" />
+            <field name="arch" type="xml">
+                <field name="company_registry" position="after">
+                    <field name="company_ruc"/>
+                    <field name="legal_agent"/>
+                    <field name="agent_ruc"/>
+                    <field name="exportador" required="1"/>       
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>