nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-14 20:35:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,212 Commits 437 Branches 1,739 Tags
cd20502c7eddeb67cdb56098a533737c7d936ebb
Commit Graph

39212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
cd20502c7e fix: Reset GST State number 
(cherry picked from commit 363e676a35)
 2022-03-23 18:00:47 +00:00
Deepesh Garg
aded1fca3e Merge pull request #30343 from deepeshgarg007/item_tax_template_bug 
fix: Taxes not getting fetched from item tax template
 2022-03-23 22:02:17 +05:30
Ankush Menat
54e4ff19ee fix: make auto created job cards "Open" 
(cherry picked from commit 6418dc1606)
 2022-03-23 16:46:22 +05:30
Ankush Menat
ff38d0498b fix: material transfer status should be before WIP 
(cherry picked from commit e1f5620654)
 2022-03-23 16:46:22 +05:30
Ankush Menat
a1740b0762 fix: ignore items without info for pending qty computation 
(cherry picked from commit 4aa74af90d)
 2022-03-23 15:51:29 +05:30
Ankush Menat
277c03e157 chore(DX): add sourceURL for debugging 
(cherry picked from commit be16fb9dbb)
 2022-03-23 15:51:29 +05:30
Deepesh Garg
67b9f43330 Merge pull request #30367 from frappe/mergify/bp/version-13-hotfix/pr-30365 
fix: Changing item prices on converting orders/receipts to invoices (backport #30365)
 2022-03-23 14:27:22 +05:30
Deepesh Garg
a3f4069ad5 fix: Check if onload property exists in the form object 2022-03-23 13:58:21 +05:30
Deepesh Garg
ebcd85e675 Merge pull request #30371 from frappe/mergify/bp/version-13-hotfix/pr-30361 
fix: GST account not showing up in tax templates (backport #30361)
 2022-03-23 13:42:44 +05:30
Deepesh Garg
0979ba0670 fix: GST account not showing up in tax templates 
(cherry picked from commit 57924599da)
 2022-03-23 07:47:52 +00:00
Deepesh Garg
0e3d0b0b03 fix: Add ignore pricelist for missing flows 
(cherry picked from commit 405dcb1d3c)
 2022-03-23 04:40:23 +00:00
Deepesh Garg
9f2868e858 fix: Changing item prices on converting orders/receipts to invoices 
(cherry picked from commit 66ca085e39)
 2022-03-23 04:40:22 +00:00
Ankush Menat
1b469bc341 fix: consider full integer batch nos 
(cherry picked from commit 41db43cdc5)
 2022-03-22 23:37:31 +05:30
Ankush Menat
4e3bb12b3a fix: ignore already fetched serial no 
exclude_sr_nos is sent as JSON string of list, so load it before
operating on it.

(cherry picked from commit a18c687844)
 2022-03-22 23:37:31 +05:30
Marica
315599b46f Merge pull request #30355 from frappe/mergify/bp/version-13-hotfix/pr-30336 
fix: Product Filters Lookup (backport #30336)
 2022-03-22 18:05:17 +05:30
mergify[bot]
7e6131280f fix: flaky salary slip email test (backport #30358) (#30360) 
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-22 17:55:26 +05:30
marination
cfce719a7d fix: Add temporary text-md variable to maintain placeholder font size in input fields 
- font is unusally large for filter lookup input
 2022-03-22 16:12:30 +05:30
mergify[bot]
e29757f023 test: get leave allocation records query (backport #30342) (#30353) 
Co-authored-by: Ankush Menat <ankush@frappe.io>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-03-22 15:44:45 +05:30
Marica
0f774f2f07 fix: Merge conflicts in macros 
- Use `filter-lookup-wrapper` on checkbox wrapper
- Bind data value to wrapper
 2022-03-22 15:39:36 +05:30
marination
37134b04d8 fix: Product Filters Lookup 
- bind the right classes to the filter lookup field
- make class names more descriptive
- make filter lookup field more visible with white bg and border
- bind lookup input field js in `views.js`
- make filter lookup field functioning for atribute filters too
- added placeholder to lookup field

(cherry picked from commit f6e64c2cac)

# Conflicts:
#	erpnext/templates/includes/macros.html
 2022-03-22 10:02:28 +00:00
Deepesh Garg
7cba4975ef fix: Taxes not getting fetched from item tax template 2022-03-21 21:28:41 +05:30
mergify[bot]
3ca90cc3c7 fix(ux): warning for disabled carry forwarding in Policy Assignment (backport #30331) (#30333) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-03-21 15:53:08 +05:30
mergify[bot]
34d27f1855 fix: clear "Retain Sample" and "Max Sample Quantity" in Item card if Has Batch No is uncheck (backport #30307) (#30314) 
* fix: clear "Retain Sample" and "Max Sample Quantity" in Item card if Has Batch No is uncheck (#30307)

(cherry picked from commit ca8d757691)

# Conflicts:
#	erpnext/stock/doctype/item/test_item.py

* chore: conflicts

* refactor: correct usage for test decorator

Co-authored-by: HENRY Florian <florian.henry@open-concept.pro>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-21 15:39:04 +05:30
Nabin Hait
cedabd7242 fix: Future recurring period calculation for additional salary (#29581) 
* fix: Future recurring period calculation for addl salary

* fix: future recurring period calculation

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-03-21 14:23:31 +05:30
Nabin Hait
c5f257da00 fix: While creating Payment Request from other forms, open a new Payment Request form without saving (#30228) 2022-03-21 14:22:10 +05:30
Nabin Hait
9abd22b408 fix: Payment Request Amount calculation in case of multicurrency (#30254) 2022-03-21 14:20:15 +05:30
mergify[bot]
71d6209a29 fix: disable deferred naming on SLE/GLE if hash method is used. (#30286) (#30315) 
* fix: dont rename GLE/SLE that dont have naming series

* test: tests for deferred naming of ledgers

(cherry picked from commit c2aad115c1)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-21 12:29:21 +05:30
Deepesh Garg
621db33591 Merge pull request #30321 from frappe/mergify/bp/version-13-hotfix/pr-30317 
fix: P&L account validation on cancellation (backport #30317)
 2022-03-21 12:05:41 +05:30
Deepesh Garg
4337b86349 Merge pull request #30318 from frappe/mergify/bp/version-13-hotfix/pr-30304 
fix: Add permission for KSA VAT documents (backport #30304)
 2022-03-21 12:05:15 +05:30
Saqib Ansari
10f06d2e50 Merge pull request #30320 from frappe/mergify/bp/version-13-hotfix/pr-30287 
fix: custom cash flow mapper doesn't show any data (backport #30287)
 2022-03-21 11:40:06 +05:30
Deepesh Garg
1b5e936d27 fix: P&L account validation on cancellation 
(cherry picked from commit 2ff6790283)
 2022-03-21 05:15:39 +00:00
Saqib Ansari
8f6333cd40 refactor: convert raw sql to frappe.qb 
(cherry picked from commit 00bfee97c7)
 2022-03-21 05:03:19 +00:00
Saqib Ansari
4dd6a99b69 fix: custom cash flow mapper doesn't show any data 
(cherry picked from commit 119273e633)
 2022-03-21 05:03:19 +00:00
Deepesh Garg
da09b64174 fix: Conflicts 2022-03-21 10:28:58 +05:30
Deepesh Garg
75458f90b5 fix: Add permission for KSA Vat documents 
(cherry picked from commit 972d06555a)

# Conflicts:
#	erpnext/patches.txt
 2022-03-21 04:49:05 +00:00
Syed Mujeer Hashmi
dc8674fe0d fix: Allow draft PE, PA to link to Vital Signs (#29934) 
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>

Co-authored-by: Chillar Anand <chillar@avilpage.com>
Co-authored-by: Chillar Anand <anand21nanda@gmail.com>
 2022-03-21 08:42:28 +05:30
mergify[bot]
3636e596d3 refactor: remove redundant if-statement (#30311) (#30316) 
(cherry picked from commit 0a015b7f70)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2022-03-20 20:24:40 +05:30
mergify[bot]
7bcad01953 fix(UX): misc serial no selector + warehouse.py refactor (backport #30309) (#30310) 
* fix: set current qty as default qty for stock entry

(cherry picked from commit f4c213379e)

* fix: filter serial nos by selected batch number

(cherry picked from commit 5ec27c9055)

* fix: skip already selected serials in sr selector

(cherry picked from commit 0a533d6ccc)

* fix: sort serial nos before sending

(cherry picked from commit 4f8bb91eae)

* test: auto serial fetching

(cherry picked from commit b9eec331e3)

* refactor: batch no filter handling

(cherry picked from commit a585dff6fd)

# Conflicts:
#	erpnext/stock/doctype/serial_no/serial_no.py

* refactor: Use QB for serial fetching query

(cherry picked from commit 4b695915f4)

# Conflicts:
#	erpnext/stock/doctype/serial_no/serial_no.py

* refactor(warehouse): raw query to ORM

(cherry picked from commit 953afda01b)

* test: warehouse conversion and treeview test

(cherry picked from commit 684d9d66d1)

* perf: Single query to delete bins instead of `N`

(cherry picked from commit 4859574233)

* chore: resolve conflicts

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-20 19:25:10 +05:30
Devarsh Bhatt
cca9668309 fix: Allow on Submit for Material Request Item Required Date (#30174) 
* fix: Allow on Submit for Material Request Item Required Date

* chore: whitespace

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
 2022-03-19 13:02:21 +05:30
mergify[bot]
3d35c69a2d fix: respect db multi_tenancy while fetching precision (#30301) (#30302) 
[skip ci]

(cherry picked from commit 5a9bf9ffd6)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-18 17:32:01 +05:30
Deepesh Garg
88b2447297 Merge pull request #30296 from frappe/mergify/bp/version-13-hotfix/pr-30266 
fix: Validate income/expense account in sales and purchase invoice (backport #30266)
 2022-03-17 18:55:21 +05:30
Deepesh Garg
2cf19aa19d fix: Test case 
(cherry picked from commit 4237e5d928)
 2022-03-17 13:03:20 +00:00
Deepesh Garg
935d2e3d64 fix: Validate income/expense account in sales and purchase invoice 
(cherry picked from commit 06936cf1c0)
 2022-03-17 13:03:20 +00:00
mergify[bot]
face53ae8e feat: Create single PL/DN from several SO. (backport #30238) (#30289) 
* feat: Create single PL/DN from several SO. New PR from latest develop to avoid rebase

(cherry picked from commit 61eb9b6c68)

* to enable selection of SO irrespective of customer,removed validation for customer

(cherry picked from commit 466df6bdb7)

* fixed spacings

(cherry picked from commit f33a725a9e)

* added new field - Picked Qty, in Sales Order Item

(cherry picked from commit a68213d82e)

* Added new field in SO - % Picked

(cherry picked from commit 9f7fee7a4f)

* removed semicolon for break statement

(cherry picked from commit e970616b51)

* as per review comments - changed for loop

(cherry picked from commit 0211f27e83)

* corrected spacing

(cherry picked from commit a12895ec03)

Co-authored-by: Krithi Ramani <krithi.ramani@gmail.com>
 2022-03-17 18:17:16 +05:30
Deepesh Garg
e60145e10a Merge pull request #30295 from frappe/mergify/bp/version-13-hotfix/pr-30261 
fix: Error in bank reconciliation statement (backport #30261)
 2022-03-17 18:11:04 +05:30
Deepesh Garg
aa1732a212 fix: Error in bank reco statement 
(cherry picked from commit fbcb413d96)
 2022-03-17 12:21:03 +00:00
Deepesh Garg
65d0189f71 Merge pull request #30284 from deepeshgarg007/dimension_wise_balance_report 
fix: Clean and fixes in Dimension-wise Accounts Balance Report
 2022-03-17 17:27:01 +05:30
mergify[bot]
3b1033c315 test: fix holiday list creation causing flaky tests (backport #30260) (#30288) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-03-17 15:39:02 +05:30
Deepesh Garg
cab69fe1f2 fix: Remove comments 2022-03-17 12:57:12 +05:30
Deepesh Garg
08a06ce5c6 fix: Clean and fixes in Dimension-wise Accounts Balance Report 2022-03-17 12:56:43 +05:30