rohitwaghchaure
661bc46b81
Merge pull request #22571 from marination/quality-feedback
...
fix: Quality Feedback and Template (minor)
2020-07-06 13:17:10 +05:30
rohitwaghchaure
1cc1fd4f86
Merge pull request #22576 from marination/party-details
...
fix: Check for Company before trying to fetch party details
2020-07-06 12:42:16 +05:30
rohitwaghchaure
e5d9ebe32e
Merge pull request #22577 from deepeshgarg007/coa_fiscal_year_fix
...
fix: Consider company fiscal year for getting balance
2020-07-06 12:34:56 +05:30
Marica
7e198527b9
Merge branch 'develop' into party-details
2020-07-06 11:09:20 +05:30
rohitwaghchaure
3292e63dee
Merge pull request #22569 from rohitwaghchaure/fixed-travis-failing-due-to-loan-issue
...
fix: travis
2020-07-04 14:14:52 +05:30
Rohit Waghchaure
f0f4f70a76
fix: test case for salary slip
2020-07-04 13:30:22 +05:30
Deepesh Garg
96d40ec9da
fix: Consider company fiscal for getting balalnce
2020-07-03 22:59:00 +05:30
marination
e27b996e38
fix: Check for Company before trying to fetch party details
2020-07-03 22:12:00 +05:30
Deepesh Garg
62181707ee
Merge pull request #22574 from deepeshgarg007/uae_item_tax_fix
...
fix: Update item tax only if item code available
2020-07-03 21:25:28 +05:30
Deepesh Garg
04661a4e15
fix: Update item tax only if item code available
2020-07-03 21:23:23 +05:30
Rohit Waghchaure
2cbf598b4b
fix: travis
2020-07-03 20:15:18 +05:30
marination
8e62035991
fix: Quality Feedback and Template (minor)
2020-07-03 16:19:55 +05:30
sahil28297
32d7ff7b34
Merge branch 'develop' into fix_develop_version
2020-07-03 11:48:22 +05:30
Deepesh Garg
271ccff77d
Merge pull request #22564 from deepeshgarg007/loan_doc_cleanup
...
fix: Remove loan security field from loan
2020-07-03 09:34:56 +05:30
Deepesh Garg
30d9101cbf
fix: Remove loan security field from loan
2020-07-02 23:39:12 +05:30
Afshan
bfffd9b01b
made "Subscription Section", "Auto Repeat" and Hub Publishing" collapsible by default ( #22521 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-02 15:11:45 +05:30
Khushal Trivedi
49d04f449e
fix: no else condition required since we can decalre it by default ( #22537 )
...
* fix: removing unnecessary else condition on customer form
* fix: removing unnecessary else condition on customer form
* fix: no else condition required since we can decalre it by default
Co-authored-by: Khushal Trivedi <khushalt5@gmail.com>
2020-07-02 14:51:20 +05:30
Marica
484a681e0c
Merge branch 'develop' into FR_ISS_204863
2020-07-01 11:29:03 +05:30
Michelle Alva
ec84afa86d
fix: Refactor dashboard links in leave policy ( #22519 )
...
* fix: refactor dashboard links in leave policy
* fx: code fix
* fix: add labels to links
* fix: code change
2020-06-30 18:04:20 +05:30
Sahil Khan
ad4eb649a2
chore: set develop version as 13.x.x
2020-06-30 17:54:41 +05:30
Nabin Hait
fdbd10f193
fix: Dashboard label in Projects and Assets module ( #22517 )
2020-06-30 09:25:17 +05:30
rohitwaghchaure
7056cd3782
fix: manufacturing dashboard grammar ( #22510 )
...
* fix: manufacturing dashboard grammar
* Update manufacturing.json
2020-06-30 08:20:03 +05:30
Afshan
06f11aba0b
feat: Autofill Supplier pop-up when only 1 Supplier in RFQ
2020-06-29 21:39:35 +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
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
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
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
Rohit Waghchaure
04cf2e029f
fix: letter head not found in opening invoice creation tool
2020-06-28 17:08:12 +05:30
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
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
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