Skip to content
Extraits de code Groupes Projets
Valider 86fc0df5 rédigé par Rémi - Le Filament's avatar Rémi - Le Filament Validation de Julien - Le Filament
Parcourir les fichiers

Modifications Stéphane

parent 2c969740
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!7Modifications Stéphane
Afficher les modifications d'espaces
En ligne Côte à côte
models/acc_contract.py
+ 2
− 2
Voir le fichier @ 86fc0df5
...@@ -41,10 +41,10 @@ class AccContract(models.Model): ...@@ -41,10 +41,10 @@ class AccContract(models.Model):
) )
partner_id_domain_seller = fields.Binary( partner_id_domain_seller = fields.Binary(
string="Partner domain", compute="_compute_partner_id_domain_seller" string="Seller domain", compute="_compute_partner_id_domain_seller"
) )
partner_id_domain_buyer = fields.Binary( partner_id_domain_buyer = fields.Binary(
string="Partner domain", compute="_compute_partner_id_domain_buyer" string="Buyer domain", compute="_compute_partner_id_domain_buyer"
) )
partner_id_domain = fields.Binary( partner_id_domain = fields.Binary(
string="Partner domain", compute="_compute_partner_id_domain" string="Partner domain", compute="_compute_partner_id_domain"
......
models/acc_operation.py
+ 11
− 8
Voir le fichier @ 86fc0df5
...@@ -12,7 +12,7 @@ class AccOperation(models.Model): ...@@ -12,7 +12,7 @@ class AccOperation(models.Model):
acc_contract_ids = fields.One2many( acc_contract_ids = fields.One2many(
comodel_name="acc.contract", comodel_name="acc.contract",
inverse_name="acc_operation_id", inverse_name="acc_operation_id",
string="Liste des contrats", string="Liste des documents",
) )
# ------------------------------------------------------ # ------------------------------------------------------
...@@ -43,11 +43,14 @@ class AccOperation(models.Model): ...@@ -43,11 +43,14 @@ class AccOperation(models.Model):
# Business methods # Business methods
# ------------------------------------------------------ # ------------------------------------------------------
def create_document(self): def create_document(self):
action = self.env["ir.actions.act_window"]._for_xml_id( return {
"oacc_document.acc_contract_act_window" 'type': 'ir.actions.act_window',
) 'name': 'Ajouter un document',
action["context"] = { 'res_model': 'acc.contract',
"default_acc_operation_id": self.id, 'view_mode': 'form',
'target': 'new', # Opens in a popup
'view_id': self.env.ref('oacc_document.operation_acc_contract_form_view').id,
'context': {
'default_acc_operation_id': self.id, # Links the new child to the current parent
},
} }
action["views"] = [(False, "form")]
return action
views/acc_contract_views.xml
+ 130
− 19
Voir le fichier @ 86fc0df5
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). --> License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
<odoo> <odoo>
<record id="acc_contract_form_view" model="ir.ui.view"> <record id="global_acc_contract_form_view" model="ir.ui.view">
<field name="name">acc_operation.acc.contract.form</field> <field name="name">acc.global.contract.form</field>
<field name="model">acc.contract</field> <field name="model">acc.contract</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Document"> <form string="Document">
...@@ -21,55 +21,147 @@ ...@@ -21,55 +21,147 @@
name="seller_id" name="seller_id"
domain="partner_id_domain_seller" domain="partner_id_domain_seller"
attrs="{'invisible': [('type', '!=', 'other')]}" attrs="{'invisible': [('type', '!=', 'other')]}"
options="{'no_create': True}"
/> />
<field
name="buyer_id"
domain="partner_id_domain_buyer"
attrs="{'invisible': [('type', '!=', 'other')]}"
/>
<field <field
name="seller_id" name="seller_id"
domain="partner_id_domain_seller" domain="partner_id_domain_seller"
string="PMO" string="PMO"
attrs="{'invisible': [('type', 'not in', ('convention', 'pmo', 'part_enedis'))]}" attrs="{'invisible': [('type', 'not in', ('convention', 'pmo', 'part_enedis'))]}"
options="{'no_create': True}"
/>
<field
name="seller_id"
domain="partner_id_domain_seller"
string="Producteur"
attrs="{'invisible': [('type', 'not in', ('facture', 'vente_achat'))]}"
options="{'no_create': True}"
/> />
<field
name="buyer_id"
domain="partner_id_domain_buyer"
attrs="{'invisible': [('type', '!=', 'other')]}"
options="{'no_create': True}"
/>
<field <field
name="buyer_id" name="buyer_id"
domain="partner_id_domain_buyer" domain="partner_id_domain_buyer"
string="Client" string="Client"
attrs="{'invisible': [('type', 'not in', ('facture_elocoop'))]}" attrs="{'invisible': [('type', 'not in', ('facture_elocoop'))]}"
options="{'no_create': True}"
/>
<field
name="buyer_id"
domain="partner_id_domain_buyer"
string="Participant"
attrs="{'invisible': [('type', '!=', 'part_enedis')]}"
options="{'no_create': True}"
/>
<field
name="buyer_id"
domain="partner_id_domain_buyer"
string="Adhérent"
attrs="{'invisible': [('type', '!=', 'pmo')]}"
options="{'no_create': True}"
/>
<field
name="buyer_id"
domain="partner_id_domain_buyer"
string="Consommateur"
attrs="{'invisible': [('type', 'not in', ('facture', 'vente_achat'))]}"
options="{'no_create': True}"
/>
<field name="partner_id_domain_seller" invisible="1" />
<field name="partner_id_domain_buyer" invisible="1" />
</group>
</group>
<group>
<field name="name" invisible="1" />
<field widget="binary" name="document" filename="name" />
</group>
</sheet>
</form>
</field>
</record>
<record id="operation_acc_contract_form_view" model="ir.ui.view">
<field name="name">acc.operation.contract.form</field>
<field name="model">acc.contract</field>
<field name="arch" type="xml">
<form string="Documents">
<sheet>
<group>
<group>
<field name="acc_operation_id" oinvisible="1" />
<field name="type" />
<field name="date_app" />
</group>
<group>
<!-- Divers -->
<field
name="seller_id"
domain="partner_id_domain_seller"
attrs="{'invisible': [('type', '!=', 'other')]}"
options="{'no_create': True}"
/>
<!-- Convention, Accord, Adhésion -->
<field
name="seller_id"
domain="partner_id_domain_seller"
string="PMO"
attrs="{'invisible': [('type', 'not in', ('convention', 'pmo', 'part_enedis'))]}"
options="{'no_create': True}"
/> />
<!-- Contrat de vente, Facture importée -->
<field <field
name="seller_id" name="seller_id"
domain="partner_id_domain_seller" domain="partner_id_domain_seller"
string="Producteur" string="Producteur"
attrs="{'invisible': [('type', 'not in', ('facture', 'vente_achat'))]}" attrs="{'invisible': [('type', 'not in', ('facture', 'vente_achat'))]}"
options="{'no_create': True}"
/> />
<!-- Divers -->
<field <field
name="buyer_id" name="buyer_id"
domain="partner_id_domain_buyer" domain="partner_id_domain_buyer"
string="Adhérent" attrs="{'invisible': [('type', '!=', 'other')]}"
attrs="{'invisible': [('type', '!=', 'pmo')]}" options="{'no_create': True}"
/> />
<!-- Facture elocoop -->
<field <field
name="buyer_id" name="buyer_id"
domain="partner_id_domain_buyer" domain="partner_id_domain_buyer"
string="Consommateur" string="Client"
attrs="{'invisible': [('type', 'not in', ('facture', 'vente_achat'))]}" attrs="{'invisible': [('type', 'not in', ('facture_elocoop'))]}"
options="{'no_create': True}"
/> />
<!-- Accord -->
<field <field
name="buyer_id" name="buyer_id"
domain="partner_id_domain_buyer" domain="partner_id_domain_buyer"
string="Participant" string="Participant"
attrs="{'invisible': [('type', '!=', 'part_enedis')]}" attrs="{'invisible': [('type', '!=', 'part_enedis')]}"
options="{'no_create': True}"
/>
<!-- Adhésion -->
<field
name="buyer_id"
domain="partner_id_domain_buyer"
string="Adhérent"
attrs="{'invisible': [('type', '!=', 'pmo')]}"
options="{'no_create': True}"
/>
<!-- Contrat de vente, Facture importée -->
<field
name="buyer_id"
domain="partner_id_domain_buyer"
string="Consommateur"
attrs="{'invisible': [('type', 'not in', ('facture', 'vente_achat'))]}"
options="{'no_create': True}"
/> />
<field name="partner_id_domain" invisible="1" />
<field name="partner_id_domain_seller" invisible="1" /> <field name="partner_id_domain_seller" invisible="1" />
<field name="partner_id_domain_buyer" invisible="1" /> <field name="partner_id_domain_buyer" invisible="1" />
</group> </group>
...@@ -83,8 +175,9 @@ ...@@ -83,8 +175,9 @@
</field> </field>
</record> </record>
<record id="acc_contract_tree_view" model="ir.ui.view"> <!-- version globale multi-operation -->
<field name="name">acc.acc_contract.tree</field> <record id="global_acc_contract_tree_view" model="ir.ui.view">
<field name="name">acc.global.contract.tree</field>
<field name="model">acc.contract</field> <field name="model">acc.contract</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree> <tree>
...@@ -93,8 +186,25 @@ ...@@ -93,8 +186,25 @@
<field name="acc_operation_id" /> <field name="acc_operation_id" />
<field name="seller_id" domain="partner_id_domain" /> <field name="seller_id" domain="partner_id_domain" />
<field name="buyer_id" domain="partner_id_domain" /> <field name="buyer_id" domain="partner_id_domain" />
<field name="type" />
<field name="partner_id_domain" invisible="1" /> <field name="partner_id_domain" invisible="1" />
</tree>
</field>
</record>
<!-- version utilisée dans le formulaire d'une operation -->
<record id="operation_acc_contract_tree_view" model="ir.ui.view">
<field name="name">acc.operation.contract.tree</field>
<field name="model">acc.contract</field>
<field name="arch" type="xml">
<tree create="0">
<field name="date_app" />
<field name="name" />
<field name="acc_operation_id" invisible="1" />
<field name="seller_id" domain="partner_id_domain" />
<field name="buyer_id" domain="partner_id_domain" />
<field name="type" /> <field name="type" />
<field name="partner_id_domain" invisible="1" />
</tree> </tree>
</field> </field>
</record> </record>
...@@ -104,6 +214,7 @@ ...@@ -104,6 +214,7 @@
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">acc.contract</field> <field name="res_model">acc.contract</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
<field name="view_id" ref="global_acc_contract_tree_view" />
<field name="help" type="html"> <field name="help" type="html">
<p class="oe_view_nocontent_create"> <p class="oe_view_nocontent_create">
Créer un nouveau document Créer un nouveau document
......
views/acc_operation_views.xml
+ 4
− 78
Voir le fichier @ 86fc0df5
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<button <button
string="Ajouter un document" string="Ajouter un document"
type="object" type="object"
class="btn-primary" class="btn btn-primary mb-2"
name="create_document" name="create_document"
/> />
</div> </div>
...@@ -24,84 +24,10 @@ ...@@ -24,84 +24,10 @@
<field <field
name="acc_contract_ids" name="acc_contract_ids"
widget="one2many" widget="one2many"
context="{'default_acc_operation_id': active_id}" context="{'default_acc_operation_id': active_id,
'tree_view_ref': 'oacc_document.operation_acc_contract_tree_view',
'form_view_ref': 'oacc_document.operation_acc_contract_form_view'}"
> >
<tree create="0" editable="bottom">
<field name="name" />
<field name="acc_operation_id" invisible="1" />
<field name="seller_id" domain="partner_id_domain" />
<field name="buyer_id" domain="partner_id_domain" />
<field name="type" />
<field name="partner_id_domain" invisible="1" />
</tree>
<form string="Documents">
<sheet>
<group>
<group>
<field name="acc_operation_id" invisible="1" />
<field name="type" />
<field name="date_app" />
</group>
<group>
<field
name="seller_id"
domain="partner_id_domain"
attrs="{'invisible': [('type', '!=', 'other')]}"
/>
<field
name="seller_id"
domain="partner_id_domain"
string="PMO"
attrs="{'invisible': [('type', 'not in', ('convention', 'pmo', 'part_enedis'))]}"
/>
<field
name="seller_id"
domain="partner_id_domain"
string="Producteur"
attrs="{'invisible': [('type', 'not in', ('facture', 'vente_achat'))]}"
/>
<field
name="buyer_id"
domain="partner_id_domain"
string="Client"
attrs="{'invisible': [('type', 'not in', ('facture_elocoop'))]}"
/>
<field
name="buyer_id"
domain="partner_id_domain"
attrs="{'invisible': [('type', '!=', 'other')]}"
/>
<field
name="buyer_id"
domain="partner_id_domain"
string="Participant"
attrs="{'invisible': [('type', '!=', 'part_enedis')]}"
/>
<field
name="buyer_id"
domain="partner_id_domain"
string="Adhérent"
attrs="{'invisible': [('type', '!=', 'pmo')]}"
/>
<field
name="buyer_id"
domain="partner_id_domain"
string="Consommateur"
attrs="{'invisible': [('type', 'not in', ('facture', 'vente_achat'))]}"
/>
<field name="partner_id_domain" invisible="1" />
</group>
</group>
<group>
<field name="name" invisible="1" />
<field
widget="binary"
name="document"
filename="name"
/>
</group>
</sheet>
</form>
</field> </field>
</page> </page>
</page> </page>
......
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter