Saqib
470c07c6e9
Merge branch 'develop' into fix-depr-after-sale
2021-10-27 16:02:38 +05:30
Ankush Menat
e0cf45e7ec
fix(ux): misleading label for image fields ( #28107 )
2021-10-27 15:27:33 +05:30
Saqib
cc07c71bbd
Merge branch 'develop' into fix-so-cancellation-message
2021-10-27 15:19:18 +05:30
Ganga Manoj
c9f3ea5fea
fix: Remove pointless buttons from Payment Order
...
fix: Remove pointless buttons from Payment Order
2021-10-27 15:16:38 +05:30
Saqib
2e61c5eb55
Merge branch 'develop' into fix-depr-after-sale
2021-10-27 15:12:51 +05:30
hendrik
f24ed6723e
fix(general_ledger): Order by in case Group by Account ( #28093 )
...
* Update general_ledger.py
Fix order_by_statement if filter group by: Group by Account
* chore: whitespace
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
2021-10-27 14:38:20 +05:30
Afshan
f0bdf9426b
Merge branch 'develop' into gst-category
2021-10-27 14:13:26 +05:30
Deepesh Garg
af9ead84e9
Merge pull request #28080 from deepeshgarg007/payment_terms_precision_validate
...
fix: Payment Terms validation precision
2021-10-27 11:48:23 +05:30
Summayya Hashmani
0806e32049
fix(ux): add naming series to ERPNext setting workspace ( #28090 )
...
* fix(ux): add naming series to setting workspace
* fix: doctype link to naming series
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
Co-authored-by: Summayya <frappe@Summayyas-MacBook-Air.local>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
2021-10-27 11:46:10 +05:30
Saqib
879a1fca76
perf(minor): improve sales invoice submission ( #27916 )
...
* perf: skip get_pricing_rules if no pricing rule exists
* perf: fetch mode of payments data in single query
* perf: get total company stock only for purchase order
* perf: skip insertion of stock ledger entry
* fix: undo changes to allow negative stock flag
* fix: sider
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-10-27 11:42:50 +05:30
Alan
05831b18ad
fix: update production plan status #27567
...
fix: update production plan status
2021-10-27 11:36:37 +05:30
mergify[bot]
25d1c1ce86
fix: add filter to query to avoid send reminder for zero years ( #28092 ) ( #28096 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 8cad23b8fb4d830a5703e107c371ae9319bc003d)
Co-authored-by: gsi-maruiz <62341390+gsi-maruiz@users.noreply.github.com>
2021-10-27 11:21:26 +05:30
Dany Robert
2920f2f614
fix: change modified timestamp to apply changes on migrate #28095
...
fix: change modified timestamp to apply changes on migrate
2021-10-27 11:17:48 +05:30
Ankush Menat
479ecb8de0
test: picklist item grouping
2021-10-27 11:10:52 +05:30
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
78825f2c6c
fix: Add extra line
2021-10-27 06:18:24 +05:30
GangaManoj
4789c3423d
fix: Linters
2021-10-27 05:25:32 +05:30
GangaManoj
06c505ddc2
fix: Linters
2021-10-27 05:23:01 +05:30
GangaManoj
07b25c4275
fix: Import statements
2021-10-27 05:20:31 +05:30
GangaManoj
54a0f5d04f
fix: Make import statements fit conventions
2021-10-27 05:15:44 +05:30
GangaManoj
6dbc47f225
fix: Rename variables
2021-10-27 05:09:44 +05:30
GangaManoj
7454167725
fix: Remove redundant code
2021-10-27 05:08:11 +05:30
GangaManoj
69e011bf6a
fix: Add test to check if SO can be cancelled after linked Work Order has been submitted
2021-10-27 05:07:16 +05:30
GangaManoj
29fc4da4c6
fix: Create Maintenance Visit
2021-10-27 04:47:26 +05:30
GangaManoj
9ec24d4915
fix: Add test to check if SO can be cancelled after linked Maintenance Visit has been submitted
2021-10-27 04:46:59 +05:30
GangaManoj
80ce3e6de7
fix: Add test to check if SO can be cancelled after linked Maintenance Schedule has been submitted
2021-10-27 04:17:21 +05:30
GangaManoj
60119f5ce5
fix: Remove redundant validations
2021-10-26 21:42:58 +05:30
GangaManoj
aac574579a
fix: Add test to check if SO can be cancelled when linked DN has been submitted
2021-10-26 21:42:58 +05:30
GangaManoj
21798d8836
fix: Add test to check if SO can be cancelled when linked SI has been submitted
2021-10-26 21:42:58 +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
