Merge lp:~miguel-miguel/bias-trunk/addons_equitek into lp:~openbias/bias-trunk/addons_equitek

[Miguel Miguel]

Cambios en ventas. Se agrego cambios en bias_customization para validar Ordenes de Ventas.

=== added symlink 'bias_analytic_payment_sale'
=== target is u'../bias_trunk/bias_analytic_payment_sale/'
=== modified file 'bias_customization/__init__.py'
--- bias_customization/__init__.py	2012-03-02 17:17:07 +0000
+++ bias_customization/__init__.py	2012-09-06 14:43:22 +0000
@@ -22,6 +22,7 @@
 
 
 #import account
+import voucher
 #import partners
 #import payment
 import product
 
=== modified file 'bias_customization/__openerp__.py'
--- bias_customization/__openerp__.py	2012-03-02 17:17:07 +0000
+++ bias_customization/__openerp__.py	2012-09-06 14:43:22 +0000
@@ -30,15 +30,19 @@
     "website" : "http://www.bias.com.mx",
     "license" : "AGPL-3",
     'depends': ['base',
-##                'account',
+                'account',
+                'account_voucher',
                 'product',
-#                'procurement',
+                'sale',
+                'bias_analytic_payment_sale',
+##                'procurement',
 ##                'purchase',
-                'sale',
 ##                'base_vat'
                 ],
     'update_xml': [
         'account/account_invoice_view.xml',
+#        'account/account_view.xml',
+        'voucher/account_voucher_view.xml',
         'sale/sale_view.xml',
 #        'security/ir.model.access.csv',
 #        'point_of_sale/wizard/pos_borrowing.xml',
@@ -48,7 +52,6 @@
 #        'account/account_invoice_view.xml',
 #        'purchase/purchase_order_report.xml',
 #        'procurement/procurement_workflow.xml',
-        'sale/sale_view.xml' ,
                    ],
     'installable': True,
     'active': False,
 
=== modified file 'bias_customization/account/__init__.py'
--- bias_customization/account/__init__.py	2011-11-03 03:33:31 +0000
+++ bias_customization/account/__init__.py	2012-09-06 14:43:22 +0000
@@ -20,10 +20,10 @@
 #
 ##############################################################################
 
-
-import report
+#import account_move_line
+#import report
 #import invoice
-import wizard
+#import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
 
=== modified file 'bias_customization/sale/i18n/es_MX.po'
--- bias_customization/sale/i18n/es_MX.po	2012-02-24 17:14:57 +0000
+++ bias_customization/sale/i18n/es_MX.po	2012-09-06 14:43:22 +0000
@@ -61,3 +61,7 @@
 msgid "Print Invoice"
 msgstr "Imprimir factura"
 
+#. module: sale
+#: view:sale.order:0
+msgid "Untaxed amount"
+msgstr "Subtotal"
 
=== modified file 'bias_customization/sale/sale.py'
--- bias_customization/sale/sale.py	2011-12-14 23:26:28 +0000
+++ bias_customization/sale/sale.py	2012-09-06 14:43:22 +0000
@@ -19,20 +19,21 @@
 #
 ##############################################################################
 
-from datetime import datetime, timedelta
-from dateutil.relativedelta import relativedelta
 import time
+from datetime import datetime
+from operator import itemgetter
 
+import netsvc
+import pooler
 from osv import fields, osv
 from tools.translate import _
 import decimal_precision as dp
-import netsvc
+import tools
 
 class sale_order(osv.osv):
     _name = "sale.order"
     _inherit = "sale.order"
 
-
     _columns = {
         'state': fields.selection([
             ('draft', 'Quotation'),
@@ -45,8 +46,9 @@
             ('done', 'Done'),
             ('cancel', 'Cancelled')
             ], 'Order State', readonly=True, help="Gives the state of the quotation or sales order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the date 'Ordered Date'.", select=True),
-        }
-
+            'project_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True, states={'draft': [('readonly', False)], 'waiting_auto': [('readonly', False)]}, help="The analytic account related to a sales order."),
+            
+    }
 
     def action_autorize(self, cr, uid, ids, *args):
         if not len(ids):
