Michael (OpenERP) has proposed merging
lp:~openerp-dev/openerp-int/mck_add_active into
lp:~openerp-dev/openerp-int/mck_addons.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-int/mck_add_active/+merge/127746
--
https://code.launchpad.net/~openerp-dev/openerp-int/mck_add_active/+merge/127746
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openerp-int/mck_add_active into
lp:~openerp-dev/openerp-int/mck_addons.
=== modified file 'mck_contact/company.py'
--- mck_contact/company.py 2012-10-02 12:50:06 +0000
+++ mck_contact/company.py 2012-10-03 12:42:54 +0000
@@ -194,6 +194,10 @@
_columns = {
"region" : fields.selection(REGION_LIST_COUNTRY, string="Region"),
+ 'active': fields.boolean('Active'),
+ }
+ _defaults = {
+ 'active': 1,
}
=== modified file 'mck_contact/industry.py'
--- mck_contact/industry.py 2012-09-06 10:47:15 +0000
+++ mck_contact/industry.py 2012-10-03 12:42:54 +0000
@@ -8,8 +8,13 @@
_columns = {
"name" : fields.char('Name', size=256, required=True),
"code" : fields.char('Code', size=64),
+ 'active' : fields.boolean('Active'),
}
+ _defaults = {
+ 'active' : True,
+ }
+
_order = 'name'
#_default = {
=== modified file 'mck_contact/relationshiplevel.py'
--- mck_contact/relationshiplevel.py 2012-09-06 10:47:15 +0000
+++ mck_contact/relationshiplevel.py 2012-10-03 12:42:54 +0000
@@ -7,7 +7,13 @@
_columns = {
## Could be more useful if replaced by "name"?
"label" : fields.char("Label", size=256, required=True),
- }
+ 'active' : fields.boolean('Active'),
+ }
+
+ _defaults = {
+ 'active' : True,
+ }
+
_order = 'label'
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'mck_contact/role.py'
--- mck_contact/role.py 2012-10-02 12:50:06 +0000
+++ mck_contact/role.py 2012-10-03 12:42:54 +0000
@@ -321,9 +321,12 @@
_columns = {
'name' : fields.char('Level', size=256),
'sequence' : fields.integer('Sequence'),
-
- }
-
+ 'active' : fields.boolean('Active'),
+
+ }
+ _defaults = {
+ 'active' : True,
+ }
_order = 'name'
class role_function_link(osv.osv):
=== modified file 'mck_contact/role_function.py'
--- mck_contact/role_function.py 2012-09-06 10:47:15 +0000
+++ mck_contact/role_function.py 2012-10-03 12:42:54 +0000
@@ -8,6 +8,11 @@
_columns = {
"name" : fields.char('Name', size=256, required=True),
"service_lines_list_ids" : fields.one2many("mck.role.service_line", "related_id", string="Service lines list"),
+ 'active' : fields.boolean('Active'),
+ }
+
+ _defaults = {
+ 'active' : True,
}
_order = 'name'
=== modified file 'mck_contact/role_type.py'
--- mck_contact/role_type.py 2012-05-30 08:47:14 +0000
+++ mck_contact/role_type.py 2012-10-03 12:42:54 +0000
@@ -9,6 +9,10 @@
'name' : fields.char('Type', size=256),
'sequence' : fields.integer('Sequence'),
'system' : fields.boolean('System Type', readonly=True),
+ 'active' : fields.boolean('Active'),
+ }
+ _defaults = {
+ 'active' : True,
}
def write(self, cr, uid, ids, vals, context=None):
@@ -25,4 +29,4 @@
return super(role_type, self).unlink(cr, uid, ids, context=context)
- _order = "sequence"
\ No newline at end of file
+ _order = "sequence"
=== modified file 'mck_contact/salutation.py'
--- mck_contact/salutation.py 2012-09-06 10:47:15 +0000
+++ mck_contact/salutation.py 2012-10-03 12:42:54 +0000
@@ -11,7 +11,7 @@
}
_defaults = {
- 'active': lambda *a: 1,
+ 'active': 1,
'domain' : 'contact',
}
=== modified file 'mck_contact/view/country.xml'
--- mck_contact/view/country.xml 2012-10-03 12:02:19 +0000
+++ mck_contact/view/country.xml 2012-10-03 12:42:54 +0000
@@ -44,6 +44,7 @@
<field name="name" />
<field name="code" />
<field name="region" required="1" />
+ <field name="active" />
</form>
</field>
</record>
@@ -60,4 +61,4 @@
parent="mck_config_address_book_addresses" action="res_country" />
</data>
-</openerp>
\ No newline at end of file
+</openerp>
=== modified file 'mck_contact/view/executive.xml'
--- mck_contact/view/executive.xml 2012-10-03 12:15:19 +0000
+++ mck_contact/view/executive.xml 2012-10-03 12:42:54 +0000
@@ -348,7 +348,8 @@
<group colspan="4" col="4">
<label string="" colspan="4"/>
<field name="name" colspan="2" required="1" />
- <label string="" colspan="2"/>
+ <field name="active" />
+ <label string="" colspan="2"/>
<field name="domain" invisible="1" />
</group>
</form>
=== modified file 'mck_contact/view/industry.xml'
--- mck_contact/view/industry.xml 2012-06-21 15:55:31 +0000
+++ mck_contact/view/industry.xml 2012-10-03 12:42:54 +0000
@@ -36,6 +36,7 @@
<label name="" colspan="4"/>
<label name="" colspan="4"/>
<field name="name" colspan="2"/>
+ <field name="active" colspan="2"/>
<label name="" colspan="2"/>
</group>
</form>
=== modified file 'mck_contact/view/relationshiplevel.xml'
--- mck_contact/view/relationshiplevel.xml 2012-09-25 13:39:03 +0000
+++ mck_contact/view/relationshiplevel.xml 2012-10-03 12:42:54 +0000
@@ -35,6 +35,7 @@
<group colspan="4" col="8">
<label string="" colspan="8"/>
<field name="label" colspan="4"/>
+ <field name="active" colspan="4"/>
<label string="" colspan="4"/>
</group>
</form>
=== modified file 'mck_contact/view/role.xml'
--- mck_contact/view/role.xml 2012-09-27 12:49:10 +0000
+++ mck_contact/view/role.xml 2012-10-03 12:42:54 +0000
@@ -196,6 +196,7 @@
<form string="Add/Modify available Role Types">
<field name="name" />
<field name="sequence" />
+ <field name="active" />
<field name="system" invisible="1" />
</form>
</field>
@@ -241,6 +242,7 @@
<form string="Add/Modify available Role Levels">
<field name="name" />
<field name="sequence" />
+ <field name="active" />
</form>
</field>
</record>
=== modified file 'mck_contact/view/role_function.xml'
--- mck_contact/view/role_function.xml 2012-05-16 15:04:41 +0000
+++ mck_contact/view/role_function.xml 2012-10-03 12:42:54 +0000
@@ -36,6 +36,7 @@
<label string="" colspan="4" />
<group colspan="4" col="4">
<field name="name" colspan="2"/>
+ <field name="active"/>
<label string="" colspan="2" />
<label string="" colspan="4" />
<separator string="Create service line for this function" colspan="4" />
=== modified file 'mck_internal/region.py'
--- mck_internal/region.py 2012-05-30 08:47:14 +0000
+++ mck_internal/region.py 2012-10-03 12:42:54 +0000
@@ -6,10 +6,12 @@
_columns = {
"name" : fields.char("Name", size=256, required=True),
"type" : fields.selection([("region","Region"),("sub-region","Sub-region")], "Type"),
+ 'active': fields.boolean('Active'),
}
_defaults = {
"type": lambda self,cr,uid,context: "region",
+ 'active': 1,
}
=== modified file 'mck_internal/view/region.xml'
--- mck_internal/view/region.xml 2012-06-21 15:55:31 +0000
+++ mck_internal/view/region.xml 2012-10-03 12:42:54 +0000
@@ -35,6 +35,7 @@
<group colspan="4" col="8">
<label string="" colspan="8"/>
<field name="name" colspan="4"/>
+ <field name="active" colspan="4"/>
<label string="" colspan="4"/>
</group>
</form>
_______________________________________________
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
