Amit Patel (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-config-wizard-warehouse-fka into
lp:~openerp-dev/openobject-addons/trunk-config-wizard-apa.
Requested reviews:
Amit Patel (OpenERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-config-wizard-warehouse-fka/+merge/115719
hello sir,
Remove extra string in label & col
Thanks,
FKA
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-config-wizard-warehouse-fka/+merge/115719
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-config-wizard-apa.
=== modified file 'stock/res_config.py'
--- stock/res_config.py 2012-06-18 10:26:13 +0000
+++ stock/res_config.py 2012-07-19 12:46:56 +0000
@@ -26,7 +26,7 @@
_inherit = 'res.config.settings'
_columns = {
- 'module_claim_from_delivery': fields.boolean("Allow Claims on Delivery Orders",
+ 'module_claim_from_delivery': fields.boolean("Claims on Delivery Orders",
help="""Adds a Claim link to the delivery order.
This installs the module claim_from_delivery."""),
'module_stock_invoice_directly': fields.boolean("Invoice Directly from the Picking",
@@ -46,14 +46,14 @@
manage product manufacturing chains, manage default locations per product,
define routes within your warehouse according to business needs, etc.
This installs the module stock_location."""),
- 'group_uom': fields.boolean("Manage Different Units of Measure for Products",
+ 'group_uom': fields.boolean("Different Units of Measure for Products",
implied_group='product.group_uom',
help="""Allows you to select and maintain different units of measure for products."""),
- 'group_uos': fields.boolean("Manage Secondary Unit of Measure (for Sale)",
+ 'group_uos': fields.boolean("Secondary Unit of Measure (for Sale)",
implied_group='product.group_uos',
help="""Allows you to sell units of a product, but invoice based on a different unit of measure.
For instance, you can sell pieces of meat that you invoice based on their weight."""),
- 'group_stock_packaging': fields.boolean("Manage Product Packaging",
+ 'group_stock_packaging': fields.boolean("Product Packaging",
implied_group='product.group_stock_packaging',
help="""Allows you to create and manage your packaging dimensions and types you want to be maintained in your system."""),
'group_stock_production_lot': fields.boolean("Serial Numbers on Products",
@@ -63,14 +63,14 @@
'group_stock_tracking_lot': fields.boolean("Serial Numbers on Logistic Units (Pallets)",
implied_group='stock.group_tracking_lot',
help="""Allows you to get the upstream or downstream traceability of the products contained in lot."""),
- 'group_stock_inventory_valuation': fields.boolean("Generate Accounting Entries per Stock Movement",
+ 'group_stock_inventory_valuation': fields.boolean("Accounting Entries per Stock Movement",
implied_group='stock.group_inventory_valuation',
help="""Allows to configure inventory valuations on products and product categories."""),
- 'group_stock_multiple_locations': fields.boolean("Manage Multiple Locations and Warehouses",
+ 'group_stock_multiple_locations': fields.boolean("Multiple Locations and Warehouses",
implied_group='stock.group_locations',
help="""This allows to configure and use multiple stock locations and warehouses,
instead of having a single default one."""),
- 'group_product_variant': fields.boolean("Support Multiple Variants per Product",
+ 'group_product_variant': fields.boolean("Multiple Variants per Product",
implied_group='product.group_product_variant',
help="""Allow to manage several variants per product. As an example, if you sell T-Shirts, for the same "Linux T-Shirt", you may have variants on sizes or colors; S, M, L, XL, XXL."""),
'decimal_precision': fields.integer('Decimal Precision on Weights', help="As an example, a decimal precision of 2 will allow weights like: 9.99 kg, whereas a decimal precision of 4 will allow weights like: 0.0231 kg."),
=== modified file 'stock/res_config_view.xml'
--- stock/res_config_view.xml 2012-07-16 13:43:14 +0000
+++ stock/res_config_view.xml 2012-07-19 12:46:56 +0000
@@ -7,36 +7,88 @@
<field name="model">stock.config.settings</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Configure Warehouse" version="7.0">
+ <form string="Configure Warehouse" version="7.0" class="oe_form_configuration">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
- <group>
- <group>
- <separator string="Traceability" colspan="2"/>
- <field name="group_stock_production_lot"/>
- <field name="group_stock_tracking_lot"/>
- <field name="module_product_expiry"
- attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
- <separator string="Logistics" colspan="2"/>
- <field name="group_stock_multiple_locations"/>
- <field name="module_stock_invoice_directly"/>
- <field name="module_stock_location"/>
- <field name="decimal_precision" class="oe_inline"/>
- </group>
- <group>
- <separator string="Partners" colspan="2"/>
- <field name="module_claim_from_delivery"/>
- <separator string="Products" colspan="2"/>
- <field name="group_stock_packaging"/>
- <field name="group_uom"/>
- <field name="group_uos"/>
- <field name="group_stock_inventory_valuation" class="oe_inline"/>
- <field name="group_product_variant"/>
- </group>
- </group>
+ <div>
+ <separator string="Traceability & Logistics"/>
+ <group>
+ <label for="id" string="Traceability"/>
+ <div>
+ <div>
+ <field name="group_stock_production_lot" class="oe_inline"/>
+ Allow you to manage products by using<label for="group_stock_production_lot"/>
+ </div>
+ <div attrs="{'invisible': [('group_stock_production_lot','=',False)]}">
+ <field name="module_product_expiry" class="oe_inline"/>
+ Track<label for="module_product_expiry"/>
+ </div>
+ <div>
+ <field name="group_stock_tracking_lot" class="oe_inline"/>
+ Allow you to manage products by using<label for="group_stock_tracking_lot"/>
+ </div>
+ </div>
+ </group>
+ <group>
+ <label for="id" string="Logistics"/>
+ <div>
+ <div>
+ <field name="group_stock_multiple_locations" class="oe_inline"/>
+ Allow to configure and use<label for="group_stock_multiple_locations"/>
+ </div>
+ <div>
+ <field name="module_stock_invoice_directly" class="oe_inline"/>
+ Allow<label for="module_stock_invoice_directly"/>
+ </div>
+ <div>
+ <field name="module_stock_location" class="oe_inline"/>
+ Provide<label for="module_stock_location"/>
+ </div>
+ <div>
+ What's the Decimal Precision on Weights:
+ <field name="decimal_precision" class="oe_inline"/>
+ </div>
+ </div>
+ </group>
+ </div>
+ <div>
+ <separator string="Products & Partners"/>
+ <group>
+ <label for="id" string="Products"/>
+ <div>
+ <div>
+ <field name="group_stock_packaging" class="oe_inline"/>
+ Allow you to create and manage your<label for="group_stock_packaging"/>
+ </div>
+ <div>
+ <field name="group_uom" class="oe_inline"/>
+ Manage<label for="group_uom"/>
+ </div>
+ <div>
+ <field name="group_uos" class="oe_inline"/>
+ Manage<label for="group_uos"/>
+ </div>
+ <div>
+ <field name="group_stock_inventory_valuation" class="oe_inline"/>
+ Allow to configure<label for="group_stock_inventory_valuation"/>
+ </div>
+ <div>
+ <field name="group_product_variant" class="oe_inline"/>
+ Allow to manage<label for="group_product_variant"/>
+ </div>
+ </div>
+ </group>
+ <group>
+ <label for="id" string="Partners"/>
+ <div>
+ <field name="module_claim_from_delivery" class="oe_inline"/>
+ Allow<label for="module_claim_from_delivery"/>
+ </div>
+ </group>
+ </div>
</form>
</field>
</record>
_______________________________________________
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
