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

846 Commits

Author SHA1 Message Date
Rohit Waghchaure
1c2fe085b5 fix: test case and removed outward field 2023-06-15 12:56:41 +05:30
rohitwaghchaure
4820221a41
Merge pull request #35636 from s-aga-r/FIX-SBB-AttributeError 
fix: miscellaneous
 2023-06-14 16:02:04 +05:30
s-aga-r
5c805db573 fix(ux): add is_cancelled=0 filter for SBB 2023-06-14 15:04:51 +05:30
mergify[bot]
4f3d531f35
fix: don't set default payment amount in case of invoice return (backport #35645) (#35647) 
fix: don't set default payment amount in case of invoice return (#35645)

(cherry picked from commit 79483cc90eb71fa82d645b2cf54d9731502cf6c7)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-06-12 18:43:26 +05:30
Rohit Waghchaure
acd12c5830 fix: get_query for batch number and incorrect batch qty 2023-06-04 16:09:01 +05:30
Rohit Waghchaure
39da92929b fix: serial and batch selector 2023-06-02 17:14:18 +05:30
Rohit Waghchaure
f79f2a3bab fix: dialog issue 2023-06-02 17:14:18 +05:30
Rohit Waghchaure
c1132d1e6d fix: serial and batch selector and added deprecated decorator 2023-06-02 17:14:16 +05:30
Rohit Waghchaure
5bb3173676 refactor: rename doctype serial and batch ledger to serial and batch entry 2023-06-02 17:14:15 +05:30
Rohit Waghchaure
e6143abb8a refactor: added new file serial batch bundle 2023-06-02 17:14:14 +05:30
Rohit Waghchaure
6c9b212dd1 fix: removed sales and purchase fields from serial nos 2023-06-02 17:14:14 +05:30
Rohit Waghchaure
bc75a7ef44 refactor: serial no normalization 2023-06-02 17:14:14 +05:30
Rohit Waghchaure
2931c657f4 fix: rate not fetching properly for inter transfer purchase order 2023-05-30 08:34:12 +05:30
vishnu
f2ceb00379 fix: Creating landed cost voucher from connections 2023-05-14 09:35:38 +00:00
Dany Robert
d9b231aa16 fix: broken save on empty row existance 2023-05-08 12:26:47 +00:00
Deepesh Garg
5c75894065
fix: Advance payment against payment terms (#34872) 2023-04-16 17:11:24 +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
Deepesh Garg
1e3eb4deed
Merge pull request #34287 from frappe/early-payment-loss 
fix: Allocate tax loss to tax account head on early payment discount
 2023-04-01 18:49:02 +05:30
ruthra kumar
986daa6578 fix: enclose ternary operator in parentheses 2023-03-31 12:09:57 +05:30
Marica
dae40dfbb4
Merge branch 'develop' into early-payment-loss 2023-03-28 15:01:28 +05:30
Deepesh Garg
ee6c107d58
fix(client): Amount calculation for 0 qty debit notes (#34455) 
fix(client): Amount calculaton for 0 qty debit notes

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-03-21 15:38:39 +05:30
marination
d6d0163514 fix: Provision to apply early payment discount if payment is recorded late 
- Party could have paid on time but payment is recorded late
- Prompt for reference date so that discount is applied while mapping
- Prompt only if discount in payment schedule of valid doctypes
- test: Reference date and impact on PE
- `make_payment_entry` (JS) must be able to access `this`
 2023-03-14 14:22:39 +05:30
Marica
2feb27e399
fix(minor): Dirty the form after clicking on Get advances button in Invoices (#34323) 
fix(minor): Dirty form after clicking on Get advances button
 2023-03-07 15:45:18 +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
rohitwaghchaure
d88fe27be6
Merge pull request #34195 from HarryPaulo/fix-performance-on-insert-item 
fix: Performance improvement when adding a new item
 2023-03-01 10:10:14 +05:30
ruthra kumar
35c70f39fa fix: pos return throwing amount greater than grand total 2023-02-28 16:21:32 +05:30
HarryPaulo
49af5ba434 fix: Performance improvement when adding a new item 2023-02-23 18:11:09 -03:00
Marica
22010b745c
Merge branch 'develop' into alternative-items-quotation 2023-02-15 13:05:33 +05:30
Deepesh Garg
47c91324b1
fix: Amount for debit and credit notes with 0 qty line items (#33902) 2023-02-11 09:04:00 +05:30
Marica
bd7e6e264e
Merge branch 'develop' into alternative-items-quotation 2023-02-06 16:30:10 +05:30
rohitwaghchaure
1b967f37af
Merge pull request #33845 from rohitwaghchaure/fixed-item-not-fetching-issue 
fix: item rate not fetching
 2023-01-28 15:10:02 +05:30
Rohit Waghchaure
0d7f98b496 fix: item rate not fetching 2023-01-28 13:51:33 +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
f19eadab9a feat: Consider filtered items table in JS for totals computation 
- Set `_items` as filtered rows if quotation else the entire table. Set at entry point of JS API
- Use `_items` instead of `items` to compute taxes and charges. Exclude alternative item rows
 2023-01-25 13:10:03 +05:30
barredterra
547d37b1db fix: missing constant definition 2023-01-21 17:29:43 +01:00
Dany Robert
1e607cd4c7
fix(pricing rule): free item duplication (#33746) 
* fix(pricing rule): free item duplication

* chore: linting issues
 2023-01-20 20:07:37 +05:30
Raffael Meyer
327b6fdb32
fix: calculate correct amount for qty == 0 (#33739) 2023-01-20 19:35:27 +05:30
vr-greycube
0f0bc9a462
fix: customer selection not mandatory in purchase invoice to fetch item details (#33572) 2023-01-10 20:26:33 +05:30
Sagar Sharma
49025db33c
Merge branch 'develop' into fix/github-issue/28766 2023-01-02 10:27:42 +05:30
Marc de Lima Lucio
3c393bfdc5
fix: javascript: execution blocked by undefined route options (#33405) 
Some implementations of DocField.get_route_options_for_new_doc() returned no value instead of an empty object in some cases, which caused a JavaScript error.
 2023-01-02 09:18:25 +05:30
s-aga-r
c716dcc01e fix: consider child nodes while getting bin details 2022-12-29 14:01:42 +05:30
Deepesh Garg
ff48634cbb Merge branch 'develop' of https://github.com/frappe/erpnext into payment_request_flow 2022-12-20 11:42:15 +05:30
Deepesh Garg
dc178984ae fix: Payment Request flow fixes from Order to Payment Entry 2022-12-15 14:15:20 +05:30
Sabu Siyad
7d64bf78cf
fix(pos): variable typo: s_pos -> is_pos 
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
 2022-12-12 19:09:00 +05:30
Deepesh Garg
0581000990 fix: Remove free items 2022-12-05 17:59:02 +05:30
Deepesh Garg
b741ae143c fix: Reapply pricing rule on qty change 2022-12-02 17:14:06 +05:30
Sabu Siyad
c5edbe2e2f
fix(lint): trailing whitespace 
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
 2022-11-30 17:12:06 +05:30
Sabu Siyad
a378619c9a
fix(pos): partial return amount update 
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
 2022-11-23 17:52:12 +05:30
Deepesh Garg
be0f6b3e6e Merge branch 'develop' of https://github.com/frappe/erpnext into editable_inovice 2022-11-05 16:35:55 +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