Merge lp:~openerp-dev/openobject-addons/trunk-improve-calendar-dragdrop-bth into lp:openobject-addons

[Thibault Delavallée (OpenERP)]

[lp:~openerp-dev/openobject-addons/trunk-improve-calendar-dragdrop-bth]

8759. By Jignesh Rathod(OpenERP) on 2013-06-17

Merge With latest code.

8760. By Bhumi Thakkar (Open ERP) on 2013-06-24

[MERGE]Merge lp:openobject-addons.

8761. By Amit Bhavsar (Open ERP) on 2013-07-01

[MERGE] merge with latest trunk

8762. By Bhumi Thakkar (Open ERP) on 2013-07-02

[MERGE]Merge lp:openobject-addons.

8763. By Bhumi Thakkar (Open ERP) on 2013-07-03

[MERGE]Merge lp:openobject-addons.

8764. By Bhumi Thakkar (Open ERP) on 2013-07-09

[MERGE]Merge lp:openobject-addons.

8765. By Bhumi Thakkar (Open ERP) on 2013-07-11

[IMP]Add field with attribute of readonly.

8766. By Bhumi Thakkar (Open ERP) on 2013-07-11

[MERGE]Merge lp:openobject-addons.

8767. By Bhumi Thakkar (Open ERP) on 2013-07-12

[MERGE]Merge lp:openobject-addons.

8768. By Bhumi Thakkar (Open ERP) on 2013-07-12

[IMP]Removed state field from calendar.

8769. By Bhumi Thakkar (Open ERP) on 2013-07-16

[MERGE]Merge lp:openobject-addons.

8770. By Bhumi Thakkar (Open ERP) on 2013-08-13

[MERGE]Merge lp:openobject-addons.

8771. By Bhumi Thakkar (Open ERP) on 2013-08-13

[IMP]Remove state from project task.

8772. By Bhumi Thakkar (Open ERP) on 2013-08-13

[IMP]Removed state from crm.

8773. By Bhumi Thakkar (Open ERP) on 2013-08-13

[IMP]Removed state from crm_claim.

8774. By Bhumi Thakkar (Open ERP) on 2013-08-13

[IMP]Removed state from project_issue.

8775. By Bhumi Thakkar (Open ERP) on 2013-08-21

[MERGE]Merge lp:openobject-addons.

8776. By Bhumi Thakkar (Open ERP) on 2013-10-29

[MERGE]Merge trunk.

8777. By Bhumi Thakkar (Open ERP) on 2013-11-08

[MERGE]Merge trunk.

Unmerged revisions

8777. By Bhumi Thakkar (Open ERP) on 2013-11-08

[MERGE]Merge trunk.

8776. By Bhumi Thakkar (Open ERP) on 2013-10-29

[MERGE]Merge trunk.

8775. By Bhumi Thakkar (Open ERP) on 2013-08-21

[MERGE]Merge lp:openobject-addons.

8774. By Bhumi Thakkar (Open ERP) on 2013-08-13

[IMP]Removed state from project_issue.

8773. By Bhumi Thakkar (Open ERP) on 2013-08-13

[IMP]Removed state from crm_claim.

8772. By Bhumi Thakkar (Open ERP) on 2013-08-13

[IMP]Removed state from crm.

8771. By Bhumi Thakkar (Open ERP) on 2013-08-13

[IMP]Remove state from project task.

8770. By Bhumi Thakkar (Open ERP) on 2013-08-13

[MERGE]Merge lp:openobject-addons.

8769. By Bhumi Thakkar (Open ERP) on 2013-07-16

[MERGE]Merge lp:openobject-addons.

8768. By Bhumi Thakkar (Open ERP) on 2013-07-12

[IMP]Removed state field from calendar.

=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml	2013-10-09 18:03:37 +0000
+++ account/account_invoice_view.xml	2013-11-08 10:26:45 +0000
@@ -10,6 +10,7 @@
                 <calendar string="Invoices" color="journal_id" date_start="date_invoice">
                     <field name="partner_id"/>
                     <field name="amount_total"/>
+                    <field name="state"/>
                 </calendar>
             </field>
         </record>

