Commit Graph

29179 Commits

Author SHA1 Message Date
Deepesh Garg
51d9572fe7 fix: Hardcode fiscal year and posting date 2021-09-05 17:56:12 +05:30
Deepesh Garg
ceaa804f04
fix: Presentation currency conversion in reports (#27316) 2021-09-05 17:21:29 +05:30
rohitwaghchaure
7b4a65484a
fix: manually added weight per unit reset to zero after save (#27330) 2021-09-03 22:00:14 +05:30
Ankush Menat
73b3a2f685
chore: whitespace 2021-09-03 21:57:38 +05:30
Deepesh Garg
092d41ecda fix: Debug CI 2021-09-03 20:04:18 +05:30
Deepesh Garg
41392acd18 Merge branch 'develop' of https://github.com/frappe/erpnext into tds_validity 2021-09-03 19:19:35 +05:30
Deepesh Garg
8f5a77446e
Merge pull request #27279 from deepeshgarg007/gstr_1_cdnr_unregistered_json_develop
feat: CDNR Unreg json generation
2021-09-03 13:55:00 +05:30
Deepesh Garg
a06a70d1a4 fix: Patch error and tests 2021-09-03 13:13:37 +05:30
Deepesh Garg
79d250845e fix: Patch 2021-09-03 13:13:37 +05:30
Deepesh Garg
2b34028acd fix: Patch and linting errors 2021-09-03 13:13:37 +05:30
Ganga Manoj
64fcd1a092
fix: make datetime objects readable (#27301)
* fix: Make datetime objects readable

* fix: Remove unused imports
2021-09-03 12:54:47 +05:30
Subin Tom
798b464ee3
fix: braintree payment processed twice (#27300) 2021-09-03 12:30:57 +05:30
Saqib
98696c0ec9
Merge pull request #27306 from GangaManoj/fix-selling-settings
fix: Move related fields together in Selling Settings
2021-09-03 12:30:02 +05:30
Ankush Menat
d1fe060e4a
fix: south africa vat patch failure (#27323)
reload doc is necessary on new doctypes
2021-09-03 12:02:32 +05:30
Shariq Ansari
e68c55ce83
fix: Removing first Spacer from home page (#27321) 2021-09-03 11:00:33 +05:30
GangaManoj
ebdc568e85 fix: Rename 'Action if Same Rate is Not Maintained' to 'Action if Same Rate is Not Maintained Throughout Sales Cycle' 2021-09-02 19:32:51 +05:30
Deepesh Garg
e1fffdb262 fix: Linting issues 2021-09-02 19:10:49 +05:30
Deepesh Garg
c85242e03d Merge branch 'develop' of https://github.com/frappe/erpnext into gstr_1_cdnr_unregistered_json_develop 2021-09-02 18:59:59 +05:30
Deepesh Garg
e8a5dc371b fix: Add payment entry custom fields 2021-09-02 18:56:04 +05:30
Ankush Menat
eec40513be
fix: minor linting issues (#27314)
* fix: syntax error in gratuity

* fix: unpacking None into three variables

* fix: unexpected kwarg for delete_accounting_dimensions
2021-09-02 17:42:45 +05:30
Ankush Menat
60185c8c71
chore: linting
[skip ci]
2021-09-02 17:36:05 +05:30
Chillar Anand
915b34391c
chore: Clean up imports (#27302)
* chore: Added isort to pre-commit config

* chore: Sort imports with isort

* chore: Clean up imports with pycln

* chore: Sort imports with isort

* chore: Fix import issues

* chore: Clean up sider issues

* chore: Remove import errors from flake8 ignore list

* chore: Clean up lint issues
2021-09-02 16:44:59 +05:30
Ankush Menat
b25d28e023
fix(patch): delete stale shopify doctypes (#27313) 2021-09-02 14:53:06 +05:30
Saqib
366012817f
Merge branch 'develop' into fix-selling-settings 2021-09-02 11:13:52 +05:30
Saqib
a158b825fc
Merge pull request #27124 from GangaManoj/gross-profit-product-bundle
feat: Improve Product Bundle handling
2021-09-02 11:12:56 +05:30
Devin Slauenwhite
43c476ddf7
fix: (Backport-develop) track salary slip ytd gross salary. (#27242)
* fix: track salary slip ytd gross salary.

* fix: ytd gross salary unique label

* Revert "fix: ytd gross salary unique label"

This reverts commit a68b387ac21e32c250d042caf75ef301b5a49a1a.

* fix: gross ytd salary unique label
2021-09-02 09:39:35 +05:30
Anupam Kumar
c25367f107
Merge pull request #27292 from anupamvs/comany-name-field-issue-develop
fix: mapping for company name lead->contact
2021-09-02 09:32:47 +05:30
Rucha Mahabal
f828d853e3
fix: Org Chart fixes (#27290)
* fix(org chart): multiple root nodes not expanding on clicking Expand All

* fix: unstable filter inserts duplicate nodes
2021-09-01 23:07:26 +05:30
GangaManoj
799d67d785 fix: Only display 'Role Allowed to Override Stop Action' if 'Maintain Same Rate Throughout Sales Cycle' is checked 2021-09-01 22:55:10 +05:30
GangaManoj
f2a7fbd126 fix: Remove redundant description 2021-09-01 22:49:05 +05:30
GangaManoj
06484321d1 fix: Move related fields to the same section 2021-09-01 22:48:09 +05:30
Deepesh Garg
d5a736d11e test: Update test case 2021-09-01 21:15:24 +05:30
Ankush Menat
dea5c34d8d
chore: whitespace 2021-09-01 19:59:22 +05:30
Ankush Menat
81eb6fde07
Merge pull request #27288 from ankush/strict_linting
chore: cleanup linting errors and introduce strict linting checks
2021-09-01 19:32:49 +05:30
Raffael Meyer
605f73b4d4
feat: add voucher-specific data to DATEV export (bp #26589) (#27287)
* feat: add voucher-specific data to datev export

* refactor: def instead of lambda
2021-09-01 19:27:54 +05:30
rohitwaghchaure
2a8cd05b44
fix: production plan UX and validation message (#27278) 2021-09-01 19:16:03 +05:30
Marica
9506c14d35
fix: Zero division error while fetching unconsumed materials (#27293)
`
2021-09-01 18:49:12 +05:30
Jannat Patel
696fa6c8fe
Merge branch 'develop' into comany-name-field-issue-develop 2021-09-01 18:25:46 +05:30
Anupam
821f6a6178 fix: mapping for company name lead->contact 2021-09-01 17:49:05 +05:30
Ankush Menat
b147b85e6a
chore: whitespace / eof fixes 2021-09-01 16:57:21 +05:30
Ankush Menat
e46567192a
fix: invalid escape sequences in regex 2021-09-01 16:57:17 +05:30
GangaManoj
bc79084dac fix: Add Product Bundle field in Items table 2021-09-01 16:06:47 +05:30
GangaManoj
bbb9fa4bf8 fix: Remove Rate from field_no_map 2021-09-01 16:00:59 +05:30
GangaManoj
471fd9718c fix: Set Product Bundle's Delivery Dates in SO as Bundle Items' Delivery Dates in PO 2021-09-01 15:36:07 +05:30
Ankush Menat
55b24345a0
fix: remove unused format from query
doctype is not used in query and parent alone is enough to identify
packed items.
2021-09-01 15:33:37 +05:30
Ankush Menat
7d9819f352
fix: remove duplicate imports 2021-09-01 15:33:35 +05:30
GangaManoj
4d8f833cc9 fix: Remove Add Row and Delete Row options for Packed Items table 2021-09-01 15:20:40 +05:30
GangaManoj
17a6a9b036 fix: Uncheck read-only for Packed Items table 2021-09-01 15:13:29 +05:30
GangaManoj
816ba55b74 fix: Make Rate read-only by default 2021-09-01 15:11:08 +05:30
Ankush Menat
2d62c500c4
fix: undefined variables 2021-09-01 15:05:00 +05:30
Ankush Menat
9fec0a5c68
refactor: itemgetter instead of assigned lambda 2021-09-01 15:02:29 +05:30
Ankush Menat
010060d92e
chore: correct indentation 2021-09-01 15:02:29 +05:30
Ankush Menat
694ae81618
fix: remove bare excepts 2021-09-01 15:02:28 +05:30
Alan
9dc0843cbd
fix: translate labels (#27282)
[skip ci]
2021-09-01 12:58:34 +05:30
Deepesh Garg
8b644d8889 fix: Report and JSON generation for Advances received 2021-09-01 10:28:15 +05:30
Deepesh Garg
5e22405c45 feat: CDNR Unreg json generation 2021-09-01 10:26:55 +05:30
Deepesh Garg
b6d0b17ed6 fix: Linting and patch fixes 2021-09-01 10:11:18 +05:30
Deepesh Garg
d06221ad7a fix: Advance TDS test case 2021-09-01 10:05:10 +05:30
GangaManoj
0e457265b7 fix: Test Product Bundle price calculation 2021-09-01 02:50:29 +05:30
GangaManoj
0c3d3bb357 fix: Test if Product Bundles are mapped properly on creating a Sales Order 2021-09-01 02:33:53 +05:30
GangaManoj
912bfb234f fix: Test if Product Bundles in SOs are replaced with their child items on creating POs 2021-09-01 02:09:46 +05:30
Ganga Manoj
82118975e2
Merge branch 'develop' into gross-profit-product-bundle 2021-08-31 22:08:10 +05:30
Rucha Mahabal
ef76f62bc1
fix: Healthcare Service Unit fixes (#27273)
* fix: validate service unit setup against practitioner schedule

* fix: service unit properties getting overwritten
2021-08-31 21:06:53 +05:30
GangaManoj
65796853f3 fix: Map Packed Items to Items table of PO 2021-08-31 20:31:22 +05:30
Ankush Menat
c1d986a0c6
fix: revert "refactor: simplify initialize_previous_data" (#27270)
This reverts commit 2f5624e588541103adb4a3170f2886590dcee42e.
2021-08-31 19:43:42 +05:30
Afshan
763450dcf8
Revert "fix: add child item groups into the filters (#26997)" (#27266)
This reverts commit c60d5523bc.
2021-08-31 19:07:20 +05:30
Frappe PR Bot
81fb493850
fix: payment terms on Sales Order when Invoice Portion field is empty (#27259) 2021-08-31 19:01:03 +05:30
Anuja Pawar
3e404f15ff
refactor: payment reconciliation tool (#27128) 2021-08-31 18:59:29 +05:30
Deepesh Garg
c37cec9b9d
fix(minor): Incorrect unallocated amount on type receive (#27262) 2021-08-31 18:50:23 +05:30
GangaManoj
eb24e87637 fix: Replace Product Bundles in the Items table with their child items 2021-08-31 18:44:29 +05:30
Frappe PR Bot
6281c33dd4
fix: pos payment methods not setting rounded_total (#27260) 2021-08-31 18:39:51 +05:30
Subin Tom
7004944cc0
feat: Taxjar Integration update (#27143)
* feat: Taxjar Integration update

* added taxable_amount,taxable_amount fields in setup.py

* Update taxjar_integration.py

Sider issues fix

* Sider issues fix

* Sider issues fix

* sider issue fix: unused import

* sider issue fix

* Update erpnext/erpnext_integrations/taxjar_integration.py

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>

* Removed permission for 'All'

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-08-31 18:33:16 +05:30
Deepesh Garg
5e10e10329 feat: Validity dates in Tax Withholding Rates 2021-08-31 18:23:28 +05:30
Anurag Mishra
ab47409e91
feat: Full and Final Settlement and Gratuity Fix (#26364)
* feat: Full and Final Settlement

* removed option to pay via salary slip

* feat: Create JV

* test:fnf

* fix: tracking asset movement

* fix: sider and test

* fix: changes Requested

* fix: changes requested

* fix: valication for Asset

* fix: add filter for reference document only if relevant field is present

* fix: doctype cleanup

- add more fields to the list view and standard filter

- set title field

- incorrect field labels

* feat: add list view settings for FNF

* fix: incorrect reference type set in Journal Entry

* fix: validation message

* chore: add Full and Final Statement link to Workspace

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-08-31 17:59:26 +05:30
Jannat Patel
48f2e5ac1d
fix: email digest original_user issue (#27191) 2021-08-31 17:43:30 +05:30
Frappe PR Bot
e958ae9002
feat: color and leave type in leave application calendar (#27246) (#27255)
* feat: color and leave type in leave application calendar

* fix: sider + use cstring

(cherry picked from commit 366eb86fdfd9bb204bce677b01b8d5bb5ffa4d6d)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
2021-08-31 17:34:48 +05:30
Dany Robert
94dcbf851a
fix: update get_exchange_rate for test mode (#26847)
* fix: no api calls on test mode

* fix: make api call, but return 1.0 incase of invalid currency

* feat: patch request.get

* fix: clear cache after test

* fix: add missing test_exchange_value

* fix: avoid api call in implicit function call during test

* fix: returning 1 while in test causes failure

Returning 1.00 causes failure of exchange rate tests.

* chore: retab

* chore: style
2021-08-31 17:19:12 +05:30
Alan
88aa7b824e
fix: pass labels through translation function (#27252) 2021-08-31 15:16:04 +05:30
Chillar Anand
88d849320f
fix(payroll): Fixed issue with accessing last salary slip for new employee (#27247) 2021-08-31 14:42:21 +05:30
GangaManoj
a067d55865 fix: Add Product Bundle field in Items table 2021-08-30 20:07:06 +05:30
GangaManoj
055ac82b39 fix: Remove Bundle Items table 2021-08-30 20:04:24 +05:30
Rucha Mahabal
1682402a9f
refactor: Healthcare Redesign Changes (#27236) 2021-08-30 18:26:56 +05:30
Dany Robert
5fd04101d4
fix: Stock Ageing report issues for serialized items (#27228)
* fix: incorrect calculation in get_range_age

* fix: remove serial numbers not in stock from fifo_queue

* refactor: make serial_no condition explicit

* refactor: reduce code duplication

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-08-30 18:11:33 +05:30
Deepesh Garg
fd467e6d32
fix: Correct company address not getting copied from Purchase Order to Invoice (#27217)
* fix: Correct company adderess not getting copied from Purchase Order to Invoice

* fix: Linting issues
2021-08-30 17:53:59 +05:30
Ankush Menat
7d2a0fe38e
Merge pull request #27197 from marination/supplier-primary-address
feat: (consistency) Add Primary Address and Contact section in Supplier
2021-08-30 14:03:09 +05:30
Subin Tom
9cb642238f
fix: expense claim reimbursed amount update (#27204) 2021-08-30 13:17:22 +05:30
Rucha Mahabal
212eb4bc1a
feat(Healthcare): Capacity for Service Unit, concurrent appointments based on capacity, Patient Appointments (#27219)
* feat(Healthcare): Capacity for Service Unit, concurrent appointments based on Capacity, Patient enhancements

* fix: appointment test

Co-authored-by: Anoop <3326959+akurungadam@users.noreply.github.com>
2021-08-30 13:10:18 +05:30
Marica
fbcf82f788
Merge branch 'develop' into supplier-primary-address 2021-08-30 12:51:37 +05:30
marination
7b78473da3 fix: Indentation and removed f-strings
- Sider: fixed indentation in js
- Dont use f-strings in queries
2021-08-30 12:50:24 +05:30
Deepesh Garg
f5cdbf161d
fix: LTV ratio comparison (#27207) 2021-08-28 14:55:51 +05:30
François de Ryckel
327071cb90
replace cur_frm with frm (#27210) 2021-08-28 14:55:11 +05:30
GangaManoj
e44567754d fix: Display Packed/Bundle Items table only if it exists 2021-08-27 20:16:13 +05:30
GangaManoj
a2b394b195 fix: Enable Print Hide for Bundle Items 2021-08-27 20:06:22 +05:30
GangaManoj
a7be02fe32 fix: Only add Item to packed_items list if it's not already there 2021-08-27 20:02:36 +05:30
Devin Slauenwhite
072151e16d
feat: Payment reconciliation on accounts module workspace (#25925)
* feat: add payment reconciliation to accounting workspace

* fix: update modified and duplicate the link

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-08-27 19:44:57 +05:30
marination
2a3ef03388 fix: Popup stale build and data consistency
- Include `supplier_quick_entry.js` in erpnext.bundle.js
- Create primary supplier address on update
- Set newly created address (quick entry)  in Supplier and Customer
- Clear address set in supplier and customer on delete (dependency)
2021-08-27 18:06:51 +05:30
Shadrak Gurupnor
7433757489
fix: patches were breaking during migration (#27200)
* fix: patches were breaking during migrating

* fix: patches were breaking during migration
2021-08-27 18:00:16 +05:30
Rucha Mahabal
5f3ec8230f
Merge pull request #27102 from anupamvs/prospect
feat(CRM): Prospect to group Leads
2021-08-27 16:48:41 +05:30
Shadrak Gurupnor
17e0fa7a8b
fix: patches were breaking while migrating (#27195)
* fix: patches were breaking while migrating

* fix: Removed duplicate function

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-08-27 16:42:25 +05:30
Rucha Mahabal
e170ad2df3 chore: add more fields to Prospect list view 2021-08-27 16:26:12 +05:30
Anupam Kumar
212921aace
Merge branch 'develop' into prospect 2021-08-27 15:57:10 +05:30
marination
bf72ec0598 feat: (consistency) Add Primary Address and Contact section in Supplier
- The same is present in customer and is inconsistent with supplier
- Helps quickly create primary address and contact via quick entry
2021-08-27 15:51:31 +05:30
Kamal Johnson
a285b5b78b
feat: Accounts, Selling & Assets Onboarding cleanup (#27112)
* refactor: company form fields arrangement

* refactor: accounts onboarding steps

* refactor: re-arrange fields & modify labels in company form

* feat: onbording steps for accounts module

* fix: updated onboarding steps for selling module

* fix: remove unwanted steps from accounts

* feat: add more onboarding steps

* feat: Refactor onboarding-module for accounting workspace

* feat: Add basic asset onboarding steps

* feat: Add basic asset item form tour

* feat: Add basic selling onboarding-steps

* feat: Add basic form tour for purchase recipt

* feat: Add basic form tour for existing asset

* feat: Adding asset category form tour

* feat: Add form tour for asset category

* feat: Refactor sales taxes and charges template form tour with new  method

* refactor: Remove old form tour for accounts settings

* refactor: Change asset category form tour with new tour method

* refactor: Change asset item form tour with new tour method

* refactor: Change purchase receipt form tour with new tour method

* refactor: Change asset form tour with new tour method

* refactor: Remove old form tour for selling settings

* refactor: general fix/typo in onboarding steps

* Apply suggestions from code review

Co-authored-by: Nabin Hait <nabinhait@gmail.com>

* refactor: Remove old form tour method for sales order.

* fix: removed duplicate section break

* fix: Removed duplicate fields

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
Co-authored-by: Anuja <anuja.pawar20@gmail.com>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-08-27 15:47:11 +05:30
Saqib
08188f2ac7
Merge branch 'develop' into gross-profit-product-bundle 2021-08-27 15:41:41 +05:30
Saqib
987746592c
fix: period closing voucher tests (#27198) 2021-08-27 15:41:26 +05:30
Saqib
8008598eb2
Merge branch 'develop' into gross-profit-product-bundle 2021-08-27 14:48:54 +05:30
Anupam
d701ad5313 fix: using frm instead of cur_frm 2021-08-27 13:09:52 +05:30
Rucha Mahabal
71b7c63ec0
feat: Ability to schedule onboarding and separation activities (#26738)
* refactor: employee onboarding form clean-up

* feat: ability to schedule onboarding / separation tasks

* feat: skip holidays while setting boarding activity dates

* chore: remove unused child table - Employee Onboarding Activity

* fix: tests

* fix: employee separation test
2021-08-27 11:12:24 +05:30
rohitwaghchaure
e6799d78ef
fix: operation time auto set to zero (#27188) 2021-08-27 10:46:45 +05:30
GangaManoj
535dd2d36d fix: Move Packed Items table right below the Items table 2021-08-27 02:47:11 +05:30
GangaManoj
4353c5e339 fix: Disable Add Row and Delete Row for Bundle Items 2021-08-27 02:32:34 +05:30
GangaManoj
bdbd4f83ab fix: Create separate section for Bundle Items 2021-08-27 02:29:47 +05:30
GangaManoj
20cfe60e84 feat: Populate Bundle Items table 2021-08-27 01:49:58 +05:30
GangaManoj
efd8a8b28e feat: Add Bundle Items table 2021-08-27 01:49:28 +05:30
GangaManoj
681c92d646 fix: Make Sales Order field editable so the PO can be linked with an SO later 2021-08-27 01:48:46 +05:30
GangaManoj
c33f5cad01 fix: Hide Rate of Bundle Items while printing 2021-08-27 01:21:52 +05:30
GangaManoj
99e6e2ce3f fix: Make Rate column read only by default 2021-08-27 01:15:01 +05:30
GangaManoj
6c03af815e fix: Display Bundle Items right below the Items table 2021-08-27 01:14:23 +05:30
GangaManoj
e506cd6a2f fix: Enable Fetch If Empty for Rate 2021-08-27 01:06:48 +05:30
GangaManoj
d4405c5e52 fix: Calculate Product Bundle price based on the prices of its child items 2021-08-27 01:02:34 +05:30
Deepesh Garg
ae7ec8e44d
fix: Base amount in tax gl entry 2021-08-26 23:51:09 +05:30
Frappe PR Bot
a1737c9a0c
fix: Production Plan: load document defaults for plan items & remove name column from listview (#26584) (#27184)
(cherry picked from commit 69d88a921273c9e0ea29d7131232686a0be7bb78)

Co-authored-by: Richard Case <64409021+casesolved-co-uk@users.noreply.github.com>
2021-08-26 23:04:54 +05:30
Pawan Mehta
db69d1dc00
fix: fetch from more than one sales order in Maintenance Visit (#26924)
* [fix] #26336

* fix(ux): make customer field reqd for fetching SO

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-08-26 22:54:24 +05:30
Chillar Anand
f1b77360ee
feat(healthcare): Added Treatment Plan Template feature (#26557)
* feat: Added doctypes for treatment plan template

* feat: Added child doctype

* feat: Added validations for patient age

* chore: Clean up treatment plan template

* fix: Limit plan items to templates

* Added multiselectdialogbox for treatment plan template

* Add template name as autoname

* Clean up code

* Cleanup lint issues

* Clean up code

* Added tests for tpt filters

* Added test records

* Fix order of fields

* Added tests for care plan template

* Added age property for patient

* Clean up code

* Clean up list view

* Clean up code

* Fix lint issues

* Clean up test records

* Code cleanup

no-docs

* chore: Code cleanup

* chore: Use ORM instead of raw sql

* fix: Make treatment plan item fields mandatory

* fix: Added healthcare roles in permissions rules

* fix: Added filters for symptoms, diagnosis

* fix: Show applicable treatment plans button only if patient is present

* fix: Fix key error issues

* fix: Fix issues with filters in plan templates

* chore: Fix age filters

* refactor: appending treatment plan items

* fix: treatment plan test

Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-08-26 22:15:30 +05:30
Rohan
16eed07a0f
fix: use Stripe's Price API for plan-price information (#26107)
* fix: use Stripe's new Plan API for price information

* patch: use inbuilt function to rename field

* fix: patch call

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-08-26 21:47:00 +05:30
Noah Jacob
422f67a4c9
refactor: update manufacturing module onboarding (#26945)
* refactor: updated manufacturing onboarding cards

* refactor: added form tours

* refactor: updated form tours and card descriptions

* Fix: Case of description

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-08-26 21:40:48 +05:30
Lovin Maxwell
f91faac7cd
fix: Pricing Rule on Transaction Based on Coupon (#26949) 2021-08-26 20:54:02 +05:30
Ankush Menat
ae55eab599
chore: remove deprecated and empty QUnit tests (#27179)
* chore: remove deprecated and empty QUnit tests

* ci: fix UI test config

Testing library was added on Frappe, in order to reuse command testing
library has to be installed during setup process.
2021-08-26 20:43:06 +05:30
Ankush Menat
a9852a5483
fix(ux): hide irrelevant fields for asset items (#26274) 2021-08-26 20:02:51 +05:30
Deepesh Garg
4b1f165429
fix: Use reverse debit and credit to get net amount in GL Entries (#27174)
* fix: Use reverse debit and credit to get net amount in GL Entries

* fix: Remove unused import
2021-08-26 18:34:15 +05:30
Ankush Menat
c07dce940e
fix: don't allow BOM's item code at any level of child items (#27157)
* refactor: bom recursion checking

* fix: dont allow bom recursion

if same item_code is added in child items at any level, it shouldn't be allowed.

* test: add test for bom recursion

* test: fix broken prodplan test using recursive bom

* test: fix recursive bom in tests
2021-08-26 18:33:42 +05:30
Marica
73b686a498
Merge pull request #27169 from marination/internal-customer-util
fix: Remove duplicate `create_internal_customer` utility
2021-08-26 16:42:28 +05:30
Ankush Menat
e7109c18db
fix: negative qty validation on stock reco cancellation (#27170)
* test: negative stock validation on SR cancel

* fix: negative stock setting ignored in stock reco

In stock reconcilation cancellation negative stock setting is ignored as
`db.get_value` is returning string `'0'` which is not casted to int/bool
for further logic. This causes negative qty, which evantually gets
caught by reposting but by design this should stop cancellation.

* test: typo and minor refactor
2021-08-26 16:40:45 +05:30
marination
501b91a608 fix: internal customer util returns str not doc object 2021-08-26 16:18:23 +05:30
Marica
e11bfe7da4
Merge pull request #27111 from 18alantom/feat-bom-process-loss-fp
feat: add provision for process loss in manufac (frontport #26151)
2021-08-26 16:10:05 +05:30
marination
45edfd9d50 fix: Remove duplicate create_internal_customer util
- Introduced via https://github.com/frappe/erpnext/pull/27086
2021-08-26 15:53:52 +05:30
Anupam
de488f68c0 adding test cases 2021-08-26 15:27:18 +05:30
Saqib
8ed6338336
refactor!: remove e_invoice utils (#27167) 2021-08-26 13:27:16 +05:30
18alantom
b389b8c3ad fix: prevent over riding scrap table values, name kwargs, set currency 2021-08-26 13:15:57 +05:30
Marica
f4dc9ee2aa
fix: Don't create inward SLE against SI unless is internal customer enabled (#27086)
* fix: Dont create inward SLE against SI unless is internal customer enabled

- Check if is internal customer enabled apart from target warehouse
- Test to check if inward SLE is made if target warehouse is accidentally set but customer is not internal

* test: Use internal customer for delivery of bundle items to target warehouse

- created `create_internal_customer` util
- reused it in delivery note and sales invoice tests
- use internal customer for target warehouse test in delivery note
2021-08-26 13:12:51 +05:30
18alantom
e20d21924c Merge branch 'develop' into feat-bom-process-loss-fp 2021-08-26 13:05:59 +05:30
Deepesh Garg
e2af9d5761
Merge pull request #27039 from nextchamp-saqib/common-party-acc
feat: common party accounting
2021-08-26 12:58:59 +05:30
rohitwaghchaure
fe4540d74d
fix: allow to change rate manually in case of stand-alone credit note (#27036)
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-08-26 12:52:36 +05:30
Anuja Pawar
baa548a3df
fix(regional): minor fixes and test for South Africa VAT report (#26933)
* fix: added test and minor fixes

* fix: sider fixes

* fix: sider

* fix: test fixes

Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-08-26 12:48:43 +05:30
Rucha Mahabal
642b4c805c
fix: Fee Validity fixes (#27156)
* chore: update Fee Validity form labels

* fix: first appointment should not be considered for Fee Validity

* fix: Fee Validity test cases

* fix: appointment test case
2021-08-26 12:15:49 +05:30
Anupam
fbac514929 feat: prospect permission 2021-08-26 12:14:29 +05:30
Brian Pond
1a919773d7
fix: Customers 'primary_address' not updated automatically (#26798) (#26799)
* Fix for Issue #26798

This PR is a fix for GitHub Issue 26798:
https://github.com/frappe/erpnext/issues/26798

TLDR:  When an Address is updated, and that Address is a Customer's Primary Address, update the Read Only field `customer.primary_address`

* Update address.py

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-08-26 11:57:28 +05:30
Anupam Kumar
c8f22e5524
fix: removing toggle_display for address and contact HTML (#27152) 2021-08-26 10:46:55 +05:30
Anupam
efdeee4d1f fix: conflicts 2021-08-26 00:15:35 +05:30
Saqib Ansari
be7a38b662 fix: cost center in test_sales_invoice_against_supplier 2021-08-25 21:35:32 +05:30