Priyesh (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons-issues3-account-pso into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons-issues3-account-pso/+merge/118306
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons-issues3-account-pso/+merge/118306
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons-issues3-account-pso.
=== modified file 'account/account_installer.xml'
--- account/account_installer.xml 2012-08-04 20:35:46 +0000
+++ account/account_installer.xml 2012-08-06 06:37:33 +0000
@@ -9,9 +9,9 @@
<form position="attributes" version="7.0">
<attribute name="string">Accounting Application Configuration</attribute>
</form>
- <button name="action_next" position="attributes">
- <attribute name="string">Continue</attribute>
- </button>
+ <footer position="replace">
+ <button name="action_next" type="object" string="Continue" class="oe_highlight"/>
+ </footer>
<separator string="title" position="replace">
<group>
<field name="charts"/>
=== modified file 'base_calendar/crm_meeting.py'
--- base_calendar/crm_meeting.py 2012-07-14 16:04:03 +0000
+++ base_calendar/crm_meeting.py 2012-08-06 06:37:33 +0000
@@ -63,7 +63,7 @@
'event_id', 'attendee_id', 'Attendees', states={'done': [('readonly', True)]}),
}
_defaults = {
- 'state': 'draft',
+ 'state': 'open',
}
# ----------------------------------------
=== modified file 'base_calendar/crm_meeting_view.xml'
--- base_calendar/crm_meeting_view.xml 2012-08-04 14:35:56 +0000
+++ base_calendar/crm_meeting_view.xml 2012-08-06 06:37:33 +0000
@@ -72,15 +72,7 @@
<field name="arch" type="xml">
<form string="Meetings" version="7.0">
<header>
- <button name="case_open" string="Confirm" type="object"
- states="draft"/>
- <button name="case_close" string="Done" type="object"
- states="open"/>
- <button name="case_reset" string="Reset to Unconfirmed" type="object"
- states="cancel,done"/>
- <button name="case_cancel" string="Cancel" type="object"
- states="draft,open"/>
- <field name="state" widget="statusbar" statusbar_visible="draft,open,done"/>
+ <field name="state"/>
</header>
<sheet>
<div class="oe_title">
=== modified file 'crm/crm_phonecall.py'
--- crm/crm_phonecall.py 2012-07-09 04:32:17 +0000
+++ crm/crm_phonecall.py 2012-08-06 06:37:33 +0000
@@ -81,6 +81,7 @@
'priority': crm.AVAILABLE_PRIORITIES[2][0],
'state': _get_default_state,
'user_id': lambda self,cr,uid,ctx: uid,
+ 'active': 1
}
def create(self, cr, uid, vals, context=None):
=== modified file 'project/project_view.xml'
--- project/project_view.xml 2012-08-04 21:53:27 +0000
+++ project/project_view.xml 2012-08-06 06:37:33 +0000
@@ -419,7 +419,7 @@
</h1>
<group>
<group>
- <field name="project_id" on_change="onchange_project(project_id)"/>
+ <field name="project_id" on_change="onchange_project(project_id)" context="{'default_use_tasks':1}"/>
<field name="user_id" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
@@ -542,15 +542,15 @@
<i><field name="date_deadline"/></i>
</div>
<div class="oe_kanban_bottom_right">
- <a t-if="record.kanban_state.raw_value === 'normal'" type="object" string="" name="set_kanban_state_done" class="oe_kanban_status"> </a>
- <a t-if="record.kanban_state.raw_value === 'done'" type="object" string="Ready" name="set_kanban_state_blocked" class="oe_kanban_status oe_kanban_status_green"> </a>
+ <a t-if="record.kanban_state.raw_value === 'normal'" type="object" string="Ready to Pull" name="set_kanban_state_done" class="oe_kanban_status"> </a>
+ <a t-if="record.kanban_state.raw_value === 'done'" type="object" string="Ready to Pull" name="set_kanban_state_blocked" class="oe_kanban_status oe_kanban_status_green"> </a>
<a t-if="record.kanban_state.raw_value === 'blocked'" type="object" string="Blocked" name="set_kanban_state_normal" class="oe_kanban_status oe_kanban_status_red"> </a>
- <a t-if="record.priority.raw_value == 1" type="object" name="set_normal_priority" class="oe_e oe_star_on">7</a>
- <a t-if="record.priority.raw_value != 1" type="object" name="set_high_priority" class="oe_e oe_star_off">7</a>
+ <a t-if="record.priority.raw_value == 1" type="object" string="Priority" name="set_normal_priority" class="oe_e oe_star_on">7</a>
+ <a t-if="record.priority.raw_value != 1" type="object" string="Priority" name="set_high_priority" class="oe_e oe_star_off">7</a>
<img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
</div>
<div class="oe_kanban_footer_left">
- <span>
+ <span groups="project.group_time_work_estimation_tasks">
<span class="oe_e">N</span>
<t t-esc="Math.round(record.remaining_hours.raw_value)"/>
</span>
=== modified file 'stock/stock.py'
--- stock/stock.py 2012-08-03 07:56:33 +0000
+++ stock/stock.py 2012-08-06 06:37:33 +0000
@@ -2809,6 +2809,14 @@
'state': fields.related('inventory_id','state',type='char',string='Status',readonly=True),
}
+ def _default_stock_location(self, cr, uid, context=None):
+ stock_location = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock')
+ return stock_location.id
+
+ _defaults = {
+ 'location_id': _default_stock_location
+ }
+
def on_change_product_id(self, cr, uid, ids, location_id, product, uom=False, to_date=False):
""" Changes UoM and name if product_id changes.
@param location_id: Location id
@@ -2840,8 +2848,20 @@
'lot_stock_id': fields.many2one('stock.location', 'Location Stock', required=True, domain=[('usage','=','internal')]),
'lot_output_id': fields.many2one('stock.location', 'Location Output', required=True, domain=[('usage','<>','view')]),
}
+
+ def _default_lot_input_stock_id(self, cr, uid, context=None):
+ lot_input_stock = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock')
+ return lot_input_stock.id
+
+ def _default_lot_output_id(self, cr, uid, context=None):
+ lot_output = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_output')
+ return lot_output.id
+
_defaults = {
'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.inventory', context=c),
+ 'lot_input_id': _default_lot_input_stock_id,
+ 'lot_stock_id': _default_lot_input_stock_id,
+ 'lot_output_id': _default_lot_output_id,
}
stock_warehouse()
=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml 2012-08-04 20:35:46 +0000
+++ stock/stock_view.xml 2012-08-06 06:37:33 +0000
@@ -679,9 +679,9 @@
<h1><field name="name"/></h1>
<group>
<group>
- <field name="lot_input_id"/>
- <field name="lot_stock_id"/>
- <field name="lot_output_id"/>
+ <field name="lot_input_id" groups="stock.group_locations"/>
+ <field name="lot_stock_id" groups="stock.group_locations"/>
+ <field name="lot_output_id" groups="stock.group_locations"/>
</group>
<group>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
@@ -698,9 +698,9 @@
<field name="arch" type="xml">
<tree string="Warehouse">
<field name="name"/>
- <field name="lot_input_id"/>
- <field name="lot_stock_id"/>
- <field name="lot_output_id"/>
+ <field name="lot_input_id" groups="stock.group_locations"/>
+ <field name="lot_stock_id" groups="stock.group_locations"/>
+ <field name="lot_output_id" groups="stock.group_locations"/>
<field name="partner_id"/>
</tree>
</field>
@@ -791,7 +791,7 @@
<group>
<group>
<field name="backorder_id" readonly="1"/>
- <field name="invoice_state" string="Invoice Control" groups="account.group_account_invoice"/>
+ <field name="invoice_state" string="Invoice Control" groups="account.group_account_invoice" attrs="{'invisible':[('invoice_state', '=', 'none')]}"/>
<field name="stock_journal_id" widget="selection" groups="account.group_account_user"/>
</group>
<group>
_______________________________________________
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
