[VIEW] +invoices unsent filter and tree column

diff --git a/__openerp__.py b/__openerp__.py
index cdba7f8..deb668f 100644 (file)
--- a/__openerp__.py
+++ b/__openerp__.py
@@ -45,7 +45,6 @@ Module pour les personnalisations de L'Heureux Cyclage
         'data/account.xml',
         'data/wiki.xml',
         'view/account_invoice.xml',
-        'view/account.xml',
         'view/base.xml',
         'view/hr_expense.xml',
         'view/membership.xml',

diff --git a/i18n/fr.po b/i18n/fr.po
index ad9dd9b..e490202 100644 (file)
--- a/i18n/fr.po
+++ b/i18n/fr.po
@@ -6,36 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-31 11:11+0200\n"
-"PO-Revision-Date: 2015-08-31 11:12+0200\n"
+"POT-Creation-Date: 2015-09-27 15:57+0200\n"
+"PO-Revision-Date: 2015-09-27 15:57+0200\n"
 "Last-Translator: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>\n"
 "Language-Team: \n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.3\n"
+"X-Generator: Poedit 1.8.4\n"
 
 #. module: lhc_custom_oe
-#: model:ir.filters,name:lhc_custom_oe.bikecoop_expired_or_non_members_admin
-#: model:ir.filters,name:lhc_custom_oe.bikecoop_expired_or_non_members_baptiste_guyomarch
-#: model:ir.filters,name:lhc_custom_oe.bikecoop_expired_or_non_members_elodie_chabert
-#: model:ir.filters,name:lhc_custom_oe.bikecoop_expired_or_non_members_julien_allaire
-#: model:ir.filters,name:lhc_custom_oe.bikecoop_expired_or_non_members_ludovic_boyer
-#: model:ir.filters,name:lhc_custom_oe.bikecoop_expired_or_non_members_ludovic_chevalier
-msgid "Ateliers anciens membres ou non membres"
-msgstr "Ateliers anciens membres ou non membres"
-
-#. module: lhc_custom_oe
-#: model:ir.filters,name:lhc_custom_oe.bikecoop_actual_members_admin
-#: model:ir.filters,name:lhc_custom_oe.bikecoop_actual_members_baptiste_guyomarch
-#: model:ir.filters,name:lhc_custom_oe.bikecoop_actual_members_elodie_chabert
-#: model:ir.filters,name:lhc_custom_oe.bikecoop_actual_members_julien_allaire
-#: model:ir.filters,name:lhc_custom_oe.bikecoop_actual_members_laura_guitot
-#: model:ir.filters,name:lhc_custom_oe.bikecoop_actual_members_ludovic_boyer
-#: model:ir.filters,name:lhc_custom_oe.bikecoop_actual_members_ludovic_chevalier
-msgid "Ateliers membres (en attente, facturés, payant ou libre)"
-msgstr "Ateliers membres (en attente, facturés, payant ou libre)"
+#: view:account.invoice:0
+msgid "Customer"
+msgstr "Client"
 
 #. module: lhc_custom_oe
 #: view:account.invoice:0
@@ -47,8 +31,16 @@ msgstr "Envoyer  par courriel"
 msgid "Administration council members"
 msgstr "Membres du conseil d'administration"
 
-#~ msgid "Customer"
-#~ msgstr "Client"
+#. module: lhc_custom_oe
+#: view:account.invoice:0
+msgid "Unsent"
+msgstr "Non envoyée"
+
+#~ msgid "Ateliers anciens membres ou non membres"
+#~ msgstr "Ateliers anciens membres ou non membres"
+
+#~ msgid "Ateliers membres (en attente, facturés, payant ou libre)"
+#~ msgstr "Ateliers membres (en attente, facturés, payant ou libre)"
 
 #~ msgid "Bequille Groups Wiki Pages"
 #~ msgstr "Pages Wiki du groupe Béquille"

