Commit Graph

38255 Commits

Author SHA1 Message Date
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
Deepesh Garg
9c7a9f3a13 fix: Parent condition in pricing rules 2021-07-29 20:02:49 +05:30
Marica
0eed394f5e
Merge branch 'develop' into stock-reco-fetch-non-empty-stock 2021-07-29 19:54:56 +05:30
rohitwaghchaure
bd33bdf210
Merge pull request #26717 from deepeshgarg007/pricing_rule_item_group
fix: Parent condition in pricing rules
2021-07-29 19:51:53 +05:30
rohitwaghchaure
22eac9bd0c
Merge pull request #26720 from rohitwaghchaure/skip-cancelled-entries-in-report-develop
fix: remove cancelled entries from Stock and Account Value comparison report
2021-07-29 19:50:00 +05:30
rohitwaghchaure
b7bbefee15
Merge pull request #26722 from rohitwaghchaure/skip-cancelled-entries-in-report
fix: remove cancelled entries from Stock and Account Value comparison report
2021-07-29 19:49:42 +05:30
Ankush
57cd273f7c
fix: empty "against account" in Purchase Receipt GLE bp #26712 (#26719)
* fix: correct field for GLE against account in PR

* fix: remove incorrect field check from reposting
2021-07-29 19:49:36 +05:30
Ankush
c7df759324
fix: empty "against account" in Purchase Receipt GLE bp #26712 (#26718)
* fix: correct field for GLE against account in PR

* fix: remove incorrect field check from reposting
2021-07-29 19:49:12 +05:30
marination
533ee9a401 feat: (Stock Reco) Ignore Empty Stock while fetching items from warehouse
- Added checkbox to `Fetch Items from Warehouse` dialog to ignore empty stock
- fix: Items fetched twice due to Item Defaults
- Improved code readability
2021-07-29 19:39:32 +05:30
GangaManoj
01ab63189a fix: Check if Purchase Order has Payment Terms Template 2021-07-29 19:28:14 +05:30
GangaManoj
6343950d82 fix: Sider issues 2021-07-29 19:27:54 +05:30
GangaManoj
57df4a3aa1 fix: Rename tests 2021-07-29 19:27:54 +05:30
GangaManoj
0413a5aafd fix: Add test to check if payment terms are fetched when creating a Purchase Invoice 2021-07-29 19:27:52 +05:30
GangaManoj
e94604f517 fix: Add test to check if payment terms are fetched when creating a Purchase Invoice 2021-07-29 19:26:39 +05:30
GangaManoj
293c5e10c3 fix: Add test to check if payment terms are fetched when creating a Sales Invoice 2021-07-29 19:26:39 +05:30
GangaManoj
59d1cc02c5 fix: Add test to check if payment terms are fetched when creating a Sales Invoice 2021-07-29 19:26:39 +05:30
GangaManoj
def7cc6cb3 fix: Modify set_payment_schedule() to include fetch_payment_terms_from_order() 2021-07-29 19:26:39 +05:30
GangaManoj
6333c3bee5 fix: Remove unused imports 2021-07-29 19:26:00 +05:30
GangaManoj
b389c9e375 fix: Fetch Payment Terms from Sales/Purchase Orders 2021-07-29 19:25:29 +05:30
GangaManoj
1011c1b01a fix: Clear Payment Schedule if PI has default Payment Schedule, but linked PO doensn't 2021-07-29 19:24:29 +05:30
GangaManoj
c7c90244fe fix: Check if Purchase Order has Payment Terms Template 2021-07-29 19:19:46 +05:30