diff --git a/models/__pycache__/__init__.cpython-35.pyc b/models/__pycache__/__init__.cpython-35.pyc new file mode 100644 index 0000000000000000000000000000000000000000..7feb0f4892fa33899d7a499d4fae843874ccd312 Binary files /dev/null and b/models/__pycache__/__init__.cpython-35.pyc differ diff --git a/models/__pycache__/account_invoice.cpython-35.pyc b/models/__pycache__/account_invoice.cpython-35.pyc new file mode 100644 index 0000000000000000000000000000000000000000..c37520b55f50f3fd6f2ada03226fef35f969775d Binary files /dev/null and b/models/__pycache__/account_invoice.cpython-35.pyc differ diff --git a/models/__pycache__/product.cpython-35.pyc b/models/__pycache__/product.cpython-35.pyc new file mode 100644 index 0000000000000000000000000000000000000000..8da60038f246442687c5ccbe567050a19c10e68e Binary files /dev/null and b/models/__pycache__/product.cpython-35.pyc differ diff --git a/models/__pycache__/res_partner.cpython-35.pyc b/models/__pycache__/res_partner.cpython-35.pyc new file mode 100644 index 0000000000000000000000000000000000000000..943f9b257d2f558860793ed1a57589c0eadd0cce Binary files /dev/null and b/models/__pycache__/res_partner.cpython-35.pyc differ diff --git a/models/__pycache__/sale.cpython-35.pyc b/models/__pycache__/sale.cpython-35.pyc new file mode 100644 index 0000000000000000000000000000000000000000..8b2ce680a04e7ac3778fb92824b997e59241eb5e Binary files /dev/null and b/models/__pycache__/sale.cpython-35.pyc differ diff --git a/models/account_invoice.py b/models/account_invoice.py index 36094587390df32b5b3c770ed6c3c899df7732a6..17dd01f0578b4cacdc816c854343e11f7f05b263 100644 --- a/models/account_invoice.py +++ b/models/account_invoice.py @@ -9,10 +9,10 @@ class AccountInvoice(models.Model): beneficiaire_id = fields.Many2one( 'res.partner', - string='Bénéficiaire', + string='Bénéficiaire de la prestation', states={'draft': [('readonly', False)]}, - domain=[('beneficiaire', '=', True)]) - partner_is_beneficiaire = fields.Boolean('Est un Bénéficiaire') + domain=[('is_company', '!=', True)]) + partner_is_beneficiaire = fields.Boolean('Est un bénéficiaire') @api.onchange('partner_id') def onchange_partner_id_benef(self): diff --git a/models/res_partner.py b/models/res_partner.py index 12abdad94258fee0f08e867400f80023371badb9..f27ae3dea4fd0f4b728844538634e51f5defac9c 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -38,8 +38,8 @@ class AutreResPartner(models.Model): for price in price_totals)) # Particulier - beneficiaire = fields.Boolean(string="Est un bénéficiaire") - societe_id = fields.Many2one('res.partner', string='Société bénéficiaire') + beneficiaire = fields.Boolean(string="Est un client direct") + societe_id = fields.Many2one('res.partner', string='Société Clients directs') email_pro = fields.Char(string="E-mail pro") mobile_pro = fields.Char('Mobile pro') phone_pro = fields.Char('Téléphone pro') @@ -81,9 +81,9 @@ class AutreResPartner(models.Model): statuts = fields.Many2one('res.partner.statut', string="Statut") num_of = fields.Char('Numéro OF') financement = fields.Selection([('direct', 'direct'), - ('agfiph', 'AGFIPH'), - ('piphfp', 'PIPHFP'), - ('eoth', 'EOTH')], string='Financement') + ('agfiph', 'AGEFIPH'), + ('piphfp', 'FIPHFP'), + ('eoth', 'OETH')], string='Financement') preference_email = fields.Boolean('E-mail') preference_courrier = fields.Boolean('Courrier') preference_chorus = fields.Boolean('Chorus Pro') @@ -91,7 +91,7 @@ class AutreResPartner(models.Model): ref_chorus = fields.Char('Références Chorus') total_invoiced_benef = fields.Monetary( compute='_compute_invoice_total_benef', - string="Total Invoiced bénéficiaire", + string="Total Invoiced clients directs", groups='account.group_account_invoice') def _compute_sale_order_count(self): @@ -109,6 +109,7 @@ class AutreResPartner(models.Model): mapped_data.get(child, 0) for child in partner_ids) partner.sale_order_count += sale_order_count_benef + @api.onchange('company_type') def onchange_company_type(self): super(AutreResPartner, self).onchange_company_type() diff --git a/models/sale.py b/models/sale.py index 881e809a747663fff0d22f7cced305a0e9d64fd7..b6224545fcb812d96cf4f12cddf4f63494afd8f8 100644 --- a/models/sale.py +++ b/models/sale.py @@ -9,14 +9,14 @@ class AutreSaleOrder(models.Model): beneficiaire_id = fields.Many2one( 'res.partner', - string='Bénéficiaire', + string='Bénéficiaire de la prestation', states={ 'draft': [('readonly', False)], 'sent': [('readonly', False)], 'sale': [('readonly', False)] }, - domain=[('beneficiaire', '=', True)]) - partner_is_beneficiaire = fields.Boolean('Est un Bénéficiaire') + domain=[('is_company', '!=', True)]) + partner_is_beneficiaire = fields.Boolean('Est un bénéficiaire') @api.multi def _prepare_invoice(self): diff --git a/report/report_account.xml b/report/report_account.xml index d13265adc17631735687e1f97a84db5abc8d2fcc..a8e585e31dd57482710aaa0a7de601e0c947671f 100644 --- a/report/report_account.xml +++ b/report/report_account.xml @@ -4,7 +4,7 @@ <xpath expr="//div[@class='page']" position="before"> <t t-if="o.beneficiaire_id"> <div name="information_block" class="col-6 mb32"> - <strong>Bénéficiaire:</strong><br/> + <strong>Client direct:</strong><br/> <t t-if="o.beneficiaire_id.name"><span class="bene-name" t-field="o.beneficiaire_id.name"/></t><br/> </div> </t> diff --git a/report/report_sale.xml b/report/report_sale.xml index a3e5628a39595ada730d496d387f5580da3806aa..52954c2022e2b9a386e206a631fe695f2f58a2c9 100644 --- a/report/report_sale.xml +++ b/report/report_sale.xml @@ -4,7 +4,7 @@ <xpath expr="//div[@class='page']" position="before"> <t t-if="doc.beneficiaire_id"> <div name="information_block" class="col-6 mb32"> - <strong>Bénéficiaire:</strong><br/> + <strong>Client direct:</strong><br/> <t t-if="doc.beneficiaire_id.name"><span class="bene-name" t-field="doc.beneficiaire_id.name"/></t><br/> </div> </t> @@ -172,6 +172,7 @@ </div> </div> + <!-- <p style="page-break-before:always;"> </p> --> <p t-field="doc.note" /> <p class="payment-term" t-if="doc.payment_term_id.note"> <span t-field="doc.payment_term_id.note"/> diff --git a/views/menu_partner.xml b/views/menu_partner.xml index 72b5843df5a551018675925ecc945109dc5593e1..a1c07dfc7e356f79a53a7f2c8f5978276555baa4 100644 --- a/views/menu_partner.xml +++ b/views/menu_partner.xml @@ -31,7 +31,7 @@ <field name="res_model">res.partner.statutspe</field> <field name="view_type">form</field> <field name="view_mode">tree,form</field> - <field name="help">Gestion des statuts spécifiques bénéficiaire disponibles dans la fiche contact</field> + <field name="help">Gestion des statuts spécifiques our les clients directs disponibles dans la fiche contact</field> </record> <!-- Partner Role --> @@ -99,7 +99,7 @@ <field name="res_model">res.partner.aide</field> <field name="view_type">form</field> <field name="view_mode">tree,form</field> - <field name="help">Gestion des aides à la communication bénéficiaire disponibles dans la fiche contact</field> + <field name="help">Gestion des aides à la communication pour les clients directs disponibles dans la fiche contact</field> </record> <!-- Partner Mode de communication --> @@ -133,7 +133,7 @@ <field name="res_model">res.partner.com</field> <field name="view_type">form</field> <field name="view_mode">tree,form</field> - <field name="help">Gestion des modes de communication bénéficiaire disponibles dans la fiche contact</field> + <field name="help">Gestion des modes de communication pour les clients directs disponibles dans la fiche contact</field> </record> <!-- Partner Suivi par --> @@ -167,7 +167,7 @@ <field name="res_model">res.partner.suivi</field> <field name="view_type">form</field> <field name="view_mode">tree,form</field> - <field name="help">Gestion "suivi par" pour les bénéficiaires disponibles dans la fiche contact</field> + <field name="help">Gestion "suivi par" pour les clients directs disponibles dans la fiche contact</field> </record> <!-- Partner Statuts société --> diff --git a/views/res_partner_view.xml b/views/res_partner_view.xml index dfb3bd9c3addfe8c193580be6ddb9ff10901fe50..9a4aad6b1ce948b6ac9e3e36a03f1e9d28dcd9a2 100644 --- a/views/res_partner_view.xml +++ b/views/res_partner_view.xml @@ -155,7 +155,8 @@ <field name="category_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True}" placeholder="Tags..."/> </group> </group> - <group attrs="{'invisible': ['|', ('is_company','!=', False),('beneficiaire','!=',True)]}" string="Infos Bénéficiaire"> + <group attrs="{'invisible': ['|', ('is_company','!=', False)]}" string="Infos Supplémentaires"> + <!-- <group attrs="{'invisible': ['|', ('is_company','!=', False),('beneficiaire','!=',True)]}" string="Infos Clients directs"> --> <group> <field name="ic_referent" /> <field name="ic_possibles" widget="many2many_tags" /> @@ -166,7 +167,8 @@ <field name="suivi_par" widget="many2many_tags"/> </group> </group> - <group attrs="{'invisible': ['|', ('is_company','!=', False),('beneficiaire','!=',True)]}" col="3"> + <!-- <group attrs="{'invisible': ['|', ('is_company','!=', False),('beneficiaire','!=',True)]}" col="3"> --> + <group attrs="{'invisible': ['|', ('is_company','!=', False)]}" col="3"> <group> <field name="dysphasique"/> </group> @@ -254,7 +256,7 @@ <field name="arch" type="xml"> <xpath expr="//filter[@name='type_person']" position="before"> <separator/> - <filter string="Bénéficiaires" name="beneficiaires" domain="[('beneficiaire','=',True)]"/> + <filter string="Clients directs" name="beneficiaires" domain="[('beneficiaire','=',True)]"/> </xpath> </field> </record> @@ -273,20 +275,20 @@ <span class="o_stat_value"> <field name="total_invoiced_benef" widget='monetary' options="{'currency_field': 'currency_id'}"/> </span> - <span class="o_stat_text">Facturé bénéficiaire</span> + <span class="o_stat_text">Facturé clients directs</span> </div> </button> </div> </field> </record> - <record id="sale.act_res_partner_2_sale_order" model="ir.actions.act_window"> + <!-- <record id="sale.act_res_partner_2_sale_order" model="ir.actions.act_window"> <field name="name">Quotations and Sales</field> <field name="res_model">sale.order</field> <field name="view_type">form</field> <field name="view_mode">tree,form,graph</field> <field name="context">{ - 'default_beneficiaire_id': active_id, + 'default_partner_id': active_id, }</field> <field name="groups_id" eval="[(4, ref('sales_team.group_sale_salesman'))]"/> <field name="help" type="html"> @@ -296,6 +298,6 @@ Once the quotation is confirmed by the customer, it becomes a sales order.<br/> You will be able to create an invoice and collect the payment. </p> </field> - </record> + </record> --> </data> </odoo> diff --git a/views/sale_view.xml b/views/sale_view.xml index 2f5d2ce05a8dd817e91f4176b9b590cd0b98c766..bd6d4fef22597a9fb0f84af57a565d455c8757d1 100644 --- a/views/sale_view.xml +++ b/views/sale_view.xml @@ -8,7 +8,7 @@ <field name="arch" type="xml"> <xpath expr="//field[@name='partner_id']" position="after"> <field name="partner_is_beneficiaire" invisible="1"/> - <field name="beneficiaire_id" attrs="{'invisible': [('partner_is_beneficiaire','=',True)]}"/> + <field name="beneficiaire_id" attrs="{'invisible': [('partner_is_beneficiaire','=',True)]}"/> </xpath> </field> </record> diff --git a/wizard/__pycache__/__init__.cpython-35.pyc b/wizard/__pycache__/__init__.cpython-35.pyc new file mode 100644 index 0000000000000000000000000000000000000000..4752528279f6a0c56af1f5ab99436d4bf99d556a Binary files /dev/null and b/wizard/__pycache__/__init__.cpython-35.pyc differ diff --git a/wizard/__pycache__/sale_make_invoice_advance.cpython-35.pyc b/wizard/__pycache__/sale_make_invoice_advance.cpython-35.pyc new file mode 100644 index 0000000000000000000000000000000000000000..4e34e2970c1a16296546c531399778f46de5cf17 Binary files /dev/null and b/wizard/__pycache__/sale_make_invoice_advance.cpython-35.pyc differ