=== modified file 'base_calendar/base_calendar_view.xml'
--- base_calendar/base_calendar_view.xml	2013-09-04 14:10:53 +0000
+++ base_calendar/base_calendar_view.xml	2013-11-08 10:26:45 +0000
@@ -243,6 +243,7 @@
                     <field name="name"/>
                     <field name="class"/>
                     <field name="show_as"/>
+                    <field name="state"/>
                 </calendar>
             </field>
         </record>

=== modified file 'base_calendar/crm_meeting_view.xml'
--- base_calendar/crm_meeting_view.xml	2013-09-04 14:11:22 +0000
+++ base_calendar/crm_meeting_view.xml	2013-11-08 10:26:45 +0000
@@ -212,6 +212,7 @@
             <calendar string="Meetings" date_start="date" color="user_id" date_stop="date_deadline" date_delay="duration">
                 <field name="name"/>
                 <field name="user_id"/>
+                <field name="state"/>
             </calendar>
         </field>
     </record>

=== modified file 'crm/crm_phonecall_view.xml'
--- crm/crm_phonecall_view.xml	2013-09-04 14:11:22 +0000
+++ crm/crm_phonecall_view.xml	2013-11-08 10:26:45 +0000
@@ -155,6 +155,7 @@
             <calendar string="Phone Calls" date_start="date" color="user_id" date_delay="duration">
                 <field name="name"/>
                 <field name="partner_id"/>
+                <field name="state"/>
             </calendar>
         </field>
     </record>

=== modified file 'crm_helpdesk/crm_helpdesk_view.xml'
--- crm_helpdesk/crm_helpdesk_view.xml	2013-09-04 14:11:22 +0000
+++ crm_helpdesk/crm_helpdesk_view.xml	2013-11-08 10:26:45 +0000
@@ -121,6 +121,8 @@
                     <field name="name"/>
                     <field name="partner_id"/>
                     <field name="categ_id"/>
+                    <field name="name"/>
+                    <field name="state"/>
                 </calendar>
             </field>
         </record>

=== modified file 'event/event_view.xml'
--- event/event_view.xml	2013-09-04 14:11:22 +0000
+++ event/event_view.xml	2013-11-08 10:26:45 +0000
@@ -270,6 +270,7 @@
                 <calendar color="type" date_start="date_begin" date_stop="date_end" string="Event Organization">
                     <field name="name"/>
                     <field name="type"/>
+                    <field name="state"/>
                 </calendar>
             </field>
         </record>
@@ -416,6 +417,7 @@
                 <calendar color="event_id" date_start="event_begin_date" date_stop="event_end_date" string="Event Registration">
                     <field name="event_id"/>
                     <field name="name"/>
+                    <field name="state"/>
                 </calendar>
             </field>
         </record>

=== modified file 'hr_holidays/hr_holidays_view.xml'
--- hr_holidays/hr_holidays_view.xml	2013-09-04 14:10:53 +0000
+++ hr_holidays/hr_holidays_view.xml	2013-11-08 10:26:45 +0000
@@ -43,6 +43,7 @@
                 <calendar string="Leave Request" color="employee_id" date_start="date_from" date_stop="date_to">
                     <field name="employee_id"/>
                     <field name="holiday_status_id"/>
+                    <field name="state"/>
                 </calendar>
             </field>
         </record>

=== modified file 'mrp/mrp_view.xml'
--- mrp/mrp_view.xml	2013-09-10 12:48:03 +0000
+++ mrp/mrp_view.xml	2013-11-08 10:26:45 +0000
@@ -597,6 +597,7 @@
                     <field name="name"/>
                     <field name="product_id"/>
                     <field name="product_qty"/>
+                    <field name="state"/>
                 </calendar>
             </field>
         </record>

=== modified file 'mrp_operations/mrp_operations_view.xml'
--- mrp_operations/mrp_operations_view.xml	2013-09-23 17:13:10 +0000
+++ mrp_operations/mrp_operations_view.xml	2013-11-08 10:26:45 +0000
@@ -147,6 +147,7 @@
             <calendar color="product" date_stop="date_finished" date_start="date_start" string="Operations">
                 <field name="workcenter_id"/>
                 <field name="production_id"/>
