mergify[bot]
|
9cba6bddde
|
fixes: Payroll module pre relese test fixes (#22500) (#22506)
* fix: salary payment based on payments
* fix: bank remittance report
* fix: Payroll period onboarding
* fix: provident-fund-deductions report
* fix: Considered unmarked days
* fix: onboarding paYroll
* feat: quick entry in payroll entry
(cherry picked from commit c2523e8453)
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
|
2020-06-29 20:07:57 +05:30 |
|
Anurag Mishra
|
c2523e8453
|
fixes: Payroll module pre relese test fixes (#22500)
* fix: salary payment based on payments
* fix: bank remittance report
* fix: Payroll period onboarding
* fix: provident-fund-deductions report
* fix: Considered unmarked days
* fix: onboarding paYroll
* feat: quick entry in payroll entry
|
2020-06-29 19:54:23 +05:30 |
|
Marica
|
510436931b
|
fix: Added Missing Trends Reports to Buying/Selling Desk (#22502)
* fix: Added Missing Trends Reports to Buying/Selling Desk
* fix: Move Reports to Other Reports
|
2020-06-29 19:52:23 +05:30 |
|
mergify[bot]
|
c312b3af13
|
fix: job offer validation fix (#22504) (#22505)
(cherry picked from commit 343651fc39)
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
|
2020-06-29 19:10:57 +05:30 |
|
mergify[bot]
|
47a3524a7d
|
fix: Stock Onboarding typo and reorder (#22499) (#22503)
(cherry picked from commit 8732b8caf6)
Co-authored-by: Marica <maricadsouza221197@gmail.com>
|
2020-06-29 18:24:25 +05:30 |
|
Anurag Mishra
|
343651fc39
|
fix: job offer validation fix (#22504)
|
2020-06-29 18:23:22 +05:30 |
|
Marica
|
3e93a2f67f
|
fix: Set Root as Parent if no parent in new tree view node (#22497)
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
|
2020-06-29 17:39:26 +05:30 |
|
Marica
|
8732b8caf6
|
fix: Stock Onboarding typo and reorder (#22499)
|
2020-06-29 17:38:42 +05:30 |
|
Anurag Mishra
|
ba5f571b0d
|
fix: take parent cost center for child if no cost center at child (#22496)
|
2020-06-29 17:35:27 +05:30 |
|
Saqib
|
41034f760d
|
Merge branch 'develop' into asset-delete-fix
|
2020-06-29 10:54:01 +05:30 |
|
Saqib Ansari
|
cc42aa1750
|
fix: cancel asset movement on asset cancellation
|
2020-06-29 10:33:24 +05:30 |
|
Mangesh-Khairnar
|
73edba0e10
|
fix: handle nonetype issue for packed items (#22493)
|
2020-06-29 08:54:53 +05:30 |
|
Deepesh Garg
|
a74cffe7a4
|
Merge pull request #21047 from vishdha/feat_taxjar
feat(ERPNext Integrations): Taxjar Integration Added
|
2020-06-28 23:01:37 +05:30 |
|
Deepesh Garg
|
23c64c0b3a
|
Merge pull request #22487 from frappe/mergify/bp/version-13-beta-pre-release/pr-21690
fix(regional): DATEV report (bp #21690)
|
2020-06-28 21:38:58 +05:30 |
|
Deepesh Garg
|
50e6e47e66
|
fix: Patch
|
2020-06-28 21:32:08 +05:30 |
|
rohitwaghchaure
|
6acde987c5
|
Merge pull request #22488 from rohitwaghchaure/fixed-letter-head-not-found
fix: letter head not found in opening invoice creation tool
|
2020-06-28 20:02:29 +05:30 |
|
Deepesh Garg
|
eca2c1cd93
|
fix: patch
|
2020-06-28 18:53:55 +05:30 |
|
Rucha Mahabal
|
67608c3179
|
Merge pull request #22476 from ruchamahabal/fix-custom-status-v13
fix: handle custom statuses for the pause SLA configuration
|
2020-06-28 17:32:25 +05:30 |
|
Rohit Waghchaure
|
04cf2e029f
|
fix: letter head not found in opening invoice creation tool
|
2020-06-28 17:08:12 +05:30 |
|
barredterra
|
7df5de9468
|
fix: hide transaction-specific for master data
(cherry picked from commit 30d194d8a7)
|
2020-06-28 11:29:48 +00:00 |
|
barredterra
|
8f7d214853
|
fix: customer and supplier data
(cherry picked from commit 53445aa25a)
|
2020-06-28 11:29:48 +00:00 |
|
barredterra
|
6adb617ede
|
fix: truncate account names to max length
(cherry picked from commit 2976831560)
|
2020-06-28 11:29:48 +00:00 |
|
barredterra
|
3efe0d0e83
|
refactor: query meta data only once
(cherry picked from commit 55c048f56c)
|
2020-06-28 11:29:47 +00:00 |
|
barredterra
|
cf53305abb
|
fix(report view): explicitly set column width for
(cherry picked from commit 7a7add5001)
|
2020-06-28 11:29:47 +00:00 |
|
Deepesh Garg
|
4c230ed4b0
|
Merge pull request #21690 from alyf-de/refactor_datev
fix(regional): DATEV report
|
2020-06-28 16:55:18 +05:30 |
|
Deepesh Garg
|
c8b11143a1
|
Merge pull request #22445 from Alchez/dev-job-offer-list-view
fix: setup status indicators for Job Offer and Job Applicant (develop)
|
2020-06-28 16:49:28 +05:30 |
|
rohitwaghchaure
|
e4d296bb1c
|
Merge pull request #22413 from Anurag810/salary-structure-help-fix
fix: 'Condition & Formula Help' appears twice
|
2020-06-28 16:29:20 +05:30 |
|
rohitwaghchaure
|
7e3f10e5bc
|
Merge pull request #22397 from Anurag810/salary_deductions_report_fixes
fix: Salary deductions report fixes
|
2020-06-28 16:27:37 +05:30 |
|
rohitwaghchaure
|
81af2235f4
|
Merge branch 'develop' into dev-job-offer-list-view
|
2020-06-28 15:25:32 +05:30 |
|
rohitwaghchaure
|
41cd4fc788
|
Merge pull request #22478 from michellealva/cost_center_filter
fix: apply filters in all transactions
|
2020-06-28 15:10:13 +05:30 |
|
rohitwaghchaure
|
4cc2e70348
|
Merge pull request #22454 from wojosc/patch-10
refactor: update customs_tariff_number.json
|
2020-06-28 15:07:19 +05:30 |
|
rohitwaghchaure
|
69aa2e400a
|
Merge pull request #22412 from frappe/mergify/bp/version-13-beta-pre-release/pr-22223
feat: Accounting entries for service item in Purchase receipt (bp #22223)
|
2020-06-28 11:26:21 +05:30 |
|
rohitwaghchaure
|
cc2d7f3e7f
|
Merge pull request #22450 from marination/serial-no-rename
fix: Disable Renaming in Serial No
|
2020-06-28 11:15:35 +05:30 |
|
rohitwaghchaure
|
d5736711ce
|
fix: indentation
|
2020-06-28 11:12:20 +05:30 |
|
rohitwaghchaure
|
2f4971b5a6
|
Merge pull request #22461 from britlog/develop
fix: product_info
|
2020-06-28 11:05:26 +05:30 |
|
Deepesh Garg
|
1d8b13c943
|
Merge pull request #22483 from deepeshgarg007/loan_security_shorttfall_fixes
fix: Loan security shortfall fixes
|
2020-06-27 18:57:14 +05:30 |
|
Deepesh Garg
|
a4b9fc74aa
|
Merge branch 'develop' into feat_taxjar
|
2020-06-27 18:51:48 +05:30 |
|
Deepesh Garg
|
589364856c
|
fix: Syntax Error
|
2020-06-27 18:44:36 +05:30 |
|
Deepesh Garg
|
72ba8f1203
|
Merge pull request #22481 from frappe/michellealva-patch-7
fix: change button label in issue
|
2020-06-27 18:01:45 +05:30 |
|
Michelle Alva
|
2f37c447dd
|
fix: change button label in issue
Changed the label of the button from "Make" to "Create" so that it is consistent with other DocTypes.
Before:
|
2020-06-27 09:27:45 +05:30 |
|
Marica
|
92bea1326a
|
Merge branch 'develop' into serial-no-rename
|
2020-06-26 20:34:09 +05:30 |
|
Marica
|
14ad9e789d
|
Merge pull request #22477 from michellealva/label-fix2
fix: remove redundant label in salary slip
|
2020-06-26 20:32:23 +05:30 |
|
michellealva
|
08f842d12e
|
fix: apply filters in all transactions
|
2020-06-26 19:56:00 +05:30 |
|
michellealva
|
e9cec2ff76
|
fix: remove redundant label in salary slip
|
2020-06-26 19:39:54 +05:30 |
|
britlog
|
0086a3727f
|
fix: product_info
|
2020-06-26 15:30:27 +02:00 |
|
Rucha Mahabal
|
5dd4bcb229
|
fix: set total hold time only if hold configurations are enabled
|
2020-06-26 18:22:24 +05:30 |
|
Rucha Mahabal
|
28c1e8ef77
|
fix: handle hold time for custom statuses
|
2020-06-26 18:21:53 +05:30 |
|
rohitwaghchaure
|
275ebefdd2
|
Merge pull request #22468 from frappe/shopping-cart-settings
fix: enable show_configure_button when shopping cart is enabled
|
2020-06-26 17:20:35 +05:30 |
|
mergify[bot]
|
fce39f706d
|
fix: Send email to credit controllers to increase credit limit (#22473)
(cherry picked from commit 0ff5af222a)
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
|
2020-06-26 16:21:56 +05:30 |
|
rohitwaghchaure
|
b2ae6d9961
|
Merge pull request #22467 from nabinhait/credit_limit_email
fix: Send email to credit controllers to increase credit limit
|
2020-06-26 15:49:25 +05:30 |
|