CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-14 15:57:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,082 Commits 416 Branches 1,717 Tags
9fc78e44ea926da28bbacbaf5d48c2a4b57c5ae9
Commit Graph

30082 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rohitwaghchaure
9fc78e44ea Merge pull request #21402 from DeeMysterio/hotfix-si-actual-qty 
feat(accounting): show actual qty for warehouse in sales invoice
 2020-04-25 01:19:04 +05:30
Diksha Jadhav
be97087d32 feat(accounting): show actual qty for warehouse in sales invoice 2020-04-24 21:09:59 +05:30
Rucha Mahabal
b0f829e541 Merge pull request #21381 from anupamvs/email-camp-end-date-hotfix 
fix: set end_date in Email Campaign
 2020-04-24 20:44:18 +05:30
Rucha Mahabal
0455a96dcd Merge branch 'version-12-hotfix' into email-camp-end-date-hotfix 2020-04-24 20:04:55 +05:30
Deepesh Garg
d771ba2895 Merge pull request #21398 from nextchamp-saqib/tax-breakup-for-cn-v12 
fix: show positive taxes in credit notes
 2020-04-24 19:01:46 +05:30
rohitwaghchaure
c8e5b42dba Merge pull request #21395 from nextchamp-saqib/price-rule-fix 
fix: rate gets overwritten when pricing rule is set
 2020-04-24 16:46:47 +05:30
