From 28eae6b9936bae411d47f22df11c6882b031c105 Mon Sep 17 00:00:00 2001 From: Juliana <juliana@le-filament.com> Date: Fri, 10 May 2019 12:34:31 +0200 Subject: [PATCH] Modifs suite formation --- models/__pycache__/__init__.cpython-35.pyc | Bin 0 -> 302 bytes .../__pycache__/account_invoice.cpython-35.pyc | Bin 0 -> 1021 bytes models/__pycache__/product.cpython-35.pyc | Bin 0 -> 734 bytes models/__pycache__/res_partner.cpython-35.pyc | Bin 0 -> 8102 bytes models/__pycache__/sale.cpython-35.pyc | Bin 0 -> 1291 bytes models/account_invoice.py | 6 +++--- models/res_partner.py | 13 +++++++------ models/sale.py | 6 +++--- report/report_account.xml | 2 +- report/report_sale.xml | 3 ++- views/menu_partner.xml | 8 ++++---- views/res_partner_view.xml | 16 +++++++++------- views/sale_view.xml | 2 +- wizard/__pycache__/__init__.cpython-35.pyc | Bin 0 -> 209 bytes .../sale_make_invoice_advance.cpython-35.pyc | Bin 0 -> 793 bytes 15 files changed, 30 insertions(+), 26 deletions(-) create mode 100644 models/__pycache__/__init__.cpython-35.pyc create mode 100644 models/__pycache__/account_invoice.cpython-35.pyc create mode 100644 models/__pycache__/product.cpython-35.pyc create mode 100644 models/__pycache__/res_partner.cpython-35.pyc create mode 100644 models/__pycache__/sale.cpython-35.pyc create mode 100644 wizard/__pycache__/__init__.cpython-35.pyc create mode 100644 wizard/__pycache__/sale_make_invoice_advance.cpython-35.pyc diff --git a/models/__pycache__/__init__.cpython-35.pyc b/models/__pycache__/__init__.cpython-35.pyc new file mode 100644 index 0000000000000000000000000000000000000000..7feb0f4892fa33899d7a499d4fae843874ccd312 GIT binary patch literal 302 zcmWgR<>gAdc`Rl*0|Ucj1|-15z`)?Zz`#)K!oa|g!oZNi$dJRpkjuyr#mK-2;xmEy zObk&>5I!@Q&&&|T4B@kY`78`kEDVe(tPH`LY%duZ7#K7eZ*do;7RMJP7M0|s7HKlx zVku6{N!4V$#h;j*oL`z(5}%n@mY<mn5@IhX%1<dxF7eZ3y~R)ja#9g90|P@53y5H4 zU|?9uP{a;mgNR=q`WgATsrvaT`T1bN&`3YIw74WcS3fZ&B|ooNKe4o=C^a`VuOvPt wvjpY>{oMSN)SP1d`1s7c%#!$cy@JYH95%W6DWy57b|Bk|*%%lY1Q<aO0J-!?>Hq)$ literal 0 HcmV?d00001 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 GIT binary patch literal 1021 zcmWgR<>mUh@?y+eCI*Jb3`l^5fq}t+fq|jel7WFCg@GZ3ks*hHA(xRMijg6gi6M%K zA(xpUikX4YJ%x!Og_)s+0Ys)UGGwtZG&3_qu`;BvFa&F|z66=6$$X0~H$Npcr}!3I zT4riaO7Sh`#DdIZkQ@wi!7R*WU|>jP0NInm0J0~A5oAv)3quww1H`Tr7KRj7h7>l2 z6d{ImMutpAh7?YQ6k!m%nUOh)jRB;Xogsynp_!2(ii07QlOc<XA%zdbP2p!q5dgUs zB*o2;BFGS|DRPU?F*!NEG_S-nuPi?^Ikk#E5yIEYgbHvMr55WIBo>wAr54>{D=sO@ z%u6qoXJBA(I=nLP@XEBz<jlm(qEv;HRE3;Gg@U5g;*!LY%=|o%+QgF7;#;gKMTu!8 zw>XMY6I1f@aw^?!v8CkaCT8Z{;>s+JPtMORNX)DJ#iVE(QYy;8z~EY3qEMQrkc49T zEiR}F;xki{8KD6OqL~;N7@R?orOm*=P{Y8G#lVoo2#T_74u&E*5Tk~HA)bjLj}sJv z5OxX!L$D^ZUx=F~a}h5C1H&zzq}04rm`84j!>uZgN0!iJyv0(Snv=GYp-7N{f#H|G zenx(7s(yY-em<BmG}2ElEiTE=)lW=G$<Hg+Pb@7dO3h8pD~V6ZEQyDjst-vG`p{sG zhX%7=LFFyU{Ji9h#Ju!WnA-Tv6o?Bz_7$^%yv-!U$iq~nff{LgI5qldGF2f0UX!^B zDaea>7#J8rG<j}u#K-3)=BCES-{Ojo&&^LM%>l7_;^PZT6LX+49PycX8L35?B}L4j z5aaMo%&RoY&r7|<j~qntnJKr}o$~W@QWNuv_!$@&ia?p^76;6IMZzF4kZ-_22qA<( zVyp}d4D6tI6kuRr;9+EAVq*kBenuWfex@Rjte+;^Ef!E<7lGm&><ozMtiGW91y%zw X5Me&Z=vy2%5I@<0+)@nEEW-={(n}5& literal 0 HcmV?d00001 diff --git a/models/__pycache__/product.cpython-35.pyc b/models/__pycache__/product.cpython-35.pyc new file mode 100644 index 0000000000000000000000000000000000000000..8da60038f246442687c5ccbe567050a19c10e68e GIT binary patch literal 734 zcmWgR<>k`p*%8Ca#K7>F0ST}$FfceUFfbJBGB7ZtFfgPrGUPBY<T5fuF)}c^r!X<3 zFf+6;fXGxvhAbwAW@d&cW`-0NhG0$BmmqUA8E>)W=BK3Q6eokYFw6{P6l*XrFr+eo zj7wo)h++a+5XH>U&cKky$N(|Eje#MG1tb!z$#P5Fv9zQpH8(Y{B%mlir8F5vRq+=< z_<B$}nGtFO69WSS$TkozwqjslC}ChIVPvRbU}$CnyO@E2v4(*mi<zMoESkl_P-MnX z!w7N-NSuX1+#Dps$Plc_<adjaOOy2$YjJ5oYEco$$XjaZsU`7HOXG7(b4oIEGV@a7 zQ&NkQi!uvJGV}A|ixYEFZ?WVh=BC~fKo{3!y2VnQnv+(<&cMK+$#{!1K0Y}ovA8%s zekH>%cm0g~+*JMil>B@!VQ8eETv}X`pR1pkl9HcSte*%Ajrf$zlK6teqLRGSB7I1B z>q8x-S5R5R#=yY91&T%<P^d7nG4e8UGIBBsGFI8)2v9xZyrs!{iz7ZB<hA(tTU_z+ zx%nxjIjQmSw|L^?3riDopfVisnRywhMVTdFmlSa`Fff1#O~xXSvx-2@0tY836pBHK xj)#$r2`u8L$#RPY6aqz{n7qa63rb928L$aR1jvwE95xUq*ntcw25Avs1^~D2wgUhF literal 0 HcmV?d00001 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 GIT binary patch literal 8102 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 literal 0 HcmV?d00001 diff --git a/models/__pycache__/sale.cpython-35.pyc b/models/__pycache__/sale.cpython-35.pyc new file mode 100644 index 0000000000000000000000000000000000000000..8b2ce680a04e7ac3778fb92824b997e59241eb5e GIT binary patch literal 1291 zcmWgR<>mUk@?y+aW(J1G3`l^5fq}t+fq|jel7WFCg@GZ3ks*hHA(xRMijg6gi6M%K zA(xpUikX4YJ%x!Og_)s+0Ys)UGGwtZG&3_qu`;BvFa&F|z66=6$$X0~H$Npcr}!3I zT4riaO7Sh`#DdIZkQ@y2KpDle7#J8*89?@=Fo5hyVFcNe%EFMv$^fw|g@qx7l_7<V zAw`rSosl7hlOaV6%-~{35eG3cnHf^J8B!!b>}E#hC^iO=c6Npoeuid7hA0k(R8EF0 zE{1jnhBQWo6aj`5L54O4uoO2~iiaUZ2*gbhW=IhMc@3nC7o<K|Q}Py{V`)iIYH(ss zs((>RYEczeabixYUOt%3U6fj^SCCj#l9yU^i><h%C^Ij;RGxu>!RheIyu&NgGLthC zGmBCcQc@Li5)}%HQj1FxOEUBGKxz|9Qj2e~rW7TnmE7VeN=;13&&#QFyTwwRnpbj* z1!T!Bwv_zb#LT=~T$#o3$@#ejiFuX3m=tY8N<|qM7+i}>6iV|Hl2B|)W`u?-69WSS zGZYsaF)%QcFff!bGSo0IG&3<|F)=hVFw}y%S<DPYdLZ#EW>93-FoNRVriPIrSd+=` z7JpJ|UMkER@tG-_thZQ;OAAtqidY#K7;Xu~7ZjxyBo?K{XXcgVXC|i>@q>h!GE+2} zKt9PyyTt>Qi7!jcDb{4X#Tg%;oRe5w93Q`u;g^ekMt*Lpett@RKA12x(oZfeF3Hc; zPfSV4&nwnX1ciNWYF<fvN@htsG^F(*iAx_8MtTL6MS=_r44@Dx<^Xw~NtBV3QGl^Z z9yQ+d(4BgV3u;_^W(qvmK*0wJI%iN`5N2Qi2Mhy47C5NlnLt@1Sd-CDletI&<WU~v z;JGCZH?TM!SwfSs2xL@|7y|<Xgb)X5mdwvf&PdElPlfp_J~IWPPX=T=$QcYwRT^mC zz^O@-=@%jyX)+ao3~__g%vDH<sECh&fgwbb?-oaVd|qO1YJB`HuK4)e{FKrh5Su4H zzOXbg2P(r6pP84DT9jE*1WHf0ID8ZHDvk2<pi#~4l%JoInwVE41@auI7`eroTbfgn z367Op95Ck=NrU9!A)v`v1d6dDP(Xl_5<AGtAZZ>(HYPSkHbyokPDV~fekLA9ekN&l yuo^#2wp%Qqv{D2L8?bYVAU67fN*k~mNce&bg0Mgq+~Tl-_{|Qax)`Kch8X}qw?|U| literal 0 HcmV?d00001 diff --git a/models/account_invoice.py b/models/account_invoice.py index 3609458..17dd01f 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 12abdad..f27ae3d 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 881e809..b622454 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 d13265a..a8e585e 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 a3e5628..52954c2 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 72b5843..a1c07df 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 dfb3bd9..9a4aad6 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 2f5d2ce..bd6d4fe 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 GIT binary patch literal 209 zcmWgR<>gAhc`PQ6fq~&M0}^0jU|?`yU|=W~VPIfLVPHsMWXNG)$Yo@RVq{=UVPXi@ zWPZuWz`&r%cuTT4F()-XH!(XkJ~OW@KQlQsJ~5>%F)umQPm}2uLlMZRl?+8J3=9zB zmxq2ver~FMeoB5mm@qWbPcAJk$<NhKOi9VlE7ngeEh$RPP0cHbPsuEaFGwsZ$xAKL mFVCz>EK1RjkI&4@EQycTE2zB1VUwGmQks)$#|&~R$oT-XgE(0L literal 0 HcmV?d00001 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 GIT binary patch literal 793 zcmWgR<>k`p*%9Nw#K7>F0ST}$FfceUFfbGwGcYiuFfgPrGUPBY<T5fuF*4*bF+?#j zFuJEOF{Cgvv@n3kR3?TjW`<^FhA0+>6c&bHP1ctn(=?fGF((#e-eSwmPf5)wP6mm= zFvtoJyV#I{fgzOvWO51v$mA48hA3u+R2GITR)%&4hBQV7h)rz_49$!TQEVW=U`>`= zQjVo1MXAAwIjN2*Wr=yosR4<Vxv6<2o_S?e62*x*sd|YJalHbFgkEM|Su)I8Rt5$J z5Stm~OKS!Oh7tyb5=Mp^28L!PhAbwA8b*d1CWacYr)pV1+$?5>B6BDsi-n<v1r#ba zH6Y(I`Q74AO3h16%S_Hp%q&Wc&rH!|y~SEwT98^)1hVB8e|&OLYGO%hd}dx*er9rN z5y<{qOki~^#i==Iw^;LwQc{a<u@~pZ=Va!k-eOD4%`eR>xy26Ep~-lQGd?~!C$YFV zK7J*`uSorj{M=Oi{FMBBFkxt<pIlm8lAo)en39s8SFE213La2^#HVDI#1|wMmE@%s z>6d3#B^IUVgTg01H!&OTpm=y-RTi-`Ffed|!UaSyFtIU8Fmf^qFji^d4sks+|7o({ z;)svWOUzA;kH5tgAD^3_Qknx|^Tfv&mL}#vWjNw9^D<J4GE0h>7#J9CvF4WMlw^YK zFXCrlU;q=Ej75APwg89#1t!RO#UKU`BO4Pqc>Oe4Z?S+v0&GkXC{Azjg%l;`6=$aA fmH2`ZA6OmOJR|~S<Sh;xh~w-)MiztIA;t^<bv(xV literal 0 HcmV?d00001 -- GitLab