nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-09 00:01:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,667 Commits 459 Branches 1,746 Tags
08b8ed5ca68af45198cb6556d0f914ddc74a7866
Commit Graph

26667 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
08b8ed5ca6 Merge pull request #19635 from ruchamahabal/fix_cash_entry_v11 
fix(minor): default Cash Entry account not getting fetched in Journal Entry (v11)
 2019-11-20 22:02:48 +05:30
Rucha Mahabal
6cefdb40d1 fix(Journal Entry): default Cash Entry account not getting fetched 2019-11-20 20:13:04 +05:30
rohitwaghchaure
d87d644dc2 Merge pull request #19621 from rohitwaghchaure/not_able_to_select_item_in_the_sales_order_hotfix 
fix: not able to select item in sales order
 2019-11-19 19:40:29 +05:30
rohitwaghchaure
eeab3128aa Merge pull request #19623 from rohitwaghchaure/code_cleanup_sales_invoice_credit_note_hotfix 
fix: code cleanup
 2019-11-19 19:39:36 +05:30
Rohit Waghchaure
7b2cec8da2 fix: code cleanup 2019-11-19 19:27:31 +05:30
rohitwaghchaure
6e3cbd8698 Update queries.py 2019-11-19 19:26:31 +05:30
Rohit Waghchaure
b5e1f846ce fix: not able to select item in sales order 2019-11-19 19:08:44 +05:30
rohitwaghchaure
9c7a33405d Merge pull request #19024 from Alchez/v11-work-order-bugs 
fix: Work Order operating cost re-calculation on client-side (v11)
 2019-11-15 11:18:39 +05:30
