Ankush Menat
6942900555
refactor: use defaultdict and enumeration
2021-10-27 11:10:52 +05:30
Diksha Jadhav
f2d136e574
feat(pick list): group items based on item code and warehouse before printing picklist
2021-10-27 11:10:52 +05:30
Ankush Menat
6ec047cba9
fix(ux): overbiling message in SO->SI, PO->PI ( #28088 )
2021-10-27 10:30:05 +05:30
GangaManoj
06c505ddc2
fix: Linters
2021-10-27 05:23:01 +05:30
GangaManoj
cde0dae987
fix: Add flag for reverse depreciation entries
2021-10-26 21:04:06 +05:30
Deepesh Garg
7ab7753bfa
Merge branch 'develop' of https://github.com/frappe/erpnext into lower_deduction_cetificate_fixes
2021-10-26 20:56:40 +05:30
GangaManoj
82bf5e5539
fix: Replace post_depreciation_entries() with make_depreciation_entry()
2021-10-26 20:53:47 +05:30
Deepesh Garg
a87c201785
Merge pull request #28054 from deepeshgarg007/tax_withholding_category_filters
...
fix(minor): Filters and validations in Tax Withholding Category
2021-10-26 20:51:24 +05:30
Deepesh Garg
0c28b477af
Merge pull request #28074 from deepeshgarg007/pan_field_hide_develop
...
fix: Move PAN field from standard doctype to fixtures for India
2021-10-26 20:44:11 +05:30
Deepesh Garg
6b22894275
Merge pull request #28052 from deepeshgarg007/company_address_update
...
fix: Auto update company address check on linking with company
2021-10-26 20:40:13 +05:30
Deepesh Garg
277dfeaf4e
Merge pull request #28057 from deepeshgarg007/company_change_fixes
...
fix: Update receivable/payable account on company change
2021-10-26 20:36:52 +05:30
Deepesh Garg
0136aedfdc
Merge pull request #28055 from deepeshgarg007/payment_entry_ux
...
fix(UX): Add mandatory depends on condition for reference no and date fields
2021-10-26 20:02:34 +05:30
Deepesh Garg
1165a8ac3a
Merge branch 'develop' into company_change_fixes
2021-10-26 19:52:45 +05:30
Deepesh Garg
89d5e494dd
fix: Reload customer and supplier doctype
2021-10-26 19:51:03 +05:30
Kenneth Sequeira
07a3be6f61
fix: remove VM from installation ( #28075 )
2021-10-25 20:10:52 +05:30
Deepesh Garg
9c1705205f
fix: Payment Terms validation precision
2021-10-25 20:06:24 +05:30
Ganga Manoj
0515b4b6f6
Merge branch 'develop' into fix-depr-after-sale
2021-10-25 19:11:19 +05:30
Anuja Pawar
59b5987030
Merge branch 'develop' into gst-category
2021-10-25 18:28:06 +05:30
Subin Tom
fc8307621c
fix: POS Closing Entry without linked invoices ( #28042 )
2021-10-25 13:18:08 +05:30
Deepesh Garg
cd4b20313e
fix: Test case fixes and linting issues
2021-10-25 11:21:55 +05:30
Anuja Pawar
a1213006a1
Merge branch 'develop' into gst-category
2021-10-25 10:50:03 +05:30
GangaManoj
9e7022830e
fix: Only add additional depreciation schedule row on sale if depreciation_amount > 0
2021-10-25 01:34:42 +05:30
Deepesh Garg
e3ae8d5a1e
fix: Move PAN field from standard doctype to fixtures for India
2021-10-24 17:24:25 +05:30
Noah Jacob
fdaf93f76c
refactor: shows opening balance from filtered from_date ( #26877 )
...
* refactor: shows opening balance from filtered from_date
* refactor: opening balance considered from filtered from_date in stock ledger
* fix: check if stock reco is opening and misc cleanups
2021-10-23 21:04:42 +05:30
Deepesh Garg
35fe065cf1
Merge pull request #28070 from frappe/mergify/bp/develop/pr-28014
...
fix: Error in TDS computation summary (backport #28014 )
2021-10-23 19:20:14 +05:30
Deepesh Garg
bf13d183d8
fix: Replace section code with tax withholding category in LDC
2021-10-23 19:00:03 +05:30
Deepesh Garg
e6e804e7d7
fix: Get LTDS based on tax withholding category
2021-10-23 18:58:41 +05:30
Deepesh Garg
7f2dde7d94
fix: Check for supplier name
...
(cherry picked from commit 944e3d467c5ab0a2a4a76a8b532e53bca77f8e61)
2021-10-23 07:47:18 +00:00
Deepesh Garg
881e091b85
fix: Check for other properties
...
(cherry picked from commit b7befe49dc83b938b74b7a63d31787734d7857f8)
2021-10-23 07:47:18 +00:00
Deepesh Garg
2ea4c95f86
fix: Error in TDS computation summary
...
(cherry picked from commit f12deae24b7ab164edd0868a1254bdf28bfeac09)
2021-10-23 07:47:18 +00:00
Anuja Pawar
21889945bf
Merge branch 'develop' into gst-category
2021-10-22 22:57:30 +05:30
Ankush Menat
4ad2b851c4
chore: change semgrep rules repo name
...
[skip ci]
2021-10-22 22:39:11 +05:30
Ankush Menat
cc1baae5eb
ci: move semgrep rules out of repo ( #28067 )
...
Moving semgrep rules out of repos as it's unnecessary to maintain
same ruleset for different repos and different branches.
2021-10-22 21:43:50 +05:30
Anuja Pawar
6a3bd882b4
fix: sider
2021-10-22 20:44:49 +05:30
Anuja Pawar
4f53837624
fix: sider
2021-10-22 20:43:54 +05:30
Anuja Pawar
59c31bb124
fix: check if gst_category exist
2021-10-22 19:26:31 +05:30
Raffael Meyer
2bdaf7bb23
fix: don't reset rates in Timesheet Detail when Activity Type is cleared ( #28056 )
...
* fix: don't reset rates when activity type is cleared
* refactor: suggestions from review
Co-authored-by: Sagar Vora <sagar@resilient.tech>
* refactor: suggestions from review (fix)
* style: fix sider
* fix: sider issue
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2021-10-21 23:53:04 +05:30
Deepesh Garg
65025fb628
fix: Update receivable/payable account on company change
2021-10-21 19:30:06 +05:30
Deepesh Garg
a20058a343
fix(minor): Add mandatory depends on condition for reference no and date fields
2021-10-21 17:52:13 +05:30
Deepesh Garg
7733afc0ae
fix(minor): Filters and fixes in Tax Withholding Category
2021-10-21 16:13:00 +05:30
Deepesh Garg
c6d06816cf
fix: Auto update company address check on linking with company
2021-10-21 15:37:59 +05:30
Faris Ansari
8b547e39a8
feat: Taxes template for selling/buying doctypes
...
Depends on the new Print Format Builder
frappe/frappe#14134
2021-10-21 12:06:02 +05:30
Alan
2849297471
refactor: move process loss report to manufacturing ( #28043 )
...
* refactor: move process loss report to manufacturing
* test: fix process loss report test
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-10-21 11:07:47 +05:30
mergify[bot]
1a31d5856f
fix: useless validation message ( #28029 ) ( #28046 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 152f9b0a432361f1c801364d1c85c42a16691a8a)
Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com>
2021-10-21 11:05:50 +05:30
Mohammed Yusuf Shaikh
03bfc77940
feat: employee initial work history updated when transfer is performed ( #27768 )
...
* feat: employee initial work history updated when transfer is performed
* fix: sider
* fix: remove commit statement
* fix: tests and code formatting
* fix: tests
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-10-21 10:15:09 +05:30
rohitwaghchaure
871cb1157f
fix: consolidated report issue #28035
...
fix: consolidated report issue
2021-10-20 21:08:15 +05:30
Rohit Waghchaure
311bafb23b
fix: incorrect fieldname
2021-10-20 20:51:57 +05:30
Ankush Menat
da3635b94f
test: execute manufacturing reports
2021-10-20 20:35:11 +05:30
Ankush Menat
126ba16740
fix: remove debug from query
2021-10-20 20:35:11 +05:30
Ankush Menat
8221e7e01f
fix: remove employee_name from job card summary
...
This field doesn't exist and it's moved on individual line level logs.
2021-10-20 20:35:11 +05:30