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

43196 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 38e71b06390652acb6412a8059290ec6feee113c.
 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
Rucha Mahabal
7b0e5661c6
fix(patch): ignore links while deleting hr payroll doctypes (#31674) 2022-07-22 12:46:59 +05:30
Marica
6883fc95ae
Merge pull request #31579 from pps190/fix-pl-customer-name 
fix: display customer name on picking list
 2022-07-21 18:38:08 +05:30
billy995
8629d01dd5
Update de.csv (#31596) 
IN,IM to IN,EIN

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2022-07-21 14:49:11 +05:30
HENRY Florian
3ba0d6cc5c
fix: update fr translations (#31526) 
* fix: update fr translations

* fix: update fr translations

* fix: update fr translations

* fix: update fr translations

* chore: Update french translation

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2022-07-21 14:48:42 +05:30
mergify[bot]
89f516c32b
fix: assign duplicate_items_msg outside conditional (backport #31639) (#31650) 
fix: assign duplicate_items_msg outside conditional (#31639)

duplicate_items_msg was defined inside if the statement  of stock_item so when duplicate was found in non_stock_item it raised referenced before assignment

(cherry picked from commit 8e23c6ad69dee213f0252d2b231317490fab760f)

Co-authored-by: Maharshi Patel <39730881+maharshivpatel@users.noreply.github.com>
 2022-07-21 13:57:03 +05:30
Marc de Lima Lucio
048c037842
FIX: quality inspection quick creation from purchase receipt: pre-fill sample size if available (#31544) 
FIX: quality inspection quick creation from transaction documents: pre-fill sample size if available

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2022-07-21 13:46:59 +05:30
Sagar Vora
bf2833b8ee
fix: ensure defaults removed in bad frappe patch get set again (#31659) 2022-07-21 13:32:03 +05:30
ruthra kumar
243f66fcd3 test: SO percentage billed when cr_note made against delivery return 2022-07-21 13:05:34 +05:30
ruthra kumar
04c1019242 fix: update SO's percentage billed on credit note 
Credit Note created from Sales Return will update precentage billed in
Sales Order accordingly
 2022-07-21 13:05:34 +05:30
Marco Fonseca
d30f8387d9
fix: correct Brazilian portuguese translations (#31498) 
* fix brazilian portuguese translations

* minor adjustments

* fix minor adjustments

* fix: remove legacy pt_br.csv

* chore: Fix translation quotation marks

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2022-07-21 12:59:04 +05:30
ruthra kumar
739d328412
Merge pull request #31537 from ruthra-kumar/add_index_to_payment_ledger 
refactor: create index for payment ledger
 2022-07-21 12:50:39 +05:30
Saqib Ansari
d578afab55
fix: rounding errors while closing pos (#31654) 2022-07-21 12:18:28 +05:30
Saqib Ansari
2eaa8b17bd
fix(pos): validate product bundles while submitting pos invoice (#31615) 2022-07-21 12:17:58 +05:30
ruthra kumar
5b85af5f1a fix: use current pos profile on sales return 2022-07-21 12:16:16 +05:30
rohitwaghchaure
5a3999e236
Merge pull request #31424 from rohitwaghchaure/feat-inventory-dimension 
feat: Inventory Dimension
 2022-07-20 19:47:14 +05:30
Deepesh Garg
6d61525ae4
Merge pull request #31648 from deepeshgarg007/dimension-patch-fix 
fix: Patch to make accounting dimension in orders
 2022-07-20 19:02:00 +05:30
Deepesh Garg
cad2035e07 chore: do not re run patch 2022-07-20 19:01:14 +05:30
Deepesh Garg
d46e406db7 fix: Patch to make accounting dimension in orders 2022-07-20 18:59:36 +05:30
Rucha Mahabal
8b67d627d8
fix(patch): Remove missed records for HR & Payroll separation (#31646) 
* fix(patch): delete HR Payroll custom fields from core

* fix: delete HR Payroll dashboard chart, number card, web forms
 2022-07-20 18:56:37 +05:30
Rucha Mahabal
2b0b53f587
Merge pull request #31467 from ruchamahabal/hr-separation 2022-07-20 16:54:44 +05:30
Rohit Waghchaure
289e6cd4ce fix: change frappe.db.sql to frappe.qb 2022-07-20 16:02:13 +05:30
Rohit Waghchaure
e576f7f07e test: test cases for inventory dimension 2022-07-20 16:02:13 +05:30
Rohit Waghchaure
dbec5cff00 feat: Inventory Dimension 2022-07-20 16:02:13 +05:30
Rucha Mahabal
f222284c33
Merge branch 'develop' into hr-separation 2022-07-20 15:47:40 +05:30
Nabin Hait
409c2e98a9
Merge pull request #31628 from nabinhait/pcv-perf-enhancements-dev 
perf: Optimization of gl entry processing logic in period closing voucher
 2022-07-20 15:38:34 +05:30