Explorar o código

Agregar un campo más para cobrador actual en pago ñandetv.

sebas %!s(int64=3) %!d(string=hai) anos
pai
achega
0c5717d453

+ 1 - 1
models/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 
-# from . import res_partner
+
 from . import account_voucher

+ 3 - 2
models/account_voucher.py

@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 #################################################################################
 #                                                                               #
 #    This program is free software: you can redistribute it and/or modify       #
@@ -22,4 +22,5 @@ class account_voucher(models.Model):
     _inherit = 'account.voucher'
     _name = 'account.voucher'
 
-    employee_id = fields.Many2one(string='Cobrador', related="partner_id.employee_id")
+    employee_id = fields.Many2one(string='Cobrador Agendado', readonly=True, related="partner_id.employee_id")
+    employee_id2 = fields.Many2one('hr.employee', string='Cobrador Real')

+ 0 - 8
models/res_partner.py

@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from openerp import models, fields, api
-
-class ResPartnerVendor(models.Model):
-    _inherit = 'res.partner'
-
-    employee_id = fields.Many2one('hr.employee', string='Cobrador')

+ 7 - 2
views/account_voucher_view.xml

@@ -8,7 +8,10 @@
           <field name="inherit_id" ref="account_voucher.view_vendor_receipt_form"/>
           <field name="arch" type="xml">
               <field name="journal_id" position="after">
-                  <field name="employee_id" attrs="{'readonly':False}"/>
+                  <field name="employee_id"/>
+              </field>
+              <field name="name" position="after">
+                  <field name="employee_id2"/>
               </field>
           </field>
       </record>
@@ -20,6 +23,7 @@
           <field name="arch" type="xml">
               <field name="reference" position="after">
                   <field name="employee_id"></field>
+                  <field name="employee_id2"/>
               </field>
           </field>
        </record>
@@ -30,7 +34,8 @@
             <field name="inherit_id" ref="account_voucher.view_voucher_filter_customer_pay" />
             <field name="arch" type="xml">
               <search>
-                  <field name="employee_id"/>
+                  <field name="employee_id" string="Cobrador Agendado"/>
+                  <field name="employee_id2" string="Cobrador Real"/>
                   <!-- <separator/>
                   <group string="Agrupar por">
                       <filter string="Cobrador" context="{'group_by':'employee_id'}"/>

+ 0 - 15
views/eiru_contract_vendor.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-  <data>
-    <record model="ir.ui.view" id="contract_vendor_form">
-      <field name="name">contract_vendor_form</field>
-      <field name="model">account.analytic.account</field>
-      <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
-      <field name="arch" type="xml">
-      <field name="manager_id" position="before">
-          <field name="employee_id"/>
-          </field>
-      </field>
-    </record>
- </data>
-</openerp>

+ 0 - 16
views/res_partner.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-
-        <record id="res_partner_vendor_form" model="ir.ui.view">
-            <field name="name">res.partner.vendor.form</field>
-            <field name="model">res.partner</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-                <field name="title" position="after">
-                     <field name="employee_id"/>
-                </field>
-            </field>
-        </record>
-    </data>
-</openerp>