Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,826 Commits 3 Branches 0 Tags 1 GiB
430b247dfc
Commit Graph

44826 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
marination
430b247dfc fix: Remove bank details fields from Shareholder 2023-04-11 01:33:08 +05:30
marination
7ed8f59dc8 test: Match by Account No, IBAN, Party Name, Desc and match correction 2023-04-10 22:11:00 +05:30
Marica
36de35c6d9
Merge branch 'develop' into bank-trans-party-automatch 2023-04-10 20:04:16 +05:30
Raffael Meyer
934e1b4e6a
fix: add german translation of "Partly Paid" (#34776) 2023-04-09 19:04:57 +05:30
Deepesh Garg
6f6928fa7b
fix: Item tax validity comparison fixes (#34784) 
fix: Item tax validity comparsion fixes
 2023-04-09 09:38:13 +05:30
Sagar Sharma
02d5d43eb1
Merge pull request #34632 from s-aga-r/refactor-batch 
refactor: rewrite `batch.py` queries in `QB`
 2023-04-08 13:11:01 +05:30
Sagar Sharma
299fb2619f
Merge branch 'develop' into refactor-batch 2023-04-08 11:15:08 +05:30
s-aga-r
4a9a5f03fc Merge branch 'develop' into refactor-batch 2023-04-08 11:06:27 +05:30
Sagar Sharma
ba553dba62
Merge pull request #34739 from resilient-tech/item-tax-override-remove 
chore!: remove override to set item tax based on HSN code
 2023-04-07 21:39:08 +05:30
Anand Baburajan
29e025c012
Merge pull request #34778 from AnandBaburajan/asset_value_adjust_get_depr_amt 
fix: improper usage of get_depreciation_amount in asset_value_adjustment
 2023-04-07 16:48:06 +05:30
Anand Baburajan
90dee8b663
Merge pull request #34735 from ihosseinu/asset_movement_translation_fix 
'Make Asset Movement' button translation fix in asset_list.js
 2023-04-07 15:30:26 +05:30
Anand Baburajan
edaa0bc3f7
Merge branch 'develop' into asset_value_adjust_get_depr_amt 2023-04-07 15:24:37 +05:30
anandbaburajan
984905109d fix: improper usage of get_depreciation_amount in asset_value_adjustment 2023-04-07 15:23:02 +05:30
Sagar Sharma
45291aaa43
Merge pull request #34760 from s-aga-r/FIX-ISS-22-23-06306 
fix: validate `Received Qty` for Internal Purchase Receipt
 2023-04-06 16:25:29 +05:30
Sagar Sharma
f7fb001126
Merge branch 'develop' into FIX-ISS-22-23-06306 2023-04-06 15:59:32 +05:30
s-aga-r
a575bd50ef test: add test cases for internal PR received qty 2023-04-06 15:26:19 +05:30
rohitwaghchaure
7d2d2dd0af
Merge pull request #34768 from rohitwaghchaure/fixed-ux-issue 
fix: UX for stock entry, bom and work order
 2023-04-06 14:16:20 +05:30
Sagar Sharma
7934441f3c
Merge pull request #34769 from s-aga-r/FIX-ISS-22-23-06397 
fix: Subcontracting Receipt incorrect `status`
 2023-04-06 13:56:23 +05:30
Sagar Sharma
cfd4da3e8a
Merge branch 'develop' into FIX-ISS-22-23-06397 2023-04-06 13:23:39 +05:30
s-aga-r
a55b818119 fix: Subcontracting Receipt incorrect status 2023-04-06 13:20:33 +05:30
Rohit Waghchaure
82a136f991 fix: UX for stock entry, bom and work order 2023-04-06 12:51:32 +05:30
Deepesh Garg
91a26608ee
fix: Unable to create payment request against purchase invoice (#34762) 2023-04-06 12:40:58 +05:30
s-aga-r
0d1df26b88 chore: add Delivery Note Item in Purchase Receipt Status Updater 2023-04-06 09:31:46 +05:30
s-aga-r
bc39dfab5d feat: add Received Qty field in Delivery Note Item 2023-04-06 09:29:44 +05:30
rohitwaghchaure
8503d581a5
Merge pull request #34743 from rohitwaghchaure/fix-incorrect-balance-qty 
fix: incorrect stock balance quantity for batch item
 2023-04-05 23:21:44 +05:30
Marica
fcc8f9f164
Merge branch 'develop' into bank-trans-party-automatch 2023-04-05 17:04:07 +05:30
marination
d7bc192804 fix: Match by both Account No and IBAN & other cleanups 
- A BT could have both account and iban, and a Supplier could have only IBAN set
- In this case, matching by either (only account) gives no match
- Match by Account OR IBAN, use `or_filters`
- If matched, set both account no. and IBAN in Bank Party Mapper

- Explain AutoMatchParty
- Add type hints to return values
- Use `set_value` to set values in BT after matching since its an after submit event
 2023-04-05 15:28:47 +05:30
Lucky-Tsuma
9bf87d708e
fix: payment entry is already created on posawesome. (#34712) 2023-04-05 13:52:00 +05:30
Deepesh Garg
56f5078357
fix: Shop by category fixes (#34688) 
* fix: Shop by category fixes

* chore: Update tests
 2023-04-05 12:43:32 +05:30
Ritwik Puri
f193393f57
fix!: require sender and message for contact us page (#34707) 
* fix: require sender and message for contact us page

* refactor: dont override frappe.send_message from client side

used override_whitelisted_method hook for the same
 2023-04-05 12:04:36 +05:30
Deepesh Garg
fd3fb64aa3
feat: Auto allocate advance payments only against orders (#34727) 
feat: Auto allocate advance payments only againt orders
 2023-04-05 12:02:44 +05:30
Anand Baburajan
869289a6e4
Merge pull request #34745 from frappe/mergify/bp/develop/pr-34737 
fix: don't include cancelled JVs in assdeprledger report (backport #34737)
 2023-04-05 11:59:52 +05:30
Raffael Meyer
e6a9b6ee95
feat: remove deprecated get_customer_list (#34624) 
feat: remove deprecated method

get_customer_list
 2023-04-05 11:56:15 +05:30
Anand Baburajan
5cc3c08059
fix: asset monthly WDV and DD schedule and refactor [develop] (#34646) 
* fix: monthly wdv and dd schedule

* chore: minor rename

* chore: fix tests
 2023-04-05 11:46:31 +05:30
anandbaburajan
1101b7bfdf fix: don't include cancelled JVs in assdeprledger report 
(cherry picked from commit 3896d41e95a2054b4ec76c5f5b2819b3f28ef98e)
 2023-04-05 06:04:43 +00:00
Rohit Waghchaure
ef4bd77196 fix: incorrect stock balance quantity for batch item 2023-04-05 00:02:45 +05:30
marination
aea4315435 chore: Make auto matching party configurable 
- Checkbox in Accounts settings "Enable Automatic Party Matching"
- Check before invoking automatching methods
- misc: Remove TODO comments
 2023-04-04 20:16:14 +05:30
marination
33604550ce chore: Perform automatch on submit 
- misc: Clearer naming
 2023-04-04 19:42:25 +05:30
marination
27ce789023 feat: Manually Update/Correct Party in Bank Transaction 
- On updating bank trans.n party after submit, the corresponding mapper doc will be updated too
- The mapper doc in turn will update all linked bank transactions that do not have this updated value
- Added Bank Party Mapper hidden link in Bank Transaction
- Rename field in BPM to `Party Name` as it does not hold description data
- If a BT matches with a BPM record, link that record in the BT
 2023-04-04 19:27:01 +05:30
Sagar Vora
9c66ebb108 chore!: remove override to set item tax based on HSN code 2023-04-04 18:02:55 +05:30
Hossein Yousefian
b70615ef18
'Make Asset Movement' button translation fix 2023-04-04 14:49:43 +03:30
marination
37c1331aba fix: Don't set description as key in Mapper doc if matched by description 
- Description is volatile and will keep changing
- It will lead to multiple Bank Party Mapper docs for the same party that will never be referenced again
- Parts of the descripton keep changing which is why it will never match a mapper record
- If matched by desc, dont create mapper record.
 2023-04-04 14:03:35 +05:30
rohitwaghchaure
12325cb685
Merge pull request #31271 from dj12djdjs/fix-reserve-qty 
fix(stock): don't reserve qty on sales return.
 2023-04-04 06:21:30 +05:30
marination
3a898289b0 chore: Single query with or filter to search Party Mapper by name/desc 2023-04-03 16:11:00 +05:30
rohitwaghchaure
682730a498
Merge pull request #34715 from rohitwaghchaure/fixed-bom-update-log 
fix: bom update log not working for large batch size
 2023-04-03 15:49:25 +05:30
Sagar Sharma
5f2874743b
Merge pull request #34713 from s-aga-r/FIX-ISS-22-23-06369 
fix: consider qty field precision
 2023-04-03 15:36:19 +05:30
Rohit Waghchaure
d56070301c fix: bom update log not working for large batch size 2023-04-03 14:47:58 +05:30
Sagar Sharma
4571bd58d2
Merge branch 'develop' into FIX-ISS-22-23-06369 2023-04-03 14:26:09 +05:30
s-aga-r
6ec7590c21 fix: consider qty field precision 2023-04-03 14:08:11 +05:30
ruthra kumar
1eefd517d1
Merge pull request #34694 from ruthra-kumar/recalculate_difference_on_allocation_change 
fix(ui): recalculate difference amount on allocation change
 2023-04-03 10:03:01 +05:30