CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-13 09:43:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,045 Commits 396 Branches 1,698 Tags
overtime-feature
Commit Graph

37045 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anurag Mishra
7539cfecd2 Merge branch 'overtime-feature' of https://github.com/anurag810/erpnext into overtime-feature 2021-08-11 15:18:08 +05:30
Anurag Mishra
18f04111d6 fix: Code optimisation 2021-08-11 15:17:42 +05:30
Anurag Mishra
b2ba9aacb2 Merge branch 'version-13-hotfix' into overtime-feature 2021-08-11 13:32:52 +05:30
Anurag Mishra
4a6694e80a fix: changes requested 2021-08-11 12:59:22 +05:30
Frappe PR Bot
f3ae956eae perf: various minor perf fixes for ledger postings (#26775) (#26896) 
* perf: only validate if voucher is journal entry

* perf: optimize merge GLE

- Order fields such that comparison will fail faster
- Break out of loops if not matched

* perf: don't try to match SLE if count mismatch

* refactor: simplify initialize_previous_data

* perf: use cache for fetching valuation_method

These are set only once fields

* refactor: simplify get_future_stock_vouchers

* refactor: simplify get_voucherwise_gl_entries

* perf: fetch only required fields for GL comparison

`select *` fetches all fields, output of this function is only used for
comparing.

* perf: reorder conditions in PL cost center check

* perf: reduce query while validating new gle

* perf: use cache for validating warehouse props

These properties don't change often, no need to query everytime.

* perf: use cached stock settings to validate SLE

* docs: update misleading docstring

Co-authored-by: Marica <maricadsouza221197@gmail.com>
(cherry picked from commit 9152715f90)

Co-authored-by: Ankush <ankush@iwebnotes.com>
 2021-08-11 12:18:58 +05:30
Rucha Mahabal
fd325a123c fix(style): apply svg container margin only in desktop view (#26894) 2021-08-10 23:49:56 +05:30
Frappe PR Bot
1167a9bf94 fix: unsetting of payment if no pos profile found (#26891) 
* fix: unseting of payment if no pos profile found (#26884)

(cherry picked from commit b614834efe)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js

* fix: conflicts

* fix: conflicts

* fix: conflicts

* fix: conflicts

Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Co-authored-by: Afshan <afshan13k@gmail.com>
 2021-08-10 23:18:23 +05:30
Anupam Kumar
a6aa6cd7d6 fix: timesheet amount issue (#25993) 
* fix: timesheet amount issue

* fix: timesheet detail rate conversion

* fix: condition to check timesheet currency

* fix: removing console statement
 2021-08-10 20:32:15 +05:30
Frappe PR Bot
1a39d1a311 fix: cost center & account validation in Sales/Purchase Taxes and Charges (#26881) 2021-08-10 19:38:39 +05:30
Anuja Pawar
66784a16cb fix: Sales Return cancellation if linked with Payment Entry (#26883) 2021-08-10 19:38:16 +05:30
Marica
d657f39ab8 Merge pull request #25622 from noahjacob/promo_scheme_feat 
feat: added multi-select fields to create multiple pricing rules.
 2021-08-10 19:09:42 +05:30
Marica
af9863146d fix: Grammar in Error message 2021-08-10 18:49:07 +05:30
Noah Jacob
49b7c7575e refactor: code cleanup 2021-08-10 18:35:46 +05:30
Noah Jacob
4ee6e32d74 test(fix): fixed test case 2021-08-10 18:34:18 +05:30
Frappe PR Bot
a7e0805039 fix(e-invoicing): cannot cancel invoice if IRN cancelled on portal (#26879) 2021-08-10 17:16:15 +05:30
Nabin Hait
f8031d3d79 Merge pull request #26261 from ruchamahabal/org-chart 
feat: Organizational Chart
 2021-08-10 17:12:59 +05:30
Saqib
363225d2ba fix(asset): incorrect date difference calculation (#26805) 2021-08-10 16:37:23 +05:30
Subin Tom
793063bf4e fix: pos return payment mode issue (#26875) 2021-08-10 15:57:30 +05:30
Frappe PR Bot
1ba04fdfe5 fix: pos profile not mandatory for Sales Invoice (#26876) 2021-08-10 15:47:36 +05:30
Marica
1776fc44b7 Merge pull request #26878 from marination/serial-no-space-hotfix 
fix: Clean Serial No input on Server Side
 2021-08-10 15:25:29 +05:30
marination
510e31952d test: Serial no sanitation 2021-08-10 14:35:51 +05:30
marination
f22b858253 fix: Clean Serial No input on Server Side 2021-08-10 14:35:41 +05:30
Marica
fd12f65047 Merge pull request #26854 from marination/asset-lcv-gl-entry-hotfix 
fix: Faulty Gl Entry for Asset LCVs (#26803)
 2021-08-10 14:07:12 +05:30
Saqib
5719198576 feat: dynamic conditions for applying SLA (#26806) 2021-08-10 13:56:48 +05:30
Anurag Mishra
24da00cada fix: updating lead status while customer creation (#26607) 
* fix:  updating lead status while customer creation

* fix: changes requested
 2021-08-10 13:17:41 +05:30
marination
06b6b7e3cc fix: Set CWIP Account in company at the start to avoid flaky test 2021-08-10 13:14:32 +05:30
Anurag Mishra
8db493b2be chore: formatting 2021-08-10 12:45:51 +05:30
Anurag Mishra
21bc752da5 fix: Removed print statement 2021-08-10 12:45:51 +05:30
Anurag Mishra
96db78f7bc fix: Test Cases 2021-08-10 12:45:51 +05:30
Anurag Mishra
32f3b24c3a fix: Test Cases 2021-08-10 12:45:51 +05:30
Anurag Mishra
10647bfcd7 fix: test 2021-08-10 12:45:51 +05:30
Anurag Mishra
7d272dc648 fix: test Payroll Entry 2021-08-10 12:45:51 +05:30
Anurag Mishra
b96165883e fix: fixed test and resolved conflicts 2021-08-10 12:45:51 +05:30
Anurag Mishra
5683857f9f fix: sider 2021-08-10 12:45:50 +05:30
Anurag Mishra
73b3121127 fix: some enhancemets and test cases 2021-08-10 12:45:50 +05:30
Anurag Mishra
769d774ccc feat: Validation, sider and form dashbord 2021-08-10 12:45:50 +05:30
Anurag Mishra
da2e95dbcc feat: Overtime based on Attendance and Timesheet 2021-08-10 12:44:50 +05:30
Anurag Mishra
3851d15360 feat:overtime 2021-08-10 12:41:45 +05:30
Anurag Mishra
e4fd6d7763 feat: Overtime 2021-08-10 12:41:45 +05:30
Anurag Mishra
8f1850b21c feat: settings for Overtime 2021-08-10 12:38:33 +05:30
Deepesh Garg
25a2f2b90e Merge pull request #26579 from deepeshgarg007/discount_accounting_v13 
feat: Enable discount accounting
 2021-08-10 11:48:14 +05:30
Subin Tom
2ab62a4484 fix: Missing method reset_issue_metrics added back to Issue doctype (#26574) 2021-08-10 11:43:59 +05:30
Noah Jacob
10ce2f5d6e refactor: added naming series for pricing rule 2021-08-10 11:42:59 +05:30
noahjacob
dd86642037 refactor: removed py2 code 2021-08-10 11:41:29 +05:30
noahjacob
b214e624bb style: fixed formatting 2021-08-10 11:41:29 +05:30
noahjacob
74bcb987f3 style: fixed formatting 2021-08-10 11:41:29 +05:30
noahjacob
4fb1b6b80c fix: Sider 2021-08-10 11:41:29 +05:30
noahjacob
a4cea1e56d refactor: variable names 2021-08-10 11:41:29 +05:30
noahjacob
3a663ac77f test: changed test item name 2021-08-10 11:41:29 +05:30
noahjacob
c95d96e7ae refactor: changed variable names 2021-08-10 11:41:29 +05:30