mirror of
https://bitbucket.org/presik/trytonpsk-sale_pos.git
synced 2023-12-14 07:13:02 +01:00
Remove payments and wizard pay
This commit is contained in:
parent
96336a235b
commit
2213ced1b0
7 changed files with 2042 additions and 39 deletions
|
@ -24,7 +24,6 @@ def register():
|
||||||
statement.Statement,
|
statement.Statement,
|
||||||
statement.StatementLine,
|
statement.StatementLine,
|
||||||
product.Product,
|
product.Product,
|
||||||
sale.SalePaymentForm,
|
|
||||||
shop.SaleShop,
|
shop.SaleShop,
|
||||||
shop.ShopDailySummaryStart,
|
shop.ShopDailySummaryStart,
|
||||||
sale.SaleUpdateDateStart,
|
sale.SaleUpdateDateStart,
|
||||||
|
@ -59,7 +58,6 @@ def register():
|
||||||
sale.SaleUpdateDate,
|
sale.SaleUpdateDate,
|
||||||
sale.SalesCosts,
|
sale.SalesCosts,
|
||||||
shop.ShopDailySummary,
|
shop.ShopDailySummary,
|
||||||
sale.WizardSalePayment,
|
|
||||||
sale.SaleIncomeDaily,
|
sale.SaleIncomeDaily,
|
||||||
sale.SaleByKind,
|
sale.SaleByKind,
|
||||||
sale.DeleteSalesDraft,
|
sale.DeleteSalesDraft,
|
||||||
|
|
|
@ -30,9 +30,6 @@ this repository contains the full copyright notices and license terms. -->
|
||||||
<record model="ir.message" id="msg_not_draft_statement">
|
<record model="ir.message" id="msg_not_draft_statement">
|
||||||
<field name="text">There is not statement journal for "%(journal)s" opened</field>
|
<field name="text">There is not statement journal for "%(journal)s" opened</field>
|
||||||
</record>
|
</record>
|
||||||
<record model="ir.message" id="msg_party_without_account_receivable">
|
|
||||||
<field name="text">Party "%(s)s" has no any account receivable defined. Please, assign one. </field>
|
|
||||||
</record>
|
|
||||||
<record model="ir.message" id="msg_cant_delete_statement">
|
<record model="ir.message" id="msg_cant_delete_statement">
|
||||||
<field name="text">This statement "%(s)s" cannot be deleted because it has payments</field>
|
<field name="text">This statement "%(s)s" cannot be deleted because it has payments</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
2039
sale-new.py
Normal file
2039
sale-new.py
Normal file
File diff suppressed because it is too large
Load diff
10
sale.xml
10
sale.xml
|
@ -3,16 +3,6 @@
|
||||||
<tryton>
|
<tryton>
|
||||||
<data>
|
<data>
|
||||||
|
|
||||||
<record model="ir.action.wizard" id="wizard_sale_payment">
|
|
||||||
<field name="name">Pay</field>
|
|
||||||
<field name="wiz_name">sale.payment</field>
|
|
||||||
</record>
|
|
||||||
<record model="ir.ui.view" id="sale_payment_view_form">
|
|
||||||
<field name="model">sale.payment.form</field>
|
|
||||||
<field name="type">form</field>
|
|
||||||
<field name="name">sale_payment_form</field>
|
|
||||||
</record>
|
|
||||||
|
|
||||||
<record model="ir.action.wizard" id="act_sale_force_draft">
|
<record model="ir.action.wizard" id="act_sale_force_draft">
|
||||||
<field name="name">Sale Force Draft</field>
|
<field name="name">Sale Force Draft</field>
|
||||||
<field name="wiz_name">sale_pos.force_draft</field>
|
<field name="wiz_name">sale_pos.force_draft</field>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
[tryton]
|
[tryton]
|
||||||
version=6.0.5
|
version=6.0.6
|
||||||
depends:
|
depends:
|
||||||
account
|
account
|
||||||
account_statement
|
account_statement
|
||||||
|
|
|
@ -11,12 +11,10 @@ copyright notices and license terms. -->
|
||||||
<xpath
|
<xpath
|
||||||
expr="/form/group[@id='buttons']/button[@name='process']"
|
expr="/form/group[@id='buttons']/button[@name='process']"
|
||||||
position="after">
|
position="after">
|
||||||
<button name="wizard_sale_payment" string="Pay"
|
|
||||||
icon="tryton-forward"/>
|
|
||||||
<button name="wizard_generate_invoice" string="Generate Invoice"
|
<button name="wizard_generate_invoice" string="Generate Invoice"
|
||||||
icon="tryton-forward"/>
|
icon="tryton-forward"/>
|
||||||
</xpath>
|
</xpath>
|
||||||
<xpath
|
<!-- <xpath
|
||||||
expr="/form/notebook/page[@id='other']"
|
expr="/form/notebook/page[@id='other']"
|
||||||
position="after">
|
position="after">
|
||||||
<page string="Payments" col="4" id="payments">
|
<page string="Payments" col="4" id="payments">
|
||||||
|
@ -26,7 +24,7 @@ copyright notices and license terms. -->
|
||||||
<label name="residual_amount"/>
|
<label name="residual_amount"/>
|
||||||
<field name="residual_amount"/>
|
<field name="residual_amount"/>
|
||||||
</page>
|
</page>
|
||||||
</xpath>
|
</xpath> -->
|
||||||
<xpath
|
<xpath
|
||||||
expr="/form/notebook/page[@id='vouchers']/field[@name='vouchers']"
|
expr="/form/notebook/page[@id='vouchers']/field[@name='vouchers']"
|
||||||
position="after">
|
position="after">
|
||||||
|
|
|
@ -1,19 +0,0 @@
|
||||||
<?xml version="1.0"?>
|
|
||||||
<!-- This file is part of the sale_payment module for Tryton.
|
|
||||||
The COPYRIGHT file at the top level of this repository contains the full
|
|
||||||
copyright notices and license terms. -->
|
|
||||||
<form>
|
|
||||||
<label name="journal"/>
|
|
||||||
<field name="journal" widget="selection"/>
|
|
||||||
<label name="payment_amount"/>
|
|
||||||
<field name="payment_amount"/>
|
|
||||||
<!-- <label name="party"/>
|
|
||||||
<field name="party"/> -->
|
|
||||||
<label name="voucher"/>
|
|
||||||
<field name="voucher"/>
|
|
||||||
<!-- <label name="self_pick_up"/>
|
|
||||||
<field name="self_pick_up"/> -->
|
|
||||||
<label name="do_invoice"/>
|
|
||||||
<field name="do_invoice"/>
|
|
||||||
<field name="require_voucher" invisible="1"/>
|
|
||||||
</form>
|
|
Loading…
Reference in a new issue