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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Deepesh Garg
|
f2c4699c9b
|
Merge pull request #26867 from fproldan/fix_price_list_subscription_hotfix
fix: depends_on in price list field in Subscription Plan
|
2021-08-09 20:35:28 +05:30 |
|
Francisco Roldan
|
0a90302170
|
fix: depends_on in price list field
|
2021-08-09 11:41:56 -03:00 |
|
Frappe PR Bot
|
18bd182f61
|
patch: delete all orphaned tables docs (#26863)
|
2021-08-09 18:34:51 +05:30 |
|
Frappe PR Bot
|
0ff9ef673c
|
fix: add parameter for db insert while adding item tax (#26855) (#26858)
(cherry picked from commit b3bbebd27c)
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
|
2021-08-09 17:58:18 +05:30 |
|
Ankush
|
9f5111809d
|
test: fix flaky purchase receipt test (#26859) (#26860)
# Conflicts:
# erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
|
2021-08-09 15:35:26 +05:30 |
|