@@ -54,6 +56,30 @@
         self.write(cr, uid, ids, {'state': 'waiting_auto', })
         return True
 
+    def order_autorizacion_object(self, cr, uid, ids, context=None):
+        wf_service = netsvc.LocalService("workflow")
+        if context is None: context = {}
+        res = False
+        analytic_obj = self.pool.get('account.analytic.account')
+        for sale in self.browse(cr, uid, ids, context=context):
+            if sale.state == 'waiting_auto':
+                if sale.project_id:
+                    pass
+                else:
+                    analytic_id = False
+                    analytic_ids = analytic_obj.search(cr, uid, [('id', '=', 2)])[0]
+                    if analytic_ids:                    
+                        analytic_id = analytic_ids
+                    vals = {
+                        'name': sale.name,
+                        'parent_id': analytic_id,
+                        'partner_id': sale.partner_id.id,
+                    }
+                    res = analytic_obj.create(cr, uid, vals, context=context)
+                    self.write(cr, uid, ids, {'project_id': res})
+        wf_service.trg_validate(uid, 'sale.order', ids[0], 'autorizacion', cr)
+        return res
+
 sale_order()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'bias_customization/sale/sale_view.xml'
--- bias_customization/sale/sale_view.xml	2012-02-24 17:15:52 +0000
+++ bias_customization/sale/sale_view.xml	2012-09-06 14:43:22 +0000
@@ -2,6 +2,27 @@
 <openerp>
     <data>
 
+        <!-- Pagos  -->
+        <record model="ir.ui.view" id="view_order_form_inherit_01">
+            <field name="name">sale.order.form.inherit.01</field>
+            <field name="model">sale.order</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="sale.view_order_form"/>
+            <field name="arch" type="xml">
+                <field name="project_id" position="replace">
+                    <field name="project_id" 
+                        context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}"
+                        groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]" /> <!-- attrs="{'required':[('state','=', 'waiting_auto')]}" --> 
+                </field>
+                <button name="%(sale.action_view_sale_advance_payment_inv)d" position="replace">
+                    <button name="%(sale.action_view_sale_advance_payment_inv)d" string="Advance Invoice"
+                        type="action" icon="gtk-execute" states="manual" groups="base.group_extended"/>
+                </button>
+            </field>
+        </record>
+
+
+    <!-- Fin de Pagos-->
         =============================
 	Add button autorization on sale order
         =============================
@@ -11,7 +32,9 @@
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
                 <button name="button_dummy" position="after">
-                    <button name="autorizacion" states="waiting_auto" string="Autorization" icon="gtk-apply" groups="account.group_account_manager"/>
+                    <button name="action_cancel" states="waiting_auto" string="Cancel Order" type="object" icon="gtk-cancel"/>
+                    <!-- <button name="autorizacion" states="waiting_auto" string="Autorization" icon="gtk-apply" groups="account.group_account_manager"/> -->
+                    <button name="order_autorizacion_object" states="waiting_auto" type="object" string="Autorization" icon="gtk-apply"/>
                 </button>
             </field>
         </record>
 
=== added directory 'bias_customization/voucher'
=== added file 'bias_customization/voucher/__init__.py'
--- bias_customization/voucher/__init__.py	1970-01-01 00:00:00 +0000
+++ bias_customization/voucher/__init__.py	2012-09-06 14:43:22 +0000
@@ -0,0 +1,29 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import account_voucher
+#import report
+#import invoice
+#import wizard
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
 
