CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-20 02:34:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,943 Commits 424 Branches 1,723 Tags
2a615af00a754162c202d10f77e1c1d36a6d48cd
Commit Graph

40943 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saqib
80d0b6ddc8 revert: "feat: Accounts, Selling & Assets Onboarding cleanup (#28491)" (#28559) 2021-11-25 16:36:29 +05:30
marination
9fa8d02184 fix: Remove commented code 
(cherry picked from commit 42395af22a)
 2021-11-25 09:06:24 +00:00
marination
e47f7a3023 chore: Add comment hinting to reason 
(cherry picked from commit 8502ccb5b2)
 2021-11-25 09:06:24 +00:00
marination
8e9cd83c4b fix: Remove RM Cost column as cost is not retrievable from Job card 
(cherry picked from commit 27236b7e9e)
 2021-11-25 09:06:23 +00:00
mergify[bot]
46df181d00 fix: do not get password if client_secret is not set (#28554) 2021-11-25 13:45:44 +05:30
Saqib
5589e189b5 fix: do not get password if client_secret is not set (#28547) 2021-11-25 12:05:29 +05:30
Ankush Menat
88a8bc7ebc test: shopify test custom field creation failing (#28544) 2021-11-24 17:20:38 +05:30
mergify[bot]
32855073ff fix: fixes in work order doctype (#28217) (#28543) 
* fix: fixes in work order doctype

* fix: sider issues and disabled set only once property

* fix: set default qty to manufacture

* fix: dont manually collapse sections

* fix: remove unnecessary messages

* fix: make dependent fields read only


Co-authored-by: Mohammed Yusuf Shaikh <49878143+mohammedyusufshaikh@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-24 16:44:20 +05:30
mergify[bot]
b8c867a4bc fix: correct module for reloading doc (#28526) 
(cherry picked from commit 0a6021e854)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-23 18:20:36 +05:30
Bhavesh Maheshwari
7ae1369d64 fix: broken bom tree view and remove duplicate button (#28512) 
* fix: broken bom tree view and remove duplicate button

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-23 17:51:13 +05:30
Akash Krishna
34deab5b71 fix: Healthcare Practitioner - query (#28303) 2021-11-23 17:48:50 +05:30
mergify[bot]
623cef1032 fix: Replace 'parent' with 'invoice_or_item' (#28516) 2021-11-23 14:02:54 +05:30
mergify[bot]
b7c63212cd fix: POS Item cart only taxes with amount displayed (#28515) 2021-11-23 11:41:24 +05:30
mergify[bot]
adcf906d1c fix: Employee link formatter showing incorrect value for Employee Name (#28504) (#28514) 
(cherry picked from commit 5ba1bc1572)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-11-23 09:39:10 +05:30
mergify[bot]
294de89b9b fix(UX): Allocated Amount in Advances not updated on updating expense amount in Expense Claim (#28497) (#28505) 
* fix(UX): Allocated Amount in Advances not updated on updating expense amount in Expense Claim

* fix: Expense Claim Advance form labels

(cherry picked from commit e7eef9601d)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-11-23 08:52:31 +05:30
Rohit Waghchaure
c92dfa988e Merge branch 'version-13-pre-release' into version-13 v13.15.0 2021-11-22 22:50:39 +05:30
Rohit Waghchaure
d03bc7d8dc bumped to version 13.15.0 2021-11-22 23:10:38 +05:50
rohitwaghchaure
742249b6c9 Merge pull request #28508 from rohitwaghchaure/change-log-for-v13-15 
chore: change log for v13.15.0
 2021-11-22 22:48:43 +05:30
Rohit Waghchaure
24c21c7f49 chore: change log for v13.15.0 2021-11-22 22:45:58 +05:30
rohitwaghchaure
c48f60e6e2 Merge pull request #28506 from frappe/revert-28499-mergify/bp/version-13-pre-release/pr-28491 
revert: "feat: Accounts, Selling & Assets Onboarding cleanup #28499"
 2021-11-22 22:31:54 +05:30
Saqib
8824712feb Revert "feat: Accounts, Selling & Assets Onboarding cleanup (#28499)" 
This reverts commit 145bcbaa6d.
 2021-11-22 20:26:44 +05:30
Deepesh Garg
3b2b9ce70c Merge pull request #28503 from frappe/mergify/bp/version-13-pre-release/pr-28469 
fix: FY query returning None for new company (backport #28469)
 2021-11-22 20:20:17 +05:30
Deepesh Garg
fe94ec6036 Merge pull request #28502 from frappe/mergify/bp/version-13-hotfix/pr-28469 
fix: FY query returning None for new company (backport #28469)
 2021-11-22 20:20:07 +05:30
Subin Tom
953f46e289 fix: FY query returning None for new company 
(cherry picked from commit 350ed1a6c2)
 2021-11-22 13:54:11 +00:00
Subin Tom
b68d5f86f9 fix: FY query returning None for new company 
(cherry picked from commit 350ed1a6c2)
 2021-11-22 13:53:44 +00:00
mergify[bot]
761bd8c97b fix: KSA Invoice print format for multicurrency invoices (#28495) 2021-11-22 18:25:37 +05:30
mergify[bot]
3bdf5c8673 fix: KSA Invoice print format for multicurrency invoices (#28496) 2021-11-22 18:25:21 +05:30
mergify[bot]
145bcbaa6d feat: Accounts, Selling & Assets Onboarding cleanup (#28499) 2021-11-22 18:24:51 +05:30
mergify[bot]
358205b177 feat: Accounts, Selling & Assets Onboarding cleanup (#28491) 2021-11-22 16:45:23 +05:30
Anupam Kumar
295dc32bd2 Merge pull request #28436 from anupamvs/crm-lead-validate-cleanup 
fix: lead validate function cleanup
 2021-11-22 14:43:47 +05:30
Anupam Kumar
08717192c7 Merge branch 'version-13-hotfix' into crm-lead-validate-cleanup 2021-11-22 14:43:34 +05:30
mergify[bot]
b6b45c6275 fix: POS string translation (#28490) 2021-11-22 13:58:47 +05:30
mergify[bot]
dff3decd56 fix: Closed status error in Work Order Summary (backport #28460) 
* fix: Closed status error in Work Order Summary (#28460)

* fix: Closed status error in Work Order Summary

* chore: use get_meta to get status options

* refactor: simplify code

Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit aa689874e3)

# Conflicts:
#	erpnext/manufacturing/report/work_order_summary/work_order_summary.py

* fix: resolve conflict

Co-authored-by: Sagar Sharma <63660334+s-aga-r@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-22 13:24:25 +05:30
mergify[bot]
1b4659f028 fix: Closed status error in Work Order Summary (backport #28460) 
* fix: Closed status error in Work Order Summary (#28460)

* fix: Closed status error in Work Order Summary

* chore: use get_meta to get status options

* refactor: simplify code

Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit aa689874e3)

# Conflicts:
#	erpnext/manufacturing/report/work_order_summary/work_order_summary.py

* fix: resolve conflict

Co-authored-by: Sagar Sharma <63660334+s-aga-r@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-22 13:23:22 +05:30
Saqib
2a7ca32296 Merge pull request #28480 from frappe/mergify/bp/version-13-hotfix/pr-28402 
fix: Gross Profit report totals (backport #28402)
 2021-11-22 13:15:30 +05:30
mergify[bot]
d8025b37cd feat: create party link from customer/supplier (#28481) 2021-11-22 13:15:12 +05:30
mergify[bot]
464428b15a fix: cost center wise ledger posting for pcv (#28482) 2021-11-22 13:14:53 +05:30
mergify[bot]
7c731147ba fix: Add extra column to display Invoice or Item when grouped by Invoice (#28483) 2021-11-22 13:14:38 +05:30
Ankush Menat
f4797ac5e3 fix: don't use cached doc while reposting 
(cherry picked from commit c436e30ee6)
 2021-11-22 13:08:21 +05:30
Ankush Menat
636a6fcae0 fix: ignore permissions while creating repost 
If user reached this code then they already have permission to create
stock transaction, hence ignore permission checks while
creating/cancelling repost item valuation entries.

(cherry picked from commit aa024fc9da)
 2021-11-22 13:08:21 +05:30
Ankush Menat
1267543064 fix: restrict repost valuation to manager roles 
(cherry picked from commit 42f1dd98dd)
 2021-11-22 13:08:21 +05:30
Anupam Kumar
3fa8b8956f Merge branch 'version-13-hotfix' into crm-lead-validate-cleanup 2021-11-22 13:04:18 +05:30
mergify[bot]
705319e563 fix: Filter out cancelled and non-depreciable Assets in Asset Value Adjustment (#28478) 2021-11-22 12:22:16 +05:30
mergify[bot]
c3c35c5ab5 fix: add child button in coa tree (#28479) 2021-11-22 12:21:56 +05:30
GangaManoj
46621bc3b1 fix: Replace 'Totals' with 'Total' 
(cherry picked from commit 1affa12b74)
 2021-11-22 06:51:55 +00:00
GangaManoj
53d1733162 fix: Display totals row in bold 
(cherry picked from commit 508a2301ee)
 2021-11-22 06:51:55 +00:00
GangaManoj
e9f599de5d fix: Remove unnecessary condition 
(cherry picked from commit c7ffe3a7b4)
 2021-11-22 06:51:54 +00:00
GangaManoj
85bf2574be fix: Add totals row when Grouped By Invoice 
(cherry picked from commit 582a7ae964)
 2021-11-22 06:51:54 +00:00
GangaManoj
826d4051a8 fix: Remove default Totals row 
(cherry picked from commit 3aaf7cb408)
 2021-11-22 06:51:54 +00:00
mergify[bot]
063d474cd0 refactor!: remove abbreviation renaming (#28441) 2021-11-22 11:36:56 +05:30