Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,062 Commits 3 Branches 0 Tags 1 GiB
936267c934
Commit Graph

41062 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saqib Ansari
936267c934 fix: move item tax to item tax template patch 2022-03-25 15:45:13 +05:30
HarryPaulo
3eb5440aa9
fix: linters erros on report sales payments summary (#30345) 
* fix: wrong values for report and get change amout based on payment TYPE.

* charcase for select field.

* fix: linter check erros

* fix: linters errors

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-22 11:39:15 +05:30
HarryPaulo
01fd3adedf
fix: report sales payments summary (#30264) 2022-03-21 16:57:27 +05:30
Deepesh Garg
9376d8d308
Merge pull request #30312 from alyf-de/refactor-sales-analytics 
refactor: sales analytics
 2022-03-21 16:44:23 +05:30
Ankush Menat
d3be84bfe8 test: correct use of test decorator 2022-03-21 15:40:34 +05:30
Rucha Mahabal
95568210b2
fix(ux): warning for disabled carry forwarding in Policy Assignment (#30331) 2022-03-21 15:30:04 +05:30
mergify[bot]
08e598e2c4
fix: Future recurring period calculation for additional salary (#29581) (#30330) 
* fix: Future recurring period calculation for addl salary

* fix: future recurring period calculation

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit cedabd7242265f354e94d4e4b526db7dbd3d5dda)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2022-03-21 15:00:55 +05:30
Deepesh Garg
1daaf6be2a
Merge pull request #30317 from deepeshgarg007/opening_gl_validation 
fix: P&L account validation on cancellation
 2022-03-21 10:45:07 +05:30
Saqib Ansari
6dc7d6b085
Merge pull request #30287 from nextchamp-saqib/fix-cash-flow-query 
fix: custom cash flow mapper doesn't show any data
 2022-03-21 10:32:42 +05:30
Deepesh Garg
28001ddf42
Merge pull request #30304 from deepeshgarg007/enable_ksa_vat_docs 
fix: Add permission for KSA VAT documents
 2022-03-21 10:18:40 +05:30
Deepesh Garg
2ff6790283 fix: P&L account validation on cancellation 2022-03-21 09:43:31 +05:30
Raffael Meyer
0a015b7f70
refactor: remove redundant if-statement (#30311) 2022-03-20 19:29:41 +05:30
Ankush Menat
c2aad115c1
fix: disable deferred naming on SLE/GLE if hash method is used. (#30286) 
* fix: dont rename GLE/SLE that dont have naming series

* test: tests for deferred naming of ledgers
 2022-03-20 19:26:34 +05:30
HENRY Florian
ca8d757691
fix: clear "Retain Sample" and "Max Sample Quantity" in Item card if Has Batch No is uncheck (#30307) 2022-03-20 15:27:00 +05:30
barredterra
36df21067c refactor: sales analytics 2022-03-20 03:58:24 +01:00
Ankush Menat
4859574233 perf: Single query to delete bins instead of N 2022-03-19 20:55:27 +05:30
Ankush Menat
684d9d66d1 test: warehouse conversion and treeview test 2022-03-19 20:55:27 +05:30
Ankush Menat
953afda01b refactor(warehouse): raw query to ORM 2022-03-19 20:55:27 +05:30
Ankush Menat
4b695915f4 refactor: Use QB for serial fetching query 2022-03-19 20:55:27 +05:30
Ankush Menat
a585dff6fd refactor: batch no filter handling 2022-03-19 20:55:27 +05:30
Ankush Menat
b9eec331e3 test: auto serial fetching 2022-03-19 20:55:27 +05:30
Ankush Menat
4f8bb91eae fix: sort serial nos before sending 2022-03-19 20:55:27 +05:30
Ankush Menat
0a533d6ccc fix: skip already selected serials in sr selector 2022-03-19 20:55:27 +05:30
Ankush Menat
5ec27c9055 fix: filter serial nos by selected batch number 2022-03-19 20:55:27 +05:30
Ankush Menat
f4c213379e fix: set current qty as default qty for stock entry 2022-03-19 20:55:27 +05:30
mergify[bot]
c2cbd407c1
fix: Allow on Submit for Material Request Item Required Date (#30174) (#30308) 
* fix: Allow on Submit for Material Request Item Required Date

* chore: whitespace

(cherry picked from commit cca9668309711bf3ca517726a94df547c5a16bbb)

Co-authored-by: Devarsh Bhatt <58166671+bhattdevarsh@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
 2022-03-19 20:31:06 +05:30
Deepesh Garg
01638a01cb
Merge pull request #30292 from frappe/mergify/bp/develop/pr-30284 
fix: Cleanup and fixes in Dimension-wise Accounts Balance Report (backport #30284)
 2022-03-18 17:36:59 +05:30
Deepesh Garg
972d06555a fix: Add permission for KSA Vat documents 2022-03-18 17:32:46 +05:30
Ankush Menat
5a9bf9ffd6
fix: respect db multi_tenancy while fetching precision (#30301) 
[skip ci]
 2022-03-18 17:29:09 +05:30
Saqib Ansari
00bfee97c7 refactor: convert raw sql to frappe.qb 2022-03-18 14:31:30 +05:30
Deepesh Garg
8819ba07a9
Merge pull request #30266 from deepeshgarg007/expense_income_account_validation 
fix: Validate income/expense account in sales and purchase invoice
 2022-03-17 18:32:34 +05:30
Deepesh Garg
5390d5e65a
Merge branch 'develop' into mergify/bp/develop/pr-30284 2022-03-17 18:02:57 +05:30
Deepesh Garg
4237e5d928 fix: Test case 2022-03-17 18:00:39 +05:30
Deepesh Garg
a651a0ffc8
Merge pull request #30261 from deepeshgarg007/bank_reco_error 
fix: Error in bank reconciliation statement
 2022-03-17 17:29:15 +05:30
Deepesh Garg
5f89cb2cca fix: Remove comments 
(cherry picked from commit cab69fe1f298b44613be21c06591e868c24ee249)
 2022-03-17 11:57:50 +00:00
Deepesh Garg
2dd0e20003 fix: Clean and fixes in Dimension-wise Accounts Balance Report 
(cherry picked from commit 08a06ce5c68023c41f53b584082b5e1c4ddb1f59)
 2022-03-17 11:57:50 +00:00
rohitwaghchaure
da16ee159a
Merge pull request #30238 from KrithiRamani/bulk_create_PL_and_DN 
feat: Create single PL/DN from several SO.
 2022-03-17 15:39:45 +05:30
Rucha Mahabal
f090e63e54
test: fix holiday list creation causing flaky tests (#30260) 2022-03-17 15:21:56 +05:30
Saqib Ansari
119273e633 fix: custom cash flow mapper doesn't show any data 2022-03-17 14:47:50 +05:30
Ankush Menat
76187d175f
refactor: call repost directly during tests (#30277) 
enqueue(now=frappe.flags.in_test) is always true in test, this change avoids
confusion.
 2022-03-16 19:50:56 +05:30
Noah Jacob
2a0ca7c91a
refactor: removed unrequired code and test for standalone delivery note serial return (#30276) 2022-03-16 19:27:47 +05:30
Ankush Menat
b93ce78df1 chore: dont supress errors server side 
not required after https://github.com/frappe/frappe/pull/16284
 2022-03-16 17:50:34 +05:30
Krithi Ramani
a12895ec03 corrected spacing 2022-03-16 13:56:54 +05:30
Ankush Menat
b46d6e3c05 test: packed item return scenarios 2022-03-16 13:36:53 +05:30
Ankush Menat
b781e8b7d1 revert: "fix: updated packed_items getting fetched on Sales Return / Credit Note (#28607)" 
This reverts commit 20216fa9f1.
 2022-03-16 13:36:53 +05:30
Deepesh Garg
2958f60b46
Merge pull request #30269 from deepeshgarg007/implicit_pricing_rule_enable_v2 
fix: Do not update ignore pricing rule check implicitly
 2022-03-16 12:32:25 +05:30
Krithi Ramani
0211f27e83 as per review comments - changed for loop 2022-03-16 12:28:30 +05:30
Deepesh Garg
1f79b47a17 fix: Do not update ignore prcing rule check implicitly 2022-03-16 11:55:43 +05:30
Saqib Ansari
e9e2679dff
Merge pull request #29984 from dj12djdjs/fix-rename-tool-msg 
fix: rename tool show fail message
 2022-03-16 10:57:17 +05:30
Saqib Ansari
e1edf50756
Merge pull request #30265 from scdanieli/patch-1 
feat: add German translations
 2022-03-16 10:54:24 +05:30