pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] improvement in view

Browse Source 
bzr revid: tpa@tinyerp.com-20120223101248-u1cx7sgnif2mfy56
This commit is contained in:
Turkesh Patel (Open ERP)
2012-02-23 15:42:48 +05:30
parent 19897724a0
commit 2f639fbe72
2 changed files with 56 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openerp/addons/base/res/res_config_sale.py
+8 -2
View File
@@ -44,7 +44,6 @@ class sale_config_picking_policy(osv.osv_memory):
('picking', 'Invoice Based on Deliveries'),
], 'Main Method Based On', required=True, help="You can generate invoices based on sales orders or based on shippings."),
'charge_delivery': fields.boolean('Do you charge the delivery?'),
#'time_unit': fields.many2one('product.uom','Main Working Time Unit'),
'picking_policy' : fields.boolean("Deliver all products at once?"),
'group_sale_pricelist_per_customer':fields.boolean("Activate pricelist to manage prices per customer "),
'group_sale_uom_per_product':fields.boolean("Allow different unit of measure per product"),
@@ -60,12 +59,19 @@ class sale_config_picking_policy(osv.osv_memory):
], 'Taxes'),
'sale_margin' : fields.boolean("Display Margin For Users"),
'sale_journal' : fields.boolean("Invoice_journal?"),
'analytic_user_function' : fields.boolean("Use specific User function on Contract/analytic accounts"),
'analytic_journal_billing_rate' : fields.boolean("Manage Different billing rates on contract/analytic accounts"),
'import_sugarcrm' : fields.boolean("Import data from sugarCRM?"),
'import_google' : fields.boolean("Import Contacts & Meetings from Google"),
'crm_caldav' : fields.boolean("Use caldev to synchronize Meetings"),
'wiki_sale_faq' : fields.boolean("Install a sales FAQ?"),
'crm_partner_assign' : fields.boolean("Manage a several address per customer"),
'google_map' : fields.boolean("Google maps on customer"),
}
_defaults = {
'order_policy': 'manual',
'tax_policy': 'no_tax',
#'time_unit': lambda self, cr, uid, c: self.pool.get('product.uom').search(cr, uid, [('name', '=', _('Hour'))], context=c) and self.pool.get('product.uom').search(cr, uid, [('name', '=', _('Hour'))], context=c)[0] or False,
}
def onchange_order(self, cr, uid, ids, sale, deli, context=None):
openerp/addons/base/res/res_config_sale_view.xml
+48
View File
@@ -56,6 +56,54 @@
</group>
</group>
<group string="Contracts" colspan="4" col="8">
<group colspan="4" col="4">
<field name="analytic_user_function"/>
<newline/>
<field name="analytic_journal_billing_rate"/>
<newline/>
</group>
</group>
<group string="Import and Synchronize data from an other application" colspan="4" col="8">
<group colspan="4" col="4">
<field name="import_sugarcrm"/>
<newline/>
<field name="import_google"/>
<newline/>
</group>
<group colspan="4" col="4">
<newline/>
<field name="crm_caldav"/>
<newline/>
</group>
</group>
<group string="Documents and Wiki" colspan="4" col="8">
<group colspan="4" col="4">
<newline/>
<field name="wiki_sale_faq" />
<newline/>
</group>
</group>
<group string="Documents and Wiki" colspan="4" col="8">
<group colspan="4" col="4">
<newline/>
<field name="wiki_sale_faq" />
<newline/>
</group>
</group>
<group string="Customer Form" colspan="4" col="8">
<group colspan="4" col="4">
<field name="crm_partner_assign"/>
<newline/>
<field name="google_map"/>
<newline/>
</group>
</group>
<group>
<button string="Cancel" icon="gtk-cancel" special="cancel" />
<button string="Apply" icon="gtk-apply" name="apply_cb" type="object" />