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

31462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marica
c62a6df016
Merge branch 'develop' into qi-on-return 2020-06-12 12:31:20 +05:30
Marica
fd3d976e06
Update erpnext/controllers/stock_controller.py 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2020-06-12 12:30:59 +05:30
Deepesh Garg
d09aa53571
Merge pull request #22208 from aliriocastro/fix-itemwise-rec-reord-level-report 
fix: key name to get float precision was misspelled
 2020-06-12 10:04:58 +05:30
Deepesh Garg
ca97e19b7e
Merge pull request #22203 from marination/account-tree 
fix: Check for Company before rendering tree in Account Tree
 2020-06-12 10:02:41 +05:30
Alirio Castro
faf33072c8 fix: key was mispelled 2020-06-11 23:32:53 -04:00
Alirio Castro
da6b0a51a2 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-06-11 23:28:40 -04:00
marination
c9a6e4f151 fix: Check for Company before rendering tree in Account Tree 2020-06-11 19:54:44 +05:30
Abhishek Balam
44b8cf4fef
enable 'user cannot create' for payment request (#22044) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-06-11 19:31:41 +05:30
marination
596560c3c2 fix: Don't prompt for Quality Inspection on Return Documents. 2020-06-11 16:39:03 +05:30
Deepesh Garg
7d3c3b9a8b
Merge pull request #22188 from deepeshgarg007/payment_terms_outstanding 
fix: Update payment schedule based on payment terms
 2020-06-10 22:17:37 +05:30
Deepesh Garg
a0fd97f2ac fix: Update payment schedule based on payment terms 2020-06-10 22:15:27 +05:30
Deepesh Garg
f108574772
Merge pull request #22186 from deepeshgarg007/inter_warehouse_party_validation 
fix: Party validation for inter-warehouse transaction
 2020-06-10 20:02:43 +05:30
Deepesh Garg
7963e2b708 fix: Party validation for inter-warehouse transaction 2020-06-10 19:57:49 +05:30
Rohan
d60d2e1826
fix: only auto-set serial nos and batches if allowed in Stock Settings (develop) (#21781) 
* fix: only auto-set serial nos and batches if allowed in Stock Settings

* fix: bug with setting disabled batch no in Pick List

* fix: remove auto-set batch variable

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-06-10 19:10:56 +05:30
rohitwaghchaure
526132d60a
Merge pull request #22182 from marination/website-price-list 
fix: Prioritize Default Customer Price List in Portal
 2020-06-10 19:07:12 +05:30
Marica
170d4b7db9
Merge branch 'develop' into website-price-list 2020-06-10 18:57:44 +05:30
Deepesh Garg
f2615634a5
Merge pull request #22185 from deepeshgarg007/item-wise-report-export_v12 
fix: Item-wise sales and purchase register export
 2020-06-10 18:51:41 +05:30
Deepesh Garg
a6acf18f6c fix: Item-wise sales and purchase register export 2020-06-10 18:50:50 +05:30
Deepesh Garg
6e0d6bd74c
Merge pull request #22184 from deepeshgarg007/item-wise-report-export 
fix: Item-wise sales and purchase register export
 2020-06-10 18:48:35 +05:30
Deepesh Garg
08fee12266 fix: Item-wise sales and purchase register export 2020-06-10 18:33:24 +05:30
marination
fdddb679ed fix: Prioritize Default Customer Price List in Portal 2020-06-10 18:22:59 +05:30
rohitwaghchaure
496b6a28f2
Merge pull request #22179 from rohitwaghchaure/code-cleanup-for-handling-batch-case-in-SI-develop 
fix: Cannot read property 'has_batch_no' of undefined
 2020-06-10 17:57:07 +05:30
Rohit Waghchaure
afe8e88cb8 fix: Cannot read property 'has_batch_no' of undefined 2020-06-10 17:55:24 +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
Anurag Mishra
452b7760df fix: dependency for leave Period in Desk page 2020-06-10 12:48:21 +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
Raffael Meyer
088ab75083
fix: move feature into update_billing_hours 2020-06-09 16:09:40 +02: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 5c54adec28.
 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
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
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
57f9d43c43 fix: Cancelled entries in tds payable monthly report 2020-06-07 00:01:20 +05:30