Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
37,250 Commits 3 Branches 0 Tags 1 GiB
b27eeb54ae
Commit Graph

37250 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohit Waghchaure
b27eeb54ae Merge branch 'version-13-pre-release' into version-13 2021-08-17 10:05:50 +05:30
Rohit Waghchaure
03fdce5a19 bumped to version 13.9.0 2021-08-17 10:25:49 +05:50
rohitwaghchaure
6dd9e0194c
Merge pull request #26968 from rohitwaghchaure/release-notes-v13-9-0 
chore: Release Notes v13.9.0
 2021-08-16 22:17:47 +05:30
Rohit Waghchaure
9722641847 chore: Release Notes v13.9.0 2021-08-16 20:38:38 +05:30
Deepesh Garg
a320a8f1df
Merge pull request #26966 from deepeshgarg007/distributed_budget_variance_report_v13_pre 
fix: Budget variance missing values
 2021-08-16 18:28:19 +05:30
Deepesh Garg
58c1739eac fix: Budget variance missing values 2021-08-16 18:04:57 +05:30
Deepesh Garg
3b4258b817
Merge pull request #26958 from deepeshgarg007/export_type_mandatory_v13_pre 
fix: Add mandatory depends on condition for export type field
 2021-08-16 15:16:07 +05:30
Deepesh Garg
4b9c127494 Merge branch 'version-13-pre-release' of https://github.com/frappe/erpnext into export_type_mandatory_v13_pre 2021-08-16 14:38:54 +05:30
Deepesh Garg
b58b1127f3 fix: Add mandatory depends on condition for export type field 2021-08-16 14:36:50 +05:30
Rucha Mahabal
67e3971c3b
fix: Org Chart fixes (#26952) 
* fix: add z-index to filter to avoid svg wrapper overlapping

* fix: expand all nodes not working when there are only 2 levels

- added dom freeze while expanding all nodes and exporting
 2021-08-16 10:38:39 +05:30
Marica
f1c9766748
Merge pull request #26943 from frappe-pr-bot/backport/version-13-pre-release/26942 
fix: (Stock Analytics) Copy previous balance dict object instead of assigning
 2021-08-13 16:01:21 +05:30
Marica
2e6899fbe4 fix: Copy previous balance dict object instead of assigning (#26942) 
- Due to plain assignment, dict mutation gave wrong monthly values

(cherry picked from commit fe2a34f171)
 2021-08-13 10:08:41 +00:00
Frappe PR Bot
f4b2f4aaf7
fix: ZeroDivisionError on creating e-invoice for credit note (#26918) 2021-08-12 17:11:38 +05:30
Marica
b1406dba98
Merge pull request #26910 from frappe-pr-bot/backport/version-13-pre-release/26908 
fix: Stock Analytics Report must consider warehouse during calculation
 2021-08-12 10:52:20 +05:30
Marica
08e4026456 fix: Stock Analytics Report must consider warehouse during calculation (#26908) 
* fix: Stock Analytics Report must consider warehouse during calculation

* fix: Brand filter in Stock Analytics

(cherry picked from commit 703b081172981833bcf9a1fc5c86517817c3ff32)
 2021-08-12 05:02:42 +00:00
Suraj Shetty
fd1c47ef77
Merge pull request #26904 from surajshetty3416/fix-list-view 2021-08-11 14:53:58 +05:30
Suraj Shetty
99658ceb4e fix: Nest .level class style under .hierarchy class 
- To avoid style overrides in list view
 2021-08-11 14:19:07 +05:30
rohitwaghchaure
a631ac605f
Merge pull request #26892 from rohitwaghchaure/merged-v13-hotfix-into-pre-release 
chore: merge version-13-hotfix into version-13-pre-release
 2021-08-11 00:13:30 +05:30
Rucha Mahabal
9855bbb95e fix(style): apply svg container margin only in desktop view (#26894) 2021-08-10 23:53:02 +05:30
Rohit Waghchaure
7167fd00bc Merge branch 'version-13-hotfix' into merged-v13-hotfix-into-pre-release 2021-08-10 23:30:16 +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
Frappe PR Bot
b7b111c3ed
fix: unseting of payment if no pos profile found (#26884) (#26890) 
(cherry picked from commit b614834efe)

Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-08-10 22:52:37 +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
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