Commit Graph

37693 Commits

Author SHA1 Message Date
GangaManoj
072f63b324 Revert "fix: Only fetch default Payment Terms Template if present"
This reverts commit fb80ca9e06.
2021-08-09 18:53:14 +05:30
GangaManoj
e247e3a4b2 fix: Only fetch default Payment Terms Template if present 2021-08-09 18:53:14 +05:30
GangaManoj
5b33e75c65 fix: Fetch discount details from Payment Terms only if Discount Type = Percentage 2021-08-09 18:53:14 +05:30
GangaManoj
0588382c38 fix: Stop fetching amount while fetching Payment Terms 2021-08-09 18:53:14 +05:30
GangaManoj
55cb82c74d fix: Compare Payment Schedules 2021-08-09 18:53:14 +05:30
GangaManoj
1200872c7e fix: Disable automcatically_fetch_payment_terms after running its associated tests 2021-08-09 18:53:13 +05:30
GangaManoj
7244afe129 fix: Rename test to reflect changes in code 2021-08-09 18:53:13 +05:30
GangaManoj
54d1336d11 fix: Condition for fetching Payment Terms from Sales/Purchase Orders 2021-08-09 18:53:13 +05:30
Saqib
668f442139
Merge branch 'develop' into po-payment-terms 2021-08-06 13:42:10 +05:30
Saqib
e7fa2e5826
fix(e-invoicing): cannot generate IRNs for standalone credit notes (#26824) 2021-08-06 11:03:57 +05:30
Nabin Hait
418d478dad
Merge pull request #26764 from nabinhait/addl_salary_fix
fix: Additional salary processing
2021-08-06 10:24:03 +05:30
Deepesh Garg
1d90f7684e
fix: Do not fetch fully return issued purchase receipts (#26809) 2021-08-05 19:17:32 +05:30
Ganga Manoj
884d8cf065
fix: Let all System Managers be able to delete Company transactions (#26815) 2021-08-05 11:14:46 +05:30
François de Ryckel
005291e6dd
fix: typo in error message (#26816) 2021-08-04 21:59:18 +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
Subin Tom
035ce304fe
fix: POS payment modes displayed wrong total (#26708) 2021-08-04 13:57:55 +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
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
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
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
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
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
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
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
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
Saqib
d4ae1febe3
fix: gl entries for exchange gain loss (#26734) 2021-07-30 11:21:49 +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