Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,753 Commits 3 Branches 0 Tags 1 GiB
9e08229b7b
Commit Graph

38753 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rucha Mahabal
9e08229b7b
fix(Org Chart): use attribute selectors instead of ID selector for node IDs with special characters (#27717) 
* fix(Org Chart): use attribute selectors instead of ID selector for node IDs with special chars

* fix: UI tests
 2021-09-30 18:32:10 +05:30
Marica
273f3fbe0f
fix: Batch scans get overwritten on the same row (#27668) 
* fix: Batch scans get overwritten on the same row

* fix: Increment batch qty if pre-existing batch is scanned

* fix: Delete accidental __init__.py file

* fix: Add patch to patches.txt for https://github.com/frappe/erpnext/pull/27554

* fix: reload doc in patch
 2021-09-30 15:51:54 +05:30
marination
cbffbc3894 fix: reload doc in patch 2021-09-30 14:53:47 +05:30
Marica
b1a4e040be
Merge branch 'develop' into scan-batch 2021-09-30 14:22:45 +05:30
marination
73ac3e0c40 fix: Add patch to patches.txt for https://github.com/frappe/erpnext/pull/27554 2021-09-30 14:22:01 +05:30
Marica
754626a102
fix: Delete accidental __init__.py file 2021-09-30 14:12:19 +05:30
Marica
cc143bca0d
fix: Maintenance Schedule child table status for legacy data (#27554) 
* fix: Maintenance Schedule child table status for legacy data

* fix: Include legacy draft schedules in patch

* fix: Pre-commit formatting
 2021-09-30 14:08:45 +05:30
Marica
c75c709114
Merge branch 'develop' into scan-batch 2021-09-30 14:07:54 +05:30
marination
abf450dc70 fix: Increment batch qty if pre-existing batch is scanned 2021-09-30 14:03:40 +05:30
mergify[bot]
9df5df4d94
fix: wrong company selected when marking attendance for all employees (#27685) (#27707) 
* fix: wrong company selected when marking attendance for all employees

* fix: enable caching for repeated queries of the same employee


(cherry picked from commit b478e72cefbdffd3e906fdd1ef822becdead78d7)

Co-authored-by: Mohammed Yusuf Shaikh <49878143+mohammedyusufshaikh@users.noreply.github.com>
 2021-09-30 12:07:38 +05:30
Ankush Menat
4685ed5a8c
fix: distribution of additional costs in mfg stock entry (#27629) 
* refactor: remove unnecessary list comprehensions

* fix: correct cost distribution logic

While apportioning costs same condition should be present on both sides
so total value is representative of all items to be apportioned.

Here while calculating incoming_items_cost only FG items are considered,
but while apportioning all items with to_warehouse are considered.

Solution: only apportion additional cost on FG items

* test: test cost distribution

* fix: patch for additional cost

fix(patch): consider PCV while patching

- consider Period closing voucher while patching
- recomute rates for SLE of affected stock entries

consider only FG/scrap item SLEs for recomputation of rates

* fix: remove client side logic for addn cost

All of this is done in python code hence removed client side code.
 2021-09-30 09:58:59 +05:30
Deepesh Garg
2a1e202e07
Merge pull request #27704 from frappe/mergify/bp/develop/pr-27551 
fix: Deferred revenue entries post account freezing (backport #27551)
 2021-09-30 09:47:44 +05:30
Deepesh Garg
f1a669c2f7 fix: Test case 
(cherry picked from commit 23863c7663a94e32e32812301a7efca79575c470)
 2021-09-30 03:06:02 +00:00
Deepesh Garg
774cd68f4c fix: Test Case 
(cherry picked from commit 846d128c5d536b5003dc3055f3239e6f92a3146c)
 2021-09-30 03:06:01 +00:00
Deepesh Garg
13d2e7b198 fix: Deferred revenue entries post account freezing 
(cherry picked from commit e2eb72eb5ba1aaadddf8278dd77bfe75a178ef01)
 2021-09-30 03:06:00 +00:00
rohitwaghchaure
104d107659
Merge pull request #27701 from rohitwaghchaure/minor-added-project-name-in-purchase-order-analysis 
fix: added project name in the purchase order analysis
 2021-09-29 23:41:31 +05:30
Rohit Waghchaure
c1f9997a67 fix: added project name in the purchase order analysis 2021-09-29 23:26:19 +05:30
Deepesh Garg
b39f8a6215
fix: Ignore user permission for Represents Company field in Sales and Purchase docs (#27684) 
* fix: Ignore user permission for Represents Company field in Sales and Purchase docs

* fix: Ignore user permission for fiscal year company
 2021-09-29 15:54:35 +05:30
Saqib
0b040c7437
fix: cannot delete a project if linked with sales order (#27536) 2021-09-28 18:13:01 +05:30
Saqib
424efd41e5
feat(regional): toggle for reduced depreciation rate as per IT Act (#27600) 2021-09-28 18:12:02 +05:30
Alan
72c081fd8f
fix: apply price list after batch or serial no insertion (#27566) 2021-09-28 12:56:26 +05:30
Alan
b91333afdd
fix: set item.qty as mandatory in picklist (#27680) 2021-09-28 06:41:37 +00:00
Noah Jacob
5c249decbb
fix(ux): added exception of template item in filters (#27560) 2021-09-27 22:34:27 +05:30
Deepesh Garg
cc5dd5c67d
feat: TDS deduction using journal entry and other fixes (#27451) 
* fix: TDS deduction using journal entry

* fix: Multi category application against single supplier

* refactor: TDS payable monthly report

* fix: Server side handling for default tax withholding category

* fix: Supplier filter for Journal Entry

* refactor: TDS computation summary report
 2021-09-27 21:43:20 +05:30
marination
596cf3951d fix: Batch scans get overwritten on the same row 2021-09-27 15:06:46 +05:30
Saqib
b68ac24cd5
chore: add shipping address in eway bill test (#27662) 2021-09-27 15:03:58 +05:30
Saqib
f2fca59ba7
fix: cannot set custom label for 'total' field in print format (#27664) 2021-09-27 14:28:16 +05:30
Saqib
9fa24ffccc
Merge pull request #27659 from nextchamp-saqib/fix-32644 
fix: setting of gain/loss if party account is in company currency
 2021-09-27 13:05:19 +05:30
Saqib
711395db22
fix: linting errors 2021-09-27 12:26:18 +05:30
Saqib
1f8ad72418
fix: indentation 2021-09-27 12:21:06 +05:30
Saqib
30f59b09fd
chore: log modified invoices 2021-09-27 12:20:16 +05:30
Saqib Ansari
18e5d59d24 fix: unknown column 'ref_exchange_rate' 2021-09-26 20:26:45 +05:30
Saqib
e8ff649298
Merge branch 'develop' into fix-32644 2021-09-26 17:07:46 +05:30
Saqib Ansari
e6b4d33f4b chore: hide exchange gain loss if empty 2021-09-26 17:07:13 +05:30
Saqib Ansari
beebfb323a patch: invalid gain loss gl entry 2021-09-26 16:58:55 +05:30
Saqib
f8c1c73953
fix: local variable 'fiscal_year_details' referenced before assignment (#27656) 2021-09-26 16:27:56 +05:30
Saqib Ansari
78ad50efc2 fix: cost center in exchange gain loss gl entry 2021-09-26 16:08:15 +05:30
Saqib Ansari
dd2d039ca8 chore: hide exchange gain loss if empty 2021-09-26 15:51:03 +05:30
Saqib Ansari
64efe8bf15 fix: setting of gain/loss if party account is in company currency 2021-09-26 15:46:13 +05:30
escix
dafe99b6e2
fix: holiday message reminder 
Minor grammatical change
 2021-09-26 11:09:13 +05:30
Sagar Vora
c8b9a55e96
feat: add Partly Paid status in Invoices (#27625) 2021-09-22 12:11:35 +05:30
Frappe PR Bot
2af6ea68ae
fix: remove unknown field employee_name from query (bp #27634) 
* fix: remove unknown field employee_name from query

* fix: remove unknown fieldname

Co-authored-by: root <root@vultr.guest>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
(cherry picked from commit 9ebabb86b3d28e2c94eb2761f1864c88b6eb1e59)

Co-authored-by: Bhavesh Maheshwari <34086262+bhavesh95863@users.noreply.github.com>
 2021-09-21 20:33:09 +05:30
Ankush Menat
c302c7ab42
fix: remove bad default for anniversary reminders (#27632) 
🤦
 2021-09-21 17:51:46 +05:30
Marica
9110223341
fix: (ux) Use subassembly schedule date while making WO from Prod Plan (#27628) 
- Set subassemply WO's planned start date from Production Plan
 2021-09-21 16:50:14 +05:30
Kenneth Sequeira
abded895f3
fix: update default KSA VAT rate for setup (#27614) 2021-09-21 10:58:18 +05:30
François de Ryckel
5c400da4e2
Update training_result.js (#27615) 
cur_frm is deprecated
 2021-09-21 09:29:15 +05:30
Abdullah A. Zaqout
6d8e869a92
fix(pos): check if item exists before fetching available qty (#27581) 2021-09-20 21:35:37 +05:30
Anuja Pawar
190c2d84da
fix: reference row added in allocation table (#27602) 2021-09-20 21:32:38 +05:30
Ankush Menat
4f01115f2f
Merge pull request #27601 from ankush/overbill_warn 
fix(ux): warn when overbilling allowance was bypassed due to role
 2021-09-20 17:42:29 +05:30
Ankush Menat
21a955d20b
fix(ux): better error message 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-09-20 17:14:35 +05:30