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

38275 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
rohitwaghchaure
b86213c890
Merge pull request #26753 from rohitwaghchaure/change-log-v13-8-0 
chore: Added change log for v13.8.0
 2021-08-01 11:37:05 +05:30
Deepesh Garg
36f6e9b58e
Merge pull request #26654 from marination/pi-expense-account 
fix: Set Expense account from warehouse only if warehouse exists (Inter company invoice)
 2021-07-31 17:32:24 +05:30
Rohit Waghchaure
6fffc90b46 chore: Added change log for v13.8.0 2021-07-31 16:22:12 +05:30
rohitwaghchaure
41da6f0d13
Merge pull request #26735 from rohitwaghchaure/fixed-cogs-in-purchase-receipt 
fix: COGS account in purchase receipt
 2021-07-31 14:50:47 +05:30
Nabin Hait
99afe375ea
Merge pull request #26237 from rtdany10/patch-5 
feat: Increase number of supported currency exchanges
 2021-07-31 11:34:15 +05:30
Rohit Waghchaure
2a14f255cf fix: COGS account in purchase receipt 2021-07-31 11:14:14 +05:30
Deepesh Garg
64267faa8f
Merge pull request #26742 from deepeshgarg007/tds_194q_calculations_v13 
fix: TDS calculation for first threshold breach for TDS category 194Q
 2021-07-30 20:41:37 +05:30
Deepesh Garg
6eded547f5 fix: TDS calculation for first threshold breach for TDS category 194Q 2021-07-30 20:12:51 +05:30
Frappe PR Bot
b5c7fce689
fix: student category mapping from the program enrollment tool (#26716) (#26739) 
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
(cherry picked from commit 1a2332a81c)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-07-30 18:54:35 +05:30
Rucha Mahabal
1a2332a81c
fix: student category mapping from the program enrollment tool (#26716) 
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
 2021-07-30 18:30:15 +05:30
Marica
7cbd755951
Merge branch 'develop' into serial-no-space 2021-07-30 14:09:19 +05:30
Saqib
d4ae1febe3
fix: gl entries for exchange gain loss (#26734) 2021-07-30 11:21:49 +05:30
Saqib
2d6f2fea5b
fix: gl entries for exchange gain loss (#26728) 2021-07-30 10:55:53 +05:30
Rucha Mahabal
821db5cce7
fix: employee status server-side validation (#26442) 
* fix: employee status server-side validation

* fix: test

* test: employee inactive status

* fix: test
 2021-07-30 10:21:42 +05:30
rohitwaghchaure
383c49cfed
Merge pull request #26726 from marination/stock-reco-fetch-non-empty-stock 
feat: (Stock Reco) Ignore Empty Stock while fetching items from warehouse
 2021-07-30 00:15:18 +05:30
rohitwaghchaure
50b4b70589
Merge pull request #26727 from deepeshgarg007/pricing_rule_item_group_v13 
fix: Parent condition in pricing rules
 2021-07-29 20:06:47 +05:30