Antony Lesuisse (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-pad_polish-stw into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-pad_polish-stw/+merge/81643
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-pad_polish-stw/+merge/81643
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-pad_polish-stw.
=== modified file 'account/account_installer.xml'
--- account/account_installer.xml 2011-10-11 14:03:35 +0000
+++ account/account_installer.xml 2011-11-08 21:41:34 +0000
@@ -28,7 +28,8 @@
<field name="charts"/>
<group colspan="4" groups="account.group_account_user">
<separator col="4" colspan="4" string="Configure Fiscal Year"/>
- <field name="company_id" colspan="4" widget="selection"/><!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
+ <field name="has_default_company" invisible="1" />
+ <field name="company_id" colspan="4" widget="selection" attrs="{'invisible' : [('has_default_company', '=', True)]}"/><!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
<field name="date_start" on_change="on_change_start_date(date_start)"/>
<field name="date_stop"/>
<field name="period" colspan="4"/>
=== modified file 'account/installer.py'
--- account/installer.py 2011-10-17 12:37:04 +0000
+++ account/installer.py 2011-11-08 21:41:34 +0000
@@ -38,7 +38,9 @@
def _get_charts(self, cr, uid, context=None):
modules = self.pool.get('ir.module.module')
- ids = modules.search(cr, uid, [('name', 'like', 'l10n_')], context=context)
+ # Looking for the module with the 'Account Charts' category
+ category_name, category_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'module_category_localization_account_charts')
+ ids = modules.search(cr, uid, [('category_id', '=', category_id)], context=context)
charts = list(
sorted(((m.name, m.shortdesc)
for m in modules.browse(cr, uid, ids, context=context)),
@@ -59,12 +61,17 @@
'sale_tax': fields.float('Sale Tax(%)'),
'purchase_tax': fields.float('Purchase Tax(%)'),
'company_id': fields.many2one('res.company', 'Company', required=True),
+ 'has_default_company' : fields.boolean('Has Default Company', readonly=True),
}
def _default_company(self, cr, uid, context=None):
user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
return user.company_id and user.company_id.id or False
+ def _default_has_default_company(self, cr, uid, context=None):
+ count = self.pool.get('res.company').search_count(cr, uid, [], context=context)
+ return bool(count == 1)
+
_defaults = {
'date_start': lambda *a: time.strftime('%Y-01-01'),
'date_stop': lambda *a: time.strftime('%Y-12-31'),
@@ -72,6 +79,7 @@
'sale_tax': 0.0,
'purchase_tax': 0.0,
'company_id': _default_company,
+ 'has_default_company': _default_has_default_company,
'charts': 'configurable'
}
=== modified file 'account_analytic_analysis/__openerp__.py'
--- account_analytic_analysis/__openerp__.py 2011-10-05 14:19:02 +0000
+++ account_analytic_analysis/__openerp__.py 2011-11-08 21:41:34 +0000
@@ -21,9 +21,9 @@
{
- 'name' : 'Analytic Account View',
+ 'name' : 'Sales Contract Management',
'version' : '1.1',
- 'category' : 'Hidden',
+ 'category' : 'Sales Management',
'complexity': "normal",
'description': """
This module is for modifying account analytic view to show important data to project manager of services companies.
=== modified file 'association/__openerp__.py'
--- association/__openerp__.py 2011-10-05 14:19:02 +0000
+++ association/__openerp__.py 2011-11-08 21:41:34 +0000
@@ -23,7 +23,7 @@
{
'name': 'Association profile',
'version': '0.1',
- 'category': 'Vertical Applications',
+ 'category': 'Specific Industry Applications',
'complexity': "normal",
'description': """
This module is to configure modules related to an association.
=== modified file 'auction/__openerp__.py'
--- auction/__openerp__.py 2011-10-05 14:19:02 +0000
+++ auction/__openerp__.py 2011-11-08 21:41:34 +0000
@@ -23,7 +23,7 @@
{
'name': 'Auction Management',
'version': '1.0',
- 'category': 'Vertical Applications',
+ 'category': 'Specific Industry Applications',
'complexity': "normal",
'description': """
This module manages the records of artists, auction articles, buyers and sellers.
=== modified file 'base_setup/base_setup.py'
--- base_setup/base_setup.py 2011-11-07 11:34:47 +0000
+++ base_setup/base_setup.py 2011-11-08 21:41:34 +0000
@@ -30,11 +30,10 @@
#Application and feature chooser, this could be done by introspecting ir.modules
DEFAULT_MODULES = {
- 'Customer Relationship Management' : ['crm',],
- 'Sales Management' : ['sale',],
+ 'Sales Management' : ['sale', 'crm'],
'Project Management' : ['project',],
'Knowledge Management' : ['document',],
- 'Warehouse Management' : ['stock',],
+ 'Warehouse Management' : ['stock', 'procurement'],
'Manufacturing' : ['mrp'],
'Accounting & Finance' : ['account'],
'Purchase Management' : ['purchase'],
=== modified file 'crm/__openerp__.py'
--- crm/__openerp__.py 2011-10-11 14:03:35 +0000
+++ crm/__openerp__.py 2011-11-08 21:41:34 +0000
@@ -23,7 +23,7 @@
{
'name': 'Customer & Supplier Relationship Management',
'version': '1.0',
- 'category': 'Customer Relationship Management',
+ 'category': 'Sales Management',
'complexity': "easy",
'description': """
The generic OpenERP Customer Relationship Management.
=== modified file 'crm/crm_lead_view.xml'
--- crm/crm_lead_view.xml 2011-11-08 19:44:49 +0000
+++ crm/crm_lead_view.xml 2011-11-08 21:41:34 +0000
@@ -688,8 +688,7 @@
name="pending"
domain="[('state','=','pending')]"/>
<separator orientation="vertical"/>
- <field name="name" string="Opportunity"/>
- <field name="partner_id" string="Customer / Email" filter_domain="['|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]"/>
+ <field name="partner_id" string="Opportunity / Customer" filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
<field name="user_id">
<filter icon="terp-personal-"
domain="[('user_id','=', False)]"
=== modified file 'crm/crm_phonecall.py'
--- crm/crm_phonecall.py 2011-10-12 11:11:42 +0000
+++ crm/crm_phonecall.py 2011-11-08 21:41:34 +0000
@@ -35,7 +35,7 @@
_columns = {
# From crm.case
'id': fields.integer('ID', readonly=True),
- 'name': fields.char('Call Summary', size=64),
+ 'name': fields.char('Call Summary', size=64, required=True),
'active': fields.boolean('Active', required=False),
'date_action_last': fields.datetime('Last Action', readonly=1),
'date_action_next': fields.datetime('Next Action', readonly=1),
=== modified file 'crm_caldav/__openerp__.py'
--- crm_caldav/__openerp__.py 2011-10-11 14:03:35 +0000
+++ crm_caldav/__openerp__.py 2011-11-08 21:41:34 +0000
@@ -24,7 +24,7 @@
{
'name': 'Calendar Synchronizing',
'version': '1.1',
- 'category': 'Customer Relationship Management',
+ 'category': 'Sales Management',
'complexity': "normal",
'description': """
Caldav features in Meeting.
=== modified file 'crm_claim/__openerp__.py'
--- crm_claim/__openerp__.py 2011-10-05 14:19:02 +0000
+++ crm_claim/__openerp__.py 2011-11-08 21:41:34 +0000
@@ -23,7 +23,7 @@
{
'name': 'Claims',
'version': '1.0',
- 'category': 'Customer Relationship Management',
+ 'category': 'Sales Management',
'complexity': "easy",
'description': """
This modules allows you to track your customers/suppliers claims and grievances.
=== modified file 'crm_fundraising/__openerp__.py'
--- crm_fundraising/__openerp__.py 2011-10-05 14:19:02 +0000
+++ crm_fundraising/__openerp__.py 2011-11-08 21:41:34 +0000
@@ -21,7 +21,7 @@
{
- 'category': 'Customer Relationship Management',
+ 'category': 'Sales Management',
'name': 'Fundraising',
'version': '1.0',
'complexity': "easy",
=== modified file 'crm_helpdesk/__openerp__.py'
--- crm_helpdesk/__openerp__.py 2011-10-05 14:19:02 +0000
+++ crm_helpdesk/__openerp__.py 2011-11-08 21:41:34 +0000
@@ -21,7 +21,7 @@
{
- 'category': 'Customer Relationship Management',
+ 'category': 'Sales Management',
'name': 'Helpdesk',
'version': '1.0',
'complexity': "easy",
=== modified file 'fetchmail/__openerp__.py'
--- fetchmail/__openerp__.py 2011-10-05 14:19:02 +0000
+++ fetchmail/__openerp__.py 2011-11-08 21:41:34 +0000
@@ -25,7 +25,7 @@
"version" : "1.0",
"depends" : ["base", 'mail'],
"author" : "OpenERP SA",
- "category": 'Customer Relationship Management',
+ 'category': 'Sales Management',
"description": """
Retrieve incoming email on POP / IMAP servers
=============================================
=== modified file 'hr/hr.py'
--- hr/hr.py 2011-10-02 17:31:16 +0000
+++ hr/hr.py 2011-11-08 21:41:34 +0000
@@ -47,7 +47,8 @@
'name': fields.char("Category", size=64, required=True),
'complete_name': fields.function(_name_get_fnc, type="char", string='Name'),
'parent_id': fields.many2one('hr.employee.category', 'Parent Category', select=True),
- 'child_ids': fields.one2many('hr.employee.category', 'parent_id', 'Child Categories')
+ 'child_ids': fields.one2many('hr.employee.category', 'parent_id', 'Child Categories'),
+ 'employee_ids': fields.many2many('hr.employee', 'employee_category_rel', 'category_id', 'emp_id', 'Employees'),
}
def _check_recursion(self, cr, uid, ids, context=None):
=== modified file 'hr/hr_view.xml'
--- hr/hr_view.xml 2011-11-08 19:44:49 +0000
+++ hr/hr_view.xml 2011-11-08 21:41:34 +0000
@@ -287,6 +287,8 @@
<form string="Employee Category">
<field name="name" />
<field name="parent_id" />
+ <separator string="Employees" colspan="4" />
+ <field name="employee_ids" colspan="4" nolabel="1" />
</form>
</field>
</record>
=== modified file 'hr_contract/hr_contract_view.xml'
--- hr_contract/hr_contract_view.xml 2011-09-17 11:03:17 +0000
+++ hr_contract/hr_contract_view.xml 2011-11-08 21:41:34 +0000
@@ -74,7 +74,7 @@
<field name="wage"/>
<field name="type_id" widget="selection"/>
</group>
- <notebook>
+ <notebook colspan='4'>
<page string="Information" name="information">
<group col="2" colspan="2" name="left_column">
<separator colspan="2" string="Duration"/>
=== modified file 'hr_holidays/hr_holidays_workflow.xml'
--- hr_holidays/hr_holidays_workflow.xml 2011-06-01 05:19:41 +0000
+++ hr_holidays/hr_holidays_workflow.xml 2011-11-08 21:41:34 +0000
@@ -84,7 +84,7 @@
<field name="act_from" ref="act_validate" />
<field name="act_to" ref="act_validate1" />
<field name="signal">second_validate</field>
- <field name="group_id" ref="base.group_hr_user"/>
+ <field name="group_id" ref="base.group_hr_manager" />
</record>
<record model="workflow.transition" id="t11">
=== modified file 'hr_payroll/__openerp__.py'
--- hr_payroll/__openerp__.py 2011-10-05 14:19:02 +0000
+++ hr_payroll/__openerp__.py 2011-11-08 21:41:34 +0000
@@ -23,7 +23,7 @@
'name': 'Payroll',
'version': '1.0',
'category': 'Human Resources',
- 'complexity': "expert",
+ 'complexity': "normal",
'description': """
Generic Payroll system.
=======================
=== modified file 'hr_payroll/hr_payroll.py'
--- hr_payroll/hr_payroll.py 2011-09-17 14:57:31 +0000
+++ hr_payroll/hr_payroll.py 2011-11-08 21:41:34 +0000
@@ -211,7 +211,7 @@
class hr_payslip_run(osv.osv):
_name = 'hr.payslip.run'
- _description = 'Payslip Run'
+ _description = 'Payslip Generation'
_columns = {
'name': fields.char('Name', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}),
'slip_ids': fields.one2many('hr.payslip', 'payslip_run_id', 'Payslips', required=False, readonly=True, states={'draft': [('readonly', False)]}),
@@ -286,7 +286,7 @@
'contract_id': fields.many2one('hr.contract', 'Contract', required=False, readonly=True, states={'draft': [('readonly', False)]}),
'details_by_salary_rule_category': fields.function(_get_lines_salary_rule_category, method=True, type='one2many', relation='hr.payslip.line', string='Details by Salary Rule Category'),
'credit_note': fields.boolean('Credit Note', help="Indicates this payslip has a refund of another", readonly=True, states={'draft': [('readonly', False)]}),
- 'payslip_run_id': fields.many2one('hr.payslip.run', 'Payslip Run', readonly=True, states={'draft': [('readonly', False)]}),
+ 'payslip_run_id': fields.many2one('hr.payslip.run', 'Payslip Generation', readonly=True, states={'draft': [('readonly', False)]}),
}
_defaults = {
'date_from': lambda *a: time.strftime('%Y-%m-01'),
=== modified file 'hr_payroll/hr_payroll_view.xml'
--- hr_payroll/hr_payroll_view.xml 2011-10-10 13:19:07 +0000
+++ hr_payroll/hr_payroll_view.xml 2011-11-08 21:41:34 +0000
@@ -392,7 +392,7 @@
<group expand="0" string="Group By...">
<filter string="Employees" icon="terp-personal" name="employee_id" context="{'group_by':'employee_id'}"/>
<separator orientation="vertical"/>
- <filter string="PaySlip Run" name="payslip_run_id" icon="terp-folder-orange" context="{'group_by':'payslip_run_id'}"/>
+ <filter string="PaySlip Generation" name="payslip_run_id" icon="terp-folder-orange" context="{'group_by':'payslip_run_id'}"/>
<separator orientation="vertical" groups="base.group_multi_company"/>
<filter string="Companies" name="company_id" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}"/>
<separator orientation="vertical"/>
@@ -684,9 +684,9 @@
<field name="model">hr.payslip.run</field>
<field name="type">search</field>
<field name="arch" type="xml">
- <search string="Search Payslip Runs">
- <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Payslip Runs"/>
- <filter icon="terp-camera_test" string="Done" domain="[('state','=','close')]" help="Done Payslip Runs"/>
+ <search string="Search Payslip Generations">
+ <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Payslip Generations"/>
+ <filter icon="terp-camera_test" string="Done" domain="[('state','=','close')]" help="Done Payslip Generations"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="date_start"/>
=== modified file 'idea/__openerp__.py'
--- idea/__openerp__.py 2011-10-05 14:19:02 +0000
+++ idea/__openerp__.py 2011-11-08 21:41:34 +0000
@@ -23,7 +23,7 @@
{
'name': 'Ideas Box',
'version': '0.1',
- 'category': 'Hidden',
+ 'category': 'Human Resources',
'complexity': "easy",
'description': """
This module allows your user to easily and efficiently participate in enterprise innovation.
=== modified file 'import_google/__openerp__.py'
--- import_google/__openerp__.py 2011-10-05 14:19:02 +0000
+++ import_google/__openerp__.py 2011-11-08 21:41:34 +0000
@@ -22,7 +22,7 @@
{
'name': 'Google Import',
'version': '1.0',
- 'category': 'Customer Relationship Management',
+ 'category': 'Sales Management',
'description': """The module adds google contact in partner address and add google calendar events details in Meeting""",
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
=== modified file 'import_sugarcrm/__openerp__.py'
--- import_sugarcrm/__openerp__.py 2011-10-05 14:19:02 +0000
+++ import_sugarcrm/__openerp__.py 2011-11-08 21:41:34 +0000
@@ -22,7 +22,7 @@
{
'name': 'Import Data from SugarCRM',
'version': '1.0',
- 'category': 'Customer Relationship Management',
+ 'category': 'Sales Management',
'description': """This Module Import SugarCRM "Leads", "Opportunities", "Users", "Accounts",
"Contacts", "Employees", Meetings, Phonecalls, Emails, and Project, Project Tasks Data into OpenERP Module.""",
'author': 'OpenERP SA',
=== modified file 'l10n_hn/__init__.py' (properties changed: +x to -x)
=== modified file 'l10n_hn/__openerp__.py' (properties changed: +x to -x)
--- l10n_hn/__openerp__.py 2011-10-10 16:55:21 +0000
+++ l10n_hn/__openerp__.py 2011-11-08 21:41:34 +0000
@@ -35,7 +35,7 @@
{
'name': 'Honduras - Plan contable general',
'version': '0.1',
- 'category': 'Localisation/Account Charts',
+ 'category': 'Localization/Account Charts',
'description': """Agrega una nomenclatura contable para Honduras. También incluye impuestos y la moneda Lempira. -- Adds accounting chart for Honduras. It also includes taxes and the Lempira currency""",
'author': 'Salvatore Josue Trimarchi Pinto',
'website': 'http://trimarchi.co.cc',
=== modified file 'l10n_hn/account_chart.xml' (properties changed: +x to -x)
=== modified file 'l10n_hn/account_tax.xml' (properties changed: +x to -x)
=== modified file 'l10n_hn/account_types.xml' (properties changed: +x to -x)
=== modified file 'l10n_hn/i18n/ca.po' (properties changed: +x to -x)
=== modified file 'l10n_hn/i18n/es.po' (properties changed: +x to -x)
=== modified file 'l10n_hn/i18n/es_PY.po' (properties changed: +x to -x)
=== modified file 'l10n_hn/i18n/fr.po' (properties changed: +x to -x)
=== modified file 'l10n_hn/i18n/gl.po' (properties changed: +x to -x)
=== modified file 'l10n_hn/i18n/hu.po' (properties changed: +x to -x)
=== modified file 'l10n_hn/i18n/it.po' (properties changed: +x to -x)
=== modified file 'l10n_hn/i18n/l10n_hn.pot' (properties changed: +x to -x)
=== modified file 'l10n_hn/i18n/pt_BR.po' (properties changed: +x to -x)
=== modified file 'l10n_hn/i18n/[email protected]' (properties changed: +x to -x)
=== modified file 'l10n_hn/l10n_hn_base.xml' (properties changed: +x to -x)
=== modified file 'lunch/__openerp__.py'
--- lunch/__openerp__.py 2011-10-05 14:19:02 +0000
+++ lunch/__openerp__.py 2011-11-08 21:41:34 +0000
@@ -33,7 +33,7 @@
""",
"version": "0.1",
"depends": ["base_tools"],
- "category" : "Hidden",
+ "category" : "Human Resources",
'description': """
The base module to manage lunch
=== modified file 'outlook/__openerp__.py'
--- outlook/__openerp__.py 2011-10-05 14:19:02 +0000
+++ outlook/__openerp__.py 2011-11-08 21:41:34 +0000
@@ -26,7 +26,7 @@
'author' : 'OpenERP SA',
'website' : 'http://www.openerp.com/',
'depends' : ['base', 'mail'],
- 'category' : 'Customer Relationship Management',
+ 'category': 'Sales Management',
'description': '''
This module provides the Outlook Plug-in.
=========================================
=== modified file 'product_expiry/__openerp__.py'
--- product_expiry/__openerp__.py 2011-10-05 14:19:02 +0000
+++ product_expiry/__openerp__.py 2011-11-08 21:41:34 +0000
@@ -21,7 +21,7 @@
"name" : "Products Expiry Date",
"version" : "1.0",
"author" : "OpenERP SA",
- "category" : "Vertical Applications",
+ "category" : "Specific Industry Applications",
'complexity': "easy",
"depends" : ["stock"],
"init_xml" : [],
=== modified file 'sale/sale_demo.xml'
--- sale/sale_demo.xml 2011-08-06 00:21:04 +0000
+++ sale/sale_demo.xml 2011-11-08 21:41:34 +0000
@@ -7,7 +7,7 @@
<record id="order" model="sale.order">
<field name="shop_id" ref="shop"/>
<field model="product.pricelist" name="pricelist_id" search="[]"/>
- <field name="user_id" ref="base.user_root"/>
+ <field name="user_id" ref="base.user_demo"/>
<field ref="base.res_partner_agrolait" name="partner_id"/>
<field ref="base.res_partner_address_8" name="partner_invoice_id"/>
<field ref="base.res_partner_address_8" name="partner_shipping_id"/>
=== modified file 'sale_crm/wizard/crm_make_sale.py'
--- sale_crm/wizard/crm_make_sale.py 2011-08-25 12:27:57 +0000
+++ sale_crm/wizard/crm_make_sale.py 2011-11-08 21:41:34 +0000
@@ -103,12 +103,13 @@
}
if partner.id:
vals['user_id'] = partner.user_id and partner.user_id.id or uid
- new_id = sale_obj.create(cr, uid, vals)
+ new_id = sale_obj.create(cr, uid, vals, context=context)
+ sale_order = sale_obj.browse(cr, uid, new_id, context=context)
case_obj.write(cr, uid, [case.id], {'ref': 'sale.order,%s' % new_id})
new_ids.append(new_id)
message = _("Opportunity '%s' is converted to Quotation.") % (case.name)
self.log(cr, uid, case.id, message)
- case_obj.message_append(cr, uid, [case], _("Converted to Sales Quotation(id: %s).") % (new_id), context=context)
+ case_obj.message_append(cr, uid, [case], _("Converted to Sales Quotation(%s).") % (sale_order.name), context=context)
if make.close:
case_obj.case_close(cr, uid, data)
=== modified file 'thunderbird/__openerp__.py'
--- thunderbird/__openerp__.py 2011-10-05 14:19:02 +0000
+++ thunderbird/__openerp__.py 2011-11-08 21:41:34 +0000
@@ -25,7 +25,7 @@
"author" : ['OpenERP SA', 'Axelor'],
"website" : "http://www.openerp.com/";,
"depends" : ["base","mail"],
- "category" : "Customer Relationship Management",
+ 'category': 'Sales Management',
"description": """
This module is required for the Thuderbird Plug-in to work properly.
====================================================================
=== modified file 'wiki_sale_faq/__openerp__.py'
--- wiki_sale_faq/__openerp__.py 2011-10-05 14:19:02 +0000
+++ wiki_sale_faq/__openerp__.py 2011-11-08 21:41:34 +0000
@@ -22,7 +22,7 @@
{
'name': 'Sale FAQ',
'version': '1.0',
- 'category': 'Customer Relationship Management',
+ 'category': 'Sales Management',
'complexity': "easy",
'description': """
This module provides a Wiki Sales FAQ Template.
_______________________________________________
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
