Pankita Shah(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons15-sales-shp into
lp:openobject-addons.
Requested reviews:
Atul Patel(OpenERP) (atp-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons15-sales-shp/+merge/129375
hello,
- i have improve move the type field in the sale module, instead of the
sale_stock
- i have improve partner tree view
- i have improve 'Units of Measure Category' field in sales.
- i have improve label "Other Pricelist",and hide "Other Pricelist" when not
click option except "Other Pricelist"
- increase the priority of the product tree view defined in hr_epense.
- default value for Planned Date which is false.
- improve event invitation removing event menu and event analysis menu.
- improve the Packaging field should be smaller and to the right of Packaging
- improve move schedule meeting and convert to opportunity to the right of
contact,
thanks
shp
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons15-sales-shp/+merge/129375
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons15-sales-shp.
=== modified file 'base_calendar/base_calendar_view.xml'
--- base_calendar/base_calendar_view.xml 2012-10-05 11:49:19 +0000
+++ base_calendar/base_calendar_view.xml 2012-10-12 09:42:28 +0000
@@ -97,25 +97,11 @@
</search>
</field>
</record>
- <record id="action_view_attendee_form" model="ir.actions.act_window">
- <field name="name">Event Invitations</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">calendar.attendee</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="view_id" ref="base_calendar.base_calendar_attendee_tree_view"/>
- <field name="context">{'default_sent_by_uid': uid}</field>
- </record>
<!-- Calendar's menu -->
<menuitem id="base.menu_calendar_configuration" name="Calendar"
parent="base.menu_base_config" sequence="50" groups="base.group_no_one"/>
- <!-- Invitation menu -->
- <menuitem id="menu_attendee_invitations"
- parent="base.menu_calendar_configuration"
- sequence="10" action="action_view_attendee_form"/>
-
<!-- Alarm form view -->
<record id="res_alarm_form_view" model="ir.ui.view">
<field name="name">res.alarm.form</field>
@@ -381,21 +367,5 @@
</field>
</record>
-
- <!-- Event action -->
- <record id="action_view_event" model="ir.actions.act_window">
- <field name="name">Events</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">calendar.event</field>
- <field name="view_type">form</field>
- <field name="view_mode">calendar,tree,form</field>
- <field name="search_view_id" ref="view_calendar_event_filter"/>
- </record>
-
- <!-- Event menu -->
- <menuitem id="menu_events"
- name="Events" parent="base.menu_calendar_configuration"
- sequence="15" action="action_view_event"/>
-
</data>
</openerp>
=== modified file 'crm/crm_phonecall_menu.xml'
--- crm/crm_phonecall_menu.xml 2012-09-28 12:31:04 +0000
+++ crm/crm_phonecall_menu.xml 2012-10-12 09:42:28 +0000
@@ -123,7 +123,7 @@
OpenERP allows you to easily define all the calls to be done
by your sales team and follow up based on their summary.
</p><p>
- You can use the import feature to massicely import a new list of
+ You can use the import feature to massively import a new list of
prospects to qualify.
</p>
</field>
=== modified file 'crm/crm_phonecall_view.xml'
--- crm/crm_phonecall_view.xml 2012-10-04 16:00:10 +0000
+++ crm/crm_phonecall_view.xml 2012-10-12 09:42:28 +0000
@@ -70,19 +70,19 @@
<field name="date"/>
<field name="name"/>
<field name="partner_id"/>
+ <button string="Convert to Opportunity"
+ name="%(phonecall2opportunity_act)d"
+ states="open,pending"
+ icon="gtk-index"
+ type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}"/>
+ <button string="Meeting"
+ states="open,pending" icon="gtk-redo"
+ name="action_make_meeting" type="object"/>
<field name="partner_phone"/>
<field name="user_id"/>
<field name="categ_id" invisible="1"/>
<field name="create_date" invisible="1"/>
<field name="opportunity_id" invisible="1"/>
- <button string="Convert to Opportunity"
- name="%(phonecall2opportunity_act)d"
- states="open,pending"
- icon="gtk-index"
- type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}"/>
- <button string="Meeting"
- states="open,pending" icon="gtk-redo"
- name="action_make_meeting" type="object"/>
<field name="state"/>
<button name="case_open" string="Confirm" type="object"
states="draft,pending" icon="gtk-go-forward"/>
=== modified file 'crm/wizard/crm_phonecall_to_phonecall.py'
--- crm/wizard/crm_phonecall_to_phonecall.py 2011-12-19 16:54:40 +0000
+++ crm/wizard/crm_phonecall_to_phonecall.py 2012-10-12 09:42:28 +0000
@@ -87,7 +87,7 @@
if 'user_id' in fields:
res.update({'user_id': phonecall.user_id and phonecall.user_id.id or False})
if 'date' in fields:
- res.update({'date': phonecall.date})
+ res.update({'date': False})
if 'section_id' in fields:
res.update({'section_id': phonecall.section_id and phonecall.section_id.id or False})
if 'categ_id' in fields:
=== modified file 'crm_claim/crm_claim.py'
--- crm_claim/crm_claim.py 2012-10-09 15:54:20 +0000
+++ crm_claim/crm_claim.py 2012-10-12 09:42:28 +0000
@@ -124,7 +124,8 @@
'date': fields.datetime.now,
'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.case', context=c),
'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
- 'active': lambda *a: 1
+ 'active': lambda *a: 1,
+ 'stage_id':lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c)
}
def stage_find(self, cr, uid, cases, section_id, domain=[], order='sequence', context=None):
=== modified file 'crm_claim/crm_claim_view.xml'
--- crm_claim/crm_claim_view.xml 2012-09-30 14:16:38 +0000
+++ crm_claim/crm_claim_view.xml 2012-10-12 09:42:28 +0000
@@ -118,8 +118,7 @@
<button name="case_cancel" string="Cancel" type="object"
states="draft,open,pending"/>
</span>
- <field name="stage_id" widget="statusbar"
- on_change="onchange_stage_id(stage_id)"/>
+ <field name="stage_id" widget="statusbar"/>
</header>
<sheet string="Claims">
<group>
=== modified file 'hr_expense/hr_expense_view.xml'
--- hr_expense/hr_expense_view.xml 2012-10-10 20:38:18 +0000
+++ hr_expense/hr_expense_view.xml 2012-10-12 09:42:28 +0000
@@ -194,6 +194,7 @@
<record id="view_product_hr_expense_form" model="ir.ui.view">
<field name="name">product.product.expense.form</field>
<field name="model">product.product</field>
+ <field eval="8" name="priority"/>
<field name="inherit_id" ref="product.product_normal_form_view"/>
<field name="arch" type="xml">
<div name="options" position="inside">
=== modified file 'product/pricelist.py'
--- product/pricelist.py 2012-09-30 10:38:51 +0000
+++ product/pricelist.py 2012-10-12 09:42:28 +0000
@@ -410,7 +410,7 @@
'min_quantity': fields.integer('Min. Quantity', required=True, help="The rule only applies if the partner buys/sells equal to or more than this quantity."),
'sequence': fields.integer('Sequence', required=True, help="Gives the order in which the pricelist items will be checked. The evaluation gives highest priority to lowest sequence and stops as soon as a matching item is found."),
'base': fields.selection(_price_field_get, 'Based on', required=True, size=-1, help="The mode for computing the price for this rule."),
- 'base_pricelist_id': fields.many2one('product.pricelist', 'If Other Pricelist'),
+ 'base_pricelist_id': fields.many2one('product.pricelist', 'Other Pricelist'),
'price_surcharge': fields.float('Price Surcharge',
digits_compute= dp.get_precision('Product Price'), help='Specify the fixed amount to add or substract(if negative) to the amount calculated with the discount.'),
=== modified file 'product/pricelist_view.xml'
--- product/pricelist_view.xml 2012-09-26 08:54:54 +0000
+++ product/pricelist_view.xml 2012-10-12 09:42:28 +0000
@@ -92,7 +92,7 @@
</group>
<group col="4" string="Price Computation">
<field name="base"/>
- <field name="base_pricelist_id" attrs="{'required': [('base','=', -1)], 'readonly': [('base','!=', -1)]}"/>
+ <field name="base_pricelist_id" attrs="{'invisible':[('base', '!=', -1)],'required': [('base','=', -1)], 'readonly': [('base','!=', -1)]}"/>
</group>
<group col="6" colspan="5">
<label string="New Price ="/>
=== modified file 'product/product_view.xml'
--- product/product_view.xml 2012-10-05 07:28:25 +0000
+++ product/product_view.xml 2012-10-12 09:42:28 +0000
@@ -490,7 +490,7 @@
</p>
</field>
</record>
- <menuitem action="product_uom_categ_form_action" id="menu_product_uom_categ_form_action" parent="base.menu_base_config" sequence="25" groups="base.group_no_one"/>
+ <menuitem action="product_uom_categ_form_action" id="menu_product_uom_categ_form_action" parent="base.menu_base_config" sequence="25" groups="product.group_uom"/>
<record id="product_ul_form_view" model="ir.ui.view">
<field name="name">product.ul.form.view</field>
=== modified file 'sale/res_partner_view.xml'
--- sale/res_partner_view.xml 2012-09-16 15:05:17 +0000
+++ sale/res_partner_view.xml 2012-10-12 09:42:28 +0000
@@ -75,6 +75,17 @@
</xpath>
</field>
</record>
+
+ <record id="view_tree_partner_id" model="ir.ui.view">
+ <field name="name">- Add partner on tree</field>
+ <field name="model">res.partner</field>
+ <field name="inherit_id" ref="base.view_partner_tree"/>
+ <field name="arch" type="xml">
+ <field name="country_id" position="after">
+ <field name="parent_id" invisible="1"/>
+ </field>
+ </field>
+ </record>
</data>
=== modified file 'sale/sale.py'
--- sale/sale.py 2012-10-10 20:00:32 +0000
+++ sale/sale.py 2012-10-12 09:42:28 +0000
@@ -716,6 +716,8 @@
'invoice_lines': fields.many2many('account.invoice.line', 'sale_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),
'invoiced': fields.boolean('Invoiced', readonly=True),
'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Product Price'), readonly=True, states={'draft': [('readonly', False)]}),
+ 'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True, readonly=True, states={'draft': [('readonly', False)]},
+ help="If 'on order', it triggers a procurement when the sale order is confirmed to create a task, purchase order or manufacturing order linked to this sale order line."),
'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Account')),
'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes', readonly=True, states={'draft': [('readonly', False)]}),
'address_allotment_id': fields.many2one('res.partner', 'Allotment Partner'),
@@ -744,6 +746,7 @@
'sequence': 10,
'invoiced': 0,
'state': 'draft',
+ 'type': 'make_to_stock',
'price_unit': 0.0,
}
=== modified file 'sale/sale_view.xml'
--- sale/sale_view.xml 2012-10-10 20:49:22 +0000
+++ sale/sale_view.xml 2012-10-12 09:42:28 +0000
@@ -225,8 +225,8 @@
</group>
<group>
<field name="tax_id" widget="many2many_tags" domain="[('parent_id','=',False),('type_tax_use','<>','purchase')]"/>
+ <field name="type"/>
<field name="th_weight"/>
-
<!-- we should put a config wizard for these two fields -->
<field name="address_allotment_id"/>
</group>
@@ -483,12 +483,12 @@
</header>
<sheet>
<label for="order_id" class="oe_edit_only"/>
- <h1><field name="order_id"/></h1>
+ <h1><field name="order_id" domain="[('state','!=','done')]"/></h1>
<label for="order_partner_id" class="oe_edit_only"/>
<h2><field name="order_partner_id"/></h2>
<group>
<group>
- <field name="product_id" readonly="1"/>
+ <field name="product_id"/>
<label for="product_uom_qty"/>
<div>
<field name="product_uom_qty" readonly="1" class="oe_inline"/>
=== modified file 'sale_stock/sale_stock.py'
--- sale_stock/sale_stock.py 2012-10-05 09:15:16 +0000
+++ sale_stock/sale_stock.py 2012-10-12 09:42:28 +0000
@@ -490,8 +490,6 @@
_columns = {
'delay': fields.float('Delivery Lead Time', required=True, help="Number of days between the order confirmation the shipping of the products to the customer", readonly=True, states={'draft': [('readonly', False)]}),
'procurement_id': fields.many2one('procurement.order', 'Procurement'),
- 'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True, readonly=True, states={'draft': [('readonly', False)]},
- help="If 'on order', it triggers a procurement when the sale order is confirmed to create a task, purchase order or manufacturing order linked to this sale order line."),
'property_ids': fields.many2many('mrp.property', 'sale_order_line_property_rel', 'order_id', 'property_id', 'Properties', readonly=True, states={'draft': [('readonly', False)]}),
'product_packaging': fields.many2one('product.packaging', 'Packaging'),
'move_ids': fields.one2many('stock.move', 'sale_line_id', 'Inventory Moves', readonly=True),
@@ -499,7 +497,6 @@
}
_defaults = {
'delay': 0.0,
- 'type': 'make_to_stock',
'product_packaging': False,
}
=== modified file 'sale_stock/sale_stock_view.xml'
--- sale_stock/sale_stock_view.xml 2012-10-04 09:02:40 +0000
+++ sale_stock/sale_stock_view.xml 2012-10-12 09:42:28 +0000
@@ -80,19 +80,19 @@
</tree>
</field>
</field>
- <xpath expr="//page[@string='Order Lines']/field[@name='order_line']/form[@string='Sales Order Lines']/group/group/field[@name='th_weight']" position="before">
+ <xpath expr="//page[@string='Order Lines']/field[@name='order_line']/form[@string='Sales Order Lines']/group/group/field[@name='type']" position="before">
<label for="delay"/>
<div>
<field name="delay" class="oe_inline"/> days
</div>
- <field name="type"/>
+
</xpath>
<xpath expr="//page[@string='Order Lines']/field[@name='order_line']/form[@string='Sales Order Lines']/group/group/field[@name='address_allotment_id']" position="after">
<field name="property_ids" widget="many2many_tags"
groups="sale.group_mrp_properties"/>
</xpath>
<xpath expr="//page[@string='Order Lines']/field[@name='order_line']/form[@string='Sales Order Lines']/group/group/field[@name='tax_id']" position="before">
- <field name="product_packaging" context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}" on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)" domain="[('product_id','=',product_id)]" groups="product.group_stock_packaging" colspan="3"/>
+ <field name="product_packaging" context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}" on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)" domain="[('product_id','=',product_id)]" groups="product.group_stock_packaging" />
</xpath>
<xpath expr="//page[@string='Order Lines']/field[@name='order_line']/form[@string='Sales Order Lines']/div/field[@name='invoice_lines']" position="after">
<label for="move_ids"/>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
