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

32304 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohit Waghchaure
afe8e88cb8 fix: Cannot read property 'has_batch_no' of undefined 2020-06-10 17:55:24 +05:30
Marica
aeeadee8f8
Merge branch 'develop' into update-items-permission-fix 2020-06-10 15:19:33 +05:30
rohitwaghchaure
0233f94570
Merge pull request #22081 from deepeshgarg007/jv_list_view 
fix: Add total debit in Journal Entry list view
 2020-06-10 14:17:13 +05:30
rohitwaghchaure
95331a31a7
Merge pull request #22155 from frappe/barredterra-billing_hours 
feat(projects): bill all hours by default
 2020-06-10 14:16:18 +05:30
rohitwaghchaure
9ea9a99889
Merge pull request #22063 from marination/procurement-tracker-develop 
fix: Procurement Tracker Data Consistency
 2020-06-10 14:13:36 +05:30
rohitwaghchaure
3a9c1b23db
Merge pull request #22096 from marination/valuation-rate 
fix: '>=' not supported between instances of 'str' and 'int'
 2020-06-10 14:12:13 +05:30
rohitwaghchaure
63e8f2c430
Merge pull request #22175 from Anurag810/expense_claim_cost_center_fix 
fix: set cost center in child table
 2020-06-10 13:40:51 +05:30
rohitwaghchaure
88b964348e
Merge pull request #22176 from Anurag810/hr_desk_page_fixes 
fix: dependency for leave Period in Desk page
 2020-06-10 13:39:51 +05:30
Rucha Mahabal
1e49c6b68b fix: update duration options 2020-06-10 12:58:16 +05:30
Anurag Mishra
452b7760df fix: dependency for leave Period in Desk page 2020-06-10 12:48:21 +05:30
Rucha Mahabal
5b6d2c2e7b
Merge branch 'develop' into sla-enhancements 2020-06-10 12:33:19 +05:30
rohitwaghchaure
904e0f4eda
Merge pull request #22106 from Anurag810/employee_onboarding_fix 
fix: problem during assigning
 2020-06-10 12:30:15 +05:30