Saqib Ansari
424dbef139 fix: rate gets overwritten when pricing rule is set 2020-04-24 16:40:03 +05:30
Saqib Ansari
6256ca81b1 fix: show positive taxes in credit notes 2020-04-24 16:01:11 +05:30
Rucha Mahabal
2307385210 Merge branch 'version-12-hotfix' into email-camp-end-date-hotfix 2020-04-23 19:42:04 +05:30
Deepesh Garg
bd4b5da11b feat: Payment allocation based on payment terms (#20946) 
* feat: Payment allocation based on payment terms

* fix: Add desccription for checkbox

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-23 16:09:08 +05:30
Anupam K
ef7f9c6ecc Review changes 2020-04-23 13:45:19 +05:30
Anupam K
097c643a59 setting end date in email campaign 2020-04-23 12:29:00 +05:30
Deepesh Garg
dd560d676e fix: Budget against accounting dimensions (#21269) 
* fix: Budget warning against custom accounting dimension

* fix: Codacy
 2020-04-23 10:35:35 +05:30
rohitwaghchaure
794fd75ca1 fix: bom update cost is not working (#21348) 
* fix: bom update cost is not working

* added test case for bom cost
 2020-04-23 09:48:31 +05:30
rohitwaghchaure
f49e66e721 fix: BOM stock report (#21377) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-23 09:45:26 +05:30
rohitwaghchaure
8fd1e08763 fix: incorrect out value in stock balance due to precision issue (#21378) 2020-04-23 09:44:54 +05:30
rohitwaghchaure
f2c43ca81e fix: patch and validation message to fix target warehouse issue (#21359) 2020-04-22 16:08:36 +05:30
Deepesh Garg
9d6ee99d99 Merge pull request #21368 from scmmishra/cal-report-12 
fix: specify column width
 2020-04-22 12:03:35 +05:30
Shivam Mishra
0578cf5a73 fix: specify column width 2020-04-22 11:53:18 +05:30
Michelle Alva
499f9198b9 fix: better error message due date (#21366) 2020-04-22 11:37:09 +05:30
Deepesh Garg
4daab871d5 Merge pull request #21354 from anupamvs/error-message-changes-hotfix 
fix: Add better error message
 2020-04-22 09:28:16 +05:30
Deepesh Garg
17585710b2 Merge pull request #21360 from rohitwaghchaure/fixed-unsupported-operand-type-issue 
fix: unsupported operand type issue in pricing rule
 2020-04-22 08:43:29 +05:30
Rohit Waghchaure
56e7887511 fix: unsupported operand type issue in pricing rule 2020-04-22 02:45:55 +05:30
Anupam K
08c782709a Better error message 2020-04-21 17:03:56 +05:30
Anupam Kumar
fb20982194 fix: on item change UOM not updated (#21254) 
* fix: on item change UOM not updated

* removing uom from js
 2020-04-21 12:57:08 +05:30
Marica
9453add3dd fix: Re-order Item Error Email format (#21343) 
* fix: Re-order Item Error Email format

* fix: Translated strings
 2020-04-21 12:53:17 +05:30
rohitwaghchaure
c62cf98d7e fix: scrap items order not showing correctly in stock entry (#21347) 2020-04-21 11:26:49 +05:30
rohitwaghchaure
ea8e302833 Merge pull request #21339 from scmmishra/issue-list-context-12 
fix: filters as dictionary
 2020-04-21 01:25:34 +05:30
rohitwaghchaure
5d3fd9dc43 Merge pull request #21344 from rohitwaghchaure/fixed_free_item_qty_hotfix 
fix: free item quantity issue
 2020-04-21 01:08:13 +05:30
rohitwaghchaure
c9ba147615 Merge pull request #21323 from marination/pick-list-enhance-hotfix 
Pick list enhance hotfix
 2020-04-21 01:07:50 +05:30
Rohit Waghchaure
7ef57533ec fix: free item quantity issue 2020-04-21 00:19:19 +05:30
gavin
712abe4cd2 Merge pull request #21338 from gavindsouza/tally-migration-fixes-v12 
fix: Tally migration
 2020-04-20 19:30:40 +05:30
Shivam Mishra
1a93977ef7 fix: filters as dictionary 2020-04-20 13:56:20 +05:30
Gavin D'souza
fc078c1d45 style: removed unused imports and updated formatting 2020-04-20 12:57:59 +05:30
Gavin D'souza
77532b96b8 fix: strip data fields of whitespaces 2020-04-20 12:57:48 +05:30
Gavin D'souza
4171c5ceeb fix(tally-migration): DocType improvement 2020-04-20 12:57:36 +05:30
Gavin D'souza
fa07e0fb9d fix: handle errors in enqueued methods and update status 2020-04-20 12:57:24 +05:30
Raffael Meyer
e80702b6c2 fix(regional): backport DATEV fix (#21281) 
* fix: quote nonnumeric values

* fix(DATEV Settings): restrict max length of IDs

* fix: display Columns as Dynamic Link instead of as Data

* fix: add column "Belegfeld 1"

* fix: truncate column Buchungstext to 60 chars

* fix: make header compatible to current DATEV Format 7.00

* fix: column names and descriptions
 2020-04-19 20:16:18 +05:30
Nabin Hait
5817adbb64 fix: Valid warehouse in woocommerce syncing and other small fixes (#21332) 
* fix: Valid warehouse in woocommerce syncing

* fix: dmall fixes in gross & net profit report

* fix: company is required for getting party details

* fix: None issue while getting raw material rate based on last purchase rate
 2020-04-19 19:28:32 +05:30
Anoop
4de4cb055f fix: removed reference to method not in version-12 (#21335) 
removed scheduler event incorrectly added in this version.

as reported on discuss -
https://discuss.erpnext.com/t/internal-server-error-and-healthcare-module-missing/60479/6?u=akurungadam
 2020-04-19 19:26:31 +05:30
Deepesh Garg
19c841eb64 fix: Total amount field ordering in transactions (#21315) 2020-04-18 22:14:14 +05:30
Deepesh Garg
5f10e0ac26 Merge pull request #21329 from rohitwaghchaure/fixed-account-name-in-gl_print-hotfix 
fix: account name not showing in the gl print
 2020-04-18 20:41:03 +05:30
Rohit Waghchaure
64bb910015 fix: account name not showing in the gl print 2020-04-18 19:04:20 +05:30
marination
6b7848232c fix: Use reload_doc in patch 2020-04-17 21:49:25 +05:30
marination
b9df3793fb fix: Commonified code and added server side validation 2020-04-17 21:47:58 +05:30
marination
09f95858c0 fix: Added patch to patches.txt 2020-04-17 21:47:41 +05:30
marination
fcd7548220 fix: Pick List Enhancements 2020-04-17 21:45:58 +05:30
Deepesh Garg
b882d7046b Merge pull request #21321 from Mangesh-Khairnar/gl-entry-label-fix 
fix: add label to gl entry
 2020-04-17 19:59:19 +05:30
Mangesh-Khairnar
b33f82d4e8 fix: add label to gl entry 2020-04-17 19:55:20 +05:30
rohitwaghchaure
cfb00fb887 Merge pull request #21314 from sahil28297/fix_italy_einvoicing_v12_hotfix 
fix(patch): reload 'Import Supplier Invoice' doc
 2020-04-17 13:29:12 +05:30