diff --git a/i18n/lhc.pot b/i18n/lhc.pot
new file mode 100644 (file)
index 0000000..c2f4d2e
--- /dev/null
+++ b/i18n/lhc.pot
@@ -0,0 +1,37 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#      * lhc_custom_oe
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-27 13:56+0000\n"
+"PO-Revision-Date: 2015-09-27 13:56+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: lhc_custom_oe
+#: view:account.invoice:0
+msgid "Customer"
+msgstr ""
+
+#. module: lhc_custom_oe
+#: view:account.invoice:0
+msgid "Sent by Email"
+msgstr ""
+
+#. module: lhc_custom_oe
+#: model:res.groups,name:lhc_custom_oe.group_ca
+msgid "Administration council members"
+msgstr ""
+
+#. module: lhc_custom_oe
+#: view:account.invoice:0
+msgid "Unsent"
+msgstr ""
+

diff --git a/i18n/lhc_custom_oe.pot b/i18n/lhc_custom_oe.pot
deleted file mode 100644 (file)
index 6b63f14..0000000
--- a/i18n/lhc_custom_oe.pot
+++ /dev/null
@@ -1,27 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#      * lhc_custom_oe
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-27 08:21+0000\n"
-"PO-Revision-Date: 2015-09-27 08:21+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: lhc_custom_oe
-#: view:account.invoice:0
-msgid "Sent by Email"
-msgstr ""
-
-#. module: lhc_custom_oe
-#: model:res.groups,name:lhc_custom_oe.group_ca
-msgid "Administration council members"
-msgstr ""
-

diff --git a/view/account.xml b/view/account.xml
deleted file mode 100644 (file)
index 1ebbbef..0000000
--- a/view/account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<openerp>
-    <data>
-        <record id="view_invoice_form" model="ir.ui.view">
-            <field name="name">account.invoice.form</field>
-            <field name="model">account.invoice</field>
-            <field name="inherit_id" ref="account.invoice_form"/>
-            <field name="priority" eval="8"/>
-            <field name="arch" type="xml">
-                <xpath expr="//button[@name='action_invoice_sent']" position="after">
-                    <button string="Sent by Email" type="object" name="action_invoice_sent" attrs="{'invisible': ['|', ('sent','=', True), ('state', '!=', 'paid')]}"/>
-                </xpath>
-            </field>
-        </record>
-    </data>
-</openerp>

diff --git a/view/account_invoice.xml b/view/account_invoice.xml
index 016e91b..2c10ea0 100644 (file)
--- a/view/account_invoice.xml
+++ b/view/account_invoice.xml
@@ -11,7 +11,6 @@
                 </xpath>
             </field>
         </record>
-        
         <record id="view_invoice_form" model="ir.ui.view">
             <field name="name">account.invoice.form</field>
             <field name="model">account.invoice</field>
@@ -24,9 +23,11 @@
                 <xpath expr="//field[@name='partner_id']" position="replace">
                     <field string="Customer" name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'search_default_customer': 1}"/>
                 </xpath>
+                <xpath expr="//button[@name='action_invoice_sent']" position="after">
+                    <button string="Sent by Email" type="object" name="action_invoice_sent" attrs="{'invisible': ['|', ('sent','=', True), ('state', '!=', 'paid')]}"/>
+                </xpath>
             </field>
         </record>
-        
         <record id="view_invoice_tree" model="ir.ui.view">
             <field name="name">account.invoice.tree</field>
             <field name="model">account.invoice</field>
@@ -36,6 +37,19 @@
                 <xpath expr="//field[@name='partner_id']" position="replace">
                     <field name="partner_id"/>
                 </xpath>
+                <xpath expr="//field[@name='amount_total']" position="after">
+                    <field name="sent"/>
+                </xpath>
+            </field>
+        </record>
+        <record id="view_account_invoice_filter" model="ir.ui.view">
+            <field name="name">account.invoice.select</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.view_account_invoice_filter"/>
+            <field name="arch" type="xml">
+                <xpath expr="//filter[@name='unpaid']" position="after">
+                    <filter name="unsent" string="Unsent" domain="[('sent','=', False)]"/>
+                </xpath>
             </field>
         </record>
     </data>