ChillarAnand
66e92d423e
chore: Added healthcare deprecation warning patch
2021-09-02 20:02:11 +05:30
ChillarAnand
e913e277d9
chore: Rename imports from erpnext to healthcare
2021-09-02 19:47:39 +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
ChillarAnand
5d4133ecac
chore: Removed healthcare demo, patch files
2021-09-02 18:25:36 +05:30
ChillarAnand
bcb3f0fedb
chore: Removed healthcare module
2021-09-02 18:14:34 +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
Ankush Menat
8b1a61be29
chore: ignore import cleanup commit in blame
2021-09-02 16:46:25 +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
Ankush Menat
a641b326c5
chore: ignore whitespace changes in blame
2021-09-01 18:43:38 +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
65279c2471
ci: add strict config for flake8
2021-09-01 16:57:21 +05:30
Ankush Menat
0afff86da7
ci: add pre-commit config
2021-09-01 16:57:20 +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
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]
2021-09-01 14:19:39 +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
