Anurag Mishra
101d15f2f8
fix: not working without from_amount and percentage_deduction ( #22380 )
2020-06-23 10:45:54 +05:30
Anurag Mishra
36560c8406
fix: staffing Plan validation ( #22379 )
2020-06-23 10:44:33 +05:30
mergify[bot]
ca8894b0fc
fix: alternative item not working for subcontract ( #22386 )
...
(cherry picked from commit 171699537c3e7d7632f45123c6d30012c8de7281)
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
2020-06-23 10:42:32 +05:30
Marica
3dee5273d6
fix: Update Packed Items via Update Items in SO ( #22392 )
2020-06-23 10:33:47 +05:30
Marica
bd5c8573de
fix: Unable to create batched Item ( #22393 )
2020-06-23 10:32:51 +05:30
Deepesh Garg
7cc1cf36ca
feat: More controlled deferred revenue booking ( #21671 )
...
* feat: More controller deferred revenue booking
* fix: Query for last gl entry
* fix: Accounting Dimension for Deferred entries
* fix: Deferred revenue booking against paid invoices
* fix: Don not update outstanding on Deferred Entry submission
* fix: Naming fixes
* feat: Deferred revenue/expense booking based on months
* fix: Test case for fix monthly deferred revenue booking
* fix: Typo
* fix: Patch to update settings
* fix: Test case to book deferred expense via journal entry
* fix: Update field for better UX
* fix: Codacy
* fix: Change select field to checkbox
2020-06-23 09:57:56 +05:30
Raffael Meyer
c3e91be48e
Merge branch 'develop' into refactor_datev
2020-06-22 19:53:47 +02:00
Deepesh Garg
3c25308b27
Merge pull request #21997 from totolouis/patch-1
...
fix: translation from HTML code to apostrophe
2020-06-22 21:43:38 +05:30
Suraj Shetty
c753502412
Merge branch 'develop' into patch-1
2020-06-22 21:41:31 +05:30
rohitwaghchaure
b658a010f1
Merge pull request #22383 from frappe/mergify/bp/develop/pr-22330
...
fix(pricing_rule): apply_on logic dont get cleanup (bp #22330 )
2020-06-22 21:08:55 +05:30
Deepesh Garg
49f51f4132
Merge pull request #22346 from AfshanKhan/ISS_20_21_02455
...
fix: set row_id by default as previous row for On Previous Row Amount and On Previous Row Total
2020-06-22 20:53:23 +05:30
Rohit Waghchaure
aaed3b988f
added validation and clear fields for Apply Rule On Other
...
(cherry picked from commit ebbbc85fc0f9aa418163f8344d3a234ecbe08488)
2020-06-22 14:52:30 +00:00
Poranut Chollavorn
e3973a4730
fix(pricing_rule): apply_on logic dont get cleanup
...
(cherry picked from commit acf399c4e0c74458c17866be7d72788aeecbe829)
2020-06-22 14:52:29 +00:00
Deepesh Garg
5dc175f068
fix(Immutable Ledger): Item wise backdated stock entry posting ( #22366 )
...
* fix(Immutable Ledger): Item wise backdated stock entry posting
* fix: Remove fiscal year query
* fix: Update message string
2020-06-22 19:05:39 +05:30
Deepesh Garg
c914d1b8e8
Merge branch 'develop' into ISS_20_21_02455
2020-06-22 18:46:58 +05:30
Anupam Kumar
71da90034d
fix: resetting lost reason in opportunity and quotation ( #22378 )
2020-06-22 18:27:14 +05:30
Deepesh Garg
be4fc1a78e
fix(UX): Notify user of expense account change in Purchase Invoice ( #22193 )
2020-06-22 18:03:11 +05:30
Anurag Mishra
7672166ce3
fix: Wrong filter ( #22375 )
2020-06-22 17:22:05 +05:30
Anurag Mishra
0093b3b27c
fix: label ( #22377 )
2020-06-22 17:21:01 +05:30
Deepesh Garg
0252cb6789
Merge pull request #22374 from deepeshgarg007/employee_advance_cancel
...
fix: Unable to cancel employee advance
2020-06-22 14:55:21 +05:30
Deepesh Garg
62897d3878
fix: Unable to cancel employee advance
2020-06-22 14:54:01 +05:30
Anurag Mishra
8ffb9f852f
fix: patch check_is_income_tax_component ( #22371 )
2020-06-22 12:17:29 +05:30
rohitwaghchaure
39a7516252
Merge pull request #22241 from deepeshgarg007/cost_center_fix
...
fix: Minor fixes in cost center
2020-06-22 11:21:14 +05:30
Alvaro
43be163b32
feat: Enabled translation on html files in LMS [Proposal] ( #21582 )
...
* :fix: translation fix for html files in LMS
* fix: typo in translation
* Update content.html
* Update content.html
* Update profile.html
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-06-22 11:06:12 +05:30
Deepesh Garg
ded3ab1cd7
fix: Test Cases
2020-06-22 09:40:15 +05:30
Deepesh Garg
7f94765d02
Merge pull request #22350 from AfshanKhan/ISS_20_21_02392
...
fix: Skipping total row for tree-view reports
2020-06-21 19:25:59 +05:30
Afshan
84c6973742
fix: adding json for checked add total row
2020-06-21 17:48:44 +05:30
Deepesh Garg
95a497cffb
Merge branch 'develop' of https://github.com/frappe/erpnext into cost_center_fix
2020-06-20 12:33:41 +05:30
Deepesh Garg
bef80b7981
fix: Test
2020-06-20 12:32:30 +05:30
Deepesh Garg
dee1c92df1
Merge pull request #22351 from kennethsequeira/purchase_inv_due
...
fix: status error in purchase invoice
2020-06-20 11:58:19 +05:30
Deepesh Garg
c70eb30e7e
Merge branch 'develop' of https://github.com/frappe/erpnext into grn_posting
2020-06-20 11:56:25 +05:30
Deepesh Garg
53d5d16abb
fix: Move check from Stock Settings to Company Master
2020-06-20 11:55:56 +05:30
Revant Nandgaonkar
d39c97e281
fix: trigger docker build on release ( #22353 )
2020-06-19 23:56:53 +05:30
Afshan
3fbe6e9e4b
fix: test case
2020-06-19 22:51:52 +05:30
Kenneth Sequeira
b7c8037e9a
fix codacy
2020-06-19 22:33:51 +05:30
Kenneth Sequeira
b4c3e2243e
Merge branch 'purchase_inv_due' of https://github.com/kennethsequeira/erpnext into purchase_inv_due
...
merge
2020-06-19 22:30:23 +05:30
Kenneth Sequeira
802c300218
Revert "fix: rogue s/codacy"
...
This reverts commit 2bf8d60d7e
.
2020-06-19 22:29:55 +05:30
Kenneth Sequeira
2bf8d60d7e
fix: rogue s/codacy
2020-06-19 22:25:55 +05:30
Anurag Mishra
289c82243f
feat: New Payroll module ( #21990 )
...
* feat: Moved Document to Payroll Module
* feat: Moved Reports to Payroll Module
* feat: Moved Print fromat With Patch
* feat: Moved Notifiction to Payroll Module and patches
* feat: added dashboard and desk page to Payroll
* feat: Payroll Dashboard
* feat: Module onboarding
* feat: Income tax Deductions Report
* feat: Ecs Checklist Report
* feat: Provident Fund Report
* feat: Professional Fund report and commonified Code
* feat: Total Payments Based On Payment Mode Report
* fix: refactor and added chart Total Payments Based On Payment Mode
* feat: Payroll Settings
* fix: Bank remittance Report
* feat(Payroll based on): Considered unmarked days
* feat: Added Help for condition an formula in Salary structure
* fix: requested changes
* fix: rename report Ecs checklist to salary_payments_via_ecs
* fix: renamed report report/total_payments_based_on_payment_mode
* fix: added role via setup.py for regional report
* feat: added All reports to desk page
* fix: frappe.reload doc in all patches
* fix: codacy
* fix: frappe.reload_doctype for patches
* patch: is_income_tax_component and component_type for salary component
* fix: uncommented code
* test: fixture
* fix: test
* test: test_payment_days_based_on_attendance
2020-06-19 19:17:57 +05:30
Marica
47a4567301
Merge branch 'develop' into purchase_inv_due
2020-06-19 18:44:53 +05:30
Kenneth Sequeira
02f3e045ab
fix: due date filter in purchase invoice
2020-06-19 18:22:04 +05:30
Afshan
65f00cea15
fix: Skipping*
2020-06-19 18:19:06 +05:30
Afshan
fbd66574ad
Skiping total row for tree-view reports
2020-06-19 18:17:01 +05:30
Deepesh Garg
9819b96141
Merge pull request #22348 from frappe/revert-21742-payment-remark-fix
...
Revert "fix: update remark on submitting payment entry"
2020-06-19 17:30:21 +05:30
Deepesh Garg
aea450c36a
Revert "fix: update remark on submitting payment entry"
2020-06-19 17:29:49 +05:30
Afshan
aca2ca5982
style: formate according to Codacy/PR Quality Review
2020-06-19 16:22:41 +05:30
Marica
383807f72e
feat: Selling Desk, Dashboard and Onboarding ( #22055 )
...
* feat: Selling Desk, Dashboard and Onboarding
* chore: Selling Onboarding and fixes in Other onboardings
* chore: Dashboard and Number card Fixtures
* fix: Escape filters and Reposition Accounts Dashboard shortcut.
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-06-19 15:33:21 +05:30
Afshan
0fe14ce94e
style: formate according to Codacy/PR Quality Review
2020-06-19 15:10:15 +05:30
Afshan
6f7652f425
fix: set row_id by default as previous row for On Previous Row Amount and On Previous Row Total
2020-06-19 14:36:56 +05:30
rohitwaghchaure
22d49726d1
Merge pull request #22341 from deepeshgarg007/bank_reco_patch
...
chore: Delete Bank Reco doctype
2020-06-19 13:10:20 +05:30