Ankush Menat
b25d28e023
fix(patch): delete stale shopify doctypes ( #27313 )
3 years ago
Saqib
a158b825fc
Merge pull request #27124 from GangaManoj/gross-profit-product-bundle
feat: Improve Product Bundle handling
3 years ago
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
3 years ago
Anupam Kumar
c25367f107
Merge pull request #27292 from anupamvs/comany-name-field-issue-develop
fix: mapping for company name lead->contact
3 years ago
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
3 years ago
Ankush Menat
dea5c34d8d
chore: whitespace
3 years ago
Ankush Menat
81eb6fde07
Merge pull request #27288 from ankush/strict_linting
chore: cleanup linting errors and introduce strict linting checks
3 years ago
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
3 years ago
rohitwaghchaure
2a8cd05b44
fix: production plan UX and validation message ( #27278 )
3 years ago
Marica
9506c14d35
fix: Zero division error while fetching unconsumed materials ( #27293 )
`
3 years ago
Ankush Menat
a641b326c5
chore: ignore whitespace changes in blame
3 years ago
Jannat Patel
696fa6c8fe
Merge branch 'develop' into comany-name-field-issue-develop
3 years ago
Anupam
821f6a6178
fix: mapping for company name lead->contact
3 years ago
Ankush Menat
b147b85e6a
chore: whitespace / eof fixes
3 years ago
Ankush Menat
65279c2471
ci: add strict config for flake8
3 years ago
Ankush Menat
0afff86da7
ci: add pre-commit config
3 years ago
Ankush Menat
e46567192a
fix: invalid escape sequences in regex
3 years ago
GangaManoj
bc79084dac
fix: Add Product Bundle field in Items table
3 years ago
GangaManoj
bbb9fa4bf8
fix: Remove Rate from field_no_map
3 years ago
GangaManoj
471fd9718c
fix: Set Product Bundle's Delivery Dates in SO as Bundle Items' Delivery Dates in PO
3 years ago
Ankush Menat
55b24345a0
fix: remove unused format from query
doctype is not used in query and parent alone is enough to identify
packed items.
3 years ago
Ankush Menat
7d9819f352
fix: remove duplicate imports
3 years ago
GangaManoj
4d8f833cc9
fix: Remove Add Row and Delete Row options for Packed Items table
3 years ago
GangaManoj
17a6a9b036
fix: Uncheck read-only for Packed Items table
3 years ago
GangaManoj
816ba55b74
fix: Make Rate read-only by default
3 years ago
Ankush Menat
2d62c500c4
fix: undefined variables
3 years ago
Ankush Menat
9fec0a5c68
refactor: itemgetter instead of assigned lambda
3 years ago
Ankush Menat
010060d92e
chore: correct indentation
3 years ago
Ankush Menat
694ae81618
fix: remove bare excepts
3 years ago
Alan
72ece75b11
ci(semgrep): add translation checks for report labels ( #27280 )
* ci(semgrep): add translation checks for report labels
* refactor: shift report tests to it's own yml
path can't be applied on a test id basis
* ci: ignore regional report in translation checks
[skip ci]
3 years ago
Alan
9dc0843cbd
fix: translate labels ( #27282 )
[skip ci]
3 years ago
GangaManoj
0e457265b7
fix: Test Product Bundle price calculation
3 years ago
GangaManoj
0c3d3bb357
fix: Test if Product Bundles are mapped properly on creating a Sales Order
3 years ago
GangaManoj
912bfb234f
fix: Test if Product Bundles in SOs are replaced with their child items on creating POs
3 years ago
Ganga Manoj
82118975e2
Merge branch 'develop' into gross-profit-product-bundle
3 years ago
Rucha Mahabal
ef76f62bc1
fix: Healthcare Service Unit fixes ( #27273 )
* fix: validate service unit setup against practitioner schedule
* fix: service unit properties getting overwritten
3 years ago
GangaManoj
65796853f3
fix: Map Packed Items to Items table of PO
3 years ago
Ankush Menat
c1d986a0c6
fix: revert "refactor: simplify initialize_previous_data" ( #27270 )
This reverts commit 2f5624e588541103adb4a3170f2886590dcee42e.
3 years ago
Afshan
763450dcf8
Revert "fix: add child item groups into the filters ( #26997 )" ( #27266 )
This reverts commit c60d5523bc
.
3 years ago
Frappe PR Bot
81fb493850
fix: payment terms on Sales Order when Invoice Portion field is empty ( #27259 )
3 years ago
Anuja Pawar
3e404f15ff
refactor: payment reconciliation tool ( #27128 )
3 years ago
Deepesh Garg
c37cec9b9d
fix(minor): Incorrect unallocated amount on type receive ( #27262 )
3 years ago
GangaManoj
eb24e87637
fix: Replace Product Bundles in the Items table with their child items
3 years ago
Frappe PR Bot
6281c33dd4
fix: pos payment methods not setting rounded_total ( #27260 )
3 years ago
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>
3 years ago
gavin
dea14eef51
Merge pull request #27240 from ankush/ubuntu_ci
ci: switch to latest LTS Ubuntu version
3 years ago
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>
3 years ago
Jannat Patel
48f2e5ac1d
fix: email digest original_user issue ( #27191 )
3 years ago
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>
3 years ago
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
3 years ago