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
Deepesh Garg
5d0a6c1e64
Merge pull request #30742 from deepeshgarg007/bot_token
...
fix: Update token to allow updates on protected branch
2022-04-19 15:30:52 +05:30
Deepesh Garg
6f332f3669
fix: Update token to allow updates on protected branch
2022-04-19 15:28:56 +05:30
Rucha Mahabal
f39615bd80
Merge pull request #30701 from ejaazkhan/shift-type-null-in-employee-checkin
2022-04-19 14:34:36 +05:30
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
Ankush Menat
c4d20ce159
Merge pull request #30729 from deepeshgarg007/semantic_releases
...
chore: Add semantic releases
2022-04-18 17:13:16 +05:30
Deepesh Garg
e0a9a69d76
chore: do not publish any assets
2022-04-18 16:45:01 +05:30
Ankush Menat
6fc11cb4c5
ci: use latest ubuntu container
2022-04-18 16:17:36 +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
c12a36aed9
chore: block major releases
2022-04-18 13:05:56 +05:30
Deepesh Garg
1c49e453ea
Merge pull request #30724 from deepeshgarg007/erpnext_changes
...
fix: Consistent customer and supplier forms
2022-04-18 11:23:26 +05:30
Deepesh Garg
cc1bdd426b
chore: Update branch name
2022-04-18 10:48:31 +05:30
Deepesh Garg
41249c57c4
chore: Add sematic releases
2022-04-18 10:38:22 +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
Deepesh Garg
4b2521c9f3
Merge pull request #30719 from frappe/mergify/bp/develop/pr-30408
...
fix: process statement to_date override (backport #30408 )
2022-04-14 20:22:46 +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
mergify[bot]
41ec5cadf6
Merge pull request #30677 from ankush/refactor/stock_balance
...
refactor: stock balance report
2022-04-14 13:02:46 +00:00
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
