Ganga Manoj
61757c17ae
Merge branch 'develop' into unlink-po-on-cancelling-so
2021-10-28 21:06:00 +05:30
GangaManoj
d24cfff388
fix: Remove unused imports
2021-10-28 20:06:48 +05:30
Deepesh Garg
98f4b90300
Merge pull request #28071 from deepeshgarg007/lower_deduction_cetificate_fixes
...
fix : Get LTDS based on tax withholding category
2021-10-28 19:59:19 +05:30
GangaManoj
1a9d2684e2
fix: Remove debugger
2021-10-28 19:27:45 +05:30
GangaManoj
8844fdbf23
fix: Remove print statements
2021-10-28 19:26:09 +05:30
Deepesh Garg
812249e5d1
Merge branch 'develop' of https://github.com/frappe/erpnext into lower_deduction_cetificate_fixes
2021-10-28 19:01:51 +05:30
Deepesh Garg
09a5616e2d
fix: Rewrite patch using query builder
2021-10-28 19:01:24 +05:30
Deepesh Garg
8e2b4ef456
Merge branch 'develop' into unlink-po-on-cancelling-so
2021-10-28 14:44:34 +05:30
Ankush Menat
b01635e1da
refactor!: remove hub #28117
...
refactor!: remove hub
2021-10-28 14:07:15 +05:30
Subin Tom
d786855d94
fix: Consolidated Financial Report throws error for empty equity data list
2021-10-28 13:19:19 +05:30
Saqib
f530764105
Merge branch 'develop' into fix-depr-after-sale
2021-10-28 12:43:51 +05:30
Faris Ansari
c8d0d9ece9
Merge pull request #28048 from netchampfaris/print-format-builder-templates
...
feat: Taxes template for selling/buying doctypes
2021-10-28 12:33:21 +05:30
Saqib
cc7a21eafa
Merge branch 'develop' into fix-depr-after-sale
2021-10-28 12:04:07 +05:30
Anupam Kumar
4787a75208
fix: opportunity link is missign from customer ( #28110 )
2021-10-28 11:13:11 +05:30
Ganga Manoj
8774862c8d
Merge branch 'develop' into fix-depr-after-sale
2021-10-28 02:15:26 +05:30
Deepesh Garg
c5a16a999c
Merge pull request #28114 from deepeshgarg007/fs_auto_email_report
...
fix: Autoemail report not showing dynamic report filters
2021-10-27 19:58:26 +05:30
Ankush Menat
d81b87d9b3
fix(ux): make qty 1 by default in WO
2021-10-27 19:46:06 +05:30
Ankush Menat
2221c9ed89
fix: don't show blocked supplier in autocomplete
2021-10-27 19:46:06 +05:30
Ankush Menat
5902762ec8
fix(ux): alternative item two way validation
2021-10-27 19:46:06 +05:30
Ankush Menat
5f9bd9b8e9
fix: remove bad hardcoded max value
2021-10-27 19:46:06 +05:30
Deepesh Garg
3a6894fb9c
fix: Autoemail report not showing dynamic report filters
2021-10-27 19:39:18 +05:30
Saqib
a261d08dd8
fix: reset temporary flag after use
2021-10-27 18:30:37 +05:30
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