Nabin Hait
5485d4c435 fix: One serial no can be tagged in multiple invoices if used against different items (#19581) 2019-11-14 13:28:29 +05:30
RJPvT
fb2d4884b3 fix: allow pending within review date (#19577) 
* fix: allow pending within review date

referenced - fix: allow Pending on review date #19497
explanation for closing not valid

* fix: codacy
 2019-11-14 10:10:02 +05:30
Nabin Hait
3b38a9e418 Accounts Receivable report fixes (#19575) 
* fix: Set due date in accounts receivable based on payment terms

* fix: Show AR summary based on outstanding
 2019-11-13 18:49:45 +05:30
Deepesh Garg
437d3e37d6 Merge pull request #19566 from deepeshgarg007/balance_sheet_filter 
fix: Accumulated Values filter disappearing
 2019-11-13 17:47:05 +05:30
Rohan
1b9a55e766 Merge branch 'version-11-hotfix' into v11-work-order-bugs 2019-11-13 13:08:59 +05:30
deepeshgarg007
a5353a8d04 fix: Accumulated Values filter disappearing 2019-11-13 12:46:19 +05:30
RJPvT
e1bc0a1028 fix: user with invoice role not able to submit (#19555) 
fix for a user not having timesheet submit privelige (e.g. a shared timesheet from another department) not being able to submit because of linked fields
 2019-11-13 10:47:40 +05:30
Deepesh Garg
92116abd92 Merge pull request #19548 from DeeMysterio/v11-emp-err 
fix(employee): show only active employees in the error while marking …
 2019-11-11 21:47:58 +05:30
Diksha
e5731b3d0f fix(employee): show only active employees in the error while marking reporting to employee as left 2019-11-11 19:08:48 +05:30
rohitwaghchaure
a36c4326c3 Merge pull request #19449 from surajshetty3416/account-head-fix 
fix: not able to change the account type in parent company account head
 2019-11-11 15:13:07 +05:30
sahil28297
5a0a4bdcff fix(cart): return rule instead of rule_label_map (#19521) 
* fix(cart): return rule instead of rule_label_map

* fix(cart): remove get_value for rule_label_map as well
 2019-11-11 11:15:29 +05:30
Nabin Hait
d2dc889849 fix(trial balance): Show opening and closing of group account in single column (#19511) 2019-11-11 10:59:30 +05:30
rohitwaghchaure
dbcdf7e225 minor: added description, uom fields in material request plan item table (#19464) 
* fix: added description, uom fields in material request plan item table

* Update material_request_plan_item.json

* Update production_plan.js
 2019-11-11 10:57:04 +05:30
rohitwaghchaure
7fdef64152 fix: incorrect balance qty in stock ledger if batch filter set (#19480) 2019-11-08 14:50:12 +05:30
Deepesh Garg
b2be301988 Merge pull request #19529 from deepeshgarg007/gst_check_digit_msg_v11 
fix: GSTIN validation msg fix
 2019-11-07 23:05:07 +05:30
deepeshgarg007
68db5a6792 fix: GSTIN validation msg fix 2019-11-07 21:58:56 +05:30
Marica
f232965392 fix[minor]: Payment Entry status patch (#19520) 2019-11-07 18:04:16 +05:30
Marica
2ff7197752 fix: Added 'status' field in Payment Entry (#19513) 2019-11-06 19:16:11 +05:30
Anurag Mishra
1d3b5b0437 fix: packed items child table reset on amending docs (#19158) 2019-11-06 16:56:14 +05:30
Nabin Hait
8280d32967 fix: incorrect number of entries while making deferred revenue entry (#19512) 2019-11-06 15:33:36 +05:30
Rohan
4a79072c71 Merge branch 'version-11-hotfix' into v11-work-order-bugs 2019-11-06 11:39:11 +05:30
Deepesh Garg
721a00cd22 Merge pull request #19489 from DeeMysterio/v11-delivery-dn 
fix(sales order): rename delivery to delivery note on sales order mak…
 2019-11-04 13:16:50 +05:30
Diksha
8ce7893bf0 fix(sales order): rename delivery to delivery note on sales order make button 2019-11-04 12:19:23 +05:30
Deepesh Garg
0f87282aef Merge pull request #19482 from MaxMorais/patch-9 
fix: Wrong datafield type in Task
 2019-11-03 17:12:15 +05:30
Deepesh Garg
de51217a80 Merge pull request #19485 from gavindsouza/sales-register-tax-v11 
fix: calculate total tax in sales register report
 2019-11-03 17:09:30 +05:30
Gavin D'souza
bc01dafbba fix: calculate total tax in sales register report 2019-11-03 14:02:52 +05:30
Maxwell Morais
a985bfc29a Wrong datafield type in Task 
The field `depends_on_tasks` is set as `Data`, but it stores a list of strings joined by comma, so with more than 5 tasks, we reach the field size limit of 144 chars and data get trunked, what make us lose data!
 2019-11-01 18:31:56 -03:00
Deepesh Garg
08dbb13451 Merge pull request #19424 from marination/search_field 
fix: Search field entries included in Item Link field query
 2019-11-01 15:40:14 +05:30
rohitwaghchaure
170dd37b86 fix: purchase order issue, margin_rate_or_amount not there in the purchase documents (#19465) 2019-10-31 15:56:05 +05:30
gavin
b1744972e0 Merge pull request #19451 from gavindsouza/hooks-update-v11 
chore: moves email digest to long job from regular
 2019-10-31 14:34:58 +05:30
marination
7aa993b14b fix: Fetching catched meta and removed description fetch from Search Fields 
Description is conditionally fetched and also used in WHERE clause, that is maintained.
Improved naming
 2019-10-30 18:39:35 +05:30
gavin
ad89cb0ef3 Merge branch 'version-11-hotfix' into hooks-update-v11 2019-10-30 17:52:26 +05:30
rohitwaghchaure
a185b51f0d Merge pull request #19447 from rohitwaghchaure/not_able_to_select_project_in_work_order_v11 
fix: not able to select the project in the work order
 2019-10-30 16:32:48 +05:30
gavin
1ff81bca7d Merge branch 'version-11-hotfix' into hooks-update-v11 2019-10-30 15:47:52 +05:30
Gavin D'souza
b02db3c3e8 chore: moves email digest to long job from regular 2019-10-30 15:20:43 +05:30
Suraj Shetty
d1d835347e fix: Pass parent_acc_name 2019-10-30 14:45:11 +05:30
Rohit Waghchaure
ba245553f0 fix: not able to change the account type in parent company account head 2019-10-30 14:39:03 +05:30
Rohit Waghchaure
112902a9c4 fix: not able to select the project in the work order 2019-10-30 14:27:18 +05:30
Anurag Mishra
3f4cdcc7a4 fix: On Specific case if no item code in name (#19420) 2019-10-30 14:18:20 +05:30
rohitwaghchaure
91f81b07d9 fix: not able to select the zero qty batch while making the sales return entry (#19436) 2019-10-30 13:30:28 +05:30
Deepesh Garg
66e92041b9 Merge pull request #19403 from Mangesh-Khairnar/fix-dn-status-11 
fix: sync delivery note status in both list view and form view
 2019-10-29 14:18:23 +05:30
Rohan
f2dc89c7a0 Merge branch 'version-11-hotfix' into v11-work-order-bugs 2019-10-29 11:25:40 +05:30