nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 17:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,485 Commits 402 Branches 1,700 Tags
fa66d1d87dd5bb225c00a56c43c2c81820c672ff
Commit Graph

38485 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rohitwaghchaure
fa66d1d87d fix: conflicts 2022-01-12 13:30:05 +05:30
Rohit Waghchaure
d71d769c7a fix: incorrect scrap item qty 
(cherry picked from commit 8f0b2fa90e)

# Conflicts:
#	erpnext/manufacturing/doctype/work_order/test_work_order.py
 2022-01-12 07:44:38 +00:00
Marica
e05ad8ed10 Merge pull request #29219 from marination/item-variant-config-backend-cleanup 
fix: Behaviour of Item Variants Cache generation
 2022-01-12 02:12:03 +05:30
Marica
f8761dc5ca Merge branch 'version-13-hotfix' into item-variant-config-backend-cleanup 2022-01-12 01:52:55 +05:30
marination
a0bd82e99f fix: Server Side test - teardown correctly 2022-01-11 22:43:39 +05:30
mergify[bot]
00ad0dd24d feat: early payment discount on sales & purchase orders (#29238) 2022-01-11 21:11:42 +05:30
Marica
c773051a3e Merge branch 'version-13-hotfix' into item-variant-config-backend-cleanup 2022-01-11 20:16:41 +05:30
marination
746bb6277f test: Variant Selector - Fetch next valid Attribute values fetching after selection of one 2022-01-11 20:15:24 +05:30
Ankush Menat
d9f31770c6 fix(patch): enable all uoms on recently created sites 
(cherry picked from commit f8119563ca)
 2022-01-11 18:56:50 +05:30
Ankush Menat
c1fbd2308c fix: UOM autocomplete broken 
All new recent sites seem to have all UOMs as disabled by default. The
desired behaviour is exact opposite of this.

(cherry picked from commit 33aad4b950)
 2022-01-11 18:56:50 +05:30
marination
577de39ca6 test: Variant Selector - Attribute Value fetching 2022-01-11 18:19:29 +05:30
mergify[bot]
819346f69f fix: "update cost" should ignore overridden routing times #29154 (#29235) 
fix: "update cost" should ignore overridden routing times
(cherry picked from commit 754596dfc1)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-01-11 09:02:57 +00:00
mergify[bot]
8bb72dece4 fix(pos): cannot ignore pricing rule for one particular invoice (#29232) 2022-01-11 14:26:39 +05:30
mergify[bot]
4343eddd46 fix(gl-report): group by cost center only if include_dimensions is checked (#28883) (#29231) 2022-01-11 13:24:21 +05:30
Ankush Menat
f35ef60262 Merge pull request #29224 from frappe/mergify/bp/version-13-hotfix/pr-29131 
fix(patch): serial no whitespace trimming (backport #29131)
 2022-01-10 22:33:15 +05:30
Ankush Menat
d0c7d4fc98 refactor: convert query to ORM 
(cherry picked from commit cbaa8fdade)
 2022-01-10 14:22:46 +00:00
Ankush Menat
fbe0442e89 fix(patch): serial no whitespace trimming 
old data can contain trailing/leading whitespace which doesn't work well
with code to find last SLE for serial no.

(cherry picked from commit 0faa116f97)
 2022-01-10 14:22:45 +00:00
mergify[bot]
055d620ef3 fix: pos invoices consolidation case with permlevel (#29220) 2022-01-10 19:48:28 +05:30
Marica
495c5126f8 fix: Exclude unpublished items while fetching items from other item groups (#29211) 2022-01-10 19:47:50 +05:30
marination
23f4b51e3e fix: Behaviour if Item Variants Cache generation 
- Revert to old behaviour where variant doesnt need to be published
- Delete unused functions
 2022-01-10 18:04:03 +05:30
marination
0174aa238c fix: Exclude unpublished items while fetching items from other item groups 2022-01-10 13:38:54 +05:30
mergify[bot]
ac4e996928 fix: Task Depends on not removed from Gantt chart (backport #28309) (#29207) 
Co-authored-by: conncampbell <conncampbell@conzu.ca>
(cherry picked from commit 31123436fb)

Co-authored-by: Conn Campbell <conn.campbell@conzu.ca>
 2022-01-10 10:49:29 +05:30
Deepesh Garg
d85aef5b2a Merge pull request #29188 from frappe/mergify/bp/version-13-hotfix/pr-29176 
fix: Inconsistency in calculating outstanding amount (backport #29176)
 2022-01-07 20:21:02 +05:30
mergify[bot]
822a8ba47a chore: remove framework patch for custom fields (#29117) (#29195) 
* chore: patches were breaking during migration

* fix: rewrote the query in query builder

* chore: removed patch from patches.txt

(cherry picked from commit 25c875e447)

Co-authored-by: Shadrak Gurupnor <30501401+shadrak98@users.noreply.github.com>
 2022-01-07 19:04:19 +05:30
Deepesh Garg
14aca20b00 Merge pull request #29194 from frappe/mergify/bp/version-13-hotfix/pr-28994 
fix: cannot create debit note with zero qty (backport #28994)
 2022-01-07 19:03:56 +05:30
Saqib Ansari
ecf341d1b1 fix: cannot save debit note with zero quantity 
(cherry picked from commit 2be5104848)
 2022-01-07 13:06:01 +00:00
Saqib Ansari
4ef9d289e8 fix(sales-invoice): cannot create debit note with zero qty 
(cherry picked from commit 04ea42ce52)
 2022-01-07 13:06:00 +00:00
Deepesh Garg
9b6c2fdfb7 fix: Conflicts 2022-01-07 15:03:55 +05:30
Deepesh Garg
203943ef97 Merge pull request #29186 from frappe/mergify/bp/version-13-hotfix/pr-29169 
fix: GL Entries for loan repayment via Salary (backport #29169)
 2022-01-07 15:02:19 +05:30
Deepesh Garg
b561c18502 fix: Inconsistency in calculating outstanding amount 
(cherry picked from commit 9d3a5c3184)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
 2022-01-07 07:59:28 +00:00
Deepesh Garg
a333635ab6 Merge pull request #29135 from deepeshgarg007/gl_balance_ar_ap 
fix: Show GL balance in Accounts Receivable and Payable summary
 2022-01-07 12:59:17 +05:30
Deepesh Garg
892e63575e fix: GL Entries for loan repayment via Salary 
(cherry picked from commit f316aaf41e)
 2022-01-07 07:25:10 +00:00
Syed Mujeer Hashmi
60ddf39e37 chore: Remove the extra 's' in patient age string (#29180) 2022-01-07 09:22:36 +05:30
mergify[bot]
7abe7c752b fix: incorrect serial no valuation report showing cancelled entries (#29172) (#29173) 
(cherry picked from commit 24fc487dd8)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-01-06 17:05:00 +05:30
Deepesh Garg
d243291e1c Merge pull request #29155 from deepeshgarg007/ksa_vat_currency 
fix: Currency in KSA VAT report
 2022-01-06 16:22:40 +05:30
Deepesh Garg
493af62038 Merge pull request #29170 from frappe/mergify/bp/version-13-hotfix/pr-29125 
fix: cannot create reverse journal entry (backport #29125)
 2022-01-06 14:11:46 +05:30
Saqib Ansari
b82d4b7577 fix: cannot create reverse journal entry 
(cherry picked from commit 3aa1817f7b)
 2022-01-06 08:01:51 +00:00
mergify[bot]
37d2f6fd15 fix: Earned Leave allocation from Leave Policy Assignment (backport #29163) (#29165) 
* fix: Earned Leave allocation from Leave Policy Assignment

* test: Earned Leave Allocation from Leave Policy Assignment

(cherry picked from commit 26247be3b8)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-01-06 11:44:58 +05:30
mergify[bot]
6cc3c612ee feat: 'Invoice Number' field in Opening Invoice Creation Tool (#29156) 2022-01-05 16:00:00 +05:30
Deepesh Garg
1d87e9d8f6 fix: Currency in KSA VAT report 2022-01-05 15:08:29 +05:30
Chillar Anand
a64efb764b refactor: Add deprecation warning for agriculture domain (#29149) 2022-01-05 11:56:32 +05:30
mergify[bot]
485fa4700f fix(UX): validate setup on clicking Mark Attendance button in Shift Type (backport #29146) (#29148) 
(cherry picked from commit ac816f4fed)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-01-04 21:52:42 +05:30
Deepesh Garg
e8e93bdf43 Merge pull request #29144 from frappe/mergify/bp/version-13-hotfix/pr-29142 
fix: map Accounting Dimensions for Bank Entry against Payroll Entry (backport #29142)
 2022-01-04 21:01:54 +05:30
Rucha Mahabal
5900968bd9 fix: map Accounting Dimensions for Bank Entry against Payroll Entry 
(cherry picked from commit 5eeb94db31)
 2022-01-04 14:58:07 +00:00
mergify[bot]
fa735a0539 fix: Modifying Opening invoice creation tool timestamp (#29127) (#29143) 2022-01-04 20:04:47 +05:30
mergify[bot]
b808ef1625 feat: allow user to change the parent company (#29138) 2022-01-04 19:29:39 +05:30
mergify[bot]
06c0313a26 fix: POS items added to cart despite low qty (#29141) 2022-01-04 19:20:19 +05:30
mergify[bot]
f4670a86a0 fix: minor issues (#29140) 2022-01-04 19:16:52 +05:30
mergify[bot]
2838dc537e fix: update idx after updating items in so/po (#29134) (#29136) 
(cherry picked from commit 733c9defdf)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-01-04 19:05:38 +05:30
Deepesh Garg
1d270dca05 fix: Show GL balance in Accounts Receivable and payable summary 2022-01-04 17:53:08 +05:30