Merge lp:~openerp-dev/openobject-addons/trunk-imp-calendar-dragdrop-dka into lp:openobject-addons

[Darshan Kalola(OpenERP)]

[lp:~openerp-dev/openobject-addons/trunk-imp-calendar-dragdrop-dka]

9087. By Niko (OpenERP) on 2014-02-28

[IMP] Add some video to manisfest ( website, website_blog, website_event, website_ecommerce)

9147. By Darshan Kalola(OpenERP) on 2014-02-20

[MERGE]sync with trunk.

9148. By Darshan Kalola(OpenERP) on 2014-02-25

[MERGE]sync with trunk.

9149. By Darshan Kalola(OpenERP) on 2014-02-28

[MERGE]sync with trunk.

9150. By Darshan Kalola(OpenERP) on 2014-03-03

[IMP]calendar view: set invisible modifier on state field beacuse no need to display on calendar view.

9151. By Darshan Kalola(OpenERP) on 2014-03-06

[MERGE]sync with trunk.

9152. By Darshan Kalola(OpenERP) on 2014-03-31

[MERGE]sync with trunk.

9153. By Darshan Kalola(OpenERP) on 2014-04-08

[MERGE]sync with trunk.

9154. By Darshan Kalola(OpenERP) on 2014-04-09

[MERGE]sync with trunk.

9155. By Darshan Kalola(OpenERP) on 2014-04-11

[MERGE]sync with trunk.

9156. By Darshan Kalola(OpenERP) on 2014-04-15

[MERGE]sync with trunk.

9157. By Darshan Kalola(OpenERP) on 2014-04-21

[MERGE]sync with trunk.

9158. By Darshan Kalola(OpenERP) on 2014-04-23

[MERGE]sync with trunk.

9159. By Darshan Kalola(OpenERP) on 2014-04-23

[MERGE]sync with trunk.

9160. By Darshan Kalola(OpenERP) on 2014-04-24

[IMP]sale: added name field in calendar view of sale order.

9161. By Darshan Kalola(OpenERP) on 2014-04-24

[MERGE]sync with trunk.

9162. By Darshan Kalola(OpenERP) on 2014-04-25

[MERGE] Merged lp:openobject-addons.

9163. By Darshan Kalola(OpenERP) on 2014-04-29

[MERGE]sync with trunk.

Unmerged revisions

9163. By Darshan Kalola(OpenERP) on 2014-04-29

[MERGE]sync with trunk.

9162. By Darshan Kalola(OpenERP) on 2014-04-25

[MERGE] Merged lp:openobject-addons.

9161. By Darshan Kalola(OpenERP) on 2014-04-24

[MERGE]sync with trunk.

9160. By Darshan Kalola(OpenERP) on 2014-04-24

[IMP]sale: added name field in calendar view of sale order.

9159. By Darshan Kalola(OpenERP) on 2014-04-23

[MERGE]sync with trunk.

9158. By Darshan Kalola(OpenERP) on 2014-04-23

[MERGE]sync with trunk.

9157. By Darshan Kalola(OpenERP) on 2014-04-21

[MERGE]sync with trunk.

9156. By Darshan Kalola(OpenERP) on 2014-04-15

[MERGE]sync with trunk.

9155. By Darshan Kalola(OpenERP) on 2014-04-11

[MERGE]sync with trunk.

9154. By Darshan Kalola(OpenERP) on 2014-04-09

[MERGE]sync with trunk.

=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml	2014-04-01 07:02:27 +0000
+++ account/account_invoice_view.xml	2014-04-29 04:43:46 +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" invisible="1"/>
                 </calendar>
             </field>
         </record>

=== modified file 'calendar/calendar_view.xml'
--- calendar/calendar_view.xml	2014-02-20 16:38:15 +0000
+++ calendar/calendar_view.xml	2014-04-29 04:43:46 +0000
@@ -225,6 +225,7 @@
             
                 <field name="name"/>
                 <field name="user_id"/>
+                <field name="state"/>
                 <field name="color_partner_id"/>
                 <field name="partner_ids"/>
             </calendar>

