[MERGE]: Merge with lp:openobject-trunk-dev-addons2

bzr revid: aag@tinyerp.co.in-20101112062248-7lou4kg8f6fazw1f

diff --combined addons/procurement/i18n/it.po
index 44b98e3,aecf56d..63df315
--- 1/addons/procurement/i18n/it.po
--- 2/addons/procurement/i18n/it.po
+++ b/addons/procurement/i18n/it.po
@@@ -8,13 -8,13 +8,13 @@@ msgstr "
  "Project-Id-Version: openobject-addons\n"
  "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
  "POT-Creation-Date: 2010-10-18 17:46+0000\n"
- "PO-Revision-Date: 2010-11-09 11:07+0000\n"
+ "PO-Revision-Date: 2010-11-10 07:44+0000\n"
  "Last-Translator: Davide Corio - Domsense <davide.corio@domsense.com>\n"
  "Language-Team: Italian <it@li.org>\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
- "X-Launchpad-Export-Date: 2010-11-10 05:03+0000\n"
+ "X-Launchpad-Export-Date: 2010-11-11 04:46+0000\n"
  "X-Generator: Launchpad (build Unknown)\n"
  
  #. module: procurement
@@@ -325,7 -325,7 +325,7 @@@ msgstr "
  
  #. module: procurement
  #: view:res.company:0
 -msgid "MRP & Logistic Scheduler"
 +msgid "MRP & Logistics Scheduler"
  msgstr ""
  
  #. module: procurement

diff --combined addons/sale/sale_view.xml
index c06b844,ec3c390..e4fd963
--- 1/addons/sale/sale_view.xml
--- 2/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@@ -49,11 -49,8 +49,8 @@@
              <field name="help">If you have more than one shops reselling your company products, you can create and manage them from here. Whenever you will record a new quotation or sale order, it has to be linked to a shop. The shop also defines the warehouse from which the products will be delivered for each particular sale.</field>
          </record>
  
-         <menuitem id="menu_config_sale"
-             parent="base.menu_base_config"
-             name="Sales" groups="base.group_extended"/>
          <menuitem action="action_shop_form" id="menu_action_shop_form"
-             parent="menu_config_sale" sequence="0" />
+             parent="base.menu_sale_config_sales" sequence="0" />
  
          <record id="view_sale_order_calendar" model="ir.ui.view">
              <field name="name">sale.order.calendar</field>
@@@ -107,10 -104,10 +104,10 @@@
                      <group col="6" colspan="4">
                          <field name="name"/>
                          <field name="date_order"/>
-                         <field name="shipped"/>
-                         <field name="client_order_ref"/>
-                         <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection"/>
                          <field name="invoiced"/>
+                         <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection"/>
+                         <field name="client_order_ref"/>
+                         <field name="shipped"/>
                      </group>
                      <notebook colspan="5">
                          <page string="Sales Order">
@@@ -207,9 -204,9 +204,9 @@@
                              <group col="13" colspan="4">
                                  <field name="state"/>
                                  <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward"/>
-                                 <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected" icon="gtk-apply"/>
-                                 <button name="ship_recreate" states="shipping_except" string="Recreate Procurement" icon="gtk-ok"/>
-                                 <button name="ship_corrected" states="shipping_except" string="Procurement Corrected" icon="gtk-apply"/>
+                                 <button name="invoice_corrected" states="invoice_except" string="Ignore Exception" icon="gtk-apply"/>
+                                 <button name="ship_recreate" states="shipping_except" string="Recreate Packing" icon="gtk-ok"/>
+                                 <button name="ship_corrected" states="shipping_except" string="Ignore Exception" icon="gtk-apply"/>
                                  <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
                                  <button name="manual_invoice" states="manual" string="Create Final Invoice" icon="gtk-go-forward" type="object"/>
                                  <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
@@@ -220,9 -217,9 +217,9 @@@
                              </group>
                          </page>
                          <page string="Other Information">
-                             <group colspan="2" col="2" groups="base.group_extended" name="logistics">
-                                 <separator string="Logistics" colspan="2"/>
-                                 <field name="incoterm"/>
+                             <group colspan="2" col="2" groups="base.group_extended" name="logistic">
+                                 <separator string="Logistic" colspan="2"/>
+                                 <field name="incoterm" widget="selection"/>
                                  <field name="picking_policy" required="True"/>
                                  <field name="order_policy" on_change="shipping_policy_change(order_policy)"/>
                                  <field name="invoice_quantity" attrs="{'readonly':[('order_policy','=','prepaid'),('order_policy','=','picking')]}"/>
@@@ -542,7 -539,7 +539,7 @@@
                    <attribute name="string">Sales Application Configuration</attribute>
                  </form>
                  <separator string="title" position="attributes">
 -                <attribute name="string">Configure Sales Order Logistic</attribute>
 +                <attribute name="string">Configure Sales Order Logistics</attribute>
                    </separator>
                    <xpath expr="//label[@string='description']" position="attributes">
                      <attribute name="string">Setup your sales workflow and default values.</attribute>

diff --combined addons/sale/security/sale_security.xml
index 4086985,5d422a3..c290016
--- 1/addons/sale/security/sale_security.xml
--- 2/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@@ -9,18 -9,18 +9,22 @@@
          <field name="name">Sales / User</field>
      </record>
  
 +    <record id="base.user_demo" model="res.users">
 +        <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
 +    </record>
 +    
      <record model="ir.ui.menu" id="base.menu_base_partner">
          <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
      </record>
-     
+ 
      <record model="ir.ui.menu" id="base.menu_base_config">
          <field eval="[(4, ref('base.group_sale_manager'))]" name="groups_id"/>
      </record>
  
+       <record id="base.user_demo" model="res.users">
+             <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
+         </record>
+ 
      <record model="ir.rule" id="sale_order_comp_rule">
          <field name="name">Sale Order multi-company</field>
          <field name="model_id" ref="model_sale_order"/>
@@@ -49,5 -49,12 +53,12 @@@
          <field name="groups" eval="[(4, ref('base.group_sale_salesman'))]"/>
      </record>
  
+     <record model="ir.rule" id="sale_order_line_comp_rule">
+         <field name="name">Sale Shop multi-company</field>
+         <field name="model_id" ref="model_sale_shop"/>
+         <field name="global" eval="True"/>
+         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+     </record>
+ 
  </data>
- </openerp>
+ </openerp>