Commit Graph

38479 Commits

Author SHA1 Message Date
Nabin Hait
f8031d3d79
Merge pull request #26261 from ruchamahabal/org-chart
feat: Organizational Chart
2021-08-10 17:12:59 +05:30
Saqib
84c4161c00
fix(e-invoicing): cannot cancel invoice if IRN cancelled on portal (#26638) 2021-08-10 16:46:44 +05:30
Saqib
2ae2580706
fix(asset): incorrect date difference calculation (#26793) 2021-08-10 16:37:48 +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
Marica
89d261df2c
Merge pull request #26873 from marination/test-asset-lcv
fix: Set CWIP Account in company at the start to avoid flaky test
2021-08-10 14:42:54 +05:30
Marica
173c4c8564
Merge branch 'develop' into test-asset-lcv 2021-08-10 14:38:31 +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
rohitwaghchaure
f8b4d69ff1
Merge pull request #26596 from marination/serial-no-space
fix: Clean Serial No input on Server Side
2021-08-10 14:32:23 +05:30
Afshan
af2f5277d5
fix: pos profile not mandatory for Sales Invoice (#26853) 2021-08-10 14:16:16 +05:30
Marica
d14f63afdc
Merge branch 'develop' into test-asset-lcv 2021-08-10 14:07:42 +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
marination
948386d85d test: Serial no sanitation 2021-08-10 14:00:55 +05:30
Saqib
5719198576
feat: dynamic conditions for applying SLA (#26806) 2021-08-10 13:56:48 +05:30
Saqib
b37c6992df
Merge branch 'develop' into po-payment-terms 2021-08-10 13:37:31 +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
Marica
f6ea00e029
Merge branch 'develop' into serial-no-space 2021-08-10 13:17:08 +05:30
Anurag Mishra
94beda65ca
fix: updating lead status while customer creation (#26606)
* fix:  updating lead status while customer creation

* fix: changes requested
2021-08-10 13:16:46 +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
marination
9ca2febd88 fix: Set CWIP Account in company at the start to avoid flaky test 2021-08-10 13:10:46 +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
Subin Tom
8db0f07115
fix: Missing method reset_issue_metrics added back to Issue doctype (#26573) 2021-08-10 11:43:43 +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
noahjacob
a9ef56a107 test: added test case for creating and updating 2021-08-10 11:41:29 +05:30
noahjacob
415519af15 feat: added multi-select fields to create multiple pricing rules. 2021-08-10 11:41:29 +05:30
Saqib
7eefe927a5
Merge branch 'develop' into payment-reconc-party-validation-fix 2021-08-10 11:37:56 +05:30
Anupam Kumar
e196dee510
Merge pull request #26085 from anupamvs/lead-cleanup
refactor: lead
2021-08-10 11:34:23 +05:30
rohitwaghchaure
c5e7673277
Merge pull request #26814 from noahjacob/mr_allowance_feat_v13
feat: over transfer allowance for material transfers (bp #26264)
2021-08-10 11:32:43 +05:30
Anupam Kumar
8e6d298fcf
Merge branch 'develop' into lead-cleanup 2021-08-10 11:32:43 +05:30
Deepesh Garg
797170e913 fix: Linting issues 2021-08-10 11:02:21 +05:30
Deepesh Garg
428ccebad9 test: Update test cases for discount accounting 2021-08-10 10:43:01 +05:30
Deepesh Garg
b73bb3e501 fix: Add discount account handling in Purchase Invoice 2021-08-10 10:42:47 +05:30
Deepesh Garg
9b561ea839 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into discount_accounting_v13 2021-08-10 10:38:14 +05:30
Deepesh Garg
cd980f5e6b
Merge pull request #26723 from GangaManoj/backport-po-payment-terms
feat: Fetch Payment Terms from linked Sales/Purchase Order
2021-08-10 10:34:39 +05:30
Afshan
f5b5be9644
Merge branch 'develop' into po-payment-terms 2021-08-10 09:32:08 +05:30
Afshan
a982a2a72e
Merge branch 'develop' into payment-reconc-party-validation-fix 2021-08-10 09:30:48 +05:30
rohitwaghchaure
7ca1493655
Merge pull request #26868 from rohitwaghchaure/merge-version-13-hotfix-into-v13-pre-9
chore: merge version-13-hotfix into v13-pre-release
2021-08-10 01:29:00 +05:30
Rohit Waghchaure
f571e42aa4 Merge branch 'version-13-hotfix' into merge-version-13-hotfix-into-v13-pre-9 2021-08-10 01:06:23 +05:30
Ankush
5e428f0447
perf(cache): fix active SLA doctype caching (#26861)
If no SLA is configured then this query runs on EVERY `validate` call.

Root cause: if not active SLA doctypes exist then `not []` evalutes to
true and causes query to run again.
2021-08-09 22:15:49 +05:30