Deepesh Garg
5ac3e7e16e
Merge pull request #30664 from frappe/mergify/bp/develop/pr-30662
...
fix: Implicit ignore pricing rule check on returns (backport #30662 )
2022-04-10 17:07:03 +05:30
Deepesh Garg
a2937cffc7
fix: Implicit ignore pricing rule check on returns
...
(cherry picked from commit 1b25a7fe765d334fce990d43224f8a790ccf8119)
2022-04-09 14:46:25 +00:00
Deepesh Garg
207bf85c74
Merge pull request #30488 from Havenir/fix-project-list-in-web-view
...
fix: web form filters for project
2022-04-09 20:06:49 +05:30
Deepesh Garg
cbd8998fc1
Merge branch 'develop' into mergify/bp/develop/pr-30438
2022-04-09 20:03:23 +05:30
Deepesh Garg
02c6b898a6
Merge branch 'develop' into mergify/bp/develop/pr-30385
2022-04-09 19:57:59 +05:30
Deepesh Garg
e30cc8422c
fix: Resolve conflicts
2022-04-09 19:53:40 +05:30
Deepesh Garg
2e00678c76
Merge pull request #30542 from deepeshgarg007/disabled_tax_category
...
fix: Ignore disabled tax categories
2022-04-09 19:52:31 +05:30
mergify[bot]
51d77cd85e
fix(pos): cannot change paid amount in pos payments ( #30660 )
2022-04-09 16:28:10 +05:30
Rucha Mahabal
cf2e6c6c08
fix: remove hardcoded employee fields that can be updated via Promotion
2022-04-09 13:15:37 +05:30
rahib-hassan
dc2944a041
fix[minor]: removed doc assignment
2022-04-09 03:55:25 +05:30
rahib-hassan
e19db77b73
Merge branch 'separate-discount-account' of github.com:rahib-hassan/erpnext into separate-discount-account
2022-04-09 03:53:51 +05:30
Suraj Shetty
199419db80
Merge branch 'develop' into exotel-fixes
2022-04-08 21:37:08 +05:30
Suraj Shetty
7ff5bc9e3d
test: Clean up form_dict
...
To avoid failures like
https://github.com/frappe/erpnext/runs/5887687369?check_suite_focus=true#step:12:783
2022-04-08 21:33:29 +05:30
rahib-hassan
ac16f3b71f
fix: lock timeout exceeded
2022-04-08 18:20:41 +05:30
Ankush Menat
af6b07f9b9
fix: block cancellation of SL/GL entries ( #30652 )
...
Individual GL/SLEs aren't supposed to be cancelled by users.
2022-04-08 18:05:04 +05:30
rahib-hassan
ac7f1cbd87
fix: minor fix
2022-04-08 17:46:49 +05:30
rahib-hassan
2173c8b114
fix(pathces): added to patches.txt
2022-04-08 17:29:08 +05:30
rahib-hassan
35e875c111
fix(patch): enable discount account in buying and selling if exist in accounts settings
2022-04-08 17:27:53 +05:30
Ankush Menat
fcbd25f27a
chore: formatting
2022-04-08 17:24:10 +05:30
Deepesh Garg
b532ade383
fix: Download JSON for GSTR-1 report
2022-04-08 17:14:10 +05:30
rahib-hassan
171c60ff37
fix: removed discount account field from account settings
2022-04-08 16:50:56 +05:30
rahib-hassan
786887768e
fix: removed discount-accounting code from account settings
2022-04-08 16:50:36 +05:30
Jannat Patel
59ad7e037c
Merge pull request #30596 from pateljannat/remove-courses-template
2022-04-08 16:27:31 +05:30
rahib-hassan
b6ce497601
fix: removed discount account field from account settings
2022-04-08 15:08:21 +05:30
Ankush Menat
d74181630a
test: prevent cancelling RIV of cancelled voucher
2022-04-08 14:57:55 +05:30
Ankush Menat
a281998bcb
fix: prevent deleting repost queue for cancelled transactions
2022-04-08 14:57:55 +05:30
Deepesh Garg
617deda2ff
Merge branch 'version-14-beta' into develop
2022-04-08 13:38:27 +05:30
Ankush Menat
49560d20bc
fix: remove bad defaults from BOM operation ( #30644 )
...
[skip ci]
2022-04-08 11:23:02 +05:30
rahib-hassan
0fcdf1b613
removed discount-accounting from account settings
2022-04-08 08:10:27 +05:30
rahib-hassan
1babc5f367
feat: separated discount accounting settings for sales and purchase
2022-04-08 08:05:10 +05:30
Ankush Menat
8d57c853f3
feat: barcode scanning in quotation ( #30637 )
2022-04-07 21:40:03 +05:30
Ankush Menat
225deb949b
fix: use empty row when batch is scanned ( #30638 )
2022-04-07 21:38:18 +05:30
Sam
8fbfba4f2f
chore: class selectors for customizability ( #30185 )
...
* Update project_row.html
Really helpful those fields has own class when styling for mobile or desktop by using Website Settings --> HTML Header, Robots and Redirects
* chore: skewercase
2022-04-07 19:27:27 +05:30
Rucha Mahabal
0562eb5f56
Merge pull request #30588 from ruchamahabal/multiple-shifts
2022-04-07 18:44:16 +05:30
Ankush Menat
bc2c6018f7
ci: mergify auto merge on passing CI + approvals
2022-04-07 18:27:47 +05:30
Rucha Mahabal
7ba66b0320
Merge branch 'develop' into multiple-shifts
2022-04-07 18:07:39 +05:30
Ankush Menat
f1fd4e5c27
test: cant_change validations on item
2022-04-07 17:30:12 +05:30
Ankush Menat
fba68541d6
refactor(Item): linked doc checking
2022-04-07 17:30:12 +05:30
Ankush Menat
2f1e98d1e8
feat: show Stock Reconciliation links on item dashboard
2022-04-07 17:30:12 +05:30
Sagar Vora
26abfd4d7c
Merge pull request #30634 from resilient-tech/fix-mutable-reassignment
...
fix: dont reassign mutable (list) to a different field
2022-04-07 17:24:52 +05:30
Sagar Vora
3b4754f3f6
fix: define tax_columns below consistency
2022-04-07 17:01:10 +05:30
Sagar Vora
fa4f57f470
fix: dont reassign mutable (list) to a different field
2022-04-07 16:51:27 +05:30
Deepesh Garg
18b1a93c7e
Merge pull request #30606 from deepeshgarg007/exchange_gain_loss_button
...
fix: Exchange gain and loss button in Payment Entry
2022-04-07 16:49:05 +05:30
Deepesh Garg
c9d6618b9b
Merge pull request #30628 from deepeshgarg007/pricng_rule_test
...
test: Pricing rule test for transactions
2022-04-07 16:37:02 +05:30
Ankush Menat
be04eaf723
fix: warehouse naming when suffix is present ( #30621 )
2022-04-07 13:21:08 +05:30
Deepesh Garg
22e8ae9dac
test: Pricing rule test for transactions
2022-04-07 13:20:53 +05:30
Saqib Ansari
45fca6bed7
feat(india): e-invoicing for intra-state union territory transactions
2022-04-07 13:09:05 +05:30
Ankush Menat
a6e26cce87
chore: broken translations
2022-04-07 13:07:14 +05:30
Deepesh Garg
f3e6a26d34
Merge pull request #30499 from ruthra-kumar/payment_terms_status_filter
...
feat: 'customer' column and more filter to Payment terms status report
2022-04-07 13:01:16 +05:30
Rucha Mahabal
ec65af5f38
fix: show allocation history for earned leaves allocated via scheduler
2022-04-07 12:57:04 +05:30