Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,761 Commits 3 Branches 0 Tags 1 GiB
122f1c0ced
Commit Graph

42761 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nabin Hait
909945c0ac fix: map old data as per new options of no-of-employees 2022-08-09 20:47:18 +05:30
ruthra kumar
bb40e38451 fix: limit pos recent order page result 2022-08-09 19:35:43 +05:30
Nabin Hait
7ecd67605f fix: limited options for no-of-employees in crm 2022-08-09 19:06:57 +05:30
Ankush Menat
08d7c48dc7
refactor: use browser native lazy loading (#31814) 2022-08-09 18:49:14 +05:30
Akash Krishna
32b30bc5de
Tds report (#31801) 
* fix: TDS Computation Summary Report not loading, too many values to unpack
 2022-08-09 17:41:02 +05:30
Sagar Vora
a2252c9236
ci: ensure unique group ID to prevent workflows from getting cancelled (#31806) 
ci: ensure unique group ID to prevent workflows from cancelling
 2022-08-09 17:19:48 +05:30
rohitwaghchaure
e93a1cc02e
Merge pull request #31804 from rohitwaghchaure/fixed-incorret-incoming-rate-for-internal-suppliier 
fix: incorrect incoming rate set for inter transfer purchase receipt
 2022-08-09 16:00:31 +05:30
Raffael Meyer
6b510546ae
fix: german translations (#31732) 2022-08-09 15:11:52 +05:30
Rohit Waghchaure
ddd24ea8c8 fix: incorrect incoming rate set for inter transfer purchase receipt 2022-08-09 14:50:20 +05:30
Abhinav Raut
534d7ce64b fix: term loan interest calculation 2022-08-08 17:35:31 +05:30
Deepesh Garg
5c4cc5ae5b
Merge pull request #31779 from ruthra-kumar/bug_add_accouting_dimension_in_asset_repair 
Bug add accouting dimension in asset repair
 2022-08-08 16:39:21 +05:30
Abhinav Raut
9ef8d5c5c3 fix: process loan interest accrual 2022-08-08 16:29:13 +05:30
Deepesh Garg
b85dbdc3c1
Merge pull request #31777 from ruthra-kumar/intercompany_po_bug 
fix: intercompany SO created from Purchase Order throws exception
 2022-08-08 16:06:09 +05:30
Deepesh Garg
e5a68b2dcb
Merge pull request #31733 from resilient-tech/fix-party-details 
fix: set `billing_address` for purchases in `get_party_details`
 2022-08-08 13:00:02 +05:30
Sagar Vora
d05082987f fix: set company_address for purchases in party.js 2022-08-08 06:04:10 +00:00
Sagar Vora
a3625b3817 fix: set billing_address for purchases in get_party_details 2022-08-08 06:04:10 +00:00
Deepesh Garg
03002f7431
Merge pull request #31780 from abhinavxd/fix-loan-pending-principal 
Fix: Loan pending principal amount
 2022-08-05 16:04:30 +05:30
ruthra kumar
80f508c4b1 chore: patch for creating existing dimensions in asset repair 2022-08-05 15:22:38 +05:30
Abhinav Raut
a272d73dd9 fix: pending principal- amount 2022-08-04 19:04:34 +05:30
ruthra kumar
452584c4bd fix: add asset repair to accounting dimension list 2022-08-04 14:09:26 +05:30
ruthra kumar
c95b986414
Merge pull request #31737 from ruthra-kumar/fix_invoice_outstanding_in_reconciliation_tool 
fix: incorrect invoice outstanding in reconciliation tool
 2022-08-04 14:07:15 +05:30
ruthra kumar
af0a353b79 fix: intercompany SO throws exception 2022-08-04 14:01:23 +05:30
ruthra kumar
ef312b8fc4 test: posting_date should not affect outstanding amount calculation 2022-08-04 09:38:01 +05:30
ruthra kumar
5f1562c5b2 fix: posting_date of linked vouchers should not affect outstanding 
posting_date filter should not be applied for linked vouchers.
 2022-08-04 09:38:01 +05:30
Ankush Menat
17b9bfd249
fix(ecommerce): remove query to non-existing field (#31771) 2022-08-03 16:48:27 +05:30
HarryPaulo
ea88451875
fix: getting error to show sales invoice group or print rep… (#31756) 
fix: formatter getting error to show sales invoice group or print report.

1 - When I view the Gross Profit report in Sales Invoice mode, the table is all broken.
Error on browser console:
TypeError: Cannot read properties of undefined (reading 'indent')

2 - When I try to print, no matter the Group (Sales Invoice, Item Code, Item Group...) nothing happens. in browser log console I have the following error:
TypeError: Cannot read properties of undefined (reading 'content')

i fixed both errors and all working perfectly.
 2022-08-03 11:21:30 +05:30
Devin Slauenwhite
9c580dde39
fix: linter (#31763) 2022-08-03 11:16:59 +05:30
Sagar Vora
9baa222976
fix: specify allowed doctype in queries (#31761) 2022-08-03 11:12:30 +05:30
Ankush Menat
0ef9c03f05 chore: CODEOWNERS 
[skip ci]
 2022-08-02 16:13:51 +05:30
rohitwaghchaure
590e91bb80
Merge pull request #31750 from rohitwaghchaure/minor-fix-change-link 
fix: minor URL link
 2022-08-01 14:31:09 +05:30
Rohit Waghchaure
0e7c4314b4 fix: minor changed link 2022-08-01 14:03:12 +05:30
Marica
1a2ffc7c6e
Merge pull request #31601 from pps190/pref-wh-wise-stock-value 
perf: reduce db calls for warehouse wise stock value chart
 2022-07-27 17:47:43 +05:30
HENRY Florian
cc1f837685
fix: update fr translations (#31687) 
* fix: update fr translations

* fix: update fr translation

* fix: update fr translation

* chore: Replace apostrophe encoding by symbol

Co-authored-by: marination <maricadsouza221197@gmail.com>
 2022-07-27 17:21:01 +05:30
Nabin Hait
67fefa37ce
Merge pull request #31678 from nabinhait/crm-fixes-5 
fix: mentions in notes, workspace links, no-of-employees field type and report fixes
 2022-07-27 16:50:18 +05:30
Marica
53b6cea610
Merge pull request #31469 from marination/make-image-field-obsolete-in-web-item 
chore: Make `image` field obsolete in Website Item (redundant)
 2022-07-27 15:43:01 +05:30
Marica
4fa58d7931
Merge branch 'develop' into make-image-field-obsolete-in-web-item 2022-07-27 14:53:03 +05:30
Suraj Shetty
273c6ff598
Merge pull request #31690 from phot0n/fix-payments-stuff 2022-07-27 14:37:15 +05:30
Marica
56db91b322
Merge branch 'develop' into make-image-field-obsolete-in-web-item 2022-07-27 14:12:09 +05:30
marination
af38baeb3b fix: Map Item image to Website Item website_image only if published via UI (v13) 
- For v12 Items, `website_image` should be mapped from `Item` to `Website Item`
 2022-07-27 14:09:49 +05:30
phot0n
0048bcb067 chore: fix linter 2022-07-27 12:34:52 +05:30
phot0n
76493e928f ci: update install script and patch workflow to accomodate payments app 2022-07-27 12:21:48 +05:30
Nabin Hait
02dd174bc7
Merge branch 'develop' into crm-fixes-5 2022-07-27 11:56:36 +05:30
Deepesh Garg
1e3918d637
Merge pull request #31286 from SolufyPrivateLimited/solufy_rec_pay_report 
fix: Added total of future amount, Remaining Balance in Payable and Receivable reports
 2022-07-27 08:26:16 +05:30
rohitwaghchaure
cdec6f60de
Merge pull request #31681 from rohitwaghchaure/dont-show-zero-qty-data-in-report 
fix: dont show zero qty available items in stock ageing report
 2022-07-27 00:44:11 +05:30
mergify[bot]
5b7b58322f
fix: hero image not loading in portal homepage (backport #31699) (#31700) 
fix: hero image not loading in portal homepage (#31699)

(cherry picked from commit 8a6432ec3f4bf63c39d1f687f618cec2360ebccf)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-07-26 13:46:03 +05:30
Sagar Vora
c6fbb7b27d Revert "docs: improve README" 
This reverts commit 38e71b0639.
 2022-07-26 13:09:46 +05:30
Sagar Vora
38e71b0639
docs: improve README 2022-07-26 13:08:39 +05:30
Deepesh Garg
98b42ce786
Merge pull request #31676 from ruthra-kumar/fix_tax_withholding_checkbox_on_PI 
fix: enable tax withholding checkbox in PI with supplier_tds
 2022-07-25 12:56:29 +05:30
Marica
d2d651a0c3
Merge branch 'develop' into make-image-field-obsolete-in-web-item 2022-07-25 12:43:08 +05:30
gavin
7b90986eb0
Merge pull request #31454 from gavindsouza/mariadb-client-refactor 
fix: Misc enhancements
 2022-07-25 12:22:42 +05:30