Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,317 Commits 3 Branches 0 Tags 1 GiB
56c6a709cd
Commit Graph

42317 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
sersaber
e5d2c1b1f3
fix: change project's actual_start_date fieldtype from Data to Date (#31085) 
* Update project.json

* Update project.json
 2022-05-26 10:04:58 +05:30
Deepesh Garg
a5677d963f
Merge pull request #31133 from frappe/mergify/bp/develop/pr-31124 
fix: timesheet fetching in sales invoice (backport #31124)
 2022-05-25 22:57:54 +05:30
Saqib Ansari
ca75d814a3 fix: timesheet fetching in sales invoice 
(cherry picked from commit 216c32f4bc13376335ae31bd09fe6b5c01855ba2)
 2022-05-25 14:45:41 +00:00
xdlumertz
c5e922c76b
fix: Chart data for monthly periodicity in Cash Flow report (#31039) 
fix: Chart data for monthly periodicity in Cash Flow report
 2022-05-25 19:39:59 +05:30
Deepesh Garg
efa5b5b3db
Merge pull request #31038 from alyf-de/taxes-title-field 
feat: show title when linking Taxes and Charges Template
 2022-05-25 19:28:59 +05:30
Deepesh Garg
e73a0a89b0
Merge pull request #31129 from deepeshgarg007/loan_doc_reco_queries 
fix: Loan Doc query in Bank Reconciliation Statement
 2022-05-25 19:21:30 +05:30
Deepesh Garg
d68187caae
Merge branch 'develop' into loan_doc_reco_queries 2022-05-25 18:50:54 +05:30
Rucha Mahabal
29228575fa fix: Job Opening linked to Staffing Plan cannot be created/updated if there are existing employees 2022-05-25 18:33:37 +05:30
Deepesh Garg
9e4a36089e chore: Linting Issues 2022-05-25 18:10:42 +05:30
Deepesh Garg
a1f53f8d31 chore: Linting Issues 2022-05-25 17:59:40 +05:30
Deepesh Garg
147fc8fde7 fix: Loan Doc query in Bank Reconciliation Statement 2022-05-25 17:58:30 +05:30
Deepesh Garg
b562168509
Merge pull request #26916 from deepeshgarg007/party_account_currency_check 
fix: Account currency validation for first transaction
 2022-05-25 17:02:58 +05:30
Deepesh Garg
ac17ecb84b
Merge branch 'develop' into party_account_currency_check 2022-05-25 16:21:06 +05:30
Deepesh Garg
bc34737709 chore: Update test case 2022-05-25 15:42:47 +05:30
Deepesh Garg
96d8b1ef3c feat: Auto accrue loan interest for backdated term loans 2022-05-25 14:19:10 +05:30
Deepesh Garg
e8f44445fd
Merge pull request #31125 from frappe/mergify/bp/develop/pr-31123 
fix: Handle missing HSN Codes (backport #31123)
 2022-05-25 13:32:41 +05:30
Deepesh Garg
6edbc58873 fix: Handle missing HSN Codes 
(cherry picked from commit ce3a21eb039453d4786dfd0871a278b588039d80)
 2022-05-25 07:04:44 +00:00
Saqib Ansari
268f413f56
fix(pos): paid amount calculation for multicurrency invoice (#31112) 2022-05-25 11:40:49 +05:30
Rucha Mahabal
273b21c0cb
chore: move patch for updating Employee Advance status to v13 (#31118) 2022-05-25 11:34:25 +05:30
Deepesh Garg
e75c843dc1
Merge pull request #31077 from deepeshgarg007/payroll_payable_party_type 
fix: Loan repayment entries for payroll payable account
 2022-05-25 11:23:43 +05:30
Deepesh Garg
d81fad09ea
Merge pull request #31080 from deepeshgarg007/company_address_trigger 
fix(India): Async issue in company address trigger
 2022-05-25 11:22:56 +05:30
marination
9f5f18e94d style: Update docstrings and fix/add type hints + Collapsible progress section in Log 2022-05-25 11:22:13 +05:30
marination
ab2d95a74d feat: Level-wise BOM cost updation 
- Process BOMs level wise and Pause after level is complete
- Cron job will resume Paused jobs, which will again process the new level and pause at the end
- This will go on until all BOMs are updated
- Added Progress section with fields to track updated BOMs in Log
- Cleanup: Add BOM Updation utils file to contain helper functions/sub-functions
- Cleanup: BOM Update Log file will only contain functions that are in direct context of the Log

Co-authored-by: Gavin D'souza <gavin18d@gmail.com>
 2022-05-25 11:21:01 +05:30
Devin Slauenwhite
55276f11f8
fix: don't fetch item_code if already exists. (#31113) 
fix: check if item_code exists before fetching
 2022-05-25 09:35:22 +05:30
barredterra
1e9f9c452f style: format 2022-05-24 13:31:29 +02:00
barredterra
1b16eb7667 refactor: set queries during setup 2022-05-24 13:30:59 +02:00
Raffael Meyer
e77c379cbb
fix: remove unsupported arguments 
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
 2022-05-24 11:52:23 +02:00
Raffael Meyer
e3bc3bf0f0
Merge branch 'develop' into german-translations-2022-05-23 2022-05-24 11:41:46 +02:00
Ankush Menat
1ecb8f4a67 chore: disable feed for material request 2022-05-24 14:32:56 +05:30
Ankush Menat
ecb39d81e0
chore: error logging for auto material requests (#31103) 2022-05-23 20:06:24 +05:30
barredterra
2388d86623 feat: Add german translations 2022-05-23 16:01:36 +02:00
barredterra
9356eb11de fix: german translations 2022-05-23 15:35:15 +02:00
barredterra
a6ddd86d31 fix: improve labels, simplify logic 2022-05-23 15:25:00 +02:00
barredterra
c704ad889d style: format warehouse js 2022-05-23 15:18:24 +02:00
Ankush Menat
a36174afdf
test: search test failing because of stale data (#31098) 2022-05-23 15:12:11 +05:30
Ankush Menat
fa039b223e
Merge pull request #31054 from marination/jc-excess-transfer-config 
fix: Job Card excess transfer behaviour
 2022-05-23 14:43:36 +05:30
Suraj Shetty
f2b6475626
Merge pull request #31092 from surajshetty3416/fix-rfq-template 
fix(rfq): Use `<a>` directly and style it as button instead of using `<button>`
 2022-05-23 11:56:17 +05:30
Wolfram Schmidt
348a674df9
fix translation German "Designation" (#31082) 
changed "Bezeichnung" to "Position" as the is more precice in the field of employment which erpnext refers to here
 2022-05-23 11:23:12 +05:30
marination
9f6e10663b chore: Run _validate_over_transfer only if excess transfer is blocked in settings 2022-05-23 11:05:55 +05:30
Suraj Shetty
9e306bd250
Merge branch 'develop' into fix-rfq-template 2022-05-23 10:48:22 +05:30
Rucha Mahabal
34e238ce4f
fix: Leave Encashment calculations (#31062) 2022-05-23 10:13:49 +05:30
Suraj Shetty
a29b92febc fix: Use directly <a> and style it as button instead of using button 
Since few email servers (like outlook) strips out link in the button making them unclickable.
 2022-05-23 10:08:20 +05:30
Ankush Menat
1a58b788e5 Merge branch 'develop' into jc-excess-transfer-config 2022-05-21 14:32:44 +05:30
Ankush Menat
3019f93915
Merge pull request #31083 from ankush/jc_corrective_creation 
fix: corrective job card creation
 2022-05-21 14:28:08 +05:30
Ankush Menat
66cf9aa344 fix: creation of corrective job card fails 
This used to fail because sub_operations is a child table that's not
initalized by default till v13, in develop branch we init tables with
empty list.
 2022-05-21 14:01:30 +05:30
Ankush Menat
e625394488 test: simplify job card tests 2022-05-21 14:01:28 +05:30
ruthra kumar
dac678e3fc test: payment ledger entry 2022-05-20 18:21:47 +05:30
ruthra kumar
e888975007 refactor: link payment ledger with gl entry creation 2022-05-20 18:21:47 +05:30
ruthra kumar
59ed7c854d refactor: ignore linked Payment Ledger Entry in basic transactions 2022-05-20 18:21:47 +05:30
ruthra kumar
451cf3a937 refactor: helper class for ple creation and delinking 
Helper functions for delinking ple and for creating payment ledger
entry for transactions on receivable/payable account types
 2022-05-20 18:21:47 +05:30