+                <field name="state"/>
             </calendar>
         </field>
     </record>

=== modified file 'project_long_term/project_long_term_view.xml'
--- project_long_term/project_long_term_view.xml	2013-09-04 14:11:22 +0000
+++ project_long_term/project_long_term_view.xml	2013-11-08 10:26:45 +0000
@@ -249,6 +249,7 @@
             <field name="arch" type="xml">
                 <calendar color="project_id" date_start="date_start" date_stop="date_end" day_length="12">
                     <field name="name"/>
+                    <field name="state"/>
                 </calendar>
             </field>
         </record>

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2013-10-18 12:58:18 +0000
+++ purchase/purchase.py	2013-11-08 10:26:45 +0000
@@ -174,7 +174,7 @@
         ),
         'partner_ref': fields.char('Supplier Reference', states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, size=64,
             help="Reference of the sales order or quotation sent by your supplier. It's mainly used to do the matching when you receive the products as this reference is usually written on the delivery order sent by your supplier."),
-        'date_order':fields.date('Order Date', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, select=True, help="Date on which this document has been created."),
+        'date_order':fields.date('Order Date', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)], 'done':[('readonly',True)]}, select=True, help="Date on which this document has been created."),
         'date_approve':fields.date('Date Approved', readonly=1, select=True, help="Date on which purchase order has been approved"),
         'partner_id':fields.many2one('res.partner', 'Supplier', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]},
             change_default=True, track_visibility='always'),
@@ -203,7 +203,7 @@
                 "Based on generated invoice: create a draft invoice you can validate later.\n" \
                 "Based on incoming shipments: let you create an invoice when receptions are validated."
         ),
-        'minimum_planned_date':fields.function(_minimum_planned_date, fnct_inv=_set_minimum_planned_date, string='Expected Date', type='date', select=True, help="This is computed as the minimum scheduled date of all purchase order lines' products.",
+        'minimum_planned_date':fields.function(_minimum_planned_date, fnct_inv=_set_minimum_planned_date, string='Expected Date', type='date', select=True, states={'confirmed':[('readonly',True)], 'done':[('readonly',True)]}, help="This is computed as the minimum scheduled date of all purchase order lines' products.",
             store = {
                 'purchase.order.line': (_get_order, ['date_planned'], 10),
             }

=== modified file 'purchase/purchase_view.xml'
--- purchase/purchase_view.xml	2013-09-17 11:48:53 +0000
+++ purchase/purchase_view.xml	2013-11-08 10:26:45 +0000
@@ -141,6 +141,9 @@
                     <field name="name"/>
                     <field name="amount_total"/>
                     <field name="partner_id"/>
+                    <field name="state"/>
+                    <field name="minimum_planned_date" attrs="{'readonly': [('shipped','=',True)]}" />
+                    <field name="shipped" />
                 </calendar>
             </field>
         </record>
@@ -234,7 +237,7 @@
                             <group>
                                 <group>
                                     <field name="dest_address_id" string="Customer Address" on_change="onchange_dest_address_id(dest_address_id)" groups="stock.group_locations"/>
-                                    <field name="minimum_planned_date"/>
+                                    <field name="minimum_planned_date" attrs="{'readonly': [('shipped','=',True)]}"/>
                                     <field name="location_id" groups="stock.group_locations"/>
                                     <field name="shipped" groups="base.group_no_one"/>
                                 </group>

=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml	2013-09-23 17:13:10 +0000
+++ stock/stock_view.xml	2013-11-08 10:26:45 +0000
@@ -729,6 +729,7 @@
                     <field name="origin"/>
                     <field name="type"/>
                     <field name="partner_id"/>
+                    <field name="state"/>
                 </calendar>
             </field>
         </record>
@@ -874,6 +875,7 @@
                     <field name="origin"/>
                     <field name="type"/>
                     <field name="partner_id"/>
+                    <field name="state"/>
                 </calendar>
             </field>
         </record>
@@ -1005,6 +1007,7 @@
                     <field name="origin"/>
                     <field name="type"/>
                     <field name="partner_id"/>
+                    <field name="state"/>
                 </calendar>
             </field>
         </record>