[email protected] has proposed merging lp:~savoirfairelinux-openerp/partner-contact-management/view_improvment into lp:~savoirfairelinux-openerp/partner-contact-management/base_contact_by_functions.
Requested reviews: Sandy Carter (http://www.savoirfairelinux.com) (sandy-carter): code review For more details, see: https://code.launchpad.net/~savoirfairelinux-openerp/partner-contact-management/view_improvment/+merge/203789 - All fields of passport are not required. - Generate pot and po files for base_contact_by_functions module. - Replace placeholder of fax field. - Redefine placeholer of street field -- https://code.launchpad.net/~savoirfairelinux-openerp/partner-contact-management/view_improvment/+merge/203789 Your team Savoir-faire Linux' OpenERP is subscribed to branch lp:~savoirfairelinux-openerp/partner-contact-management/base_contact_by_functions.
=== modified file 'base_contact_by_functions/__init__.py' --- base_contact_by_functions/__init__.py 2013-12-17 19:13:54 +0000 +++ base_contact_by_functions/__init__.py 2014-01-29 16:53:31 +0000 @@ -20,8 +20,8 @@ # ############################################################################## -import res_partner -import functions -import res_institutions +from . import res_partner +from . import functions +from . import res_institutions # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: === modified file 'base_contact_by_functions/i18n/base_contact_by_functions.pot' --- base_contact_by_functions/i18n/base_contact_by_functions.pot 2014-01-03 16:57:29 +0000 +++ base_contact_by_functions/i18n/base_contact_by_functions.pot 2014-01-29 16:53:31 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-03 16:48+0000\n" -"PO-Revision-Date: 2014-01-03 11:48-0500\n" +"POT-Creation-Date: 2014-01-28 22:15+0000\n" +"PO-Revision-Date: 2014-01-28 17:15-0500\n" "Last-Translator: EL Hadji DEM <[email protected]>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -140,6 +140,11 @@ msgstr "" #. module: base_contact_by_functions +#: view:res.partner:0 +msgid "Zip" +msgstr "" + +#. module: base_contact_by_functions #: field:res.partner,delivered_country:0 msgid "Country Passport" msgstr "" @@ -171,6 +176,11 @@ #. module: base_contact_by_functions #: view:res.partner:0 +msgid "Tag" +msgstr "" + +#. module: base_contact_by_functions +#: view:res.partner:0 msgid "Passport information" msgstr "" @@ -181,11 +191,6 @@ #. module: base_contact_by_functions #: view:res.partner:0 -msgid "Is an Organism?" -msgstr "" - -#. module: base_contact_by_functions -#: view:res.partner:0 msgid "Parent organism" msgstr "" @@ -230,6 +235,11 @@ msgstr "" #. module: base_contact_by_functions +#: view:res.partner:0 +msgid "Is an Organism" +msgstr "" + +#. module: base_contact_by_functions #: field:res.partner,function_id:0 msgid "Position Occupied" msgstr "" @@ -268,11 +278,6 @@ #. module: base_contact_by_functions #: view:res.partner:0 -msgid "à" -msgstr "" - -#. module: base_contact_by_functions -#: view:res.partner:0 msgid "History" msgstr "" @@ -309,6 +314,11 @@ #. module: base_contact_by_functions #: view:res.partner:0 +msgid "No, Street, Apartment/Office" +msgstr "" + +#. module: base_contact_by_functions +#: view:res.partner:0 msgid "Use address organism" msgstr "" === modified file 'base_contact_by_functions/i18n/fr.po' --- base_contact_by_functions/i18n/fr.po 2014-01-03 16:57:29 +0000 +++ base_contact_by_functions/i18n/fr.po 2014-01-29 16:53:31 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-03 16:49+0000\n" -"PO-Revision-Date: 2014-01-03 11:51-0500\n" +"POT-Creation-Date: 2014-01-29 15:16+0000\n" +"PO-Revision-Date: 2014-01-29 10:19-0500\n" "Last-Translator: EL Hadji DEM <[email protected]>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -81,7 +81,7 @@ #. module: base_contact_by_functions #: view:res.partner:0 msgid "State" -msgstr "État" +msgstr "Etat" #. module: base_contact_by_functions #: help:res.category.functions,sequence:0 @@ -97,7 +97,7 @@ #. module: base_contact_by_functions #: view:res.partner:0 msgid "e.g. Sales Director" -msgstr "e.g. Directeur" +msgstr "ex: Directeur de vente" #. module: base_contact_by_functions #: help:functions,acronym:0 @@ -107,7 +107,7 @@ #. module: base_contact_by_functions #: view:res.partner:0 msgid "Tags..." -msgstr "Étiquettes..." +msgstr "Etiquettes..." #. module: base_contact_by_functions #: field:res.partner,start_date:0 @@ -122,7 +122,7 @@ #. module: base_contact_by_functions #: view:res.partner:0 msgid "Fax:" -msgstr "Fax :" +msgstr "Télécopie :" #. module: base_contact_by_functions #: field:res.partner,expiration_date:0 @@ -136,6 +136,11 @@ #. module: base_contact_by_functions #: view:res.partner:0 +msgid "Fax" +msgstr "Télécopie" + +#. module: base_contact_by_functions +#: view:res.partner:0 msgid "Parent Organism" msgstr "Organisme parent" @@ -157,7 +162,7 @@ #. module: base_contact_by_functions #: model:ir.model,name:base_contact_by_functions.model_res_category_functions msgid "Categories functions" -msgstr "Categories functions" +msgstr "Catégories functions" #. module: base_contact_by_functions #: help:res.institution,name:0 @@ -171,6 +176,11 @@ #. module: base_contact_by_functions #: view:res.partner:0 +msgid "Tag" +msgstr "Etiquette" + +#. module: base_contact_by_functions +#: view:res.partner:0 msgid "Passport information" msgstr "Informations du passeport" @@ -181,11 +191,6 @@ #. module: base_contact_by_functions #: view:res.partner:0 -msgid "Is an Organism?" -msgstr "Est un Organisme?" - -#. module: base_contact_by_functions -#: view:res.partner:0 msgid "Parent organism" msgstr "Organisme parent" @@ -230,6 +235,11 @@ msgstr "institution" #. module: base_contact_by_functions +#: view:res.partner:0 +msgid "Is an Organism" +msgstr "Est un Organisme" + +#. module: base_contact_by_functions #: field:res.partner,function_id:0 msgid "Position Occupied" msgstr "Fonction Occupée" @@ -268,11 +278,6 @@ #. module: base_contact_by_functions #: view:res.partner:0 -msgid "à" -msgstr "à" - -#. module: base_contact_by_functions -#: view:res.partner:0 msgid "History" msgstr "Historique" @@ -309,6 +314,11 @@ #. module: base_contact_by_functions #: view:res.partner:0 +msgid "No, Street, Apartment/Office" +msgstr "No, Rue, Appartement/Bureau" + +#. module: base_contact_by_functions +#: view:res.partner:0 msgid "Use address organism" msgstr "Utiliser l'adresse de l'organisme" === modified file 'base_contact_by_functions/res_partner_view.xml' --- base_contact_by_functions/res_partner_view.xml 2014-01-27 18:50:56 +0000 +++ base_contact_by_functions/res_partner_view.xml 2014-01-29 16:53:31 +0000 @@ -22,8 +22,16 @@ </label> <!--Add ')' at the end of 'Is an Organism?'--> <label for="is_company" position="replace"> - <label for="is_company" string="Is an Organism?"/>) + <label for="is_company" string="Is an Organism"/>) </label> + <!--Replace Street placeholder by No, Street, Apartment/Office--> + <field name="street" position="attributes"> + <attribute name="placeholder">No, Street, Apartment/Office</attribute> + </field> + <field name="fax" position="attributes"> + <attribute name="string">Fax</attribute> + </field> + <notebook position="inside"> <page string="Functions" attrs="{'invisible': [('is_company','=',False), ('child_ids', '=', [])]}" @@ -516,7 +524,7 @@ <field name="model">res.partner</field> <field name="arch" type="xml"> <label for="is_company" position="replace"> - <label for="is_company" string="Is an Organism?"/> + <label for="is_company" string="Is an Organism"/> </label> <field name="parent_id" position="replace"> <field name="parent_id" === modified file 'partner_maiden_name/__init__.py' --- partner_maiden_name/__init__.py 2014-01-03 15:07:50 +0000 +++ partner_maiden_name/__init__.py 2014-01-29 16:53:31 +0000 @@ -20,6 +20,6 @@ # ############################################################################## -import res_partner +from . import res_partner # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: === modified file 'partner_member_observer/__init__.py' --- partner_member_observer/__init__.py 2014-01-03 15:07:50 +0000 +++ partner_member_observer/__init__.py 2014-01-29 16:53:31 +0000 @@ -20,6 +20,6 @@ # ############################################################################## -import res_partner +from . import res_partner # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: === modified file 'partner_supplier_information/__init__.py' --- partner_supplier_information/__init__.py 2014-01-03 15:07:50 +0000 +++ partner_supplier_information/__init__.py 2014-01-29 16:53:31 +0000 @@ -20,6 +20,6 @@ # ############################################################################## -import res_partner +from . import res_partner # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: === modified file 'passport/__init__.py' --- passport/__init__.py 2014-01-17 17:21:05 +0000 +++ passport/__init__.py 2014-01-29 16:53:31 +0000 @@ -20,6 +20,6 @@ # ############################################################################## -import res_passport +from . import res_passport # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: === modified file 'passport/res_passport.py' --- passport/res_passport.py 2014-01-17 17:21:05 +0000 +++ passport/res_passport.py 2014-01-29 16:53:31 +0000 @@ -27,14 +27,13 @@ _description = 'Passport' _name = 'res.passport' _columns = { - 'name': fields.char('Owner name', size=256, required=True, select=True, + 'name': fields.char('Owner name', size=256, select=True, help='Owner name (As printed into the passport).'), - 'number': fields.char('Passport No', size=50, required=True, + 'number': fields.char('Passport No', size=50, help='Passport number.'), 'country_id': fields.many2one('res.country', 'Delivery country', - required=True, help="Delivery country."), - 'expiration_date': fields.date('Expiration date', required=True, + 'expiration_date': fields.date('Expiration date', help="Expiration date."), 'birth_date': fields.date('Birth Date', help="Birth Date."), 'gender': fields.selection([('male', 'Male'),
-- Mailing list: https://launchpad.net/~savoirfairelinux-openerp Post to : [email protected] Unsubscribe : https://launchpad.net/~savoirfairelinux-openerp More help : https://help.launchpad.net/ListHelp
