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

2250 Commits

Author SHA1 Message Date
Deepesh Garg
5c75894065
fix: Advance payment against payment terms (#34872) 2023-04-16 17:11:24 +05:30
Deepesh Garg
a7051cb9b5
fix: Don't use stale item details (#34847) 2023-04-14 09:59:42 +05:30
s-aga-r
a14a6002e7 Merge branch 'develop' into stock-reservation 2023-04-11 10:00:39 +05:30
s-aga-r
ac24d778e8 refactor: add Docstrings for functions 2023-04-05 19:48:15 +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
s-aga-r
38e9367184 fix: re-reserve stock on SO Update Items 2023-04-02 21:24:59 +05:30
Deepesh Garg
4c61ee30bb
fix: Multiple issues in purchase invoice submission (#34600) 
* fix: Multiple issues in purchase invoice submission

* fix: Base grand total calculation

* chore: Calculate base grand total separately only in multi currency docs

* fix: Add gl entry for round off
 2023-04-02 09:35:27 +05:30
s-aga-r
de1492759d feat: add option to reserve stock in SO 2023-03-31 21:42:13 +05:30
s-aga-r
26569b2162 fix: Stock Reservation validation for SO 2023-03-31 13:12:19 +05:30
s-aga-r
e286d05904 fix: SRE Available Qty to Reserve for Group Warehouse 2023-03-30 16:26:42 +05:30
Sagar Sharma
867d898304
fix: zero rm-cost for batch rm item in SCR (#34616) 
fix: `0` rm-cost for batch rm item in SCR
 2023-03-28 18:45:16 +05:30
Deepesh Garg
12ad2aa2e5
fix: Percentage billing in Sales Order (#34606) 2023-03-28 15:33:59 +05:30
s-aga-r
9652cb8de5 chore: create SRE on SO submission 2023-03-25 15:50:00 +05:30
s-aga-r
9c1e566394 fix: filters not getting applied on Web Form 2023-03-09 22:12:35 +05:30
Deepesh Garg
9a8f8e8b7d
Revert "fix: Default sales team not getting set" (#34376) 
Revert "fix: Default sales team not getting set (#34284)"

This reverts commit 7d0199d743.
 2023-03-09 15:36:52 +05:30
Deepesh Garg
10632d75b0
fix: Do not calculate commission post submit (#34267) 
* fix: Do not calculate commision post submit

* chore: Update condition to match server side logic

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>

---------

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-03-07 11:44:09 +05:30
Deepesh Garg
7d0199d743
fix: Default sales team not getting set (#34284) 2023-03-07 11:41:26 +05:30
s-aga-r
cb0b6de4b9 fix: Serial No is mandatory even if the qty is 0 2023-03-02 11:27:46 +05:30
s-aga-r
a9f0a11ce6 fix: rejected_serial_no not getting copied from PR to PR(Return) 2023-03-02 11:15:46 +05:30
Deepesh Garg
6a89cb98ce
Merge pull request #33874 from frappe/alternative-items-quotation 
feat: Support for Alternative Items in Quotation
 2023-03-01 17:41:24 +05:30
Rohit Waghchaure
a8445da02a fix: labels name 2023-02-28 15:47:45 +05:30
Rohit Waghchaure
eab775ef32 feat: adjust purchase receipt valuation rate as per purchase invoice rate 2023-02-28 14:11:55 +05:30
Deepesh Garg
e26c6dc76b
Revert "fix: Concurrency issues in Sales and Purchase returns" (#34202) 
Revert "fix: Concurrency issues in Sales and Purchase returns (#34019)"

This reverts commit a67284e96d.
 2023-02-24 15:28:14 +05:30
Marica
47ab26dedf
Merge branch 'develop' into alternative-items-quotation 2023-02-23 13:20:28 +05:30
ruthra kumar
c722f2819c
fix: ignore repost payment ledger on basic documents cancellation (#34054) 
fix: ignore repost payment ledger on cancel/delete of Inv/Pay/JE's

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-19 12:09:10 +05:30
rohitwaghchaure
4399a93843
Merge pull request #34091 from rohitwaghchaure/fixed-incorrect-consumed-qty-in-scr 
fix: incorrect consumed qty in subcontracting receipt
 2023-02-16 15:10:14 +05:30
Rohit Waghchaure
156e45970a fix: incorrect consumed qty in subcontracting receipt 2023-02-16 14:17:27 +05:30
Marica
22010b745c
Merge branch 'develop' into alternative-items-quotation 2023-02-15 13:05:33 +05:30
Deepesh Garg
a67284e96d
fix: Concurrency issues in Sales and Purchase returns (#34019) 2023-02-13 15:31:19 +05:30
Marica
bd7e6e264e
Merge branch 'develop' into alternative-items-quotation 2023-02-06 16:30:10 +05:30
anandbaburajan
3380dc5dea chore: use continue, not break 2023-02-04 11:20:26 +05:30
Anand Baburajan
bb424965ee
Merge branch 'develop' into cancel_pi_cancelled_asset 2023-02-03 23:00:40 +05:30
anandbaburajan
b961321de5 fix: allow PI cancel if linked asset is cancelled 2023-02-03 22:58:22 +05:30
Gavin D'souza
940ad6e3f2 fix: Fetch all fields via get_returned_qty_map_for_row 2023-02-01 13:53:37 +05:30
marination
cef7dfd0b4 feat: Dialog to select alternative item before creating Sales order 
- Users can leave the row blank in the dialog if original item is to be used
- Else users can select an alternative item against an original item
- In the document, users must check `Is Alternative Item` if needed and also specify which item it is an altenrative to since there are no documented mappings
 2023-01-26 14:36:25 +05:30
marination
91982d1e4f feat: Filter out alternative item rows in taxes and totals for Quotation 
- Added a Quotation Item field `is_alternative_item`
- Use filtered rows for taxes and totals computation
 2023-01-24 18:03:53 +05:30
rohitwaghchaure
b5d2eedfa6
Merge pull request #33759 from rohitwaghchaure/fix-incorrect-actual-qty-for-packed-item 
fix: incorrect actual qty for the packed item
 2023-01-20 23:38:55 +05:30
Rohit Waghchaure
02566a02a8 fix: incorrect actual qty for the packed item 2023-01-20 22:38:56 +05:30
Deepesh Garg
597ef0a498
fix: Short closed order, receipt and delivery note status on cancellation (#33743) 
* fix: Short closed order, receipt and delivery note status on cancellation

* test: Cancelled status check
 2023-01-20 19:44:06 +05:30
Raffael Meyer
67cf7e1728
refactor: use DocStatus (#33594) 2023-01-15 17:34:16 +05:30
Deepesh Garg
906ad10d16
fix: Return against internal purchase invoice (#33635) 2023-01-15 17:32:57 +05:30
s-aga-r
b26e96cdf4 chore: linter 2023-01-12 13:41:53 +05:30
s-aga-r
6878f40d1d chore: add row-index in error msgs 2023-01-12 12:02:00 +05:30
Rohit Waghchaure
d1d4671320 feat: provision to disable get last purchase rate 
fix: set_incoming_rate condition
 2023-01-09 18:10:52 +05:30
Rohit Waghchaure
7249657d15 fix: timeout error in the Purchase Invoice 2023-01-09 14:53:54 +05:30
s-aga-r
751bdc98ed fix: set supplier details while mapping SE(Send to Subcontractor) 2023-01-03 17:17:23 +05:30
Sagar Sharma
d072169340
Merge branch 'develop' into fix/github-issue/28766 2022-12-29 16:38:53 +05:30
s-aga-r
c716dcc01e fix: consider child nodes while getting bin details 2022-12-29 14:01:42 +05:30
Deepesh Garg
617518389a
fix: Conversion factor error for invoices without item code (petty expenses) (#32714) 
* fix: Set default uom conversion factor to 1 for invoices

* chore: set default conversion_factor as 1

* chore: remove print statements
 2022-12-29 10:41:36 +05:30
barredterra
36997d9788 fix: translation for warning on Overbilling/-receipt/-delivery 2022-12-13 18:59:20 +01:00
Ankush Menat
915e0347b0
chore!: remove activity log feeds (#33294) 
- This contains little to no information and practically no one uses this.
- Also causes a lot of problem by adding way too many feeds in activity
  log to the point where activity page doesn't even load.
 2022-12-12 15:14:30 +05:30
Deepesh Garg
6db52930d8 Merge branch 'develop' of https://github.com/frappe/erpnext into buying_selling_pricing_rule 2022-12-08 18:05:05 +05:30
Deepesh Garg
81397ba3ee
Merge pull request #33227 from barredterra/add-translation-variable-order 
fix: add translation variable index
 2022-12-08 15:17:07 +05:30
barredterra
748c74ba52 fix: add translation variable order 2022-12-05 18:24:22 +01:00
Deepesh Garg
ef9d126254 fix: Allow item rate udpates for non-stock invoices 2022-12-05 10:17:19 +05:30
Deepesh Garg
b741ae143c fix: Reapply pricing rule on qty change 2022-12-02 17:14:06 +05:30
Deepesh Garg
bfb81ef56f fix: Due date for month end payment term 2022-11-30 20:53:41 +05:30
Deepesh Garg
8287fb5104
Merge pull request #33143 from deepeshgarg007/auto_repeat_dates 
fix: Auto repeat date validations
 2022-11-29 09:28:19 +05:30
Deepesh Garg
6a47fb6c9e chore: Update condition 2022-11-28 22:47:44 +05:30
Deepesh Garg
fa15221455 fix: Auto repeat date validations 2022-11-28 19:22:35 +05:30
Deepesh Garg
104fdcb9f9 fix: Dispatch address display 2022-11-24 16:41:40 +05:30
ruthra kumar
bf76b85dfd fix: update advace paid in SO/PO in account currency 2022-11-22 12:33:18 +05:30
s-aga-r
8a73e963ce fix: don't set rejected-qty in return SCR 2022-11-16 14:28:32 +05:30
s-aga-r
01f56c621c Revert "fix: get consumed_qty based on received_qty in SCR" 
This reverts commit 70c9b8dc50.
 2022-11-15 14:32:16 +05:30
Daizy Modi
4efc947f14
perf: use get_cached_value instead of db.get_value in controllers (#32776) 2022-11-07 09:21:03 +05:30
Sagar Sharma
70c9b8dc50 fix: get consumed_qty based on received_qty in SCR 2022-11-06 13:33:47 +05:30
Deepesh Garg
8d30ebb12b
fix: Disable tax included prices for internal transfers (#32794) 
* fix: Disable tax-included prices for internal transfers
 2022-11-05 20:51:15 +05:30
Sagar Sharma
5665d1afa0
Merge branch 'develop' into fix/scr/return 2022-11-05 16:36:07 +05:30
Deepesh Garg
4ff06a9d79
Merge pull request #32844 from deepeshgarg007/auto_allocate_advances 
fix: Auto advance allocation against partial invoices
 2022-11-05 16:27:59 +05:30
Sagar Sharma
324bfa9fde test: fix test case 2022-11-05 16:18:31 +05:30
Sagar Sharma
760c26e9c0 fix: make BOM required in SCR Item 2022-11-05 15:52:14 +05:30
Sagar Sharma
54072ec9cd fix: map BOM while mapping the return SCR 2022-11-05 15:51:29 +05:30
Deepesh Garg
181df2fe63 fix: Auto advance allocation against partial invoices 2022-11-04 15:49:37 +05:30
Deepesh Garg
cbf82872fb
Merge pull request #32646 from niralisatapara/tds_purchase_invoice 
feat: Item Wise TDS Calculation
 2022-11-04 13:08:10 +05:30
Rohit Waghchaure
b0fc568c80 fix: not able to select customer / supplier 2022-11-03 11:24:58 +05:30
niralisatapara
12456f9850 feat: item wise tds calculation 2022-11-03 10:46:30 +05:30
ruthra kumar
c3dc1c272b
Merge pull request #32816 from ruthra-kumar/advance_paid_in_so_and_po 
fix: update advance paid in SO/PO from Payment Ledger
 2022-11-02 16:27:56 +05:30
niralisatapara
2ca0cf6fc4 feat: item wise tds calculation 2022-11-02 12:19:51 +05:30
niralisatapara
4aff2a32ad Merge branch 'develop' of https://github.com/niralisatapara/erpnext into develop 2022-11-02 11:21:02 +05:30
ruthra kumar
4487065b67 fix: update advance paid in SO/PO from Payment Ledger 2022-11-01 10:29:31 +05:30
Deepesh Garg
06e8e28531 fix: Mode of payment for returns in POS Sales Invoice 2022-10-31 19:58:46 +05:30
Rohit Waghchaure
5f84993bae test: added test case to validate seachfields for customer, supplier 2022-10-24 16:10:47 +05:30
Rohit Waghchaure
46d148defd fix: searchfield not working for cuctsomer, supplier as per customize form 2022-10-24 15:48:34 +05:30
Deepesh Garg
9aa5e20ef7 chore: check only for inter-company transfers 2022-10-12 15:53:28 +05:30
Deepesh Garg
49601558c6 chore: fix precision condition 2022-10-12 14:57:16 +05:30
Deepesh Garg
1c05c004cd chore: Use proper accounts 2022-10-12 14:19:09 +05:30
Deepesh Garg
df2a0e265b chore: GL Entries for SLE diff 2022-10-11 14:55:09 +05:30
Deepesh Garg
a14c5dbcc4 Merge branch 'develop' of https://github.com/frappe/erpnext into internal_transfer_precision_fixes 2022-10-10 15:08:15 +05:30
niralisatapara
e758a753f8 Item Wise TDS Calculation 
For calculating Item wise TDS in Purchase Invoice.
 2022-10-03 16:39:35 +05:30
Sagar Sharma
fa2290657a fix: add validation for non-stock item in SCR 2022-09-30 16:18:15 +05:30
rohitwaghchaure
10b7592d14
Merge pull request #32414 from rohitwaghchaure/consider-searchfields-as-per-customize-form 
fix: searchfields as per customize form not working for Item
 2022-09-29 14:51:55 +05:30
Rohit Waghchaure
fd889fd29a fix: searchfields as per customize form not working for Item 2022-09-28 23:00:45 +05:30
Sagar Sharma
a145d1065a
Merge branch 'develop' into fix/stock-entry/supplied-items 2022-09-28 16:55:57 +05:30
Sagar Sharma
ac7409bbf3 fix: supplied items added twice in Stock Entry 2022-09-28 16:46:48 +05:30
Nabin Hait
6145013f30
Merge branch 'develop' into fix_asset_scrap_and_sale_dep 2022-09-27 15:56:39 +05:30
Deepesh Garg
ce80b9fa0e Merge branch 'develop' of https://github.com/frappe/erpnext into internal_transfer_precision_fixes 2022-09-26 21:16:25 +05:30
Deepesh Garg
6e47fd54a0 fix: Hanlde rounding loss for internal transfer 2022-09-26 21:15:57 +05:30
ruthra kumar
6e65f01ede
Merge pull request #32296 from ruthra-kumar/amount_in_words_for_debit_note 
fix: get amount in words for debit note
 2022-09-20 18:09:33 +05:30
ruthra kumar
70f6484d9d fix: get amount in words for debit note 2022-09-20 17:32:23 +05:30
Sagar Sharma
3a9c08e7c9 fix: po_detail or sco_rm_detail not getting set while while mapping SE 2022-09-19 18:47:46 +05:30