=== added file 'bias_customization/voucher/account_voucher.py'
--- bias_customization/voucher/account_voucher.py	1970-01-01 00:00:00 +0000
+++ bias_customization/voucher/account_voucher.py	2012-09-06 14:43:22 +0000
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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/>.
+#
+##############################################################################
+
+import time
+from lxml import etree
+
+import netsvc
+from osv import osv, fields
+import decimal_precision as dp
+from tools.translate import _
+
+
+class account_voucher_line(osv.osv):
+    _inherit = "account.voucher.line"
+
+    def onchange_amount_id(self, cr, user, ids, move_line_id, amount, context=None):
+        currency_pool = self.pool.get('res.currency')
+        currency_pool = self.pool.get('account_voucher')
+        move_line_pool = self.pool.get('account.move.line')
+        print 'amount : ', amount
+        if move_line_id:
+            move_line = move_line_pool.browse(cr, user, move_line_id, context=context)
+            print 'move_line ', move_line
+            print 'move_line_id ', move_line_id
+            print 'amount : ', amount
+        return {}
+
+    _columns = {
+        'amount':fields.float('Amount', digits_compute=dp.get_precision('Account')),
+    }
+
+
+account_voucher_line()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'bias_customization/voucher/account_voucher_view.xml'
--- bias_customization/voucher/account_voucher_view.xml	1970-01-01 00:00:00 +0000
+++ bias_customization/voucher/account_voucher_view.xml	2012-09-06 14:43:22 +0000
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+
+        <record model="ir.ui.view" id="view_voucher_line_form_inherit_01">
+            <field name="name">account.voucher.line.form.inherit.01</field>
+            <field name="model">account.voucher.line</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account_voucher.view_voucher_line_form"/>
+            <field name="arch" type="xml">
+                <field name="amount" position="replace">
+                    <field name="amount" on_change="onchange_amount_id(move_line_id, amount)" />
+                </field>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_vendor_receipt_form_inherit_01">
+            <field name="name">account.voucher.receipt.form.inherit.01</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account_voucher.view_vendor_receipt_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page/field[@name='line_dr_ids']/tree/field[@name='amount']" position="replace">
+                    <field name="amount" on_change="onchange_amount_id(move_line_id, amount)" sum="Payment" />
+                </xpath>
+            </field>
+        </record>
+
+
+        <!--
+        <record model="ir.ui.view" id="view_vendor_receipt_form_inherit_01">
+            <field name="name">account.voucher.receipt.form.inherit.01</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account_voucher.view_vendor_receipt_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page/field[@name='line_dr_ids']/tree/field[@name='account_id']" position="after">
+                    <field name="account_analytic_id"/>
+                </xpath>
+                <xpath expr="/form/notebook/page/field[@name='line_cr_ids']/tree/field[@name='account_id']" position="after">
+                    <field name="account_analytic_id"/>
+                </xpath>
+            </field>
+        </record>
+
+        -->
+        <!--
+        <record model="ir.ui.view" id="view_low_priority_payment_form_inherit_01">
+            <field name="name">account.voucher.payment.low.priority.form.inherit.01</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="priority">1</field>
+            <field name="inherit_id" ref="account_voucher.view_low_priority_payment_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page/field[@name='line_dr_ids']/tree/field[@name='account_id']" position="after">
+                    <field name="account_analytic_id"/>
+                </xpath>
+                <xpath expr="/form/notebook/page/field[@name='line_cr_ids']/tree/field[@name='account_id']" position="after">
+                    <field name="account_analytic_id"/>
+                </xpath>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_vendor_payment_form_inherit_01">
+            <field name="name">account.voucher.payment.form.inherit.01</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account_voucher.view_vendor_payment_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page/field[@name='line_dr_ids']/tree/field[@name='account_id']" position="after">
+                    <field name="account_analytic_id"/>
+                </xpath>
+                <xpath expr="/form/notebook/page/field[@name='line_cr_ids']/tree/field[@name='account_id']" position="after">
+                    <field name="account_analytic_id"/>
+                </xpath>
+            </field>
+        </record>
+        -->
+    </data>
+</openerp>
+
+
+