Ganga Manoj
28bdd6d2e3
Merge branch 'develop' into fix-depr-after-sale
2021-09-27 22:18:04 +05:30
GangaManoj
40ec2d622b
fix: Add tests for depreciation
2021-09-27 22:14:42 +05:30
GangaManoj
fdd9e6cc3c
fix: Replace asset.schedules with asset.get('schedules')
2021-09-27 22:14:16 +05:30
Deepesh Garg
cc5dd5c67d
feat: TDS deduction using journal entry and other fixes ( #27451 )
...
* fix: TDS deduction using journal entry
* fix: Multi category application against single supplier
* refactor: TDS payable monthly report
* fix: Server side handling for default tax withholding category
* fix: Supplier filter for Journal Entry
* refactor: TDS computation summary report
2021-09-27 21:43:20 +05:30
marination
596cf3951d
fix: Batch scans get overwritten on the same row
2021-09-27 15:06:46 +05:30
Saqib
b68ac24cd5
chore: add shipping address in eway bill test ( #27662 )
2021-09-27 15:03:58 +05:30
Saqib
f2fca59ba7
fix: cannot set custom label for 'total' field in print format ( #27664 )
2021-09-27 14:28:16 +05:30
Shariq Ansari
18918e1b4f
chore: linter fix
2021-09-27 14:08:44 +05:30
Saqib Ansari
a7df4227da
fix: trim sales invoice custom field lengths
2021-09-27 13:56:16 +05:30
Shariq Ansari
0de735f20b
fix: Fixed alignment of Title, Subtitle, Action Button
2021-09-27 13:50:19 +05:30
Saqib
9fa24ffccc
Merge pull request #27659 from nextchamp-saqib/fix-32644
...
fix: setting of gain/loss if party account is in company currency
2021-09-27 13:05:19 +05:30
Subin Tom
54754f4eb8
fix: updated patch, add fields only if fields are checked
2021-09-27 12:51:54 +05:30
Saqib
711395db22
fix: linting errors
2021-09-27 12:26:18 +05:30
Saqib
1f8ad72418
fix: indentation
2021-09-27 12:21:06 +05:30
Saqib
30f59b09fd
chore: log modified invoices
2021-09-27 12:20:16 +05:30
ChillarAnand
765a9bb731
refactor: Remove sales invoice custom js related to healthcare
2021-09-27 07:34:54 +05:30
Saqib Ansari
18e5d59d24
fix: unknown column 'ref_exchange_rate'
2021-09-26 20:26:45 +05:30
Dany Robert
5ce6a4c107
fix: tax rate being overridden in case of 0.00
...
Tax rate could be different for different expenses.
Therefore, rate is kept as 0.00 and tax amount entered manually.
But fetching used to override the rate(upon saving) and mess up the amount.
2021-09-26 18:31:27 +05:30
Saqib
e8ff649298
Merge branch 'develop' into fix-32644
2021-09-26 17:07:46 +05:30
Saqib Ansari
e6b4d33f4b
chore: hide exchange gain loss if empty
2021-09-26 17:07:13 +05:30
Saqib Ansari
beebfb323a
patch: invalid gain loss gl entry
2021-09-26 16:58:55 +05:30
Saqib
f8c1c73953
fix: local variable 'fiscal_year_details' referenced before assignment ( #27656 )
2021-09-26 16:27:56 +05:30
Saqib Ansari
78ad50efc2
fix: cost center in exchange gain loss gl entry
2021-09-26 16:08:15 +05:30
Saqib Ansari
dd2d039ca8
chore: hide exchange gain loss if empty
2021-09-26 15:51:03 +05:30
Saqib Ansari
64efe8bf15
fix: setting of gain/loss if party account is in company currency
2021-09-26 15:46:13 +05:30
escix
dafe99b6e2
fix: holiday message reminder
...
Minor grammatical change
2021-09-26 11:09:13 +05:30
GangaManoj
796ed947ce
fix: Reverse depreciation entry made on sale if asset that was set to be sold in the future gets returned
2021-09-25 19:11:29 +05:30
GangaManoj
b9fb59da58
fix: Reset depreciation schedule on returning asset
2021-09-25 19:04:16 +05:30
Sagar Vora
c8b9a55e96
feat: add Partly Paid status in Invoices ( #27625 )
2021-09-22 12:11:35 +05:30
Frappe PR Bot
2af6ea68ae
fix: remove unknown field employee_name from query (bp #27634 )
...
* fix: remove unknown field employee_name from query
* fix: remove unknown fieldname
Co-authored-by: root <root@vultr.guest>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
(cherry picked from commit 9ebabb86b3d28e2c94eb2761f1864c88b6eb1e59)
Co-authored-by: Bhavesh Maheshwari <34086262+bhavesh95863@users.noreply.github.com>
2021-09-21 20:33:09 +05:30
Ankush Menat
c302c7ab42
fix: remove bad default for anniversary reminders ( #27632 )
...
🤦
2021-09-21 17:51:46 +05:30
Marica
9110223341
fix: (ux) Use subassembly schedule date while making WO from Prod Plan ( #27628 )
...
- Set subassemply WO's planned start date from Production Plan
2021-09-21 16:50:14 +05:30
Kenneth Sequeira
abded895f3
fix: update default KSA VAT rate for setup ( #27614 )
2021-09-21 10:58:18 +05:30
François de Ryckel
5c400da4e2
Update training_result.js ( #27615 )
...
cur_frm is deprecated
2021-09-21 09:29:15 +05:30
GangaManoj
7ab3b9dd5a
fix: Add test for depreciation on sale of a depreciated Asset
2021-09-21 07:11:40 +05:30
GangaManoj
249672c35d
fix: Add depreciation_schedule details in create_asset()
2021-09-21 07:11:40 +05:30
GangaManoj
700e78d69b
fix: Remove extra brackets
2021-09-21 07:11:40 +05:30
Ganga Manoj
eb8122baba
Merge branch 'develop' into fix-depr-after-sale
2021-09-21 06:29:41 +05:30
GangaManoj
3c8879e777
fix: Calculate depreciation_amount accurately
2021-09-21 06:07:06 +05:30
GangaManoj
244d9dee04
fix: Correct expected_values
2021-09-21 06:06:21 +05:30
Abdullah A. Zaqout
6d8e869a92
fix(pos): check if item exists before fetching available qty ( #27581 )
2021-09-20 21:35:37 +05:30
Anuja Pawar
190c2d84da
fix: reference row added in allocation table ( #27602 )
2021-09-20 21:32:38 +05:30
GangaManoj
e77534fe13
fix: Unlink PO on cancelling SO
2021-09-20 21:18:18 +05:30
Ganga Manoj
41678faeee
Merge branch 'develop' into unlink-po-on-cancelling-so
2021-09-20 21:16:31 +05:30
Shariq Ansari
3e8e6ac4e2
fix: Creating unique hash for slider id instead of slider name
2021-09-20 20:52:08 +05:30
GangaManoj
8396f24e70
fix: Unlink PO on cancelling SO
2021-09-20 19:01:46 +05:30
Ankush Menat
4f01115f2f
Merge pull request #27601 from ankush/overbill_warn
...
fix(ux): warn when overbilling allowance was bypassed due to role
2021-09-20 17:42:29 +05:30
Ankush Menat
21a955d20b
fix(ux): better error message
...
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-09-20 17:14:35 +05:30
Ankush Menat
5e4fbba753
refactor: add guard clause in for loop
...
Reduce overly indented code/improve readability.
2021-09-20 16:40:51 +05:30
Ankush Menat
43bf82b58b
fix: warn when overbilling checks are skipped.
2021-09-20 16:31:20 +05:30
