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

31488 Commits

Author SHA1 Message Date
Deepesh Garg
54cdff7947 fix: Add back calculation for discount 
(cherry picked from commit 067564bd260437290b7cb190fb1cdc02eb658d0a)
 2022-03-25 07:30:40 +00:00
Deepesh Garg
174a6ec398 fix: Rate change issue on save and mapping from other doc 
(cherry picked from commit 13fcda57767c456dfca4c064c41ca4f80a1898b2)
 2022-03-25 07:30:40 +00:00
Shadrak Gurupnor
c4854bb1b1
fix: failing broken patches (#30409) 
* fix: failing broken patches

* refactor: simpler conditions

[skip ci]
 2022-03-25 12:49:37 +05:30
Saqib Ansari
9a0f5bff65
Merge branch 'develop' into fix-pos-issues-again 2022-03-25 10:52:08 +05:30
Saqib Ansari
16253a2f72 fix: set is_return & return_against in POS Invoice Reference table 2022-03-25 10:51:30 +05:30
Ankush Menat
788d492757 test: basic item and wh capacity dashboard tests 2022-03-25 10:51:19 +05:30
Ankush Menat
10d5fb8cd1 test: check printviews for all docs 2022-03-25 10:51:19 +05:30
Saqib Ansari
1b556d1c53 fix: test cases 2022-03-24 17:59:34 +05:30
Ankush Menat
d4ee31dc8f fix: consider all existing PO items 
When this is sent from API/client side doesn't send temporary_name it
can be flaky. Hence, use all available names for validation.
 2022-03-24 17:58:22 +05:30
Saqib Ansari
cb4873c019 fix: sider issues 2022-03-24 17:56:27 +05:30
Saqib Ansari
cf51a0a1b8 fix(pos): cannot close the pos if sr. no. is sold & returned 2022-03-24 16:22:36 +05:30
Ankush Menat
5b1d6055e6 fix: subassembly items linked to temporary name 
Production Plan tables for po_items and sub_assembly_items are prepared
client side so both dont exist at time of first save or modifying and
hence any "links" created are invalid. This change retains temporary
name so it can be relinked server side after naming is performed.

Co-Authored-By: Marica <maricadsouza221197@gmail.com>
 2022-03-24 15:00:05 +05:30
Ankush Menat
3d43c437ad fix: only validate qty for main non-subassy items 2022-03-24 15:00:05 +05:30
Marica
d24458ab77
fix: (ux) Add is_group=0 filter on website warehouse (#30396) 
- It does not support group warehouses right now and it is misleading
 2022-03-24 12:56:57 +05:30
Saqib Ansari
4aabe97565
Merge branch 'develop' into fix-pos-issues-again 2022-03-24 11:18:13 +05:30
Deepesh Garg
07c7ebfd99
Merge branch 'develop' into gst_state_number_unsetting 2022-03-23 22:04:13 +05:30
Ankush Menat
c9dcf31cf7 test: ensure super()setUpClass is called 2022-03-23 19:46:50 +05:30
Deepesh Garg
993cc287d5
Merge branch 'develop' into sales_person_dashboard 2022-03-23 16:11:22 +05:30
Ankush Menat
6418dc1606 fix: make auto created job cards "Open" 2022-03-23 15:50:46 +05:30
Ankush Menat
e1f5620654 fix: material transfer status should be before WIP 2022-03-23 15:50:46 +05:30
Ankush Menat
4aa74af90d fix: ignore items without info for pending qty computation 2022-03-23 15:46:40 +05:30
Ankush Menat
be16fb9dbb chore(DX): add sourceURL for debugging 2022-03-23 15:46:40 +05:30
Deepesh Garg
78ca88d227 fix: Check if onload property exists in the form object 2022-03-23 13:55:05 +05:30
Deepesh Garg
c3f1ad78aa
Merge pull request #30361 from deepeshgarg007/tax_account_display 
fix: GST account not showing up in tax templates
 2022-03-23 13:17:11 +05:30
Deepesh Garg
3a1e31592e
Merge branch 'develop' into ignore_price_list 2022-03-23 09:27:44 +05:30
Deepesh Garg
405dcb1d3c fix: Add ignore pricelist for missing flows 2022-03-23 09:04:03 +05:30
Deepesh Garg
66ca085e39 fix: Changing item prices on converting orders/receipts to invoices 2022-03-22 23:03:41 +05:30
Deepesh Garg
57924599da fix: GST account not showing up in tax templates 2022-03-22 18:26:58 +05:30
Saqib Ansari
f2ae63cbfd fix(pos): remove returned sr. nos. from pos reserved sr. nos. list 2022-03-22 17:41:49 +05:30
Ankush Menat
f606d2ecc6
fix: flaky salary slip email test (#30358) 2022-03-22 17:36:18 +05:30
Ankush Menat
41db43cdc5 fix: consider full integer batch nos 2022-03-22 16:40:17 +05:30
Ankush Menat
a18c687844 fix: ignore already fetched serial no 
exclude_sr_nos is sent as JSON string of list, so load it before
operating on it.
 2022-03-22 16:40:17 +05:30
Deepesh Garg
ec04242d72
Merge pull request #30340 from deepeshgarg007/opening_too_field_fixes 
fix: Opening invoice tool field placement
 2022-03-22 16:17:12 +05:30
Deepesh Garg
749ab9b799
Merge branch 'develop' into bank_transaction_currency_symbol_fixes 2022-03-22 16:16:03 +05:30
Marica
87a0b72c26
Merge pull request #30336 from marination/product-filter-lookup 
fix: Product Filters Lookup
 2022-03-22 15:31:28 +05:30
Rucha Mahabal
0ae6561620
test: get leave allocation records query (#30342) 
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-22 15:14:05 +05:30
Ankush Menat
51873da4bc test: dynamic current FY creation in before_tests 2022-03-22 14:23:56 +05:30
Ankush Menat
6b638a196b chore: drop dead sample code 2022-03-22 14:23:56 +05:30
Ankush Menat
9a99f993bc refactor: merge print settings custom fields 2022-03-22 14:23:56 +05:30
Ankush Menat
457d616966 refactor: remove dead duplicate code 2022-03-22 14:23:56 +05:30
Ankush Menat
f37316a266 refactor: use get_value instead of exists 2022-03-22 13:07:45 +05:30
barredterra
5c4eabf075 fix: usage of frappe.db.exists 2022-03-22 13:07:45 +05:30
Marica
387fa61a83
Merge branch 'develop' into product-filter-lookup 2022-03-22 12:13:46 +05:30
Deepesh Garg
01cd9e7c2e
Merge branch 'develop' into opening_too_field_fixes 2022-03-22 11:53:06 +05:30
Deepesh Garg
4e2f866a2a
Merge branch 'develop' into gst_state_number_unsetting 2022-03-22 11:52:55 +05:30
Deepesh Garg
645ed7d0fd
Merge branch 'develop' into sales_person_dashboard 2022-03-22 11:52:36 +05:30
Deepesh Garg
69a4b8c80b
Merge branch 'develop' into bank_transaction_currency_symbol_fixes 2022-03-22 11:52:20 +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
Deepesh Garg
636e7f67eb fix: Opening invoice tool field placement 2022-03-21 19:34:57 +05:30
Deepesh Garg
e78a445c24 fix: Currency symbol in bank transactions 2022-03-21 19:06:04 +05:30
marination
f6e64c2cac fix: Product Filters Lookup 
- bind the right classes to the filter lookup field
- make class names more descriptive
- make filter lookup field more visible with white bg and border
- bind lookup input field js in `views.js`
- make filter lookup field functioning for atribute filters too
- added placeholder to lookup field
 2022-03-21 17:58:39 +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
Deepesh Garg
363e676a35 fix: Reset GST State number 2022-03-21 16:28:17 +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
Saqib Ansari
aff7408775 fix(pos): allow validating stock on save 2022-03-21 14:08:56 +05:30
Saqib Ansari
4afb47e869 fix(pos): specific case when serialized item not removed 2022-03-21 13:24:11 +05:30
Saqib Ansari
2f82e237ef fix(pos): customer group filter in customer selector 2022-03-21 12:47:35 +05:30
Deepesh Garg
3a7776ea7f fix: Contribution amount against invoices in Sales Person Dashboard 2022-03-21 12:04:18 +05:30
Saqib Ansari
d5fd8e0ba6 fix: prevent multiple save on applying coupon code 2022-03-21 11:36:30 +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