Commit Graph

39491 Commits

Author SHA1 Message Date
Ankush Menat
f4b60a48f5 refactor: simplify sr no fetching 2021-10-29 16:56:15 +05:30
Ankush Menat
2aa019ae4c fix: fetch serial nos from ledger unconditionally 2021-10-29 16:56:15 +05:30
Noah Jacob
deb6b38fab refactor: replaced db.sql with qb 2021-10-29 16:56:15 +05:30
Noah Jacob
b44945380d fix: incorrect amount of serial_nos fetched 2021-10-29 16:56:15 +05:30
Subin Tom
75a76e634d
fix: POS consolidated invoice rounded total issue () 2021-10-29 16:45:04 +05:30
Deepesh Garg
8ccd3fee9e fix: COA importer importing all accounts as group 2021-10-29 16:08:52 +05:30
Deepesh Garg
199fc52917
Merge pull request from rtdany10/patch-8
fix: incorrect VAT Amount in UAT VAT 201 report
2021-10-29 14:42:02 +05:30
Deepesh Garg
7180d76b36
Merge pull request from deepeshgarg007/accounting_dimension_userperm
fix: Accounting Dimension filters not honouring user permissions
2021-10-29 14:39:58 +05:30
Marica
292419bc9e
fix: Skip empty rows while updating unsaved BOM cost ()
- Dont try to get valuation rate if row has no item code
- Dont try to add exploded items if row has no item code
2021-10-29 13:49:27 +05:30
Ankush Menat
afe09d4e80
test: remove unnecessary creation of new company () 2021-10-29 13:45:07 +05:30
Deepesh Garg
aa9e78bed1 fix: Accounting Dimension filters not honouring user permissions 2021-10-29 12:45:19 +05:30
Anuja Pawar
4589f39875
Merge branch 'develop' into gst-category 2021-10-29 12:41:04 +05:30
Deepesh Garg
d0e2b52f51
Merge pull request from nemesis189/consolidated-finan-report-empty-list-error
fix: Consolidated Financial Report throws error for empty equity data list
2021-10-29 12:11:16 +05:30
Deepesh Garg
28c116a1bf
Merge pull request from GangaManoj/unlink-po-on-cancelling-so
fix: Unlink PO on cancelling SO
2021-10-29 11:57:41 +05:30
Deepesh Garg
051aaa708d fix: Ignore PO on So cancel 2021-10-29 11:35:34 +05:30
Anuja Pawar
d23b7a77b8
Merge branch 'develop' into gst-category 2021-10-28 23:22:03 +05:30
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 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
marination
8502ccb5b2 chore: Add comment hinting to reason 2021-10-28 16:53:45 +05:30
marination
27236b7e9e fix: Remove RM Cost column as cost is not retrievable from Job card 2021-10-28 16:45:23 +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
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 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 () 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 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 () 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 ()
* 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 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 ()
* 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 ()
* 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