Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,132 Commits 3 Branches 0 Tags 1 GiB
196e18187f
Commit Graph

45132 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
f3b3dabb9a
fix: Naming series error in Journal Entry template (#35084) 2023-05-01 10:50:51 +05:30
Sagar Sharma
424bd701f3
Merge branch 'develop' into PACKING-SLIP-FOR-DN-PACKED-ITEMS 2023-05-01 08:05:18 +05:30
s-aga-r
bbcb65894b refactor: use get_product_bundle_list() to get all product bundle at once 2023-05-01 08:04:03 +05:30
s-aga-r
ba61292dfc test: add test case for packed qty validation on DN submit 2023-05-01 07:25:36 +05:30
ruthra kumar
123355392b fix: incorrect paid_amount and exchange rate in PE 
If Company master has no default cash or bank account set but Party has
default company bank account set. In this case, paid_amount and
conversion rate are not calculated correctly
 2023-04-30 08:36:56 +05:30
Vishnu VS
9fd7a05b40
Merge branch 'develop' into develop 2023-04-29 21:02:54 +05:30
s-aga-r
699532647d refactor: validate_packed_qty() 2023-04-28 23:03:33 +05:30
s-aga-r
b0eb9ea7bd refactor(minor): use set_onload to get unpacked items details 2023-04-28 22:47:27 +05:30
s-aga-r
7742c592c5 test: add test cases for Packing Slip 2023-04-28 21:51:15 +05:30
s-aga-r
da00fc0f16 fix(ux): don't show Create > Packing Slip button if items are already packed 2023-04-28 18:28:28 +05:30
s-aga-r
8d1bccada4 fix(ux): remove Get Items button from Packing Slip 2023-04-28 18:02:24 +05:30
s-aga-r
e75aa4e291 fix(ux): get items on selecting DN in Packing Slip 2023-04-28 17:59:34 +05:30
s-aga-r
269cc96c41 refactor: move js validations to py 2023-04-28 17:47:36 +05:30
s-aga-r
90701c7ae9 fix: validate Packing Slip Item Qty with DN Items 2023-04-28 17:05:51 +05:30
rohitwaghchaure
35ee8d19b0
Merge pull request #35092 from rohitwaghchaure/fixed-reserved-qty-issue-for-dn 
fix: not able to create delivery note from sales order
 2023-04-28 16:02:35 +05:30
s-aga-r
9e5b102768 fix: make DN item reference mandatory for Packing Slip Item 2023-04-28 15:41:59 +05:30
s-aga-r
372bce4567 fix: Packing Slip Item Qty 2023-04-28 15:26:02 +05:30
Rohit Waghchaure
bdf2f7416a fix: not able to create delivery note from sales order 2023-04-28 15:16:02 +05:30
s-aga-r
0add90e7ec chore: enable no_copy for dn_detail and pi_detail in Packing Slip Item 2023-04-28 15:05:28 +05:30
s-aga-r
77f1e8ce78 fix: update Packed Qty in DN on submit and cancel of Packing Slip 2023-04-28 15:04:41 +05:30
ruthra kumar
4ccce93394 refactor: checkbox to toggle parent doc cost center preference 2023-04-28 14:20:50 +05:30
ruthra kumar
0f3b06cc8a refactor: checkbox in Sales Invoice 2023-04-28 14:20:50 +05:30
ruthra kumar
ebe6787510 refactor: checkbox to toggle parent doc cost center preference 2023-04-28 14:20:48 +05:30
Vishnu VS
bb13c236b9
Merge branch 'develop' into develop 2023-04-28 14:06:12 +05:30
ruthra kumar
b44331c981 refactor: checkbox in purchase invoice 2023-04-28 14:06:04 +05:30
s-aga-r
e6fc281acf feat: add field Packed Qty in Delivery Note Item and Packed Item 2023-04-28 13:20:47 +05:30
Sagar Sharma
d6c5b3e419
Merge pull request #35081 from SolufyPrivateLimited/fix-qc-hyperlink-v14 
fix: Hyperlink in Quality Inspection Summary
 2023-04-28 12:48:53 +05:30
s-aga-r
75fe9dd3ea fix: don't map items twice 
* don't explicitly map Delivery Note Item custom fields to Packing Slip Item, get auto-mapped while mapping the doc.
* call Packing List `set_missing_values` after mapping the doc.
* refactor `get_recommended_case_no`, use `frappe.db.get_value` instead of `frappe.db.sql`.
 2023-04-28 10:53:17 +05:30
s-aga-r
ee9f97ca7c fix: remove duplicate items validation 2023-04-28 09:07:03 +05:30
Vishnu VS
489f853ee2
Merge branch 'develop' into develop 2023-04-27 21:17:47 +05:30
s-aga-r
b62bf78814 refactor: packing_slip.js 2023-04-27 19:43:37 +05:30
s-aga-r
380dd73065 fix: map Packed Items while creating Packing Slip 2023-04-27 18:37:32 +05:30
Nihantra Patel
72dd7884a8 fix: Hyperlink in Quality Inspection Summary 2023-04-27 17:04:39 +05:30
ruthra kumar
787313b875
Merge pull request #35077 from SolufyPrivateLimited/fix-gp-link-14 
fix: Report link, option, and added a link for Sales Person in GP
 2023-04-27 16:40:45 +05:30
s-aga-r
eca77134ae feat: add field pi_detail in Packing Slip 2023-04-27 15:48:02 +05:30
Nihantra Patel
6dfca79af3 fix: Report link, option, and added a link for Sales Person in GP 2023-04-27 15:04:50 +05:30
Vishnu VS
06e458c745
Merge branch 'develop' into develop 2023-04-27 12:24:29 +05:30
rohitwaghchaure
01bfd2ab67
Merge pull request #35066 from rohitwaghchaure/fixed-delivered-qty-issue-while-making-mr 
fix: don't create material request from sales order against delivered items
 2023-04-27 09:05:36 +05:30
Rohit Waghchaure
1e2deee579 fix: don't create material request from sales order against the delivered items 2023-04-26 20:30:53 +05:30
Vishnu VS
f68eef833c
Update erpnext/manufacturing/doctype/job_card/job_card.py 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2023-04-26 20:25:43 +05:30
Vishnu VS
5c94f2cc52
Update erpnext/manufacturing/doctype/job_card/job_card.py 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2023-04-26 20:25:15 +05:30
Vishnu VS
25d0119b7e
Merge branch 'develop' into develop 2023-04-26 18:56:09 +05:30
HarryPaulo
3be1ab9b8d
fix: allow submit delivery note when the sales order was billed... (#34910) 2023-04-25 21:54:41 +05:30
Kitti U. @ Ecosoft
c36dc3dc57
fix: v14, Bank Reconcile Tools not cover case JV debit bank (#35000) 2023-04-25 21:34:28 +05:30
rohitwaghchaure
5e37308b5e
Merge pull request #35050 from Nandhinidevi123/workstation_filter 
add if condition for workstation filter
 2023-04-25 21:28:41 +05:30
rohitwaghchaure
b24704740b
Merge pull request #34918 from s-aga-r/FIX-ISS-22-23-06298 
perf: Journal Entries
 2023-04-25 21:27:52 +05:30
mergify[bot]
ab0f7794b7
fix: wrong qty of remaining work orders to be created when using "Create" > "Work Order" (#34726) 
fix: wrong qty of remaining work orders to be created when using "Create" > "Work Order" (#34726)

* fix: convert asynchronous field update to synchronous

* fix: wrong qty of remaining work orders to be created when using "Create" > "Work Order"

(cherry picked from commit 189b020d228bdb1c0c589697162cf91718b2fa27)

Co-authored-by: danjeremynavarro <46537526+danjeremynavarro@users.noreply.github.com>
 2023-04-25 21:08:50 +05:30
tundebabzy
3d90b970d1
fix: click handler should not attempt indexed access of empty array (#35013) 
fix: click handler should not attempt indexed access
of empty array
 2023-04-25 20:57:59 +05:30
Ernesto Ruiz
c4512d552e
chore: Add translate function to Depreciation Journal Entry Remark (#35022) 
chore: Add translate function to Depreciation Journal Entry Remark
 2023-04-25 20:56:53 +05:30
Deepesh Garg
f88431a79a
fix: Common party JV cost center (#35008) 2023-04-25 20:54:22 +05:30