Yaltik
/
golem
1
0
Fork 2
Code Issues Pull Requests 4 Releases Activity

[IMP]GOLEM Activity Registration Payment : better invoicing form organization

This commit is contained in:
Fabien BOURGEOIS 2018-08-04 08:00:42 +02:00
parent f1aa568e78
commit 8b40f33a9d
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
golem_activity_registration_payment/__manifest__.py
View File

@ -19,7 +19,7 @@
'name': 'GOLEM Activity Member Registration Payments', 'name': 'GOLEM Activity Member Registration Payments',
'summary': 'GOLEM Activities Member Registration Payments', 'summary': 'GOLEM Activities Member Registration Payments',
'description': 'GOLEM Activities Member Registration Payments', 'description': 'GOLEM Activities Member Registration Payments',
'version': '10.0.0.3.2', 'version': '10.0.0.3.3',
'category': 'GOLEM', 'category': 'GOLEM',
'author': 'Fabien Bourgeois', 'author': 'Fabien Bourgeois',
'license': 'AGPL-3', 'license': 'AGPL-3',

38
golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.xml
View File

@ -31,28 +31,34 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
Please confirm activity prices and choose a payment schedule if needed. Please confirm activity prices and choose a payment schedule if needed.
</p> </p>
<group states="init"> <group states="init">
<field name="season_id" readonly="1" /> <group name="lines" colspan="2">
<field name="member_id" readonly="1" /> <field name="season_id" readonly="1" />
<field name="line_ids" string="Activities and Prices"> <field name="member_id" readonly="1" />
<tree delete="false" create="false" edit="true" editable="bottom"> <field name="line_ids" string="Activities and Prices">
<field name="activity_id" readonly="1" /> <tree delete="false" create="false" edit="true" editable="bottom">
<field name="currency_id" invisible="1" /> <field name="activity_id" readonly="1" />
<field name="price" sum="Total" /> <field name="currency_id" invisible="1" />
</tree> <field name="price" sum="Total" />
</field> </tree>
<field name="schedule_id" context="{'default_season_id': season_id}" /> </field>
<field name="journal_id" string="Payment method" </group>
options="{'no_create': True}" <group name="payment" colspan="2">
attrs="{'invisible': [('schedule_id', '=', False)], <field name="schedule_id" context="{'default_season_id': season_id}" />
'required': [('schedule_id', '!=', False)]}" /> <field name="journal_id" string="Payment method"
options="{'no_create': True}"
attrs="{'invisible': [('schedule_id', '=', False)],
'required': [('schedule_id', '!=', False)]}" />
</group>
</group> </group>
<p states="init">If the service user wants to pay with several payment methods, please validate with the main one, go to the payments and change journal on those needed.</p> <p states="init">If the service user wants to pay with several payment methods, please validate with the main one, go to the payments and change journal on those needed.</p>
<p states="final"> <p states="final">
Congratulations, activities had been confirmed and invoiced. Congratulations, activities had been confirmed and invoiced.
</p> </p>
<group states="final"> <group states="final">
<field name="invoice_id" readonly="1" /> <group>
<field name="payment_ids" readonly="1" /> <field name="invoice_id" readonly="1" />
<field name="payment_ids" readonly="1" />
</group>
</group> </group>
<footer> <footer>
<button name="validate" string="Validate" type="object" <button name="validate" string="Validate" type="object"