Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,058 Commits 3 Branches 0 Tags
Commit Graph

47058 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
3a51a3f37e refactor: convert payment reconciliation tool to virtual doctype 2023-11-18 08:06:44 +05:30
s-aga-r
a5a5341643
Merge pull request #38127 from s-aga-r/FIX-37162 
feat: add `Supplier Delivery Note` field in SCR
 2023-11-17 18:46:58 +05:30
Rucha Mahabal
20c6e9fca2
fix(Timesheet): reset billing hours equal to hours if they exceed actual hours (#38134) 2023-11-17 18:08:55 +05:30
Gursheen Kaur Anand
8c6e341a71
Merge pull request #38144 from GursheenK/tax-report-party-without-naming-series 
fix(minor): show party instead of party name where naming series not set
 2023-11-17 14:18:16 +05:30
Smit Vora
7e43d7b131
fix: allow regional gl in payment entry for gl preview (#38136) 2023-11-17 12:38:08 +05:30
Gursheen Anand
b27af6b5c8 fix: show party instead of party name where naming series not set 2023-11-17 12:36:57 +05:30
ruthra kumar
c69fb80222
Merge pull request #38119 from ruthra-kumar/missing_filter_in_payable_report 
fix: add revaluation journal filter in Payable report
 2023-11-17 09:56:51 +05:30
ruthra kumar
134201794a fix: add revaluation journal filter in Payable report 2023-11-17 09:48:17 +05:30
rohitwaghchaure
2df767f596
fix: bom creator not able to amend / duplicate (#38128) 
fix: bom creator not able to amend
 2023-11-16 16:01:35 +05:30
s-aga-r
da80e4dbce feat: add Supplier Delivery Note field in SCR 2023-11-16 13:05:49 +05:30
s-aga-r
5cc8603cff
Merge pull request #38090 from blaggacao/fix/dn-mapper 
fix(dn): regression from bulk transaction fix
 2023-11-16 12:42:25 +05:30
David Arnold
426c245032 fix(dn): regression from bulk transaction fix 2023-11-16 12:21:23 +05:30
Deepesh Garg
9731b74ad3
Merge pull request #38071 from GursheenK/unequal-dr-cr-for-payments-with-partial-credit-note 
fix: handle partial return against invoices in payment entries
 2023-11-16 10:35:55 +05:30
ruthra kumar
ee29526bbe
Merge pull request #38038 from ruthra-kumar/refactor_bulk_transaction 
refactor: supercharge Bulk actions
 2023-11-16 09:51:34 +05:30
ruthra kumar
3e884d347a
Merge pull request #38082 from ruthra-kumar/fix_fy_exception 
refactor: use 'boolean' parameter while fetching FY year
 2023-11-16 09:47:30 +05:30
Anand Baburajan
6e0362dee8
chore: change read only condition of asset quantity field (#38111) 
chore: change read only condition of asset quantity
 2023-11-15 17:58:37 +05:30
Gursheen Anand
2499675ad1 fix: test total unallocated amount in payment 2023-11-15 13:32:23 +05:30
Arjun
908b21f7fd
fix: duplicate field in Closing Stock Balance (#38105) 2023-11-15 12:34:38 +05:30
Anand Baburajan
e93a19ffb5
chore: refetch item images on transaction save (#38095) 
chore: re fetch item images on transaction save
 2023-11-14 19:38:15 +05:30
rohitwaghchaure
3e77c0b564
fix: valuation rate for the subcontracting receipt supplied items with Serial and Batch Bundle (#38094) 
fix: valuation rate for the subcontracting receipt supplied items with batch
 2023-11-14 19:27:41 +05:30
rohitwaghchaure
e769e750ec
fix: Not able to save subcontracting receipt (#38085) 2023-11-14 15:08:37 +05:30
ruthra kumar
c31ee8ea33 refactor: use 'boolean' parameter while fetching FY year 2023-11-14 07:25:10 +05:30
Anand Baburajan
8e010ef063
Merge pull request #38077 from anandbaburajan/trans_delete_att_comm 
chore: delete comments and unlink attachments on company transactions deletion
 2023-11-13 18:55:44 +05:30
Gursheen Anand
09f9764bbd test: payment against partial return invoices 2023-11-13 18:11:00 +05:30
Gursheen Anand
a59c942cd4 fix: reset dr_or_cr for every reference 2023-11-13 18:09:49 +05:30
anandbaburajan
b097bb20d9 fix: unrelated transation date typo 2023-11-13 18:09:09 +05:30
anandbaburajan
2f9e96e324 chore: delete comments and unlink attachments on company transactions deletion 2023-11-13 18:03:33 +05:30
Dany Robert
56b8d1b927
fix: remove ESS role when not mapped to employee (#37867) 
* fix: remove ESS role when not mapped to employee

* fix: emp role removal on unlinking

* fix: test case for user employee role mapping

* fix: mapped employee and user on creation
 2023-11-13 17:00:02 +05:30
Gursheen Anand
5b446d4575 fix: handle partial return against invoices 2023-11-13 15:05:34 +05:30
mergify[bot]
9ae5c979e8
fix: Identical items are added line by line instead of grouped together in POS (#37986) 
fix: Identical items are added line by line instead of grouped together in POS (#37986)

fix: Identical items are added line by line instead of grouped together in POS (#37986)
(cherry picked from commit 011cf3d73e2f4dd98c4b33c502ca34665e067c57)

Co-authored-by: bVisible <info@bvisible.ch>
 2023-11-13 14:43:46 +05:30
David Arnold
ea7565889f
feat(customer): add button to quick-create sales order and quotation (#37320) 
* feat(customer): add button to quick-create sales order and quotation

* fix: create buttons in customer

* refactor: don't repeat yourself

---------

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
 2023-11-13 14:19:22 +05:30
rohitwaghchaure
4a111f7362
fix: indentation issue in the Production Plan Summary report (#38019) 
fix: Production Plan Summary report
 2023-11-13 13:26:55 +05:30
ruthra kumar
ffd171a26b
Merge pull request #38064 from ruthra-kumar/revaluation_checkbox_for_ar_summary 
refactor: add revaluation journal checkbox in AR/AP summary reports
 2023-11-13 12:07:33 +05:30
ruthra kumar
95edd82638 refactor: add revaluation journal checkbox in AR/AP summary reports 2023-11-13 11:56:43 +05:30
Raffael Meyer
e07c3aad6b
Merge pull request #38063 from barredterra/remove-create-contact 2023-11-13 06:25:30 +01:00
ruthra kumar
a393a6b76c refactor: raise exception on invalid date 2023-11-13 10:39:40 +05:30
barredterra
d380bf8179 feat: remove unused method create_contact 2023-11-12 20:04:38 +01:00
Raffael Meyer
8062d2be3b
Merge pull request #38060 from barredterra/refactor-fullname-parsing 
refactor: parse full name
 2023-11-12 16:16:15 +01:00
barredterra
d17e37c581 test: parse full name 2023-11-12 14:51:40 +01:00
barredterra
6f432b8e45 refactor: parse full name 2023-11-12 14:48:18 +01:00
Arjun
94faa44697
fix: close Credit Limit Crossed dialog (#38052) 2023-11-12 18:02:13 +05:30
David Arnold
9fde782403
fix(customer): contact creation for companies (#38055) 2023-11-12 17:51:18 +05:30
ViralKansodiya
ecc305dd59
fix: add customer name and supplier name columns (#37557) 
fix: add customer name and supplier name columns
 2023-11-12 17:48:37 +05:30
Niraj Gautam
6f6d5cb4cf
fix(POS): 100 % Discount on Point of Sales (#37411) 
fix: Allow 100% discount in POS
 2023-11-12 11:52:35 +05:30
Deepesh Garg
8634abc021
fix: COA Importer app related issues (#37238) 
* fix: COA Importer app related issues

* fix: Clear all account links fields befor import

* fix: Attribute error
 2023-11-12 11:42:26 +05:30
David Arnold
a74e1f1600
fix(crm): ensure primary address and contact follows customer setting (#37710) 
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-11-11 20:20:21 +05:30
hyaray
59438ee8d4
chore: Add missing translations (#38043) 
chore: Add missing translations
 2023-11-11 19:38:24 +05:30
David Arnold
4ed9927a30
fix(patch): to migrate properly in post section (#38045) 2023-11-11 19:37:23 +05:30
David Arnold
ae508144cd
fix(customer): quick form and integration fixes (#37386) 2023-11-11 19:35:07 +05:30
ruthra kumar
a52a1b49af refactor: update traceback on retry 2023-11-11 05:20:27 +05:30