Frappe PR Bot
bf8d0c256d
fix: typo in error message ( #26816 ) ( #26817 )
...
(cherry picked from commit 005291e6dd
)
Co-authored-by: François de Ryckel <f.deryckel@gmail.com>
2021-08-04 22:01:17 +05:30
François de Ryckel
005291e6dd
fix: typo in error message ( #26816 )
2021-08-04 21:59:18 +05:30
Noah Jacob
673bc58193
test: test case for over transfer of materials
2021-08-04 18:48:24 +05:30
Noah Jacob
8fced95f8c
feat: over transfer allowance for material transfers
2021-08-04 18:48:24 +05:30
GangaManoj
8328f45230
fix: Rename test to reflect changes in code
2021-08-04 17:33:35 +05:30
Frappe PR Bot
13192e1db1
fix: trigger lost reason dialog when status is changed to lost ( #26811 ) ( #26812 )
...
(cherry picked from commit e5d8ba65ca
)
Co-authored-by: Mohammed Yusuf Shaikh <49878143+mohammedyusufshaikh@users.noreply.github.com>
2021-08-04 17:07:22 +05:30
Mohammed Yusuf Shaikh
e5d8ba65ca
fix: trigger lost reason dialog when status is changed to lost ( #26811 )
2021-08-04 16:35:38 +05:30
Anupam Kumar
df477dcae6
fix: bank remittance report issue ( #26398 ) ( #26766 )
2021-08-04 14:02:43 +05:30
Subin Tom
035ce304fe
fix: POS payment modes displayed wrong total ( #26708 )
2021-08-04 13:57:55 +05:30
Saqib
5c9d4db0e9
Merge branch 'develop' into payment-reconc-party-validation-fix
2021-08-04 13:57:00 +05:30
Dany Robert
9f94c19752
fix: ignore permission to update call log ( #26797 )
...
Backport of #26112
#no-docs
2021-08-04 10:01:44 +05:30
Frappe PR Bot
1b9a5c851d
fix: incorrect amount in work order required items table. ( #26585 ) ( #26623 )
...
* fix: amount in work order not equal to rate * qty
* fix: patch for amount in work order required items
(cherry picked from commit cd12d95a24
)
Co-authored-by: Ankush <ankush@iwebnotes.com>
2021-08-03 20:06:36 +05:30
Frappe PR Bot
85815f989c
fix: Reset weight_per_unit on replacing Item ( #26619 ) ( #26791 )
...
* fix: Assign Item's default weight_per_unit as its weight_per_unit in get_item_details
* fix: Set weight_uom in get_item_details as Item's default weight_uom
(cherry picked from commit 471f48f64d
)
Co-authored-by: Ganga Manoj <ganga.manoj98@gmail.com>
2021-08-03 20:06:07 +05:30
Saqib
3a50490c04
fix: fetching of item tax from hsn code ( #26736 )
...
* fix: fetching of item tax from hsn code
2021-08-03 15:57:11 +05:30
Deepesh Garg
b4784493c9
Merge pull request #26480 from Anuja-pawar/sa-vat-report
...
feat(regional): South Africa VAT Audit Report
2021-08-03 15:24:43 +05:30
Deepesh Garg
4e1a205c11
fix: Optimize item updation
2021-08-03 14:58:45 +05:30
Deepesh Garg
346bde875c
Merge branch 'develop' of https://github.com/frappe/erpnext into sa-vat-report
2021-08-03 14:44:20 +05:30
Ganga Manoj
471f48f64d
fix: Reset weight_per_unit on replacing Item ( #26619 )
...
* fix: Assign Item's default weight_per_unit as its weight_per_unit in get_item_details
* fix: Set weight_uom in get_item_details as Item's default weight_uom
2021-08-03 14:39:38 +05:30
Frappe PR Bot
5a442f1bce
fix: change format string to percent string interpolation ( #26774 ) ( #26778 )
...
(cherry picked from commit 7fe588e236
)
Co-authored-by: Alan <2.alan.tom@gmail.com>
2021-08-03 13:29:10 +05:30
Frappe PR Bot
373ed1f65c
fix: remove limit from stock balance report ( #26773 ) ( #26779 )
...
(cherry picked from commit b3740e9afc
)
Co-authored-by: Ankush <ankush@iwebnotes.com>
2021-08-03 13:28:50 +05:30
GangaManoj
f99696b75d
fix: Condition for fetching Payment Terms from Sales/Purchase Orders
2021-08-02 23:15:44 +05:30
Anuja
f2ee1155c0
fix: sider fixes
2021-08-02 23:13:21 +05:30
Ankush
efb037b566
refactor!: drop shopify integration from ERPNext ( #26700 )
...
BREAKING CHANGE: remove Shopify integration.
The integration is moved to a separate app with additional enhancements.
The app is still FOSS and licensed under the same license as ERPNext. Any
data migration required is taken care of after installing the app and
enabling it.
New app: https://github.com/frappe/ecommerce_integrations
2021-08-02 21:57:52 +05:30
Deepesh Garg
db40d88fc2
Merge pull request #26780 from nemesis189/added-dispatch-address-to-sales-v13-new
...
feat: Added dispatch address fields in Sales Ord, Sales Inv, Delivery Note for Eway Bill
2021-08-02 21:11:50 +05:30
Subin Tom
6ba11a382a
test: Updated test case for Eway bill
2021-08-02 20:36:46 +05:30
Subin Tom
8800aaaee7
feat: Added fields for dispatch address in Sales Order, Sales Invoice, Delivery Note for Eway Bill
2021-08-02 20:36:37 +05:30
Saqib
78762850ee
fix: gl entries for exchange gain loss ( #26711 )
2021-08-02 20:15:54 +05:30
Ankush
b3740e9afc
fix: remove limit from stock balance report ( #26773 )
2021-08-02 20:13:26 +05:30
Alan
7fe588e236
fix: change format string to percent string interpolation ( #26774 )
2021-08-02 20:07:55 +05:30
Ankush
e43bdf76a5
chore: warning for shopify integration deprecation ( #26701 )
...
* chore: warning for shopify integration deprecation
* fix: warn deprecation during patch for sysadmins
2021-08-02 18:57:48 +05:30
Anuja
3bcbc86291
fix: resolved conflicts in patches.txt
2021-08-02 12:58:46 +05:30
Anuja
f9fc3bbfa8
fix: added patch for custom field and minor fixes
2021-08-02 12:54:30 +05:30
Deepesh Garg
ad7bb316c1
fix: GL Entries for discount amount with item qty greater than 1
2021-08-02 12:41:06 +05:30
Deepesh Garg
c677d47a4a
fix: Test Cases
2021-08-02 12:40:44 +05:30
Deepesh Garg
c525b372c6
fix: Tests
2021-08-02 12:40:00 +05:30
Deepesh Garg
92f7a5a390
fix: GL For taxes if discount applied on Grand Total
2021-08-02 12:39:43 +05:30
Deepesh Garg
b7267f8f5f
fix: Syntax Error
2021-08-02 12:39:22 +05:30
Frappe PR Bot
a9474a9fbd
fix: POS Invoice consolidated Sales Invoice field set to no copy ( #26768 )
2021-08-02 12:25:27 +05:30
Subin Tom
e99cd2e9da
fix: POS Invoice consolidated Sales Invoice field set to no copy ( #26706 )
2021-08-02 11:39:20 +05:30
Subin Tom
4597f151f5
fix: POS Item Cart non-stop scroll issue ( #26693 )
2021-08-02 11:38:31 +05:30
Subin Tom
3b7615750a
fix: POS Item Cart non-stop scroll issue ( #26692 )
2021-08-02 11:37:38 +05:30
Subin Tom
58118d7830
fix: missing QR Code in auto email attachment ( #26598 )
2021-08-02 11:34:43 +05:30
Subin Tom
a75c7c48d8
fix: missing QR Code in auto email attachment ( #26599 )
2021-08-02 11:34:28 +05:30
rohitwaghchaure
31fe5f5b92
fix: added progress bar in repost item valuation ( #26680 )
2021-08-02 11:01:30 +05:30
Anuja Pawar
4ec02ad91d
Merge branch 'develop' into sa-vat-report
2021-08-02 10:42:04 +05:30
Nabin Hait
74bb55bfd2
Revert "fix: Tax calculation for Recurring additional salary ( #24206 )"
...
This reverts commit adfdc71844
.
2021-08-01 20:03:38 +05:30
Nabin Hait
493029195c
fix: Additional salary processing
2021-08-01 19:47:42 +05:30
Rohit Waghchaure
343143037c
fix: conflicts
2021-08-01 14:45:24 +05:30
Rohit Waghchaure
8880d13227
Merge branch 'version-13-pre-release' into version-13
2021-08-01 14:35:10 +05:30
Rohit Waghchaure
8cb560c753
bumped to version 13.8.0
2021-08-01 14:55:09 +05:50