Randhir Mayatra (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-config-wizard-apa-Wizard_string_update-rma
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-apa-Wizard_string_update-rma/+merge/117568
Hello sir,
I have Make Changes into the wizards.
Thank you
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-config-wizard-apa-Wizard_string_update-rma/+merge/117568
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-config-wizard-apa.
=== modified file 'base_setup/res_config.py'
--- base_setup/res_config.py 2012-06-29 13:41:51 +0000
+++ base_setup/res_config.py 2012-08-01 05:22:47 +0000
@@ -25,12 +25,12 @@
_name = 'base.config.settings'
_inherit = 'res.config.settings'
_columns = {
- 'module_multi_company': fields.boolean('Multi Company',
+ 'module_multi_company': fields.boolean('manage multiple companies',
help="""Work in multi-company environments, with appropriate security access between companies.
This installs the module multi_company."""),
- 'module_portal': fields.boolean('Activate Customer Portal',
+ 'module_portal': fields.boolean('activate customer portal',
help="""The portal will give access to a series of documents for your customers; his quotations, his invoices, his projects, etc."""),
- 'module_share': fields.boolean('Allow Sharing Resources to External Users',
+ 'module_share': fields.boolean('allow sharing documents to',
help="""As an example, you will be able to share a project or some tasks to your customers, or quotes/sales to several persons at your customer company, or your agenda availabilities to your contacts."""),
}
=== modified file 'base_setup/res_config_view.xml'
--- base_setup/res_config_view.xml 2012-07-31 15:53:52 +0000
+++ base_setup/res_config_view.xml 2012-08-01 05:22:47 +0000
@@ -35,7 +35,7 @@
<field name="module_share" class="oe_inline"/>
<label for="module_share"/>
</div>
- <div>
+ <div name="portal">
<field name="module_portal" class="oe_inline"/>
<label for="module_portal"/>
</div>
=== modified file 'knowledge/res_config.py'
--- knowledge/res_config.py 2012-07-24 09:31:32 +0000
+++ knowledge/res_config.py 2012-08-01 05:22:47 +0000
@@ -25,18 +25,18 @@
_name = 'knowledge.config.settings'
_inherit = 'res.config.settings'
_columns = {
- 'module_wiki_faq': fields.boolean('Internal FAQ as a Wiki',
+ 'module_wiki_faq': fields.boolean('manage internal FAQ as a wiki',
help="""This installs the module wiki_faq."""),
- 'module_wiki_quality_manual': fields.boolean('Quality Manual as a Wiki',
+ 'module_wiki_quality_manual': fields.boolean('use quality manual as a wiki',
help="""This installs the module wiki_quality_manual."""),
- 'module_document': fields.boolean('Document Management',
+ 'module_document': fields.boolean('manage documents',
help="""This is a complete document management system, with: user authentication,
full document search (but pptx and docx are not supported), and a document dashboard.
This installs the module document."""),
- 'module_document_ftp': fields.boolean('Share Repositories (FTP)',
+ 'module_document_ftp': fields.boolean('share repositories(FTP)',
help="""Access your documents in OpenERP through an FTP interface.
This installs the module document_ftp."""),
- 'module_document_webdav': fields.boolean('Share Repositories (WebDAV)',
+ 'module_document_webdav': fields.boolean('share repositories(WebDAV)',
help="""Access your documents in OpenERP through WebDAV.
This installs the module document_webdav."""),
}
=== modified file 'mrp/res_config.py'
--- mrp/res_config.py 2012-06-09 16:04:04 +0000
+++ mrp/res_config.py 2012-08-01 05:22:47 +0000
@@ -28,11 +28,11 @@
_inherit = 'res.config.settings'
_columns = {
- 'module_stock_planning': fields.boolean('Master Production Schedule',
+ 'module_stock_planning': fields.boolean('manage master production shedule',
help ="""This allows to create a manual procurement plan apart of the normal MRP scheduling,
which works automatically based on minimum stock rules.
This installs the module stock_planning."""),
- 'module_mrp_repair': fields.boolean("Manage Product Repairs",
+ 'module_mrp_repair': fields.boolean("manage repairs of products ",
help="""Allows to manage all product repairs.
* Add/remove products in the reparation
* Impact for stocks
@@ -41,34 +41,34 @@
* Repair quotation report
* Notes for the technician and for the final customer.
This installs the module mrp_repair."""),
- 'module_mrp_operations': fields.boolean("Detailed Planning of Work Orders",
+ 'module_mrp_operations': fields.boolean("allow detailed planning of work order",
help="""This allows to add state, date_start,date_stop in production order operation lines (in the "Work Centers" tab).
This installs the module mrp_operations."""),
- 'module_mrp_subproduct': fields.boolean("Produce Several Products from One Manufacturing Order",
+ 'module_mrp_subproduct': fields.boolean("produce several prouducts from one manufacturing order",
help="""You can configure sub-products in the bill of material.
Without this module: A + B + C -> D.
With this module: A + B + C -> D + E.
This installs the module mrp_subproduct."""),
- 'module_mrp_jit': fields.boolean("Real-Time Scheduling",
+ 'module_mrp_jit': fields.boolean("generate procurement in real time",
help="""This allows Just In Time computation of procurement orders.
All procurement orders will be processed immediately, which could in some
cases entail a small performance impact.
This installs the module mrp_jit."""),
- 'module_stock_no_autopicking': fields.boolean("Manual Picking to Fulfill Manufacturing Orders",
+ 'module_stock_no_autopicking': fields.boolean("manage manual picking to fulfill manufacturing orders ",
help="""This module allows an intermediate picking process to provide raw materials to production orders.
For example to manage production made by your suppliers (sub-contracting).
To achieve this, set the assembled product which is sub-contracted to "No Auto-Picking"
and put the location of the supplier in the routing of the assembly operation.
This installs the module stock_no_autopicking."""),
- 'group_mrp_routings': fields.boolean("Manage Routings and Work Orders",
+ 'group_mrp_routings': fields.boolean("manage routings and work orders ",
implied_group='mrp.group_mrp_routings',
help="""Routings allow you to create and manage the manufacturing operations that should be followed
within your work centers in order to produce a product. They are attached to bills of materials
that will define the required raw materials."""),
- 'group_mrp_properties': fields.boolean("Allow Several BoMs per Product",
+ 'group_mrp_properties': fields.boolean("allow several bill of materials per products",
implied_group='product.group_mrp_properties',
help="""The selection of the right Bill of Material to use will depend on the properties specified on the sale order and the Bill of Material."""),
- 'module_product_manufacturer': fields.boolean("Define Manufacturers on Products",
+ 'module_product_manufacturer': fields.boolean("define manufacturers on products ",
help="""This allows you to define the following for a product:
* Manufacturer
* Manufacturer Product Name
=== modified file 'mrp/res_config_view.xml'
--- mrp/res_config_view.xml 2012-07-31 08:50:56 +0000
+++ mrp/res_config_view.xml 2012-08-01 05:22:47 +0000
@@ -22,6 +22,7 @@
<div>
<field name="module_mrp_repair" class="oe_inline"/>
<label for="module_mrp_repair"/>
+<<<<<<< TREE
</div>
<div>
<field name="module_stock_no_autopicking" class="oe_inline"/>
@@ -48,6 +49,34 @@
<field name="module_stock_planning" class="oe_inline"/>
<label for="module_stock_planning"/>
</div>
+=======
+ </div>
+ <div>
+ <field name="module_stock_no_autopicking" class="oe_inline"/>
+ <label for="module_stock_no_autopicking" />
+ </div>
+ </div>
+ </group>
+ <group >
+ <label for="id" string="Planning"/>
+ <div>
+ <div>
+ <field name="module_mrp_jit" class="oe_inline"/>
+ <label for="module_mrp_jit"/>
+ </div>
+ <div>
+ <field name="group_mrp_routings" class="oe_inline"/>
+ <label for="group_mrp_routings"/>
+ </div>
+ <div>
+ <field name="module_mrp_operations" class="oe_inline"/>
+ <label for="module_mrp_operations" />
+ </div>
+ <div>
+ <field name="module_stock_planning" class="oe_inline"/>
+ <label for="module_stock_planning"/>
+ </div>
+>>>>>>> MERGE-SOURCE
</div>
</group>
<separator string="Master Data"/>
=== modified file 'project/res_config.py'
--- project/res_config.py 2012-06-25 08:43:13 +0000
+++ project/res_config.py 2012-08-01 05:22:47 +0000
@@ -27,38 +27,38 @@
_inherit = 'res.config.settings'
_columns = {
- 'module_project_mrp': fields.boolean('Create Tasks from a Sale Order',
+ 'module_project_mrp': fields.boolean('generate tasks from sale orders',
help ="""This feature automatically creates project tasks from service products in sale orders.
More precisely, tasks are created for procurement lines with product of type 'Service',
procurement method 'Make to Order', and supply method 'Produce'.
This installs the module project_mrp."""),
- 'module_pad': fields.boolean("Use Collaborative Note Pads for Tasks",
+ 'module_pad': fields.boolean("use integrated collaborative note pads on task",
help="""Lets the company customize which Pad installation should be used to link to new pads
(by default, http://ietherpad.com/).
This installs the module pad."""),
- 'module_project_timesheet': fields.boolean("Timesheets per Task",
+ 'module_project_timesheet': fields.boolean("record timesheet lines per tasks",
help="""This allows you to transfer the entries under tasks defined for Project Management to
the timesheet line entries for particular date and user, with the effect of creating,
editing and deleting either ways.
This installs the module project_timesheet."""),
- 'module_project_long_term': fields.boolean("Manage Gantt and Resource Planning",
+ 'module_project_long_term': fields.boolean("manage resources palnning on gantt view",
help="""A long term project management module that tracks planning, scheduling, and resource allocation.
This installs the module project_long_term."""),
- 'module_project_issue': fields.boolean("Issues and Bug Tracking",
+ 'module_project_issue': fields.boolean("track issues and bug",
help="""Provides management of issues/bugs in projects.
This installs the module project_issue."""),
- 'time_unit': fields.many2one('product.uom', 'Working Time Unit', required=True,
+ 'time_unit': fields.many2one('product.uom', 'working time unit', required=True,
help="""This will set the unit of measure used in projects and tasks."""),
- 'module_project_issue_sheet': fields.boolean("Track and Invoice Issues Working Time",
+ 'module_project_issue_sheet': fields.boolean("invoice working time on issues",
help="""Provides timesheet support for the issues/bugs management in project.
This installs the module project_issue_sheet."""),
- 'group_tasks_work_on_tasks': fields.boolean("Task's Work on Tasks",
+ 'group_tasks_work_on_tasks': fields.boolean("compute work activities on tasks",
implied_group='project.group_tasks_work_on_tasks',
help="Allows you to compute work on tasks."),
- 'group_time_work_estimation_tasks': fields.boolean("Time Estimation on Tasks",
+ 'group_time_work_estimation_tasks': fields.boolean("manage time estimation on tasks",
implied_group='project.group_time_work_estimation_tasks',
help="Allows you to compute Time Estimation on tasks."),
- 'group_manage_delegation_task': fields.boolean("Manage Task Delegation",
+ 'group_manage_delegation_task': fields.boolean("allow task delegation",
implied_group='project.group_delegate_task',
help="Allows you to delegate tasks to other users."),
}
=== modified file 'project_issue/res_config.py'
--- project_issue/res_config.py 2012-06-14 13:27:53 +0000
+++ project_issue/res_config.py 2012-08-01 05:22:47 +0000
@@ -26,7 +26,7 @@
_inherit = ['project.config.settings', 'fetchmail.config.settings']
_columns = {
- 'fetchmail_issue': fields.boolean("Create Issues from Incoming Mails",
+ 'fetchmail_issue': fields.boolean("create issues from an incoming email account ",
fetchmail_model='project.issue', fetchmail_name='Incoming Issues',
help="""Allows you to configure your incoming mail server, and create issues from incoming emails."""),
}
=== modified file 'purchase/res_config.py'
--- purchase/res_config.py 2012-06-25 12:34:21 +0000
+++ purchase/res_config.py 2012-08-01 05:22:47 +0000
@@ -32,34 +32,34 @@
[('manual', 'Based on Purchase Order Lines'),
('picking', 'Based on Receptions'),
('order', 'Pre-Generate Draft Invoices based on Purchase Orders'),
- ], 'Default Invoicing Control Method', required=True, default_model='purchase.order'),
- 'group_purchase_pricelist':fields.boolean("Pricelist per Supplier",
+ ], 'default invoicing control method', required=True, default_model='purchase.order'),
+ 'group_purchase_pricelist':fields.boolean("manage pricelist per supplier",
implied_group='product.group_purchase_pricelist',
help="""Allows to manage different prices based on rules per category of Supplier.
Example: 10% for retailers, promotion of 5 EUR on this product, etc."""),
- 'group_uom':fields.boolean("Manage Different Units of Measure for Products",
+ 'group_uom':fields.boolean("manage different units of measures for products",
implied_group='product.group_uom',
help="""Allows you to select and maintain different units of measure for products."""),
- 'group_purchase_delivery_address': fields.boolean("Allow Different Addresses for Delivery and Invoice",
+ 'group_purchase_delivery_address': fields.boolean("allow a different address for incoming products and invoicing",
implied_group='purchase.group_delivery_invoice_address',
help="Allows you to specify different delivery and invoice addresses on a purchase order."),
- 'module_purchase_analytic_plans': fields.boolean('Use Multiple Analytic Accounts on Purchases',
+ 'module_purchase_analytic_plans': fields.boolean('use multiple analytic accounts on orders',
help ="""Allows the user to maintain several analysis plans. These let you split
lines on a purchase order between several accounts and analytic plans.
This installs the module purchase_analytic_plans."""),
- 'module_warning': fields.boolean("Alerts by Products or Supplier",
+ 'module_warning': fields.boolean("alerts by products or supllier",
help="""Allow to configure warnings on products and trigger them when a user wants to purchase a given product or a given supplier.
Example: Product: this product is deprecated, do not purchase more than 5.
Supplier: don't forget to ask for an express delivery."""),
- 'module_purchase_double_validation': fields.boolean("Two Levels of Approval",
+ 'module_purchase_double_validation': fields.boolean("force two levels of approvals (limit to require a second approval)",
help="""Provide a double validation mechanism for purchases exceeding minimum amount.
This installs the module purchase_double_validation."""),
- 'module_purchase_requisition': fields.boolean("Manage Purchase Requisitions",
+ 'module_purchase_requisition': fields.boolean("manage purchase requisitions",
help="""Purchase Requisitions are used when you want to request quotations from several suppliers for a given set of products.
You can configure per product if you directly do a Request for Quotation
to one supplier or if you want a purchase requisition to negotiate with several suppliers."""),
- 'decimal_precision': fields.integer('Decimal Precision on Price',help="As an example, a decimal precision of 2 will allow prices like: 9.99 EUR, whereas a decimal precision of 4 will allow prices like: 0.0231 EUR per unit."),
+ 'decimal_precision': fields.integer('specify decimal precision on price',help="As an example, a decimal precision of 2 will allow prices like: 9.99 EUR, whereas a decimal precision of 4 will allow prices like: 0.0231 EUR per unit."),
}
_defaults = {
@@ -80,7 +80,7 @@
class account_config_settings(osv.osv_memory):
_inherit = 'account.config.settings'
_columns = {
- 'module_purchase_analytic_plans': fields.boolean('Several Analytic Accounts on Purchases',
+ 'module_purchase_analytic_plans': fields.boolean('use multiple analytic accounts on orders',
help="""This allows install module purchase_analytic_plans."""),
'group_analytic_account_for_purchases': fields.boolean('Analytic Accounting for Purchases',
implied_group='purchase.group_analytic_accounting',
=== modified file 'purchase/res_config_view.xml'
--- purchase/res_config_view.xml 2012-07-30 12:02:40 +0000
+++ purchase/res_config_view.xml 2012-08-01 05:22:47 +0000
@@ -13,7 +13,7 @@
</header>
<separator string="Invoicing Process"/>
<group>
- <label for="id" string="Invoicing Setting"/>
+ <label for="id" string="Invoicing Settings"/>
<div>
<div>
<label for="default_invoice_method"/>
=== modified file 'purchase_double_validation/purchase_double_validation_installer.xml'
--- purchase_double_validation/purchase_double_validation_installer.xml 2012-07-20 10:59:04 +0000
+++ purchase_double_validation/purchase_double_validation_installer.xml 2012-08-01 05:22:47 +0000
@@ -7,11 +7,8 @@
<field name="type">form</field>
<field name="inherit_id" ref="purchase.view_purchase_configuration"/>
<field name="arch" type="xml">
- <div name="module_purchase_double_validation" position="before">
- <div>
- <label for="limit_amount"/>
+ <div name="module_purchase_double_validation" position="inside">
<field name="limit_amount" attrs="{'required': [('module_purchase_double_validation','=',True)]}" class="oe_inline"/>
- </div>
</div>
</field>
</record>
=== modified file 'signup/res_config.py'
--- signup/res_config.py 2012-07-25 19:55:40 +0000
+++ signup/res_config.py 2012-08-01 05:22:47 +0000
@@ -4,7 +4,7 @@
_inherit = 'base.config.settings'
_columns = {
- 'signup_template_user_id': fields.many2one('res.users', 'Template user for signup')
+ 'signup_template_user_id': fields.many2one('res.users', 'template user for signup')
}
def get_default_signup(self, cr, uid, fields, context=None):
=== modified file 'signup/res_config.xml'
--- signup/res_config.xml 2012-07-25 19:55:40 +0000
+++ signup/res_config.xml 2012-08-01 05:22:47 +0000
@@ -6,9 +6,12 @@
<field name="inherit_id" ref="base_setup.view_general_configuration"/>
<field name="type">form</field>
<field name="arch" type="xml">
- <field name="module_portal" position="after">
- <field name="signup_template_user_id"/>
- </field>
+ <div name="portal" position="after">
+ <div name="portal">
+ <label for="signup_template_user_id"/>
+ <field name="signup_template_user_id" class="oe_inline"/>
+ </div>
+ </div>
</field>
</record>
</data>
=== modified file 'stock/res_config.py'
--- stock/res_config.py 2012-07-19 12:54:16 +0000
+++ stock/res_config.py 2012-08-01 05:22:47 +0000
@@ -26,14 +26,14 @@
_inherit = 'res.config.settings'
_columns = {
- 'module_claim_from_delivery': fields.boolean("Allow Claims on Delivery Orders",
+ 'module_claim_from_delivery': fields.boolean("allow claim on deliveries",
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",
+ 'module_stock_invoice_directly': fields.boolean("generate directly invoice from the picking",
help="""This allows to automatically launch the invoicing wizard if the delivery is
to be invoiced when you send or deliver goods.
This installs the module stock_invoice_directly."""),
- 'module_product_expiry': fields.boolean("Expiry Date on Lots",
+ 'module_product_expiry': fields.boolean("expiry date on lots",
help="""Track different dates on products and serial numbers.
The following dates can be tracked:
- end of life
@@ -41,39 +41,39 @@
- removal date
- alert date.
This installs the module product_expiry."""),
- 'module_stock_location': fields.boolean("Push/Pull Logistic Rules",
+ 'module_stock_location': fields.boolean("create push/pull logistic rules",
help="""Provide push and pull inventory flows. Typical uses of this feature are:
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("manage units of measure on 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("invoice products in a different units of measure then the",
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("manage 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",
+ 'group_stock_production_lot': fields.boolean("track serial number on products",
implied_group='stock.group_production_lot',
help="""This allows you to manage products by using serial numbers.
When you select a lot, you can get the upstream or downstream traceability of the products contained in lot."""),
- 'group_stock_tracking_lot': fields.boolean("Serial Numbers on Logistic Units (Pallets)",
+ 'group_stock_tracking_lot': fields.boolean("track serial number 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("generate 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("manage 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("support multiple variants per products ",
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."),
+ 'decimal_precision': fields.integer('decimal precision on weight', 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."),
}
def get_default_dp(self, cr, uid, fields, context=None):
=== modified file 'stock/res_config_view.xml'
--- stock/res_config_view.xml 2012-07-31 09:36:58 +0000
+++ stock/res_config_view.xml 2012-08-01 05:22:47 +0000
@@ -13,7 +13,7 @@
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
- <separator string="Traceability & Logistics"/>
+ <separator string="Traceability & Accounting"/>
<group>
<label for="id" string="Traceability"/>
<div>
@@ -79,7 +79,7 @@
</div>
<div>
<field name="group_uos" class="oe_inline"/>
- <label for="group_uos" string="Unit of Measure (for Sale)"/>
+ <label for="group_uos" />
</div>
<div>
<field name="group_product_variant" class="oe_inline"/>
_______________________________________________
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
