Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,957 Commits 3 Branches 0 Tags 1 GiB
e77c379cbb
Commit Graph

32195 Commits

Author SHA1 Message Date
Deepesh Garg
c7edc29152 Merge branch 'develop' of https://github.com/frappe/erpnext into cost_center_filter_p_r 2022-04-30 22:11:43 +05:30
Deepesh Garg
bfd053ed23
Merge branch 'develop' into uae_setup_cleaup 2022-04-30 19:54:40 +05:30
Devin Slauenwhite
5ff471e22f fix: linter 2022-04-29 16:39:33 -04:00
Devin Slauenwhite
fa1378dd49 fix: prevent user from proceeding without all qty picked. 2022-04-29 16:38:52 -04:00
Devin Slauenwhite
5f8f83c6d8 fix: warn user pick list is not complete instead of auto fulfilling picked_qty. 2022-04-29 16:28:49 -04:00
Devin Slauenwhite
48128911be fix: syntax 2022-04-29 16:27:15 -04:00
Devin Slauenwhite
472e634625
Merge branch 'develop' into feat-picklist-scan 2022-04-29 14:11:42 -04:00
Devin Slauenwhite
2554cdceeb revert: scan_mode flag 2022-04-29 13:45:59 -04:00
Devin Slauenwhite
24d8f62b21 revert: barcode scan field from pick list item. 2022-04-29 13:40:48 -04:00
Deepesh Garg
ab94b73e93 fix: Cost center filter on payment reconciliation 2022-04-29 18:06:13 +05:30
Rucha Mahabal
65742947e7
fix(UX): record reason for skipping attendance or marking absent for auto attendance (#30844) 2022-04-29 15:46:00 +05:30
Deepesh Garg
a8452c2ba2 fix: Multi currency opening invoices 2022-04-29 14:27:03 +05:30
Deepesh Garg
1622faad40
Merge pull request #30802 from deepeshgarg007/multi_currency_opening 
fix: Allow multi-currency opening invoices
 2022-04-29 13:34:54 +05:30
Deepesh Garg
f25251bb70 chore: Clean up patches 2022-04-29 12:42:29 +05:30
Deepesh Garg
0cb36cc18c
Merge branch 'develop' into payment_term_rpt_on_selling 2022-04-28 21:22:38 +05:30
Deepesh Garg
3c578a3b0b chore: Add patch to delete education doctypes 2022-04-28 19:54:28 +05:30
Deepesh Garg
44c54f69f8 chore: Remove references for Student doctype 2022-04-28 16:16:47 +05:30
Deepesh Garg
cc867fd949 chore: Remove Fees Doctype 2022-04-28 15:51:32 +05:30
Deepesh Garg
848827cf5c chore: Remove references for Assessment Group 2022-04-28 15:11:22 +05:30
Deepesh Garg
8dcbbf1b9e chore: Remove course links from training doctypes 2022-04-28 13:49:34 +05:30
Deepesh Garg
60b693f84f chore: clean up hooks 2022-04-28 12:02:54 +05:30
Deepesh Garg
41e2959389 chore: remove files related to LMS 2022-04-28 10:41:30 +05:30
Devin Slauenwhite
8053f2dbcd feat: increment picked_qty on scan_barcode 2022-04-27 22:10:15 -04:00
Devin Slauenwhite
ceffbf243e fix: show alert when maximum qty scanned is reached 2022-04-27 22:07:25 -04:00
Devin Slauenwhite
159cf2848e fix: get correct row to modify with duplicate item_codes and max_qty fields are present 2022-04-27 22:03:39 -04:00
Devin Slauenwhite
e04fbb6a99 feat: pick list scan fields 2022-04-27 22:02:04 -04:00
Deepesh Garg
69d369dd7f refactor: Remove education domain from ERPNext 2022-04-27 19:20:36 +05:30
Ankush Menat
777f0204dd
test: create new item instead of using with _Test Item (#30827) 
Unnecessary dependency causes flake in stock. The test was reposting all
entries for item just to test some behavior that is best tested on a
newly created item _anyway_.
 2022-04-27 17:47:40 +05:30
Ankush Menat
ebd5f0b1bb chore: make picked qty read only 2022-04-27 14:53:20 +05:30
Ankush Menat
9a8e3ef235 fix(UX): only show pick list when picking is pending 
[skip ci]
 2022-04-27 14:43:42 +05:30
Ankush Menat
47e1a0104c fix: dont map picked qty and consider pick qty for new PL 
Co-Authored-By: marination <maricadsouza221197@gmail.com>
 2022-04-27 13:44:19 +05:30
Deepesh Garg
429361ce87 chore: Remove domains from Setup 2022-04-27 13:32:51 +05:30
Ankush Menat
8207697e43 fix: compare against stock qty while validating 
Other changes:

- only allow whole number of bundles to get picked
 2022-04-27 12:51:18 +05:30
Ahmad
b226e7d2ac feat: request_for_quotation 
- Show supplier name if supplier ID is not equal to supplier name
 2022-04-27 12:16:03 +05:00
Ankush Menat
9e60acdf56 test: test bundle - picklist behaviour 2022-04-27 12:05:15 +05:30
Ankush Menat
ee54ece8fd test: product bundle fixture 2022-04-27 12:05:15 +05:30
Ankush Menat
1ac275ce61 feat: transfer picklist stock info to packing list 2022-04-27 12:05:15 +05:30
Ankush Menat
41aa4b3524 fix: round off bundle qty 
This is to accomodate bundles that might allow floating point qty.
 2022-04-27 12:05:15 +05:30
Ankush Menat
25485edfd9 refactor: remove unnecssary vars 
also remove misleading docstring
 2022-04-27 12:05:15 +05:30
Ankush Menat
23cb0d684d feat: create DN from pick list with bundle items 2022-04-27 12:05:15 +05:30
Ankush Menat
f574121741 refactor: simpler check for non-SO items 2022-04-27 12:05:15 +05:30
Ankush Menat
277b51b404 refactor: groupby using keys instead of int index 2022-04-27 12:05:15 +05:30
Ankush Menat
3ddad6891a refactor: simplify needlessly complicated code 2022-04-27 12:05:15 +05:30
Ankush Menat
60bc26fdbe feat: back-update min picked qty for a bundle 2022-04-27 12:05:15 +05:30
Ankush Menat
c3fc0a4f55 perf: single update per Sales Order. 
For each SO item the sales order picking status was being updated, this
isn't required and wasteful.
 2022-04-27 12:05:15 +05:30
Ankush Menat
e64cc66df7 refactor: sales order status update 
- rename badly named variables
- support updated packed items
 2022-04-27 12:05:15 +05:30
Ankush Menat
36c5e8a14f feat: Pick list from SO with Product Bundle 2022-04-27 12:05:15 +05:30
Ankush Menat
7d5682020a test: bundles in picklist 2022-04-27 12:05:15 +05:30
Ankush Menat
5c3f9019cc refactor: misc pick list refactors 
- make tracking fields read only and no-copy 🤦
- collapse print settings section, most users configure it once and
  forget about it, not need to show this.
- call pick list grouping function directly
- use get_descendants_of instead of obscure db function
 2022-04-27 12:05:15 +05:30
Deepesh Garg
67bb29026f fix: Ignore custom field validation while setup 2022-04-26 20:15:15 +05:30
Ankush Menat
24a7acaabc chore: incorrect translations 2022-04-26 19:22:26 +05:30
Ankush Menat
dcc2243fbb
Merge pull request #30811 from marination/multiple-wh-acc 
chore: Warn users about multiple warehouse accounts
 2022-04-26 18:18:11 +05:30
marination
e2a163d4e9 fix: Use account_type == 'Stock' to filter stock accounts 2022-04-26 17:50:51 +05:30
marination
44331f4f1f chore: Warn users about multiple warehouse accounts 
- Get distinct accounts that warehouse value has been booked against
- If same account as the one being set, ignore
- If not same account or multiple accounts: warn user that it makes it harder to track mismatches
 2022-04-26 17:43:33 +05:30
Rucha Mahabal
1cc8c79807
test: fix flaky carry forwarded leave expiry test (#30810) 2022-04-26 17:43:08 +05:30
Saqib Ansari
078f26bef3
Merge pull request #30808 from nextchamp-saqib/pos-search-ux-fix 
fix(pos): search field doesn't reset on checkout
 2022-04-26 14:47:22 +05:30
Saqib Ansari
b1ac5ff9d2 fix(pos): number pad translations 2022-04-26 14:41:36 +05:30
Saqib Ansari
03a6103fe5 fix(pos): search field doesn't reset on checkout 2022-04-26 14:28:33 +05:30
Deepesh Garg
00ace8f62c
Merge branch 'develop' into accounting_dimension_consistency 2022-04-26 14:26:08 +05:30
Deepesh Garg
82a0635c66 fix: Consistent accounting dimensions across Sales and Purchase docs 2022-04-26 14:01:13 +05:30
ruthra kumar
b0ead459a0 feat: add payment terms status rpr to Selling homepage 2022-04-26 13:30:13 +05:30
Ankush Menat
88e257ff6d fix: column name in party query 2022-04-26 11:47:05 +05:30
Ankush Menat
052171f51c fix: date condition in tax rule 2022-04-26 11:47:05 +05:30
Ankush Menat
a90e7e32a4 fix: proper quoting in sql queries 2022-04-26 11:47:05 +05:30
Ankush Menat
7e555d3d8c fix: item price query for postgres 
postgres doesn't like bad type comparisons and doesn't have `isnull`
funciton
 2022-04-26 11:47:02 +05:30
Ankush Menat
7d2587c0a9 fix: nullish check and table name 2022-04-26 11:03:32 +05:30
Ankush Menat
0fdfc1e76e fix: only query fields that exist 2022-04-26 11:03:32 +05:30
Ankush Menat
ce75fe0ec4 fix: out of range date value 2022-04-26 11:03:32 +05:30
Ankush Menat
cdac2b8c63 fix: ignore duplicate fixtures 2022-04-26 11:03:32 +05:30
Ankush Menat
e1c1687661 refactor: use db agnostic CombineDatetime 2022-04-26 11:03:32 +05:30
Deepesh Garg
d3582ea399 fix: Allow multi-currency opening invoices 2022-04-25 18:18:39 +05:30
Deepesh Garg
4ffea617ef
Merge pull request #30754 from deepeshgarg007/round_off_account_cost_center 
fix: First preference to parent cost center rather than round off cost center
 2022-04-25 17:06:19 +05:30
Deepesh Garg
3fa1c63479 test: Unit test for round off entry dimensions 2022-04-25 16:29:26 +05:30
Deepesh Garg
b1158bcb7c
Merge pull request #30799 from nextchamp-saqib/einv-cess-fix 
fix(india): cess value not considered while validating e-invoice totals
 2022-04-25 14:39:15 +05:30
Deepesh Garg
f064e0b15e
Merge pull request #30642 from rahib-hassan/separate-discount-account 
feat: separate discount accounting for buying and selling
 2022-04-25 14:07:20 +05:30
Saqib Ansari
8e6c7a6bf7 fix(india): cess value not considered while validating e-invoice totals 2022-04-25 14:02:46 +05:30
Deepesh Garg
02aaa6546c chore: Remove dead code 2022-04-25 12:42:06 +05:30
Deepesh Garg
22bc107d70
Merge pull request #30778 from deepeshgarg007/accpunting_dimension_validate_ignore_new 
fix: Do not validate while creating accounting dimension
 2022-04-25 12:30:51 +05:30
rahib-hassan
6c86067d90
Merge branch 'develop' into separate-discount-account 2022-04-25 12:17:50 +05:30
Ankush Menat
d6a43a39ae
test: tie breaking in SLEs (#30796) 
[skip ci]
 2022-04-25 11:46:01 +05:30
Deepesh Garg
618fa0e8ea
Merge branch 'develop' into accpunting_dimension_validate_ignore_new 2022-04-24 20:55:50 +05:30
Deepesh Garg
afc6aa88f0
Merge pull request #30763 from deepeshgarg007/loan_reconciliation 
fix: Add loan doctypes in bank clearance
 2022-04-24 20:55:29 +05:30
Deepesh Garg
c515abc392 test: Remove teardown method 2022-04-24 19:20:29 +05:30
Deepesh Garg
c312cd3725 fix: Check if accounting dimension exists 2022-04-24 18:11:32 +05:30
Deepesh Garg
783793deac Merge branch 'develop' of https://github.com/frappe/erpnext into round_off_account_cost_center 2022-04-23 21:40:38 +05:30
Deepesh Garg
015812b0b8 fix: Add accounting dimensions for round off GL Entry 2022-04-23 21:40:08 +05:30
Deepesh Garg
d4d83f4bb6 test: Fixes in test case 2022-04-23 12:33:35 +05:30
Deepesh Garg
0eacc99ab7 test: Fixes in test case 2022-04-23 12:08:30 +05:30
Rucha Mahabal
deed9702cf
Merge pull request #30780 from ruchamahabal/promotion-enhancements 2022-04-22 22:33:39 +05:30
Rucha Mahabal
8e5327a0e0 fix: clear property child table on changing employee 2022-04-22 21:33:24 +05:30
Rucha Mahabal
9d158088ee chore: remove unused Employee Transfer Property doctype 2022-04-22 20:20:12 +05:30
Rucha Mahabal
cfa4dfe7a8 fix: reset old CTC on promotion cancellation 2022-04-22 20:20:04 +05:30
Rucha Mahabal
9b93c63830 fix: tests 2022-04-22 17:54:32 +05:30
Wolfram Schmidt
43c1d63ab2
fix translation (#30781) 
fixed the short word for March in german language
 2022-04-22 17:32:34 +05:30
Rucha Mahabal
788e0a1c6c chore: format employee_property_update.js 2022-04-22 17:25:37 +05:30
Rucha Mahabal
ed04241cf4
Merge branch 'develop' into promotion-enhancements 2022-04-22 16:38:01 +05:30
Rucha Mahabal
833a33a94b test: employee property update via Employee Promotion 2022-04-22 16:28:25 +05:30
Rucha Mahabal
a93867de19 feat: add CTC fields in Employee master and Promotion 2022-04-22 16:28:14 +05:30
marination
8d632e9b9c style: Re-run pre-commit 2022-04-22 16:27:29 +05:30
marination
b848e61954 fix: Skip unpublished Variants with published templates in shopping cart quote validation 2022-04-22 16:25:56 +05:30
Devin Slauenwhite
53d8168dea fix: linter format string after translation 2022-04-22 16:25:28 +05:30
Devin Slauenwhite
ea6d6e31b3 fix: linter trilaing whitespace 2022-04-22 16:25:21 +05:30
Devin Slauenwhite
48da3b4482 fix: sider issues 2022-04-22 16:23:18 +05:30
Devin Slauenwhite
b88d5d135e fix(test): validate exception without website item 2022-04-22 16:23:07 +05:30
Devin Slauenwhite
86832fb7fe test: assert error if quotation contains non website item 2022-04-22 16:22:58 +05:30
Devin Slauenwhite
678a1179d4 fix: shopping cart quotation without website item 2022-04-22 16:22:32 +05:30
Deepesh Garg
9bb132fdd3 fix: Do not validate while creating accounting dimension 2022-04-22 13:39:43 +05:30
Vladislav
e088e65871
fix: update translation (#30725) 
* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv
 2022-04-22 11:00:57 +05:30
Deepesh Garg
81b3342480
Merge pull request #30757 from nextchamp-saqib/einv-401-fix 
fix(india): 401 & 403 client error while generating IRN
 2022-04-21 18:55:26 +05:30
Deepesh Garg
8a8476bb5c test: Add test coverage for bank clearance 2022-04-21 18:53:18 +05:30
Ankush Menat
d5ab626a31
Merge pull request #30726 from ankush/dependent_gle_reposting 
fix: dependent gle reposting
 2022-04-21 18:06:40 +05:30
Ankush Menat
ee3036651a
fix: batch_no filtering not working when batch no is also a number in scientific notation (#30770) 
[skip ci]
 2022-04-21 16:34:31 +05:30
rahib-hassan
78c8e46511
Merge branch 'develop' into separate-discount-account 2022-04-21 15:06:58 +05:30
Deepesh Garg
c42547d40f fix: Use parent cost center for Sales and Purchase Invoice 2022-04-21 13:26:44 +05:30
Marica
87f1617780
Merge branch 'develop' into field-filters-e-com 2022-04-21 12:32:33 +05:30
marination
c5d4bed932 test: setup e commerce settings before running invalid filtrs test 2022-04-21 12:29:30 +05:30
Rucha Mahabal
c3dc5d5ce7 fix: property addition not working for select fields 2022-04-21 08:17:00 +05:30
rahib-hassan
02e17dbded fix: removed manual enable-discount-account method 2022-04-21 02:42:42 +05:30
rahib-hassan
2c78cc2014 fix: removed manual rollback - enable discount account 2022-04-21 02:40:59 +05:30
Deepesh Garg
3d0e68acaa fix: select doctype as payment_document 2022-04-20 19:49:53 +05:30
Deepesh Garg
c3e27b5556 fix: Loan doctypes in bank reconciliation 2022-04-20 19:07:53 +05:30
marination
8981405a62 test: Field filter validation and Custom field as field filter 
- Test to block Item fields (which aren’t in Website Item) in E Commerce Settings as filters
- Removed unnecessary function and setup in E Commerce Settings test
- Removed commented useless test
- Test to check custom field as filter
 2022-04-20 18:50:47 +05:30
marination
6d750e185e fix: Handle Multiselect field mapping separately 
- Map Multiselect child table to Website Item (copy rows)
 2022-04-20 17:40:03 +05:30
rahib-hassan
13092bcc2d fix: enable discount roll_back 2022-04-20 16:46:29 +05:30
rahib-hassan
1e143e7479 fix: use @change_settings to enable_discount_account 2022-04-20 16:06:55 +05:30
rahib-hassan
f3fa6ac4c2 fix: account setting seperation gl discount account creation 2022-04-20 16:01:12 +05:30
Rucha Mahabal
5411e69553
fix: filters not working in Shift Assignment Calendar view (#30752) 2022-04-20 14:56:06 +05:30
Saqib Ansari
ee8047aba3 fix(india): 401 & 403 client error while generating IRN 2022-04-20 14:14:29 +05:30
rahib-hassan
f058755ad3 fix: test cases updated 2022-04-20 13:24:15 +05:30
HENRY Florian
143786aaa0
fix: Must not be able to start Job Card if it is related to Work Order that is not started yet (#29072) 
* fix: Cannot start Job strat if related to Work Order not started yet

* fix: Cannot start Job strat if related to Work Order not started yet

* test

* test

* fix siders

* PR review

* chore: Code cleanup

- Better short circuit for if condition (make it such that both conditions dont always have to be computed)
- Remove `r.message` extraction by avoiding `then()`

* chore: Remove unnecessary json change

Co-authored-by: marination <maricadsouza221197@gmail.com>
 2022-04-20 12:29:52 +05:30
marination
5660b335ba fix: Mistyped variable name in patch 2022-04-20 12:25:59 +05:30
Deepesh Garg
0ac11a5b30 fix: First preference to parent cost center rather than round off cost center 2022-04-20 12:18:11 +05:30
Ankush Menat
9734329094 test: discard local future SLE cache between tests 2022-04-19 17:40:28 +05:30
Ankush Menat
700e864d90 fix: sort stock vouchers before reposting GLE 2022-04-19 17:40:26 +05:30
Ankush Menat
b24920c0e9 fix: correct sorting while updating bin 2022-04-19 17:38:36 +05:30
Ankush Menat
d2882ea436 test: use disposable item codes in tests 
dependency causes flake
 2022-04-19 17:38:36 +05:30
Ankush Menat
8f519545b0 test: repost queue progress 2022-04-19 17:38:36 +05:30
Ankush Menat
ecdb49314f fix: dependent GLE reposting 2022-04-19 17:38:36 +05:30
Ankush Menat
a2af2daca7 test: dependent GL entry reposting 2022-04-19 17:38:36 +05:30
Ankush Menat
afc5a55a23 refactor: repost error handling 2022-04-19 17:38:36 +05:30
FinByz Tech Pvt. Ltd
54a05075f3 fix(india): transporter name is null while generating e-way bill (#30736) 
(cherry picked from commit 6291b28c37f02380001ab68b3a660b2804383ab2)
 2022-04-19 10:57:59 +00:00
Rucha Mahabal
789fa31b82
Merge branch 'develop' into shift-type-null-in-employee-checkin 2022-04-19 13:39:32 +05:30
Rucha Mahabal
3cddc1e97e test: shift fetching when assignment has an end date 2022-04-19 13:39:03 +05:30
Rucha Mahabal
98cccf221e fix: shift fetching fails in Employee Checkin if shift assignment has an end date 
Co-authored-by: Ejaaz Khan <ejaazrkhan@gmail.com>
 2022-04-19 13:17:36 +05:30
Rucha Mahabal
7c547f152f
fix(patch): check if column is present while fixing reverse linking (#30737) 2022-04-19 12:18:46 +05:30
marination
d0cd194398 chore: Patch to copy custom fields (field filters) from Item to Website Item 2022-04-18 21:40:19 +05:30
Deepesh Garg
d96bfe13a8 Merge pull request #30721 from ruthra-kumar/bug_so_analysis_report 
fix: SO's without delivery note will also be fetched
 2022-04-18 19:58:37 +05:30
marination
1e80b97915 refactor: Change Filter Fields table fieldtype to Autocomplete 
- Remove dynamic js fieldtype change to `Select`
 2022-04-18 19:01:43 +05:30
marination
d35b37881b fix: Validate field filter wrt to Website Item & re-use validation in Item Group 2022-04-18 18:51:48 +05:30
Marica
8a366309e1
Merge branch 'develop' into field-filters-e-com 2022-04-18 18:11:25 +05:30
marination
c993ac09df fix: Query filter fields from Website Item instead of Item master 
- tweak `filters.py` to correctly query filter field values from Website Item
- Use Website Item for filter field options in Settings and Item Group Field Filter table
 2022-04-18 18:01:48 +05:30
rahib-hassan
bcfbb3e9c8 fix: code formatting 2022-04-18 15:04:47 +05:30
rahib-hassan
ebb7bc201b fix: library import formatting 2022-04-18 14:53:45 +05:30
Deepesh Garg
264ec65255
Merge pull request #30728 from deepeshgarg007/pricing_rule_apply_mapped_doc 
fix: Price changing on creating Sales return from Delivery Note
 2022-04-18 14:34:28 +05:30
rahib-hassan
52fd804aed Merge branch 'develop' of github.com:rahib-hassan/erpnext into separate-discount-account 2022-04-18 14:13:46 +05:30
Deepesh Garg
9c081947ec fix: Price changing on creating Sales retrun from Delivery Note 2022-04-18 10:21:15 +05:30
Deepesh Garg
5cdd0d6719 fix: Move tax withholding category field 2022-04-16 20:34:56 +05:30
Deepesh Garg
0a67b0239e fix: Consistent customer and supplier forms 2022-04-16 19:43:59 +05:30
ruthra kumar
13487e2408 test: Sales order analysis report 2022-04-16 12:02:32 +05:30
Bhavesh Maheshwari
72757994f8 fix: process statement to_date override 
(cherry picked from commit 378d15d388ae9cac7a5f897af83c99605403503a)
 2022-04-14 13:14:11 +00:00
ruthra kumar
e28e6726f1 fix: SO analysis rpt will fetch SO's without Delivery note as well 2022-04-14 18:37:46 +05:30
Ankush Menat
9af2d68945 refactor: convert queries to ORM/QB, add types 2022-04-14 18:05:38 +05:30
Ankush Menat
ba29323e11 test: increase assertions to cover all cases 2022-04-14 18:05:38 +05:30
Ankush Menat
e278ee359a test: item attribute columns 2022-04-14 18:05:38 +05:30
Ankush Menat
febc74a21b refactor: rewrite stock balance query to QB 2022-04-14 18:05:35 +05:30
Ankush Menat
8a499e95d3 test: uom conversion in stock balance report 2022-04-14 18:01:43 +05:30
Ankush Menat
af0ea7b532 test: assert balanaces against SLE 2022-04-14 18:01:42 +05:30
Ankush Menat
f4766ae4eb test: opening balance in stock balance report 2022-04-14 18:01:42 +05:30
Ankush Menat
8b2432dfa0 test: stock balance report tests 2022-04-14 18:01:42 +05:30
Ankush Menat
64ac22af82 refactor: add filter type info 2022-04-14 18:01:42 +05:30
HENRY Florian
e6aa28ea14
fix: update translation (#30716) 
* fix: update translation

* fix: update translation

* fix: update translation

* fix: update translation
 2022-04-14 17:46:47 +05:30
Ankush Menat
15576c1ce8
Merge pull request #30707 from marination/values-out-of-sync-jv 
fix: Remove "Values Out of Sync" validation
 2022-04-14 17:39:18 +05:30
Ankush Menat
0d64349142
Merge branch 'develop' into separate-discount-account 2022-04-14 17:29:28 +05:30
rahib-hassan
4130493b58 fix: Label typo 2022-04-14 16:03:08 +05:30
rahib-hassan
01fde15bd5 fix: dependent codes updated 2022-04-14 15:48:55 +05:30
rahib-hassan
0eff74c650 fix: tabspacing 2022-04-14 15:42:16 +05:30
Deepesh Garg
1659f1eb6d
Merge pull request #29963 from nabinhait/income-tax-computation 
feat: Income tax computation Report
 2022-04-14 15:31:17 +05:30
Deepesh Garg
e2fa9f708e
Merge pull request #30710 from deepeshgarg007/advance_jv_allocation 
fix: Exchange gain and loss on advance Journal Entry allocation
 2022-04-14 15:10:04 +05:30
Nabin Hait
cd2ab32242 fix: orginised code 2022-04-14 14:05:21 +05:30
Nabin Hait
bc7007d588
fix: get enabled deduction components 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2022-04-14 14:02:01 +05:30
Nabin Hait
d06b7378f8
fix: get enabled and submitted income tax slab 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2022-04-14 14:01:44 +05:30
Nabin Hait
67086e618d
fix: get enabled earning components 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2022-04-14 14:00:28 +05:30
Marica
87117313a1
Merge branch 'develop' into values-out-of-sync-jv 2022-04-14 13:41:27 +05:30
Deepesh Garg
c38be53ce8 test: Update customer in Sales Invoice 2022-04-14 13:26:47 +05:30
Suraj Shetty
11fa187263
Merge pull request #30715 from surajshetty3416/fix-exotel-call-log 2022-04-14 12:45:15 +05:30
Suraj Shetty
77599fe443 fix: Set correct options for link field 
issue introduced via https://github.com/frappe/erpnext/pull/30711
 2022-04-14 12:32:31 +05:30
Deepesh Garg
86cfa3a53f
Merge pull request #30712 from frappe/mergify/bp/develop/pr-30700 
fix: Payment reco query with max invoice and payment amount limit (backport #30700)
 2022-04-14 12:32:11 +05:30
marination
d75d5ebe8d chore: Remove Values Out of Sync from Repost hourly job 
- It runs after repost (after commiting), so it has 0 impact on repost itself
- Just that scheduled job log shows up as failed, while actually repost is done and repost document is "Completed"
- The check is inaccurate also, so best to remove this
- Users cant do anything about it anyway. This just piles up phantom failed jobs unneccessarily
 2022-04-14 12:30:06 +05:30
Deepesh Garg
065c38152a Merge branch 'develop' of https://github.com/frappe/erpnext into item_wise_provisional_accounting 2022-04-14 12:04:21 +05:30
Deepesh Garg
ad171c6225 test: Update test case 2022-04-14 12:03:12 +05:30
Deepesh Garg
e6cb948a96 fix: Payment reco query with max invocie and payment amount limit 
(cherry picked from commit 4008c95ac6afc3b06a0a602e3f469db61e1f0453)
 2022-04-14 05:42:17 +00:00
Deepesh Garg
972d9ec5b4 test: Update customer 2022-04-14 11:10:41 +05:30
Suraj Shetty
6e837bcdfc style: Fix linter warning 2022-04-14 10:02:15 +05:30
Suraj Shetty
c272170b86 fix(call log): Convert Data to Link for type_of_call 
Convert `Data` to `Link` for type_of_call,
employee_user_id and call_received_by fields
 2022-04-14 09:51:54 +05:30
Deepesh Garg
31883b699d fix: Exchange gain and loss on advance jv allocation 2022-04-13 20:52:25 +05:30
Ankush Menat
79fbc2c504
test: flaky PR close test (#30709) 2022-04-13 20:42:25 +05:30
Suraj Shetty
d890ee9495
Merge pull request #29962 from nemesis189/exotel-fixes 
fix: Exotel Call Log fixes
 2022-04-13 20:36:03 +05:30
Suraj Shetty
ff41b8da4e fix: Update received_by if "to" is changed 2022-04-13 20:12:08 +05:30
Suraj Shetty
cef28df8db test: Do not overwrite frappe.form_dict to retain proxy reference 
Set frappe.local.form_dict instead
 2022-04-13 19:10:19 +05:30
marination
89fab78027 fix: Remove "Values Out of Sync" validation from Journal Entry 
- Even if there is a difference there's not much a user can do
- Checking it at the JV level is senseless. Blindly making users post another JV will lead to more error.
- Users making JV are usually accountants who know what they are doing
- The validation computes incorrect values for an account that contributes partially to warehouse's value.
 2022-04-13 18:44:50 +05:30
Raffael Meyer
6453fb4cea
refactor!: remove DATEV integration (#30584) 
The DATEV integration follows the trend and moves into a separate app.

- the DATEV Integration will be maintained at https://github.com/alyf-de/erpnext_datev (version-14 branch)
- the German Compliance and Localization will be maintained at https://github.com/alyf-de/erpnext_germany
 2022-04-13 09:24:19 +00:00
Marica
c5247a0767
Merge branch 'develop' into pp-wo-company 2022-04-13 11:52:15 +05:30
marination
6315acc450 fix: Map correct company to PO made via Prod Plan (subcontract) 2022-04-13 11:47:58 +05:30
Ankush Menat
bfaaebde0d
Merge branch 'develop' into separate-discount-account 2022-04-12 18:38:23 +05:30
Deepesh Garg
228195ba74
Merge pull request #30689 from deepeshgarg007/disabled_gl_dimensions 
fix: Do not show disabled dimensions in reports
 2022-04-12 16:11:07 +05:30
Deepesh Garg
4f9b38a591
Merge pull request #30686 from nabinhait/ignore-permlevel-for-fields 
feat: Ignore permlevel for specific fields
 2022-04-12 15:55:28 +05:30
Noah Jacob
8261b2bb4f
refactor: trigger generate schedule when any change made in items table (#29874) 
* refactor: trigger generate schedule when any change made in items table

* chore: added serial validation on server side

* test: serials updated in schedules after save

* fix: schedule not generating after updating some fields

* feat: generate_schedule is triggered on_save when items table is changed

* test: updated tests to check other field changes on save

* chore: removed serial validation function for schedules table and added no_of_visits validation function

* test: updated for manually deleted schedele rows

* refactor: updated validate_items_table_change to return bool

* test: updated test_schedule_with_serials to cover validate_items_table_change

* fix: linting
 2022-04-12 15:30:49 +05:30
Deepesh Garg
9a1c560c82 fix: Do not show disabled dimensions in reports 2022-04-12 15:27:08 +05:30
marination
2777c5c67c fix: Map Production Plan company in subassembly WO created from it 2022-04-12 14:30:01 +05:30
Nabin Hait
993c6c0de9 feat: Ignore permlevel for specific fields 2022-04-12 12:24:47 +05:30
Ankush Menat
60fb71bd2a
fix: ignore item-less maintenance visit for sr no (#30684) 2022-04-12 11:14:02 +05:30
Deepesh Garg
7d263e9ecf
Merge pull request #30651 from deepeshgarg007/gst_download_json_key_error 
fix: Download JSON for GSTR-1 report
 2022-04-12 00:06:25 +05:30
Marica
014298a867
Merge pull request #30674 from marination/work-order-partial-transfer 
fix: Handle multiple item transfer in separate SEs against WO
 2022-04-11 17:23:57 +05:30
Deepesh Garg
79b90118e1
Merge branch 'develop' into gst_download_json_key_error 2022-04-11 17:15:04 +05:30
Marica
3f8be3ac10
Merge branch 'develop' into work-order-partial-transfer 2022-04-11 16:49:22 +05:30
marination
5aa60bb651 test: Multiple RM transfer in separate Stock Entries 
- Added test and acceptance of 0 as For Quantity in test helper
 2022-04-11 16:44:55 +05:30
Nabin Hait
e46898f5f5 fix: test cases 2022-04-11 16:37:34 +05:30
Nabin Hait
aad29ad572 fix: removed unused imports 2022-04-11 15:33:22 +05:30
marination
be2e5ce966 style: Missing Semicolon 2022-04-11 15:32:57 +05:30
Nabin Hait
c27e3ef03e fix: Show message is no employee found 2022-04-11 15:30:26 +05:30
Deepesh Garg
553178bfe7 test: Add test 2022-04-11 15:29:20 +05:30
Nabin Hait
7072dda31f fix: sider issues 2022-04-11 15:19:42 +05:30
Deepesh Garg
54eef3daad Merge branch 'develop' of https://github.com/frappe/erpnext into deferred_revenue_default_account_fixes 2022-04-11 15:09:30 +05:30
Saqib Ansari
0373347a97
Merge branch 'develop' into separate-discount-account 2022-04-11 14:55:42 +05:30
Nabin Hait
c7848089ab tests: Added unit tests for income tax computation report 2022-04-11 14:51:23 +05:30
Deepesh Garg
3ce64170db feat: Item-wise provisional accounting for service items 2022-04-11 14:35:22 +05:30
rahib-hassan
a7a5742375 fix: merge conflict(patch) 2022-04-11 14:28:36 +05:30
marination
dfff4beaf4 fix: Handle multiple item transfer in separate SEs against WO 
- Check for pending qty in child items to show/hide "Start" button
- If no qty needed to transfer (FG qty is fulfilled), but RM qty pending: map pending in SE with For Quantity = 0
 2022-04-11 14:10:57 +05:30
Ankush Menat
c3e1f0e369 refactor: ignore mandatory fields during setup 2022-04-11 13:19:17 +05:30
Ankush Menat
086d31b59f fix: dont validate currency exchange in setup 
Redues ~4-5 seconds of time and chances of setup failure.
 2022-04-11 13:19:17 +05:30
Nabin Hait
e3a53590de fix: Added filter to consider Tax Exemption Declaration if proof not submitted 2022-04-11 12:23:13 +05:30
Nabin Hait
535217a042 fix: Added income tax slab column 2022-04-11 12:23:13 +05:30
Nabin Hait
1f018a912b fix: Get exemptions from declaration only if proof not submitted 2022-04-11 12:23:13 +05:30
Nabin Hait
b4900ef220 fix: duplicate exemption amount and rounded tax 2022-04-11 12:23:13 +05:30
Nabin Hait
a74eec01ea fix: Added report link in the Payroll workspace 2022-04-11 12:23:13 +05:30
Nabin Hait
a9b5d990a4 fix: Removed designation filter 2022-04-11 12:23:13 +05:30
Nabin Hait
0480bb318e fix: Modified column width 2022-04-11 12:23:13 +05:30
Nabin Hait
f9633bbd48 feat: Income Tax Computation Report 2022-04-11 12:23:11 +05:30
HENRY Florian
03c631d723
fix: update translation (#30654) 2022-04-11 10:49:18 +05:30
Deepesh Garg
227a711d70
Merge pull request #30585 from frappe/mergify/bp/develop/pr-30575 
fix: Do not apply shipping rule for POS transactions (backport #30575)
 2022-04-10 20:12:53 +05:30
Deepesh Garg
0f414d51f4
Merge pull request #30443 from frappe/mergify/bp/develop/pr-30438 
fix: Incorrect default amount to pay for POS invoices (backport #30438)
 2022-04-10 18:56:02 +05:30
Deepesh Garg
ddbd82af95
Merge pull request #30459 from frappe/mergify/bp/develop/pr-30385 
fix(India): Auto tax fetching based on GSTIN (backport #30385)
 2022-04-10 18:55:26 +05:30
Deepesh Garg
809117229d
Merge pull request #30626 from nextchamp-saqib/einv-utgst 
feat(india): e-invoicing for intra-state union territory transactions
 2022-04-10 18:54:17 +05:30
Ankush Menat
8138e53cf3 test: flaky picklist tests 2022-04-10 17:50:57 +05:30
Deepesh Garg
a2937cffc7 fix: Implicit ignore pricing rule check on returns 
(cherry picked from commit 1b25a7fe765d334fce990d43224f8a790ccf8119)
 2022-04-09 14:46:25 +00:00
Deepesh Garg
207bf85c74
Merge pull request #30488 from Havenir/fix-project-list-in-web-view 
fix: web form filters for project
 2022-04-09 20:06:49 +05:30
Deepesh Garg
cbd8998fc1
Merge branch 'develop' into mergify/bp/develop/pr-30438 2022-04-09 20:03:23 +05:30
Deepesh Garg
02c6b898a6
Merge branch 'develop' into mergify/bp/develop/pr-30385 2022-04-09 19:57:59 +05:30
Deepesh Garg
e30cc8422c
fix: Resolve conflicts 2022-04-09 19:53:40 +05:30
Deepesh Garg
2e00678c76
Merge pull request #30542 from deepeshgarg007/disabled_tax_category 
fix: Ignore disabled tax categories
 2022-04-09 19:52:31 +05:30