pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] account: add payment terms to data

Browse Source 
- This commit moves the Payment Term "End of Following Month" from
  demo data to data and adds two new Payment Terms: "21 Days" and
  "30% Now, Balance 60 Days".
  It allows the customer to define less Payment Terms

task-2032586
This commit is contained in:
mcm-odoo
2019-08-29 11:49:17 +00:00
parent 0e9a60a090
commit d4710d92dd
7 changed files with 40 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/data/account_data.xml
+22 -3
View File
@@ -51,9 +51,15 @@
<field name="digits">6</field>
</record>
<record id="account_payment_term_net" model="account.payment.term">
<field name="name">30 Net Days</field>
<field name="note">Payment terms: 30 Net Days</field>
<record id="account_payment_term_21days" model="account.payment.term">
<field name="name">21 Days</field>
<field name="note">Payment terms: 21 Days</field>
<field name="line_ids" eval="[(5, 0), (0, 0, {'value': 'balance', 'value_amount': 0.0, 'sequence': 500, 'days': 21, 'option': 'day_after_invoice_date'})]"/>
</record>
<record id="account_payment_term_30days" model="account.payment.term">
<field name="name">30 Days</field>
<field name="note">Payment terms: 30 Days</field>
<field name="line_ids" eval="[(5, 0), (0, 0, {'value': 'balance', 'value_amount': 0.0, 'sequence': 500, 'days': 30, 'option': 'day_after_invoice_date'})]"/>
</record>
@@ -69,6 +75,19 @@
<field name="line_ids" eval="[(5, 0), (0, 0, {'value': 'balance', 'value_amount': 0.0, 'sequence': 500, 'days': 60, 'option': 'day_after_invoice_date'})]"/>
</record>
<record id="account_payment_term_end_following_month" model="account.payment.term">
<field name="name">End of Following Month</field>
<field name="note">Payment terms: End of Following Month</field>
<field name="line_ids" eval="[(5, 0), (0, 0, {'value': 'balance', 'value_amount': 0.0, 'sequence': 500, 'days': 31, 'option': 'day_following_month'})]"/>
</record>
<record id="account_payment_term_advance_60days" model="account.payment.term">
<field name="name">30% Now, Balance 60 Days</field>
<field name="note">Payment terms: 30% Now, Balance 60 Days</field>
<field name="line_ids" eval="[(5, 0), (0, 0, {'value': 'percent', 'value_amount': 30.0, 'sequence': 400, 'days': 0, 'option': 'day_after_invoice_date'}),
(0, 0, {'value': 'balance', 'value_amount': 0.0, 'sequence': 500, 'days': 60, 'option': 'day_after_invoice_date'})]"/>
</record>
<!--
Account Statement Sequences
-->
addons/account/demo/account_demo.xml
+5 -11
View File
@@ -21,12 +21,6 @@
</record>
<!-- Payment Terms -->
<record id="account_payment_term" model="account.payment.term">
<field name="name">End of Following Month</field>
<field name="note">Payment terms: End of Following Month</field>
<field name="line_ids" eval="[(5, 0), (0, 0, {'value': 'balance', 'value_amount': 0.0, 'sequence': 500, 'days': 31, 'option': 'day_following_month'})]"/>
</record>
<record id="account_payment_term_advance" model="account.payment.term">
<field name="name">30% Advance End of Following Month</field>
<field name="note">Payment terms: 30% Advance End of Following Month</field>
@@ -40,17 +34,17 @@
<!-- Add Payment terms on some demo partners -->
<record id="base.res_partner_2" model="res.partner">
<field name="property_payment_term_id" ref="account.account_payment_term_net"/>
<field name="property_payment_term_id" ref="account.account_payment_term_30days"/>
</record>
<record id="base.res_partner_12" model="res.partner">
<field name="property_payment_term_id" ref="account_payment_term"/>
<field name="property_supplier_payment_term_id" ref="account_payment_term"/>
<field name="property_payment_term_id" ref="account.account_payment_term_end_following_month"/>
<field name="property_supplier_payment_term_id" ref="account.account_payment_term_end_following_month"/>
</record>
<record id="base.res_partner_4" model="res.partner">
<field name="property_supplier_payment_term_id" ref="account.account_payment_term_net"/>
<field name="property_supplier_payment_term_id" ref="account.account_payment_term_30days"/>
</record>
<record id="base.res_partner_1" model="res.partner">
<field name="property_supplier_payment_term_id" ref="account_payment_term"/>
<field name="property_supplier_payment_term_id" ref="account.account_payment_term_end_following_month"/>
</record>
</data>
</odoo>
addons/event_sale/tests/test_event_sale.py
+1 -1
View File
@@ -38,7 +38,7 @@ class EventSaleTest(common.TransactionCase):
self.sale_order = self.env['sale.order'].create({
'partner_id': self.env.ref('base.res_partner_2').id,
'note': 'Invoice after delivery',
'payment_term_id': self.env.ref('account.account_payment_term').id
'payment_term_id': self.env.ref('account.account_payment_term_end_following_month').id
})
# In the sales order I add some sales order lines. i choose event product
addons/l10n_generic_coa/data/account_invoice_demo.xml
+2 -2
View File
@@ -6,7 +6,7 @@
<field name="type">out_invoice</field>
<field name="partner_id" ref="base.res_partner_12"/>
<field name="invoice_user_id" ref="base.user_demo"/>
<field name="invoice_payment_term_id" ref="account.account_payment_term"/>
<field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
<field name="invoice_date" eval="time.strftime('%Y-%m')+'-01'"/>
<field name="invoice_line_ids" eval="[
(0, 0, {'product_id': ref('product.consu_delivery_02'), 'price_unit': 642.0, 'quantity': 5}),
@@ -54,7 +54,7 @@
<field name="type">in_invoice</field>
<field name="partner_id" ref="base.res_partner_12"/>
<field name="invoice_user_id" ref="base.user_demo"/>
<field name="invoice_payment_term_id" ref="account.account_payment_term"/>
<field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
<field name="invoice_date" eval="time.strftime('%Y-%m')+'-01'"/>
<field name="invoice_line_ids" eval="[
(0, 0, {'product_id': ref('product.product_delivery_01'), 'price_unit': 10.0, 'quantity': 1}),
addons/l10n_in/data/account_invoice_demo.xml
+8 -8
View File
@@ -7,7 +7,7 @@
<field name="partner_id" ref="l10n_in.res_partner_registered_customer"/>
<field name="l10n_in_reseller_partner_id" ref="l10n_in.res_partner_reseller"/>
<field name="invoice_user_id" ref="base.user_demo"/>
<field name="invoice_payment_term_id" ref="account.account_payment_term"/>
<field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
<field name="invoice_date" eval="time.strftime('%Y-%m')+'-01'"/>
<field name="invoice_line_ids" model="account.move.line" eval="[
(0, 0, {
@@ -51,7 +51,7 @@
<field name="type">out_invoice</field>
<field name="partner_id" ref="l10n_in.res_partner_unregistered_customer"/>
<field name="invoice_user_id" ref="base.user_demo"/>
<field name="invoice_payment_term_id" ref="account.account_payment_term"/>
<field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
<field name="invoice_date" eval="time.strftime('%Y-%m')+'-01'"/>
<field name="invoice_line_ids" model="account.move.line" eval="[
(0, 0, {
@@ -98,7 +98,7 @@
<field name="type">out_invoice</field>
<field name="partner_id" ref="l10n_in.res_partner_unregistered_customer_out_state"/>
<field name="invoice_user_id" ref="base.user_demo"/>
<field name="invoice_payment_term_id" ref="account.account_payment_term"/>
<field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
<field name="invoice_date" eval="time.strftime('%Y-%m')+'-01'"/>
<field name="invoice_line_ids" model="account.move.line" eval="[
(0, 0, {
@@ -118,7 +118,7 @@
<field name="type">out_invoice</field>
<field name="partner_id" ref="base.res_partner_3"/>
<field name="invoice_user_id" ref="base.user_demo"/>
<field name="invoice_payment_term_id" ref="account.account_payment_term"/>
<field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
<field name="invoice_date" eval="time.strftime('%Y-%m')+'-01'"/>
<field name="l10n_in_export_type">export_with_igst</field>
<field name="journal_id" model="account.journal"
@@ -148,7 +148,7 @@
<field name="type">out_invoice</field>
<field name="partner_id" ref="l10n_in.res_partner_registered_customer"/>
<field name="invoice_user_id" ref="base.user_demo"/>
<field name="invoice_payment_term_id" ref="account.account_payment_term"/>
<field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
<field name="invoice_date" eval="time.strftime('%Y-%m')+'-01'"/>
<field name="invoice_line_ids" model="account.move.line" eval="[
(0, 0, {
@@ -176,7 +176,7 @@
<field name="partner_id" ref="l10n_in.res_partner_registered_customer"/>
<field name="l10n_in_reseller_partner_id" ref="l10n_in.res_partner_reseller"/>
<field name="invoice_user_id" ref="base.user_demo"/>
<field name="invoice_payment_term_id" ref="account.account_payment_term"/>
<field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
<field name="invoice_date" eval="time.strftime('%Y-%m')+'-02'"/>
<field name="reversed_entry_id" ref="l10n_in.demo_invoice_b2b"/>
<field name="invoice_line_ids" model="account.move.line" eval="[
@@ -221,7 +221,7 @@
<field name="type">out_refund</field>
<field name="partner_id" ref="l10n_in.res_partner_unregistered_customer"/>
<field name="invoice_user_id" ref="base.user_demo"/>
<field name="invoice_payment_term_id" ref="account.account_payment_term"/>
<field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
<field name="invoice_date" eval="time.strftime('%Y-%m')+'-02'"/>
<field name="reversed_entry_id" ref="l10n_in.demo_invoice_b2cl"/>
<field name="invoice_line_ids" model="account.move.line" eval="[
@@ -243,7 +243,7 @@
<field name="type">out_invoice</field>
<field name="partner_id" ref="l10n_in.res_partner_registered_customer"/>
<field name="invoice_user_id" ref="base.user_demo"/>
<field name="invoice_payment_term_id" ref="account.account_payment_term"/>
<field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
<field name="invoice_date" eval="(datetime.now() + relativedelta(months=1)).strftime('%Y-%m-01')"/>
<field name="invoice_line_ids" model="account.move.line" eval="[
(0, 0, {
addons/stock_dropshipping/tests/test_dropship.py
+1 -1
View File
@@ -88,7 +88,7 @@ class TestDropship(common.TransactionCase):
# Create a sales order with a line of 200 PCE incoming shipment, with route_id drop shipping
so_form = Form(self.env['sale.order'])
so_form.partner_id = self.env.ref('base.res_partner_2')
so_form.payment_term_id = self.env.ref('account.account_payment_term')
so_form.payment_term_id = self.env.ref('account.account_payment_term_end_following_month')
with mute_logger('odoo.tests.common.onchange'):
# otherwise complains that there's not enough inventory and
# apparently that's normal according to @jco and @sle
addons/stock_dropshipping/tests/test_procurement_exception.py
+1 -1
View File
@@ -24,7 +24,7 @@ class TestProcurementException(common.TransactionCase):
so_form.partner_id = self.env.ref('base.res_partner_2')
so_form.partner_invoice_id = self.env.ref('base.res_partner_address_3')
so_form.partner_shipping_id = self.env.ref('base.res_partner_address_3')
so_form.payment_term_id = self.env.ref('account.account_payment_term')
so_form.payment_term_id = self.env.ref('account.account_payment_term_end_following_month')
with so_form.order_line.new() as line:
line.product_id = product_with_no_seller
line.product_uom_qty = 3