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

685 Commits

Author SHA1 Message Date
Deepesh Garg
6d121ae6e4 chore: fix typo 2023-06-22 13:03:09 +05:30
Deepesh Garg
3aead05f42 fix: Test related errors 2023-06-22 11:41:43 +05:30
Deepesh Garg
b64ebc6fcc test: fix payment reco tests 2023-06-21 17:49:45 +05:30
Deepesh Garg
92f845c0e1 chore: Advance fetching order 2023-06-21 12:21:19 +05:30
Deepesh Garg
016ed951da test: Update tests 2023-06-20 13:22:32 +05:30
Deepesh Garg
7ec9d76545 Merge branch 'develop' of https://github.com/frappe/erpnext into #34282-Record-advance-payment-as-a-liability 2023-06-19 09:48:01 +05:30
Gursheen Anand
442e3f2aa2 fix: update outstanding amount and unpaid status on cancellation of payment entry 2023-06-16 13:38:47 +05:30
Gursheen Anand
ba4ab06ae3 fix: changed account types in controller method 2023-06-14 12:39:16 +05:30
Anand Baburajan
491a50a027
fix: make showing taxes as table in print configurable (#35672) 2023-06-13 19:42:56 +05:30
Gursheen Anand
17341adf1c fix: calculate outstanding amount on reconcile correctly 2023-06-13 15:00:46 +05:30
Gursheen Anand
a06017c2c3 fix: Use advance account from Reconciliation document for fetching Payment Entries 2023-06-12 15:24:53 +05:30
Gursheen Anand
7591f1010b fix: Make get party account method return a list instead of a single default account. 2023-06-12 11:06:03 +05:30
Gursheen Anand
4ee163742a fix: Using one field for both advance liability accounts 2023-06-08 13:15:23 +05:30
Smit Vora
b1ef19a0cd
fix(regional): allow regional override for updating gl_dict (#35550) 2023-06-05 01:43:26 +05:30
Gursheen Anand
74619269f0 feat: Record Advance Payments as Liability 
Ability to let user record advance payments as liability instead of a negative asset.

Issue #34282
 2023-06-02 17:13:51 +05:30
Ankush Menat
686685bba0
fix: use kwargs in new_doc (#35497) 
To handle https://github.com/frappe/frappe/pull/21190#event-9386089620
 2023-05-31 12:50:14 +05:30
rohitwaghchaure
565322daba
Merge branch 'develop' into stock-reservation 2023-05-24 14:32:04 +05:30
ruthra kumar
0da6c1688b
fix: unable to create partial invoice with auto fetch terms enabled (#35285) 
fix: fetch so/po terms if auto fetch is enabled
 2023-05-16 18:57:42 +05:30
Rohit Waghchaure
38aaba5720 fix: inventory dimension for inter company transfer return use case 2023-05-13 13:00:05 +05:30
s-aga-r
7548bb3fbe Merge branch 'develop' into stock-reservation 2023-05-03 12:06:11 +05:30
Deepesh Garg
f88431a79a
fix: Common party JV cost center (#35008) 2023-04-25 20:54:22 +05:30
Deepesh Garg
f7b50f2ade
fix: Unable to allocate advance against invoice (#35007) 2023-04-25 19:18:45 +05:30
s-aga-r
0cd10a50d2 Merge branch 'develop' into stock-reservation 2023-04-22 10:04:46 +05:30
Rohit Waghchaure
19911b48fd fix: validation for internal transfer entry 2023-04-21 16:56:09 +05:30
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
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
Deepesh Garg
906ad10d16
fix: Return against internal purchase invoice (#33635) 2023-01-15 17:32:57 +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
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
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
ruthra kumar
bf76b85dfd fix: update advace paid in SO/PO in account currency 2022-11-22 12:33:18 +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
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
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
Deepesh Garg
181df2fe63 fix: Auto advance allocation against partial invoices 2022-11-04 15:49:37 +05:30
ruthra kumar
4487065b67 fix: update advance paid in SO/PO from Payment Ledger 2022-11-01 10:29:31 +05:30
Nabin Hait
6145013f30
Merge branch 'develop' into fix_asset_scrap_and_sale_dep 2022-09-27 15:56:39 +05:30
rohitwaghchaure
3c01bf3a12
Merge pull request #32238 from rohitwaghchaure/fix-pricing-rules-issues 
fix: suggestion threshold label and rule was not working for other item with min and max amount
 2022-09-17 12:11:24 +05:30
Rohit Waghchaure
f5bd3fa952 fix: suggestion threshold label and rule was not working for other items with min and max amount 2022-09-16 16:03:08 +05:30
anandbaburajan
ff5cad1cd6 fix: calculate depreciation properly on asset sale entry and scrap entry 2022-09-15 13:15:34 +05:30
Nabin Hait
e24a4b18c4 Merge branch 'SaiFi0102-asset-capitalization' into develop 2022-09-13 15:00:21 +05:30
ruthra kumar
4576c1ebc3
Merge pull request #32137 from ruthra-kumar/delete_payment_ledger_entries_on_src_doc_delete 
refactor(minor): delete linked payment ledger entries on source doc deletion
 2022-09-11 11:21:24 +05:30