=== modified file 'crm/crm_phonecall_view.xml'
--- crm/crm_phonecall_view.xml	2014-03-12 09:07:34 +0000
+++ crm/crm_phonecall_view.xml	2014-04-29 04:43:46 +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-10-27 12:31:04 +0000
+++ crm_helpdesk/crm_helpdesk_view.xml	2014-04-29 04:43:46 +0000
@@ -121,6 +121,7 @@
                     <field name="name"/>
                     <field name="partner_id"/>
                     <field name="categ_id"/>
+                    <field name="state" invisible="1"/>
                 </calendar>
             </field>
         </record>

=== modified file 'event/event_view.xml'
--- event/event_view.xml	2014-04-10 09:17:47 +0000
+++ event/event_view.xml	2014-04-29 04:43:46 +0000
@@ -251,6 +251,7 @@
                 <calendar color="type" date_start="date_begin" date_stop="date_end" string="Event Organization">
                     <field name="name"/>
                     <field name="type"/>
+                    <field name="state" invisible="1"/>
                 </calendar>
             </field>
         </record>
@@ -397,6 +398,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" invisible="1"/>
                 </calendar>
             </field>
         </record>

=== modified file 'hr_holidays/hr_holidays_view.xml'
--- hr_holidays/hr_holidays_view.xml	2014-02-11 15:48:27 +0000
+++ hr_holidays/hr_holidays_view.xml	2014-04-29 04:43:46 +0000
@@ -45,6 +45,7 @@
                           quick_add="False" avatar_model="hr.employee"> 
                     <field name="employee_id"/>
                     <field name="holiday_status_id"/>
+                    <field name="state" invisible="1"/>
                 </calendar>
             </field>
         </record>

=== modified file 'mrp/mrp_view.xml'
--- mrp/mrp_view.xml	2014-03-19 06:35:49 +0000
+++ mrp/mrp_view.xml	2014-04-29 04:43:46 +0000
@@ -597,6 +597,7 @@
                     <field name="name"/>
                     <field name="product_id"/>
                     <field name="product_qty"/>
+                    <field name="state" invisible="1"/>
                 </calendar>
             </field>
         </record>

=== modified file 'mrp_operations/mrp_operations_view.xml'
--- mrp_operations/mrp_operations_view.xml	2014-01-29 18:47:03 +0000
+++ mrp_operations/mrp_operations_view.xml	2014-04-29 04:43:46 +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" invisible="1"/>
             </calendar>
         </field>
     </record>

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2014-04-18 06:12:56 +0000
+++ purchase/purchase.py	2014-04-29 04:43:46 +0000
@@ -171,7 +171,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'),
@@ -200,7 +200,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	2014-04-17 09:05:15 +0000
+++ purchase/purchase_view.xml	2014-04-29 04:43:46 +0000
@@ -144,6 +144,9 @@
                     <field name="name"/>
                     <field name="amount_total"/>
                     <field name="partner_id"/>
+                    <field name="state" invisible="1"/>
+                    <field name="minimum_planned_date" invisible="1" attrs="{'readonly': [('shipped','=',True)]}" />
+                    <field name="shipped" invisible="1"/>
                 </calendar>
             </field>
         </record>
@@ -237,7 +240,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 'sale/sale_view.xml'
--- sale/sale_view.xml	2014-04-08 05:35:52 +0000
+++ sale/sale_view.xml	2014-04-29 04:43:46 +0000
@@ -18,6 +18,7 @@
             <field name="model">sale.order</field>
             <field name="arch" type="xml">
                 <calendar string="Sales Orders" color="state" date_start="date_order">
+                    <field name="name"/>
                     <field name="partner_id"/>
                     <field name="amount_total"/>
                 </calendar>

=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml	2014-04-22 09:25:29 +0000
+++ stock/stock_view.xml	2014-04-29 04:43:46 +0000
@@ -735,6 +735,7 @@
                     <field name="origin"/>
                     <field name="type"/>
                     <field name="partner_id"/>
+                    <field name="state" invisible="1"/>
                 </calendar>
             </field>
         </record>
@@ -880,6 +881,7 @@
                     <field name="origin"/>
                     <field name="type"/>
                     <field name="partner_id"/>
+                    <field name="state" invisible="1"/>
                 </calendar>
             </field>
         </record>
@@ -1011,6 +1013,7 @@
                     <field name="origin"/>
                     <field name="type"/>
                     <field name="partner_id"/>
+                    <field name="state" invisible="1"/>
                 </calendar>
             </field>
         </record>