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
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
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
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
Jannat Patel
59ad7e037c
Merge pull request #30596 from pateljannat/remove-courses-template
2022-04-08 16:27:31 +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
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
Rucha Mahabal
6203ffc8fa
fix: make New Leaves Allocated read-only if policy assignment is linked to the allocation and leave type is earned leave
2022-04-07 12:57:04 +05:30
Rucha Mahabal
f8f1c3d8b5
fix: enable Track Changes in Leave Allocation
2022-04-07 12:57:04 +05:30
Ankush Menat
e4c6d6a1a6
fix: strip html tags before checking for empty description ( #30619 )
2022-04-07 12:53:10 +05:30
Deepesh Garg
8feb4f08c5
fix: Exchange gain and loss button in Payment Entry
2022-04-06 20:51:51 +05:30
Ankush Menat
8e425252c4
chore: typo
2022-04-06 18:27:41 +05:30
Ankush Menat
9e2d54f9a4
chore: broken translation
...
[skip ci]
2022-04-06 18:21:28 +05:30
Ankush Menat
eebcf2a9f1
fix: only trigger onload checks on saved docs ( #30603 )
2022-04-06 18:13:55 +05:30
Deepesh Garg
9bf5f76ac8
fix: Deferred Revenue/Expense Account validation
2022-04-06 17:33:46 +05:30
Ankush Menat
8b090a9f7d
fix: hide pending qty only if original item is assigned ( #30599 )
2022-04-06 16:35:36 +05:30
Ankush Menat
ba42c87687
refactor: don't use pandas for basic reports ( #30597 )
2022-04-06 15:40:41 +05:30
Jannat Patel
bce1c2a028
fix: removed unused courses template
2022-04-06 14:44:10 +05:30
Ankush Menat
bb875fe217
fix: check null values in is_cancelled patch ( #30594 )
2022-04-06 14:20:39 +05:30
HENRY Florian
4895761d89
fix: update translation ( #30474 )
...
* fix: update translation
* fix: update translation
* fix: update translation
* fix: update translation
* fix: update translation
* fix: update translation
* fix: update translation
* fix: update translation
* fix: update translation
* fix: update translation
2022-04-06 14:00:05 +05:30
Deepesh Garg
a818acf66d
Merge pull request #30557 from deepeshgarg007/loan_repayment_issue
...
fix: Issues on loan repayment
2022-04-06 11:36:53 +05:30
Rucha Mahabal
00ddb4c42a
Merge branch 'develop' into multiple-shifts
2022-04-06 11:22:46 +05:30
Rucha Mahabal
c5850e3923
Revert "feat: Scheduling Multiple shifts and Auto Attendance" ( #30587 )
2022-04-06 11:18:47 +05:30
Deepesh Garg
4c8dae40cd
Merge branch 'develop' into loan_repayment_issue
2022-04-06 10:57:25 +05:30
Deepesh Garg
b8df82d23c
Merge pull request #30555 from deepeshgarg007/party_account_user_perm
...
fix: Ignore user perm for party account company
2022-04-06 10:57:13 +05:30