Anurag Mishra
402c347f83 fix: set cost center in child table 2020-06-10 12:27:59 +05:30
Anupam Kumar
934e30ecac
update program course (#22166) 2020-06-10 11:07:43 +05:30
Rucha Mahabal
bb3b616a04 fix: set valuesin db for handle hold time 2020-06-09 23:17:51 +05:30
Raffael Meyer
088ab75083
fix: move feature into update_billing_hours 2020-06-09 16:09:40 +02:00
Deepesh Garg
ee9a4c54ad
Merge pull request #22165 from frappe/mergify/bp/version-13-beta-pre-release/pr-22164 
Revert "fix: docfield of sales_order is not fetching route options for new doc" (bp #22164)
 2020-06-09 17:55:12 +05:30
Deepesh Garg
c1bc819f18 Revert "fix: docfield of sales_order is not fetching route options for new doc (#21123)" 
This reverts commit 5c54adec28c7fda2e290a1bd2bfd1ab7f3c751d0.

(cherry picked from commit e5fe00cf58bf1aa0edbb07bfbc70dc66c60023f2)
 2020-06-09 12:18:25 +00:00
Deepesh Garg
0dd925cfc8
Merge pull request #22164 from frappe/revert-21123-patch-1 
Revert "fix: docfield of sales_order is not fetching route options for new doc"
 2020-06-09 17:42:42 +05:30
rohitwaghchaure
b42ac845da
Merge pull request #22147 from marination/finished-good-valuation 
fix: Finished Product Valuation at Repack
 2020-06-09 17:42:06 +05:30
Deepesh Garg
e5fe00cf58 Revert "fix: docfield of sales_order is not fetching route options for new doc (#21123)" 
This reverts commit 5c54adec28c7fda2e290a1bd2bfd1ab7f3c751d0.
 2020-06-09 17:41:27 +05:30
Raffael Meyer
d27d88c3e4
feat: bill all hours by default 2020-06-08 22:52:44 +02:00
Nabin Hait
d5b97d6996
Update CODEOWNERS 2020-06-08 19:51:55 +05:30
marination
f5b9deea5b fix: Finished Product Valuation at Repack 2020-06-08 13:02:00 +05:30
Karthikeyan S
e9ff6d3d52
feat(Cost Center): Distributed Cost Center (#21531) 
* feat: Distributed Cost Center

Squashed commit of the following:

commit 274236eb92dfddfd015583ee1e6b5e1937366d28
Author: Vignesh <kaviya.3111999@gmail.com>
Date:   Mon Mar 23 18:32:26 2020 +0530

    Fix: Indentation

commit beae0b9849f333dd1d9f29c27192ea7de2e4e809
Author: Vignesh <kaviya.3111999@gmail.com>
Date:   Mon Mar 23 18:26:50 2020 +0530

    The validations are added to distributed cost center.

commit 3f66943adacb5797338ef3510251bf6633be3dba
Author: Vignesh <kaviya.3111999@gmail.com>
Date:   Thu Mar 19 22:17:25 2020 +0530

    The distributed cost centers are shown with the percentage allocation in the reports

commit 1ac11df522096fa187d2f5863b4c970e18b37fac
Author: Vignesh <kaviya.3111999@gmail.com>
Date:   Thu Mar 19 13:36:04 2020 +0530

    The child table distributed cost center are added to cost center doctype and then validate percentage allocation.

* fix(Distributed Cost Center): validation and filters

* fix(Distributed Cost Center): financial statement query

* fix(Distributed Cost Center): add test cases

Co-authored-by: Vignesh S <svignesh0308@gmail.com>

* fix(Distributed Cost Center): budget variance, general ledger, profitability analysis reports.

* Merge branch 'develop' into develop-distributed-cost-center

* fix(Distributed Cost Center): Added DCC reflection in actual amount column of Budget Variance Report.

* Update creation field in general ledger report

Co-authored-by: Nabin Hait <nabinhait@gmail.com>

* creation field updated in gl_entries query

Co-authored-by: Nabin Hait <nabinhait@gmail.com>

Co-authored-by: KaviyaPeriyasamy <kaviya.3111999@gmail.com>
Co-authored-by: Vignesh S <svignesh0308@gmail.com>
Co-authored-by: KaviyaPeriyasamy <kaviyaperiyasamy22@gmail.com>
Co-authored-by: Kaviya Periyasamy <36359901+KaviyaPeriyasamy@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-06-08 12:20:21 +05:30
rohitwaghchaure
c6d4c2afb6
Merge pull request #22113 from Anurag810/leave_application-fixes 
fix: Wrong filters
 2020-06-08 10:43:22 +05:30
rohitwaghchaure
b3b5c96749
Merge pull request #22092 from marination/shippinng-address 
fix: Apply shipping rule without address too
 2020-06-08 10:36:19 +05:30
rohitwaghchaure
6debdc89c2
Merge pull request #22121 from rohitwaghchaure/error-report-exponential-smoothing-report 
fix: 'ForecastingReport' object has no attribute 'total_demand'
 2020-06-08 10:30:19 +05:30
Deepesh Garg
023f35bed7
Merge pull request #22143 from deepeshgarg007/loan_amount_precision_v13 
fix: Precision in loan amount calculation
 2020-06-07 21:38:18 +05:30
Deepesh Garg
221076c258 Merge branch 'version-13-beta-pre-release' of https://github.com/frappe/erpnext into loan_amount_precision_v13 2020-06-07 21:32:50 +05:30
Deepesh Garg
df93589032 fix: Ignore GL Entry on cancel 2020-06-07 21:29:25 +05:30
Deepesh Garg
3fed098f16 fix: Precision in loan amount calculation 2020-06-07 21:28:32 +05:30
Deepesh Garg
63e8391381
Merge pull request #22142 from deepeshgarg007/loan_amount_precision 
fix: Precision in loan amount calculation
 2020-06-07 21:28:23 +05:30
Deepesh Garg
0bc163c230 fix: Ignore GL Entry on cancel 2020-06-07 21:23:55 +05:30
Deepesh Garg
e5ac8cc430 fix: Precision in loan amount calculation 2020-06-07 21:18:47 +05:30
Mangesh-Khairnar
3031128167
fix: fetch tax lines within the shipping lines (#22138) 2020-06-07 18:02:23 +05:30
Deepesh Garg
76ddf4f0b5
Merge pull request #22132 from deepeshgarg007/tds_monthly_cancelled_v13 
fix: Cancelled entries in tds payable monthly report
 2020-06-07 00:08:57 +05:30
Deepesh Garg
c01b4aa2e5
Merge pull request #22131 from deepeshgarg007/tds_monthly_cancelled 
fix: Cancelled entries in tds payable monthly report
 2020-06-07 00:08:17 +05:30
Deepesh Garg
cdd92d756d fix: Cancelled entries in tds payable monthly report 2020-06-07 00:03:28 +05:30
Deepesh Garg
57f9d43c43 fix: Cancelled entries in tds payable monthly report 2020-06-07 00:01:20 +05:30
Revant Nandgaonkar
3375a2e85a
ci: trigger docker build on release (#22128) 2020-06-06 21:08:49 +05:30
Rucha Mahabal
73326d308b refactor: move pause SLA configuration to SLA DocType 2020-06-05 18:23:39 +05:30
Rucha Mahabal
d7d3ca4214 fix: tests 2020-06-05 16:57:37 +05:30
Abhishek Balam
328a55749d
fix(HR): Fix half day error when only 1 day is selected (#22122) 
* fix half day error when only 1 day is selected

* adding validation fix for half day on serverside
 2020-06-05 16:46:57 +05:30
Rucha Mahabal
25ef6a9638 fix: add default hold statuses in fixtures and patch 2020-06-05 16:37:20 +05:30
Rucha Mahabal
8d39928418 refactor: dashboard indicator when SLA is on hold 2020-06-05 16:36:31 +05:30
Rucha Mahabal
2c9f7cf371 feat: pause SLA on statuses configuration 2020-06-05 16:35:57 +05:30
Rohit Waghchaure
5a82276389 fix: 'ForecastingReport' object has no attribute 'total_demand' 2020-06-05 13:56:20 +05:30
Rucha Mahabal
b29cb87868 refactor: setting avg_response_time moved to communication 2020-06-05 13:35:38 +05:30
Deepesh Garg
407c7bc113
Merge pull request #22067 from marination/item-attribute 
fix: Misleading Error message for Item Attribute.
 2020-06-05 11:21:08 +05:30