Merge lp:~cv.clearcorp/openerp-ccorp-addons/7.0-account_payment_term_security into lp:openerp-ccorp-addons/7.0

[Carlos Vásquez (ClearCorp)]

[FIX] Fix bug in sale order view
[ADD] Add security in purchase order and supplier invoice for payment_term field

[lp:~cv.clearcorp/openerp-ccorp-addons/7.0-account_payment_term_security]

875. By Carlos Vásquez (ClearCorp) on 2014-06-12

[FIX] Fix translations for account_invoice_payment_term_date_due_security report

876. By Carlos Vásquez (ClearCorp) on 2014-06-12

[FIX] Fix translations (again) for account_invoice_payment_term_date_due_security module

=== modified file 'account_invoice_payment_term_date_due_security/__init__.py'
--- account_invoice_payment_term_date_due_security/__init__.py	2014-06-11 14:33:23 +0000
+++ account_invoice_payment_term_date_due_security/__init__.py	2014-06-12 17:51:37 +0000
@@ -21,4 +21,5 @@
 ##############################################################################
 
 import account_invoice_inherit
-import sale_order_inherit
\ No newline at end of file
+import sale_order_inherit
+import purchase_order_inherit
\ No newline at end of file

=== modified file 'account_invoice_payment_term_date_due_security/__openerp__.py'
--- account_invoice_payment_term_date_due_security/__openerp__.py	2014-06-11 14:33:23 +0000
+++ account_invoice_payment_term_date_due_security/__openerp__.py	2014-06-12 17:51:37 +0000
@@ -32,11 +32,12 @@
 it adds security on payment term in sale order
 """,    
     'website' : 'http://clearcorp.co.cr',
-    'depends' : ['base','account','sale'],
+    'depends' : ['base','account','sale','purchase'],
     'data' : [
               'security/account_invoice_payment_term_date_due_security.xml',
               'account_invoice_inherit.xml',
               'sale_order_inherit.xml',
+              'purchase_order_inherit.xml',
               ],
     'installable': True,
     'auto_install': False,

=== modified file 'account_invoice_payment_term_date_due_security/account_invoice_inherit.py'
--- account_invoice_payment_term_date_due_security/account_invoice_inherit.py	2014-06-11 14:33:23 +0000
+++ account_invoice_payment_term_date_due_security/account_invoice_inherit.py	2014-06-12 17:51:37 +0000
@@ -68,6 +68,7 @@
             #Call method to change date_due
             res = super(accountInvoiceinherit, self).onchange_payment_term_date_invoice(cr, uid, ids, payment_term_visible, date_invoice)
             res['value'].update({'payment_term':payment_term_visible})
+            res['value'].update({'date_due_visible': res['value']['date_due']})
             
         return res
             

=== modified file 'account_invoice_payment_term_date_due_security/account_invoice_inherit.xml'
--- account_invoice_payment_term_date_due_security/account_invoice_inherit.xml	2014-06-11 14:33:23 +0000
+++ account_invoice_payment_term_date_due_security/account_invoice_inherit.xml	2014-06-12 17:51:37 +0000
@@ -23,7 +23,7 @@
                 </data>
             </field>
         </record>
-        
+      
         <record id="account_invoice_payment_term_no_group" model="ir.ui.view">
             <field name="name">account.invoice.payment.no.group</field>
             <field name="model">account.invoice</field>
@@ -55,7 +55,64 @@
                     <attribute name="readonly">0</attribute>
                 </field>
             </field>
-       </record>
-
+       </record>       
+         
+        <record id="account_invoice_payment_term_date_due_inherit_supplier" model="ir.ui.view">
+            <field name="name">account.invoice.payment.term.date.due.inherit.supplier</field>
+            <field name="model">account.invoice</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.invoice_supplier_form"/>
+            <field name="arch" type="xml">
+                <data>
+                    <field name = "date_due" position="attributes">
+                        <attribute name="attrs">{'invisible': True}</attribute>
+                    </field>
+                    <field name = "date_due" position="after" version="7.0">
+                        <field name="date_due_visible" />
+                    </field>          
+                    <field name = "payment_term" position="attributes">
+                        <attribute name="attrs">{'invisible': True}</attribute>
+                    </field>
+                     <field name = "payment_term" position="after" version="7.0">
+                        <field name="payment_term_visible" on_change="onchange_payment_term_visible(payment_term_visible, date_invoice)" class="oe_inline"/>
+                    </field>
+                </data>
+            </field>
+        </record>
+        
+        <record id="account_invoice_payment_term_no_group_supplier" model="ir.ui.view">
+            <field name="name">account.invoice.payment.no.group.supplier</field>
+            <field name="model">account.invoice</field>
+            <field name="type">form</field>
+            <field name="priority" eval="10"/>
+            <field name="inherit_id" ref="account_invoice_payment_term_date_due_inherit_supplier"/>
+            <field name="arch" type="xml">
+               <field name="date_due_visible" position="attributes"> 
+                    <attribute name="readonly">1</attribute> 
+                </field> 
+                <field name="payment_term_visible" position="attributes"> 
+                    <attribute name="readonly">1</attribute>
+                </field>
+            </field>
+       </record>
+       
+       <record id="account_invoice_payment_term_group_supplier" model="ir.ui.view">
+            <field name="name">account.invoice.payment.group.supplier</field>
+            <field name="model">account.invoice</field>
+            <field name="type">form</field>
+            <field name="priority" eval="20"/>
+            <field name="groups_id" eval="[(4, ref('account_invoice_payment_term_date_due_security.group_account_payment_term_date_due_security'))]"/>
+            <field name="inherit_id" ref="account_invoice_payment_term_date_due_inherit_supplier"/>
+            <field name="arch" type="xml">
+                <field name="date_due_visible" position="attributes"> 
+                    <attribute name="readonly">0</attribute>
+                </field> 
+                <field name="payment_term_visible" position="attributes"> 
+                    <attribute name="readonly">0</attribute>
+                </field>
+            </field>
+       </record>
+        
+        
     </data>
 </openerp>

=== modified file 'account_invoice_payment_term_date_due_security/i18n/account_invoice_payment_term_date_due_security.pot'
--- account_invoice_payment_term_date_due_security/i18n/account_invoice_payment_term_date_due_security.pot	2014-06-11 14:33:23 +0000
+++ account_invoice_payment_term_date_due_security/i18n/account_invoice_payment_term_date_due_security.pot	2014-06-12 17:51:37 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-11 01:22+0000\n"
-"PO-Revision-Date: 2014-06-11 01:22+0000\n"
+"POT-Creation-Date: 2014-06-12 17:06+0000\n"
+"PO-Revision-Date: 2014-06-12 17:06+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,12 +21,6 @@
 msgstr ""
 
 #. module: account_invoice_payment_term_date_due_security
-#: view:account.invoice:0
-#: view:sale.order:0
-msgid "{'invisible': True}"
-msgstr ""
-
-#. module: account_invoice_payment_term_date_due_security
 #: field:account.invoice,date_due_visible:0
 msgid "Due Date"
 msgstr ""
@@ -57,3 +51,12 @@
 msgid "Sales Order"
 msgstr ""
 
+#. module: account_invoice_payment_term_date_due_security
+#: model:res.groups,name:account_invoice_payment_term_date_due_security.group_sale_order_payment_term_security
+msgid "Sale Order Payment Term Security"
+msgstr ""
+
+#. module: account_invoice_payment_term_date_due_security
+#: model:res.groups,name:account_invoice_payment_term_date_due_security.group_purchase_order_payment_term_security
+msgid "Purchase Order Payment Term Security"
+msgstr ""

=== modified file 'account_invoice_payment_term_date_due_security/i18n/es.po'
--- account_invoice_payment_term_date_due_security/i18n/es.po	2014-06-11 14:33:23 +0000
+++ account_invoice_payment_term_date_due_security/i18n/es.po	2014-06-12 17:51:37 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-11 01:22+0000\n"
-"PO-Revision-Date: 2014-06-11 01:22+0000\n"
+"POT-Creation-Date: 2014-06-12 17:07+0000\n"
+"PO-Revision-Date: 2014-06-12 17:07+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -18,11 +18,7 @@
 #. module: account_invoice_payment_term_date_due_security
 #: help:account.invoice,date_due_visible:0
 msgid "If you use payment terms, the due date will be computed automatically at the generation of accounting entries. The payment term may compute several due dates, for example 50% now and 50% in one month, but if you want to force a due date, make sure that the payment term is not set on the invoice. If you keep the payment term and the due date empty, it means direct payment."
-msgstr "Si utiliza los plazos de pago, la fecha de vencimiento será calculada "
-"automáticamente en la generación de los asientos contables. Si se mantiene "
-"el plazo de pago y la fecha de vencimiento vacía, significa que es un pago "
-"directo. El plazo de pago podrá calcular varias fechas de vencimiento, por "
-"ejemplo, 50% ahora, 50% en un mes."
+msgstr "Si utiliza los plazos de pago, la fecha de vencimiento será calculada automáticamente en la generación de los asientos contables. Si se mantiene el plazo de pago y la fecha de vencimiento vacía, significa que es un pago directo. El plazo de pago podrá calcular varias fechas de vencimiento, por ejemplo, 50% ahora, 50% en un mes."
 
 #. module: account_invoice_payment_term_date_due_security
 #: field:account.invoice,date_due_visible:0
@@ -37,6 +33,7 @@
 #. module: account_invoice_payment_term_date_due_security
 #: field:account.invoice,payment_term_visible:0
 #: field:sale.order,payment_term_visible:0
+#: field:purchase.order,payment_term_visible:0
 msgid "Payment Term"
 msgstr "Plazo de pago"
 
@@ -55,3 +52,12 @@
 msgid "Sales Order"
 msgstr "Pedido de venta"
 
+#. module: account_invoice_payment_term_date_due_security
+#: model:res.groups,name:account_invoice_payment_term_date_due_security.group_sale_order_payment_term_security
+msgid "Sale Order Payment Term Security"
+msgstr "Orden de Venta: Seguridad Plazo de Pago"
+
+#. module: account_invoice_payment_term_date_due_security
+#: model:res.groups,name:account_invoice_payment_term_date_due_security.group_purchase_order_payment_term_security
+msgid "Purchase Order Payment Term Security"
+msgstr "Orden de Compra: Seguridad Plazo de Pago"

=== added file 'account_invoice_payment_term_date_due_security/purchase_order_inherit.py'
--- account_invoice_payment_term_date_due_security/purchase_order_inherit.py	1970-01-01 00:00:00 +0000
+++ account_invoice_payment_term_date_due_security/purchase_order_inherit.py	2014-06-12 17:51:37 +0000
@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Addons modules by CLEARCORP S.A.
+#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
+#
+#    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 osv import orm, osv, fields
+from tools.translate import _
+
+class purchaseOrderinherit(orm.Model):
+    
+     _inherit = 'purchase.order'
+     
+     def _get_payment_term(self, cr, uid, ids, fields, arg, context=None):
+        res = {}        
+        for purchase in self.browse(cr, uid, ids, context=context):
+            if purchase.payment_term_id:
+                res[purchase.id] = purchase.payment_term_id.id
+        return res
+
+     _columns = {
+        'payment_term_visible': fields.function(_get_payment_term, type='many2one', relation='account.payment.term', 
+            store={'purchase.order': (lambda self, cr, uid, ids, c={}: ids, ['payment_term_id'], 10),}, string="Payment Term",),
+       }
+     
+     def onchange_partner_id(self, cr, uid, ids, partner_id):       
+        res = super(purchaseOrderinherit, self).onchange_partner_id(cr, uid, ids, partner_id)
+                
+        if 'payment_term_id' in res['value'].keys():
+            res['value'].update({'payment_term_visible': res['value']['payment_term_id']})
+                
+        return res  
+    
+     def onchange_payment_term_visible(self, cr, uid, ids, payment_term_visible):
+        res = {}
+        res['value'] = {}
+        
+        if payment_term_visible:
+            res['value'].update({'payment_term_id':payment_term_visible})
+             
+        return res          
+     
\ No newline at end of file

=== added file 'account_invoice_payment_term_date_due_security/purchase_order_inherit.xml'
--- account_invoice_payment_term_date_due_security/purchase_order_inherit.xml	1970-01-01 00:00:00 +0000
+++ account_invoice_payment_term_date_due_security/purchase_order_inherit.xml	2014-06-12 17:51:37 +0000
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_purchase_order_form_payment_term_inherit" model="ir.ui.view">
+            <field name="name">view.purchase.order.form.payment.term.inherit</field>
+            <field name="model">purchase.order</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="purchase.purchase_order_form"/>
+            <field name="arch" type="xml">
+                <data>
+                    <field name = "payment_term_id" position="attributes">
+                        <attribute name="attrs">{'invisible': True}</attribute>
+                    </field>
+                    <field name="payment_term_id" position="after">
+                        <field name="payment_term_visible" on_change="onchange_payment_term_visible(payment_term_visible)"/>
+                    </field>
+                </data>
+            </field>
+        </record>
+        
+        
+        <record id="purchase_order_payment_term_no_group" model="ir.ui.view">
+            <field name="name">purchase.order.payment.term.no.group</field>
+            <field name="model">purchase.order</field>
+            <field name="type">form</field>
+            <field name="priority" eval="10"/>
+            <field name="inherit_id" ref="view_purchase_order_form_payment_term_inherit"/>
+            <field name="arch" type="xml">
+                <field name="payment_term_visible" position="attributes"> 
+                    <attribute name="readonly">1</attribute>
+                </field>
+            </field>
+       </record>
+       
+       <record id="purchase_order_payment_term_group" model="ir.ui.view">
+            <field name="name">purchase.order.payment.term.group</field>
+            <field name="model">purchase.order</field>
+            <field name="type">form</field>
+            <field name="priority" eval="20"/>
+            <field name="groups_id" eval="[(4, ref('account_invoice_payment_term_date_due_security.group_purchase_order_payment_term_security'))]"/>
+            <field name="inherit_id" ref="view_purchase_order_form_payment_term_inherit"/>
+            <field name="arch" type="xml">
+                <field name="payment_term_visible" position="attributes"> 
+                    <attribute name="readonly">0</attribute>
+                </field>
+            </field>
+       </record>
+        
+    </data>
+</openerp>

=== modified file 'account_invoice_payment_term_date_due_security/sale_order_inherit.py'
--- account_invoice_payment_term_date_due_security/sale_order_inherit.py	2014-06-11 14:33:23 +0000
+++ account_invoice_payment_term_date_due_security/sale_order_inherit.py	2014-06-12 17:51:37 +0000
@@ -23,7 +23,7 @@
 from osv import orm, osv, fields
 from tools.translate import _
 
-class accountInvoiceinherit(orm.Model):
+class saleOrderinherit(orm.Model):
     
      _inherit = 'sale.order'
      
@@ -40,10 +40,19 @@
        }
      
      def onchange_partner_id(self, cr, uid, ids, part, context=None):       
-        res = super(accountInvoiceinherit, self).onchange_partner_id(cr, uid, ids, part, context)
+        res = super(saleOrderinherit, self).onchange_partner_id(cr, uid, ids, part, context=context)
                 
         if 'payment_term' in res['value'].keys():
             res['value'].update({'payment_term_visible': res['value']['payment_term']})
                 
-        return res           
+        return res      
+    
+     def onchange_payment_term_visible(self, cr, uid, ids, payment_term_visible):
+        res = {}
+        res['value'] = {}        
+        
+        if payment_term_visible:
+            res['value'].update({'payment_term':payment_term_visible})
+             
+        return res     
      
\ No newline at end of file

=== modified file 'account_invoice_payment_term_date_due_security/sale_order_inherit.xml'
--- account_invoice_payment_term_date_due_security/sale_order_inherit.xml	2014-06-11 14:33:23 +0000
+++ account_invoice_payment_term_date_due_security/sale_order_inherit.xml	2014-06-12 17:51:37 +0000
@@ -12,13 +12,14 @@
                     <field name = "payment_term" position="attributes">
                         <attribute name="attrs">{'invisible': True}</attribute>
                     </field>
-                    <xpath expr="/form/sheet/notebook/page[@string='Other Information']/group/group[@name='sale_pay']" position="inside" version="7.0">
-                        <field name="payment_term_visible" widget="selection"/>
-                    </xpath>
+                    <field name="payment_term" position="after">
+                        <field name="payment_term_visible"  on_change="onchange_payment_term_visible(payment_term_visible)"/>
+                    </field>
                 </data>
             </field>
         </record>
-
+        
+        
         <record id="sale_order_payment_term_no_group" model="ir.ui.view">
             <field name="name">sale.order.payment.term.no.group</field>
             <field name="model">sale.order</field>
@@ -45,6 +46,6 @@
                 </field>
             </field>
        </record>
-
+        
     </data>
 </openerp>

=== modified file 'account_invoice_payment_term_date_due_security/security/account_invoice_payment_term_date_due_security.xml'
--- account_invoice_payment_term_date_due_security/security/account_invoice_payment_term_date_due_security.xml	2014-06-11 14:33:23 +0000
+++ account_invoice_payment_term_date_due_security/security/account_invoice_payment_term_date_due_security.xml	2014-06-12 17:51:37 +0000
@@ -1,17 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data>
-    <record id="group_account_payment_term_date_due_security" model="res.groups">
-        <field name="name">Payment Term Date Due Security</field>
-        <field name="category_id" ref="base.module_category_accounting_and_finance"/>
-        <field name="users" eval="[(4, ref('base.user_root'))]"/>
-    </record>
-    
-    <record id="group_sale_order_payment_term_security" model="res.groups">
-        <field name="name">Sale Order Payment Term Security</field>
-        <field name="category_id" ref="base.module_category_sales_management"/>
-        <field name="users" eval="[(4, ref('base.user_root'))]"/>
-    </record>
-    
-</data>
+    <data>
+        
+        <record id="group_account_payment_term_date_due_security" model="res.groups">
+            <field name="name">Payment Term Date Due Security</field>
+            <field name="category_id" ref="base.module_category_accounting_and_finance"/>
+            <field name="users" eval="[(4, ref('base.user_root'))]"/>
+        </record>
+        
+        <record id="group_sale_order_payment_term_security" model="res.groups">
+            <field name="name">Sale Order Payment Term Security</field>
+            <field name="category_id" ref="base.module_category_sales_management"/>
+            <field name="users" eval="[(4, ref('base.user_root'))]"/>
+        </record>
+        
+        <record id="group_purchase_order_payment_term_security" model="res.groups">
+            <field name="name">Purchase Order Payment Term Security</field>
+            <field name="category_id" ref="base.module_category_sales_management"/>
+            <field name="users" eval="[(4, ref('base.user_root'))]"/>
+        </record>
+    
+    </data>
 </openerp>
\ No newline at end of file