CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-17 01:07:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,700 Commits 422 Branches 1,718 Tags
35e9bfca388b3c8f50e5e65d357dd735822bba8b
Commit Graph

42700 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nabin Hait
35e9bfca38 fix: map old data as per new options of no-of-employees 
(cherry picked from commit 909945c0ac)
 2022-08-09 15:18:25 +00:00
Nabin Hait
735a60807a fix: limited options for no-of-employees in crm 
(cherry picked from commit 7ecd67605f)
 2022-08-09 15:18:25 +00:00
mergify[bot]
c3fd802351 refactor: use browser native lazy loading (backport #31814) (#31815) 
refactor: use browser native lazy loading (#31814)

(cherry picked from commit 08d7c48dc7)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-08-09 18:51:27 +05:30
Deepesh Garg
6046f8bc5e Merge pull request #31798 from frappe/mergify/bp/version-14-hotfix/pr-31779 
Bug add accouting dimension in asset repair (backport #31779)
 2022-08-09 17:58:35 +05:30
Sagar Vora
adcd21724b Merge pull request #31793 from frappe/mergify/bp/version-14-hotfix/pr-31733 
fix: set `billing_address` for purchases in `get_party_details` (backport #31733)
 2022-08-08 12:09:43 +00:00
ruthra kumar
04bdff736b chore: patch for creating existing dimensions in asset repair 
(cherry picked from commit 80f508c4b1)
 2022-08-08 11:10:25 +00:00
ruthra kumar
65bb1d8cc2 fix: add asset repair to accounting dimension list 
(cherry picked from commit 452584c4bd)
 2022-08-08 11:10:25 +00:00
Deepesh Garg
ebf766cf62 Merge pull request #31794 from frappe/mergify/bp/version-14-hotfix/pr-31777 
fix: intercompany SO created from Purchase Order throws exception (backport #31777)
 2022-08-08 16:36:46 +05:30
ruthra kumar
1d1f12f949 fix: intercompany SO throws exception 
(cherry picked from commit af0a353b79)
 2022-08-08 10:36:55 +00:00
Sagar Vora
4c82533239 fix: set company_address for purchases in party.js 
(cherry picked from commit d05082987f)
 2022-08-08 07:31:44 +00:00
Sagar Vora
5a28ba8537 fix: set billing_address for purchases in get_party_details 
(cherry picked from commit a3625b3817)
 2022-08-08 07:31:44 +00:00
mergify[bot]
8737c10ce4 fix(ecommerce): remove query to non-existing field (backport #31771) (#31773) 
fix(ecommerce): remove query to non-existing field (#31771)

(cherry picked from commit 17b9bfd249)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-08-03 16:49:16 +05:30
Ankush Menat
2defb89962 ci: fix automated release regex (#31770) 
[skip ci]
 2022-08-03 16:15:32 +05:30
mergify[bot]
53b9d61c46 fix: getting error to show sales invoice group or print rep… (backport #31756) (#31767) 
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.

(cherry picked from commit ea88451875)

Co-authored-by: HarryPaulo <paulo_fabris@hotmail.com>
 2022-08-03 11:22:54 +05:30
mergify[bot]
3092131913 fix: linter (backport #31763) (#31766) 
fix: linter (#31763)

(cherry picked from commit 9c580dde39)

Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com>
 2022-08-03 11:17:44 +05:30
mergify[bot]
6dce122825 fix: specify allowed doctype in queries (backport #31761) (#31764) 
fix: specify allowed doctype in queries (#31761)

(cherry picked from commit 9baa222976)

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2022-08-03 11:16:41 +05:30
Ankush Menat
248cc48842 ci: setup releases for v14 (#31759) 
[skip ci]
 2022-08-02 12:11:36 +05:30
Deepesh Garg
ebd8f2f45b chore: verison bump and change log v14.0.0 2022-08-01 22:29:34 +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 8a6432ec3f)

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
Gavin D'souza
3c26415b6f fix(gd): Scan FY only if current_fiscal_year set 2022-07-25 11:54:49 +05:30
Gavin D'souza
cb73528c9c test: Use assertSequenceEqual for comparision between Tuple / Lists 
Use AssertSequence for type agnostic checks
 2022-07-25 11:54:49 +05:30
Gavin D'souza
b07dd1083a ci: Check for conflicts & valid python in early separate step 2022-07-25 11:54:49 +05:30
ruthra kumar
9439a7fd30 Merge pull request #31576 from ruthra-kumar/return_not_updating_so_billed_percentage 
fix: credite note for returned delivery note updates SO's billed percentage
 2022-07-25 11:24:00 +05:30
phot0n
8004550444 fix: add payments as a required app for erpnext 2022-07-25 10:46:46 +05:30
phot0n
ef14da21bc fix: payment utils import paths 
Since we're splitting payments app from frappe, updating
ERPnext paths as well
 2022-07-25 10:38:09 +05:30
Rohit Waghchaure
5da7e01db2 fix: dont show zero qty available items in stock ageing report 2022-07-22 17:54:46 +05:30
Nabin Hait
29b8715205 fix: mentions in notes, workspace links, no-of-employees field type and report fixes 2022-07-22 15:33:39 +05:30
ruthra kumar
b461724416 fix: enable tax withholding checkbox in PI with supplier_tds 2022-07-22 14:32:14 +05:30
Deepesh Garg
538f5a9964 Merge pull request #31497 from HarryPaulo/develop 
fix: translated message for credit limit blocking
 2022-07-22 14:22:58 +05:30
Deepesh Garg
80b354f1c7 Merge pull request #31656 from ruthra-kumar/use_current_profile_in_pos_return 
fix: use current pos profile on sales return
 2022-07-22 13:10:53 +05:30