odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP]delivery,lunch,user_ldap:Last Improvement is Done and remove the installer.py file 

bzr revid: mma@tinyerp.com-20110606102100-wr3kcnbfnc7iylbu
This commit is contained in:
mayur maheshwari (Open ERP) 2011-06-06 15:51:00 +05:30
parent 185a3bf824
commit 8a12233a50
7 changed files with 95 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
addons/delivery/delivery_view.xml
View File

@ -35,9 +35,33 @@
<field name="amount" attrs="{'invisible':[('free_if_more_than','=',False)]}"/>
</group>
<newline/>
<field name="use_detailed_pricelist" />
<field name="use_detailed_pricelist" />
</group>
<field name="pricelist_ids" nolabel="1" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}"/>
<field name="pricelist_ids" nolabel="1" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree,form">
<tree string="Delivery grids">
<field name="sequence"/>
<field name="carrier_id"/>
<field name="name"/>
</tree>
<form string="Delivery grids">
<field name="name" select="1"/>
<field name="active" select="1"/>
<field name="sequence" groups="base.group_extended" select="1"/>
<notebook colspan="4">
<page string="Grid definition">
<field colspan="4" name="line_ids" nolabel="1" select="1"/>
</page>
<page string="Destination">
<separator colspan="4" string="Countries"/>
<field colspan="4" name="country_ids" nolabel="1"/>
<separator colspan="4" string="States"/>
<field colspan="4" name="state_ids" nolabel="1"/>
<field name="zip_from"/>
<field name="zip_to"/>
</page>
</notebook>
</form>
</field>
</form>
</field>
</record>
@ -119,8 +143,8 @@
<group colspan="5" col="5">
<field colspan="4" name="name" select="1"/>
<newline/>
<field name="type" string="Condition"/>
<field name="operator" nolabel="1" />
<field name="type" string="Condition"/>
<field name="operator" nolabel="1" />
<field name="max_value" nolabel="1"/>
</group>
<newline/>

24
addons/lunch/lunch_view.xml
View File

@ -24,24 +24,24 @@
<field name="model">lunch.order</field>
<field name="arch" type="xml">
<form string="Order">
<group col="4" colspan="4">
<group colspan="4" col="4">
<field name="user_id" select="1"/>
<field name="date" select="1"/>
</group>
<group col="4" colspan="4">
<field name="product" select="1" on_change="onchange_product(product)"/>
<field name="category"/>
<field name="cashmove"/>
<field name="product" select="1" on_change="onchange_product(product)"/>
<field name="category"/>
<field name="descript"/>
</group>
<group col="4" colspan="6" >
<field name="price"/>
<button name="%(action_lunch_order_confirm)d" string="Confirm Order" type="action" icon="gtk-ok"/>
<field name="cashmove"/>
<newline/>
<field name="state" />
<button name="%(action_lunch_order_confirm)d" string="Confirm Order" type="action" icon="gtk-ok" attrs="{'invisible':[('state','=','confirmed')]}" />
<button name="%(action_lunch_order_cancel)d" string="Cancel Order" type="action" icon="gtk-cancel"/>
</group>
<group col="2" colspan="4">
<field name="state"/>
</group>
<!--group colspan="4" col="8">
<field name="state" colspan="4"/>
<button name="%(action_lunch_order_confirm)d" string="Confirm Order" type="action" icon="gtk-ok" attrs="{'invisible':[('state','=','confirmed')]}" colspan="2" />
<button name="%(action_lunch_order_cancel)d" string="Cancel Order" type="action" icon="gtk-cancel" colspan="2"/>
</group-->
</form>
</field>
</record>

5
addons/lunch/wizard/lunch_order_cancel_view.xml
View File

@ -31,5 +31,10 @@
<field name="target">new</field>
</record>
<act_window id="action_lunch_order_cancel_values"
key2="client_action_multi" name="Cancel Order"
res_model="lunch.order.cancel" src_model="lunch.order"
view_mode="form" target="new" view_type="form"/>
</data>
</openerp>

5
addons/lunch/wizard/lunch_order_confirm_view.xml
View File

@ -33,5 +33,10 @@
<field name="target">new</field>
</record>
<act_window id="action_lunch_order_confirm_values"
key2="client_action_multi" name="Confirm Order"
res_model="lunch.order.confirm" src_model="lunch.order"
view_mode="form" target="new" view_type="form"/>
</data>
</openerp>

