John Clarke
677978dd00
Update stock_ageing.py
...
As reviewer Deepesh Garg advised thanks! batch[0] can be int of float - see line 49 - so change proposed cint to flt
2020-06-12 05:53:24 -06:00
Anurag Mishra
ec54653852
fix: Child is shown in Parent process if added from tree view
2020-06-12 17:02:31 +05:30
rohitwaghchaure
ee6f80e25b
Merge pull request #22213 from vishdha/fix-credit-limit-notification_v13
...
feat: notify credit controller role users with credit limit extension request
2020-06-12 16:37:41 +05:30
Deepesh Garg
7e974c9e2c
fix: Test Cases
2020-06-12 15:29:40 +05:30
Sahil Khan
182c1f860b
fix(patch): escape special characters in company field
2020-06-12 15:16:20 +05:30
Abhishek Balam
86ea75e49e
fix(HR): Change Due Advance Amount to Pending Amount ( #22123 )
...
* rename 'Due Advance Amount' field to 'Pending Amount'
* changed fieldname and references for easier debugging
* added patch for moving data
* added newline added
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
2020-06-12 13:13:14 +05:30
Shivam Mishra
3bf18509ba
Merge branch 'develop' into membership-fixes
2020-06-12 07:27:20 +00:00
Rohan Bansal
ccd03bc120
feat: notify credit controller role users with credit limit extension requests
2020-06-12 12:48:54 +05:30
Vignesh S
90957b7f74
feat(Attendance): Add In and Out time to attendance ( #21547 )
...
* feat(Attendance): Add In and Out time to attendance
Co-authored-by: Karthikeyan S <skarthikeyan1410@gmail.com>
* fix:add depends in attendance IN time and OUT time
Co-authored-by: Karthikeyan S <skarthikeyan1410@gmail.com>
2020-06-12 12:32:55 +05:30
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
Shivam Mishra
241088c73e
Merge branch 'develop' into membership-fixes
2020-06-11 16:53:15 +00:00
John Clarke
6b55f66f02
Stock Ageing TypeError: ‘<’ not supported between instances of ‘int’ and ‘str’
...
Proposed fix re this error report https://discuss.erpnext.com/t/stock-ageing-report-typeerror-not-supported-between-instances-of-int-and-str/62605
2020-06-11 10:24:48 -06:00
Deepesh Garg
9df4532d14
fix: Travis(develop)
2020-06-11 21:33:43 +05:30
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
Rucha Mahabal
d7481f59ba
fix: patch
2020-06-11 17:41:05 +05:30
Rucha Mahabal
4dbb7c552c
Merge branch 'develop' into sla-enhancements
2020-06-11 17:04:20 +05:30
Rucha Mahabal
9c27d683ba
fix: priority column width
...
Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
2020-06-11 17:03:53 +05:30
marination
596560c3c2
fix: Don't prompt for Quality Inspection on Return Documents.
2020-06-11 16:39:03 +05:30
Shivam Mishra
3f60801566
Merge branch 'develop' into membership-fixes
2020-06-11 10:16:39 +00:00
Shivam Mishra
8c24810f30
refactor: ignore mandatory for customer
2020-06-11 15:42:29 +05:30
Shivam Mishra
49d51b8ce7
feat: check duplicate contact explicitly
2020-06-11 14:24:07 +05:30
Shivam Mishra
84fcc55a36
refactor: do nothing if member is not found
2020-06-11 13:34:40 +05:30
Shivam Mishra
8d61a0abef
fix: use string to verify webhook
2020-06-11 13:34:25 +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
Marica
170d4b7db9
Merge branch 'develop' into website-price-list
2020-06-10 18:57:44 +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
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
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
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
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
P-Froggy
6f87f97efe
fix: Wrong Ordered-Status Indicator for Material Request Items ( #22118 )
...
The indicator displaying if a material request item has been ordered or not (green/orange) used the wrong quantity field for determining the status.
The qty field used in the code is not in stock uom while the ordered_qty field is.
Now, the stock_qty field is used for correct comparison with ordered_qty.
2020-06-05 10:57:07 +05:30
Anurag Mishra
94582a89c7
fix: Wrong filters
2020-06-04 17:50:47 +05:30
Rucha Mahabal
3f08350181
fix: retain Hold status
2020-06-04 15:56:59 +05:30
Marica
d03ebbd51d
Merge branch 'develop' into valuation-rate
2020-06-04 15:31:11 +05:30
rohitwaghchaure
2213ea3d82
Merge pull request #22109 from rohitwaghchaure/routing-operations-not-in-a-sequence
...
fix: routing operations not added sequentially in the BOM
2020-06-04 14:56:10 +05:30
Rohit Waghchaure
404ed88c0c
fix: routing operations not added sequentially in the BOM
2020-06-04 14:46:50 +05:30
rohitwaghchaure
dd97a5f4a8
Merge pull request #22107 from rohitwaghchaure/fixed-import-supplier-invoice-not-worked
...
fix: import supplier invoice not working
2020-06-04 14:40:30 +05:30
Rohit Waghchaure
60c1855014
fix: import supplier invoice not working
2020-06-04 14:31:35 +05:30
Anurag Mishra
225802e3a0
fix: problem during assigning
2020-06-04 14:15:55 +05:30
Rucha Mahabal
94d03c6100
fix: remove Service Level DocType from Support Desk Page
2020-06-04 12:35:36 +05:30
Rucha Mahabal
b3338a149b
fix: code clean-up
2020-06-04 12:35:00 +05:30
Deepesh Garg
c83ad8185a
Merge pull request #22098 from deepeshgarg007/accounts_payable_error
...
fix: Error when no data is present in AR/AP report
2020-06-03 21:59:28 +05:30
Deepesh Garg
7135a75e5e
fix: Error when no data is present in AR/AP reeport
2020-06-03 21:51:21 +05:30
marination
6f7e9d2904
fix: '>=' not supported between instances of 'str' and 'int'
2020-06-03 17:13:58 +05:30
marination
0c72249403
fix: Apply shipping rule without address too
2020-06-03 14:32:07 +05:30
Deepesh Garg
881999d3bf
Merge pull request #22089 from scmmishra/selling-dash-fix
...
fix: dashboard chart does not exist on selling page
2020-06-03 13:38:36 +05:30
Shivam Mishra
b84dd9b5f5
fix: dashboard chart does not exist on selling page
2020-06-03 13:24:18 +05:30
Myuddin khatri
9276d16420
fix(stock): able to create purchase invoice from purchase receipt dashboard
...
able to create purchase invoice from purchase receipt dashboard
2020-06-03 11:22:49 +05:30
Shivam Mishra
f460c17961
fix: syntax error ( #22082 )
2020-06-02 21:48:23 +05:30
Shivam Mishra
789df32683
feat: verify signature on webhook ( #21872 )
2020-06-02 19:18:22 +05:30
Deepesh Garg
60f3a2b8e7
fix: Add total debit in Journal Entry list view
2020-06-02 18:26:43 +05:30
gavin
7a05662e9f
Merge pull request #21491 from gavindsouza/tally-migration-feat
...
feat(Tally migration): Errored documents handling
2020-06-02 13:03:13 +05:30
Deepesh Garg
fecac677ec
Merge pull request #22075 from abhishekbalam/fix-customer-count
...
fix(Accounts): Customer Count in Customer Acq. Report wrong
2020-06-02 00:09:01 +05:30
Abhishek Balam
192d4c8810
indent to tabs instead of spaces
2020-06-01 23:58:05 +05:30