Sultan
/
invoice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Expense changes

This commit is contained in:
Hillel Coren 2021-01-11 22:39:49 +02:00
parent bb52ef51be
commit 03e357d76b
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/data/models/expense_model.dart
View File

@ -124,6 +124,7 @@ abstract class ExpenseEntity extends Object
taxAmount2: 0, taxAmount2: 0,
taxAmount3: 0, taxAmount3: 0,
usesInclusiveTaxes: company?.expenseInclusiveTaxes ?? false, usesInclusiveTaxes: company?.expenseInclusiveTaxes ?? false,
calculateTaxByAmount: company?.calculateExpenseTaxByAmount ?? false,
clientId: client?.id, clientId: client?.id,
vendorId: vendor?.id, vendorId: vendor?.id,
invoiceId: '', invoiceId: '',
@ -554,7 +555,7 @@ abstract class ExpenseEntity extends Object
double get taxAmount { double get taxAmount {
var total = 0.0; var total = 0.0;
if (taxAmount1 != 0 || taxAmount2 != 0 || taxAmount3 != 0) { if (calculateTaxByAmount == true) {
total += taxAmount1 + taxAmount2 + taxAmount3; total += taxAmount1 + taxAmount2 + taxAmount3;
} else { } else {
if (usesInclusiveTaxes) { if (usesInclusiveTaxes) {

6
lib/ui/expense/edit/expense_edit_details.dart
View File

@ -198,7 +198,7 @@ class ExpenseEditDetailsState extends State<ExpenseEditDetails> {
), ),
if (!expense.usesInclusiveTaxes) amountField, if (!expense.usesInclusiveTaxes) amountField,
if (company.enableFirstItemTaxRate) if (company.enableFirstItemTaxRate)
if (company.calculateExpenseTaxByAmount) if (expense.calculateTaxByAmount == true)
TaxRateField( TaxRateField(
initialTaxAmount: expense.taxAmount1, initialTaxAmount: expense.taxAmount1,
initialTaxName: expense.taxName1, initialTaxName: expense.taxName1,
@ -218,7 +218,7 @@ class ExpenseEditDetailsState extends State<ExpenseEditDetails> {
initialTaxRate: expense.taxRate1, initialTaxRate: expense.taxRate1,
), ),
if (company.enableSecondItemTaxRate) if (company.enableSecondItemTaxRate)
if (company.calculateExpenseTaxByAmount) if (expense.calculateTaxByAmount == true)
TaxRateField( TaxRateField(
initialTaxAmount: expense.taxAmount2, initialTaxAmount: expense.taxAmount2,
initialTaxName: expense.taxName2, initialTaxName: expense.taxName2,
@ -238,7 +238,7 @@ class ExpenseEditDetailsState extends State<ExpenseEditDetails> {
initialTaxRate: expense.taxRate3, initialTaxRate: expense.taxRate3,
), ),
if (company.enableThirdItemTaxRate) if (company.enableThirdItemTaxRate)
if (company.calculateExpenseTaxByAmount) if (expense.calculateTaxByAmount == true)
TaxRateField( TaxRateField(
initialTaxAmount: expense.taxAmount1, initialTaxAmount: expense.taxAmount1,
initialTaxName: expense.taxName1, initialTaxName: expense.taxName1,

8
lib/ui/expense/edit/expense_edit_settings.dart
View File

@ -240,16 +240,14 @@ class ExpenseEditSettingsState extends State<ExpenseEditSettings> {
if (company.numberOfItemTaxRates > 0) if (company.numberOfItemTaxRates > 0)
FormCard( FormCard(
children: [ children: [
/*
BoolDropdownButton( BoolDropdownButton(
label: localization.enterTaxes, label: localization.enterTaxes,
enabledLabel: localization.byAmount, enabledLabel: localization.byAmount,
disabledLabel: localization.byRate, disabledLabel: localization.byRate,
value: false, value: expense.calculateTaxByAmount ?? false,
onChanged: (value) => viewModel.onChanged(expense onChanged: (value) => viewModel.onChanged(
.rebuild((b) => b..calculateExpenseTaxByAmount = value)), expense.rebuild((b) => b..calculateTaxByAmount = value)),
), ),
*/
SizedBox(height: 16), SizedBox(height: 16),
SwitchListTile( SwitchListTile(
activeColor: Theme.of(context).accentColor, activeColor: Theme.of(context).accentColor,