Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,296 Commits 3 Branches 0 Tags 1 GiB
3beeeb589a
Commit Graph

32296 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sahil Khan
b91e9c6aee Merge branch 'version-13-beta-pre-release' into version-13-beta 2020-06-30 18:46:02 +05:30
Sahil Khan
f278425c01 bumped to version 13.0.0-beta.3 2020-06-30 19:06:02 +05:50
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
Anurag Mishra
8f2cb0beb6 fix: set half day date None if half day is unchecked 2020-06-30 12:11:03 +05:30
mergify[bot]
dca65de1b6
fix: Salary deductions report fixes (bp #22397) (#22520) 
* feat: added year filters

(cherry picked from commit d0d9b53361)

* Fix: if there is no component

(cherry picked from commit f9ca29cebd)

* fix: test_tax_for_payroll_period

(cherry picked from commit ece9508eb5)

Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>
 2020-06-30 11:45:40 +05:30
Nabin Hait
7813cabfd3 chore: Added Change Log 2020-06-30 11:35:41 +05:30
mergify[bot]
7db00dde2d
fix: Dashboard label in Projects and Assets module (#22517) (#22518) 
(cherry picked from commit fdbd10f193)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-06-30 09:33:18 +05:30
Nabin Hait
fdbd10f193
fix: Dashboard label in Projects and Assets module (#22517) 2020-06-30 09:25:17 +05:30
mergify[bot]
e0388a169a
fix: manufacturing dashboard grammar (#22510) (#22516) 
* fix: manufacturing dashboard grammar

* Update manufacturing.json

(cherry picked from commit 7056cd3782)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2020-06-30 08:57:26 +05:30
Marica
7ca8022b8f
fix: Set Root as Parent if no parent in new tree view node (#22508) 2020-06-30 08:20:58 +05:30
Marica
0efda4e457
fix: Added Missing Trends Reports to Buying/Selling Desk (#22509) 
* fix: Added Missing Trends Reports to Buying/Selling Desk

* fix: Move Reports to Other Reports
 2020-06-30 08:20:35 +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
Deepesh Garg
8230e41a42 fix: Insert instead of DB insert 2020-06-29 21:20:05 +05:30
Deepesh Garg
d1bf6e0277 fix: Do not ignore validate methods on GLL entry submit 2020-06-29 21:14:03 +05:30
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