1
addons/users_ldap/__init__.py
View File

@ -19,6 +19,5 @@
##############################################################################
import users_ldap
import installer
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

55
addons/users_ldap/installer.py
View File

@ -1,55 +0,0 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 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/>.
#
##############################################################################
from osv import fields, osv
import pooler
import tools
import logging
from service import security
import ldap
from ldap.filter import filter_format
class ldap_installer(osv.osv):
_name = 'ldap.installer'
_order = 'sequence'
_rec_name = 'ldap_server'
_columns = {
'sequence': fields.integer('Sequence'),
'company': fields.many2one('res.company', 'Company', required=True,
ondelete='cascade'),
'ldap_server': fields.char('LDAP Server address', size=64, required=True),
'ldap_server_port': fields.integer('LDAP Server port', required=True),
'ldap_binddn': fields.char('LDAP binddn', size=64, required=True),
'ldap_password': fields.char('LDAP password', size=64, required=True),
'ldap_filter': fields.char('LDAP filter', size=64, required=True),
'ldap_base': fields.char('LDAP base', size=64, required=True),
'user': fields.many2one('res.users', 'Model User',
help="Model used for user creation"),
'create_user': fields.boolean('Create user',
help="Create the user if not in database"),
}
_defaults = {
'ldap_server': lambda *a: '127.0.0.1',
'ldap_server_port': lambda *a: 389,
'sequence': lambda *a: 10,
'create_user': lambda *a: True,
}
ldap_installer()

89
addons/users_ldap/user_ldap_installer.xml
View File

@ -1,53 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!-- ldap installer Form View -->
<record model="ir.ui.view" id="view_ldap_installer_form">
<data>
<!-- ldap installer Form View -->
<record model="ir.ui.view" id="view_ldap_installer_form">
<field name="name">ldap.installer.form</field>
<field name="model">ldap.installer</field>
<field name="model">res.company.ldap</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="LDAP Configuration">
<field name="ldap_server"/>
<field name="ldap_server_port"/>
<field name="ldap_binddn"/>
<field name="ldap_password"/>
<field name="ldap_base"/>
<field name="ldap_filter"/>
<field name="create_user"/>
<field name="user"/>
<newline/>
<field name="sequence"/>
<group col="2" colspan="2">
<separator string="Server Information" colspan="2"/>
<field name="ldap_server"/>
<field name="ldap_server_port"/>
</group>
<group col="2" colspan="2">
<separator string="Login Information" colspan="2"/>
<field name="ldap_binddn"/>
<field name="ldap_password"/>
</group>
<group col="2" colspan="2">
<separator string="Process Parameter" colspan="2"/>
<field name="ldap_base"/>
<field name="ldap_filter"/>
<field name="sequence"/>
</group>
<group col="2" colspan="2">
<separator string="User Information" colspan="2"/>
<field name="create_user"/>
<field name="user"/>
</group>
</form>
</field>
</record>
<!-- ldap installer Tree View -->
<record model="ir.ui.view" id="view_ldap_installer_tree">
<field name="name">ldap.installer.tree</field>
<field name="model">ldap.installer</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="LDAP Configuration">
<field name="sequence"/>
<field name="ldap_server"/>
<field name="ldap_server_port"/>
<field name="ldap_base"/>
</tree>
</field>
</record>
<record id="action_ldap_installer" model="ir.actions.act_window">
<field name="name">Setup your ldap configuration</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">ldap.installer</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_ldap_installer_tree"/>
</record>
<record id="config_wizard_action_ldap_installer" model="ir.actions.todo">
<field name="action_id" ref="action_ldap_installer"/>
<field name="type">normal</field>
<field name="target">current</field>
<field name="state">skip</field>
</record>
</data>
</record>
<!-- ldap installer action -->
<record id="action_ldap_installer" model="ir.actions.act_window">
<field name="name">Setup your LDAP Server</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">res.company.ldap</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="view_id" ref="view_ldap_installer_form"/>
</record>
<record id="config_wizard_action_ldap_installer" model="ir.actions.todo">
<field name="action_id" ref="action_ldap_installer"/>
<field name="type">normal</field>
<field name="target">current</field>
<field name="state">skip</field>
</record>
</data>
</openerp>