Dany Robert
01e7076b65
Merge branch 'develop' into currency-exchange-settings
2021-11-06 09:59:00 +05:30
Ankush Menat
aed45f22f4
Merge pull request #28249 from ankush/dead_code
...
chore: py2 compatibility code cleanup
2021-11-05 11:55:55 +05:30
Ankush Menat
37e6e1f330
chore: ignore six removal commit in blame
2021-11-05 11:28:31 +05:30
Ankush Menat
8fe5feb6a4
chore: remove all six compat code
2021-11-05 11:16:29 +05:30
Ankush Menat
56a25a0c4f
chore: drop future from requirements.txt
2021-11-05 11:16:29 +05:30
Ankush Menat
897e90ac55
chore: remove past module dependencies
2021-11-05 11:16:29 +05:30
Ankush Menat
6098e92ba9
chore: remove utf-8 compat code
2021-11-05 11:16:29 +05:30
mergify[bot]
25f647f067
fix: Bulk update of valid upto field wasn't working (bp #28242 )
...
* fix: Bulk update of valid upto field wasn't working
Check in dates for the price list was failing because valid_upto field was string. Converting to date fixed the problem.
* chore: extend fix and cleanup whitespace
Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit 95a5ef1d416d54ecf0f557586b341b0dce2a0b05)
Co-authored-by: fatihustaoglu <46131068+fatihustaoglu@users.noreply.github.com>
2021-11-04 21:46:48 +05:30
Raffael Meyer
114028e473
feat: replace newline in remarks (DATEV report) ( #28152 )
2021-11-04 21:44:24 +05:30
marination
0aa237f38c
test: Stock Entry from JC correctness (items mapping and qty)
2021-11-04 20:14:28 +05:30
Marica
51fb543f67
Merge branch 'develop' into se-required-items-from-jc
2021-11-08 18:05:11 +05:30
Saif Ur Rehman
85d1a237ce
fix(Asset Capitalization): Reverse depreciation on cancel
2021-11-04 14:15:47 +05:00
Saif Ur Rehman
dc3c27fd1b
fix(Asset Capitalization): update code for changes in depreciation logic
2021-11-04 13:47:33 +05:00
Saif Ur Rehman
2d9da22721
Merge branch 'develop' of https://github.com/frappe/erpnext into asset-capitalization
...
# Conflicts:
# erpnext/accounts/doctype/sales_invoice/sales_invoice.py
# erpnext/assets/doctype/asset/test_asset.py
# erpnext/assets/workspace/assets/assets.json
2021-11-04 12:48:33 +05:00
Dany Robert
4716523c77
fix: sider issues
2021-11-04 05:38:00 +00:00
Dany Robert
4a0f2175ad
fix: pre-commit issues
2021-11-04 05:25:48 +00:00
Dany Robert
1f8be84985
fix : remove mutable data structures from argument defaults
2021-11-04 05:12:09 +00:00
Dany Robert
e65a76b214
chore: clean up
2021-11-04 05:04:10 +00:00
Dany Robert
08b2735a79
fix: make fields editable only when service provider is custom
2021-11-04 05:01:37 +00:00
Dany Robert
7291d9f236
feat: option for preconfigured selectable service providers
2021-11-03 14:13:22 +00:00
Saqib Ansari
b7a44fe0a3
perf: improve financial statement loading time
2021-11-03 18:17:31 +05:30
Dany Robert
d869b3933b
Merge branch 'frappe:develop' into currency-exchange-settings
2021-11-03 18:15:27 +05:30
Suraj Shetty
30a6f03ad3
Merge pull request #28192 from revant/build-on-rel
...
ci: migrate docker to github actions
2021-11-03 18:08:17 +05:30
Anupam
7044ae5e39
fix: testcases:
2021-11-03 17:41:04 +05:30
Noah Jacob
cb064b06ad
fix: added job_card_item link in material request ( #28222 )
...
* fix: added job_card_item links in material request
* fix: add no copy to row references
2021-11-03 11:53:57 +00:00
marination
3da03028f3
fix: Pull Items that are in JC in Stock Entry against JC
...
- Check if items pulled in stock entry are present in Job Card
- Code cleanup and removed redundant checks
Co-authored-by: Gavin D'souza <gavin18d@gmail.com>
2021-11-03 17:05:57 +05:30
Anuja Pawar
0d65a6e333
Merge branch 'develop' into gst-category
2021-11-03 15:49:22 +05:30
Anupam
cc15cf6ae2
fix: linter isuue
2021-11-03 13:54:46 +05:30
Revant Nandgaonkar
c2697bca76
ci: change GITHUB_PAT to CI_PAT
2021-11-03 13:52:37 +05:30
Anupam Kumar
8ebc412e8b
Merge branch 'develop' into manufacturing-work-order-stop
2021-11-03 13:41:37 +05:30
Anupam
ba47bd02b6
fix: sider isuue
2021-11-03 13:41:22 +05:30
Anupam
9b4c7e4796
fix: validate job card
2021-11-03 13:27:50 +05:30
Saqib
a5902fa3f8
Merge pull request #28187 from hrwX/subscription_active_fixes
...
fix: do not generate multiple invoices
2021-11-03 11:40:39 +05:30
Anuja Pawar
3c4484fbf9
Merge branch 'develop' into gst-category
2021-11-02 23:30:16 +05:30
Anuja Pawar
f2fbcc8124
fix: sider
2021-11-02 23:29:06 +05:30
Anupam
9c0906f1b5
fix: test cases
2021-11-02 20:43:00 +05:30
Deepesh Garg
11e90cc0be
Merge pull request #28205 from deepeshgarg007/lower_deduction_validation_fix
...
fix: Error on LDC creation
2021-11-02 20:27:18 +05:30
Deepesh Garg
66348e1a03
fix: Error on LDC creation
2021-11-02 20:26:40 +05:30
Marica
91112c49e1
Merge pull request #28202 from marination/serial-no-popup-with-scanner
...
fix: Serial Nos not set in the row after scanning in popup
2021-11-02 20:17:48 +05:30
hrwx
2bce193b81
Merge branch 'develop' of https://github.com/frappe/erpnext into subscription_active_fixes
2021-11-02 14:05:10 +00:00
Saqib
ec0a72423a
fix: Calculate depreciation_amount accurately ( #27585 )
2021-11-02 18:45:03 +05:30
marination
734b57deec
fix: Serial Nos not set in the row after scanning in popup
...
- Avoid whitspaces while calculating length of serial nos
2021-11-02 18:34:55 +05:30
Noah Jacob
857d87da97
fix: replaced "=" with "in" for multiple statuses in query #28193
...
fix: replaced "=" with "in" for multiple statuses in query
2021-11-02 17:52:45 +05:30
Saqib
7681600b5e
fix: test wdv method for indian region
2021-11-02 17:47:44 +05:30
hrwx
890a786858
fix: do not generate multiple invoices
2021-11-02 11:58:01 +00:00
GangaManoj
f047c6ffc8
fix: Test for WDV
2021-11-02 16:43:31 +05:30
Anuja Pawar
d72709dd81
fix(Payment Entry): splitting outstanding rows as per payment terms ( #27946 )
2021-11-02 16:28:46 +05:30
Marica
11c0b37658
Merge pull request #28195 from marination/se-batch-filter
...
fix: (ux) Remove warehouse filter on Batch field for Material Receipt
2021-11-02 16:09:32 +05:30
marination
48886ee705
chore: Add comment above fix for future reference
2021-11-02 15:57:41 +05:30
marination
048210a8f6
fix: Remove warehouse filter on Batch field for Material Receipt
2021-11-02 15:49:58 +05:30
