Anupam Kumar
|
88c9fe35bd
|
fix: employee remider settings (#27365)
|
2021-09-07 00:15:58 +05:30 |
|
Ahmad
|
87380d021d
|
feat(regional): QR Code generation for Saudi Arabia Sales Invoices
|
2021-09-06 23:36:55 +05:00 |
|
Ahmad
|
b42d63e526
|
Merge remote-tracking branch 'refs/remotes/havenir/ksa-vat' into ksa-vat
|
2021-09-06 23:26:52 +05:00 |
|
Ahmad
|
cb0c2d1477
|
feat(Regional): KSA VAT Report
|
2021-09-06 23:25:20 +05:00 |
|
ChillarAnand
|
c8565c7090
|
chore: Removed healthcare module code in other modules
|
2021-09-06 20:47:27 +05:30 |
|
Anupam Kumar
|
b0d970001a
|
feat: multi-currency in Opportunity (#26590)
* feat: multi-currency
* refactor: lead form
* fix: test case for opportunity item
* fix: removing local changes
* fix: test cases
* fix: test cases
* fix: review changes
* fix: reverting lead.json chnages
* fix: toggle display for currency fields
* review changes
* fix: test case
* fix: linter issues
* fix: unused import
* feat: grand total in opportunity
* fix: patch
* fix: sort imports
* fix: reload opportunity item doctype
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
|
2021-09-06 16:54:28 +05:30 |
|
Florian HENRY
|
aa7ee3ca03
|
fix: link in dashboard missing on SI from DN
|
2021-09-06 11:40:44 +02:00 |
|
Ankush Menat
|
14b01619de
|
fix: patch failure for vat audit report (#27355)
|
2021-09-06 13:47:56 +05:30 |
|
Marica
|
0f2a52078c
|
fix: Dont fetch Stopped/Cancelled MRs in Stock Entry Get Items dialog (#27326)
|
2021-09-06 13:14:09 +05:30 |
|
Deepesh Garg
|
25d208aa8a
|
fix: GL Entries on advance TDS allocation
|
2021-09-06 10:37:41 +05:30 |
|
Dany Robert
|
f46022993c
|
Merge branch 'develop' into currency-exchange-settings
|
2021-09-05 19:50:19 +05:30 |
|
Deepesh Garg
|
51d9572fe7
|
fix: Hardcode fiscal year and posting date
|
2021-09-05 17:56:12 +05:30 |
|
Deepesh Garg
|
ceaa804f04
|
fix: Presentation currency conversion in reports (#27316)
|
2021-09-05 17:21:29 +05:30 |
|
Dany Robert
|
c8d313b992
|
Merge branch 'develop' into currency-exchange-settings
|
2021-09-04 17:57:05 +05:30 |
|
rtdany10
|
06340ad08a
|
feat: button to restore default settings
|
2021-09-04 17:53:51 +05:30 |
|
rtdany10
|
227466c365
|
chore: clean up layout and code
|
2021-09-04 14:04:56 +05:30 |
|
rohitwaghchaure
|
7b4a65484a
|
fix: manually added weight per unit reset to zero after save (#27330)
|
2021-09-03 22:00:14 +05:30 |
|
Ankush Menat
|
73b3a2f685
|
chore: whitespace
|
2021-09-03 21:57:38 +05:30 |
|
Deepesh Garg
|
092d41ecda
|
fix: Debug CI
|
2021-09-03 20:04:18 +05:30 |
|
rtdany10
|
a86d9c91d0
|
chore: code clean up
|
2021-09-03 19:21:06 +05:30 |
|
Deepesh Garg
|
41392acd18
|
Merge branch 'develop' of https://github.com/frappe/erpnext into tds_validity
|
2021-09-03 19:19:35 +05:30 |
|
Dany Robert
|
d56c8d44a6
|
Merge branch 'develop' into currency-exchange-settings
|
2021-09-03 18:47:12 +05:30 |
|
rtdany10
|
d8b8032de1
|
feat: init CES default values
|
2021-09-03 15:50:05 +05:30 |
|
rtdany10
|
e093863c9e
|
feat: fetch api details from settings
|
2021-09-03 15:03:47 +05:30 |
|
Deepesh Garg
|
8f5a77446e
|
Merge pull request #27279 from deepeshgarg007/gstr_1_cdnr_unregistered_json_develop
feat: CDNR Unreg json generation
|
2021-09-03 13:55:00 +05:30 |
|
Deepesh Garg
|
a06a70d1a4
|
fix: Patch error and tests
|
2021-09-03 13:13:37 +05:30 |
|
Deepesh Garg
|
79d250845e
|
fix: Patch
|
2021-09-03 13:13:37 +05:30 |
|
Deepesh Garg
|
2b34028acd
|
fix: Patch and linting errors
|
2021-09-03 13:13:37 +05:30 |
|
Ganga Manoj
|
64fcd1a092
|
fix: make datetime objects readable (#27301)
* fix: Make datetime objects readable
* fix: Remove unused imports
|
2021-09-03 12:54:47 +05:30 |
|
Subin Tom
|
798b464ee3
|
fix: braintree payment processed twice (#27300)
|
2021-09-03 12:30:57 +05:30 |
|
Saqib
|
98696c0ec9
|
Merge pull request #27306 from GangaManoj/fix-selling-settings
fix: Move related fields together in Selling Settings
|
2021-09-03 12:30:02 +05:30 |
|
Ankush Menat
|
d1fe060e4a
|
fix: south africa vat patch failure (#27323)
reload doc is necessary on new doctypes
|
2021-09-03 12:02:32 +05:30 |
|
Shariq Ansari
|
e68c55ce83
|
fix: Removing first Spacer from home page (#27321)
|
2021-09-03 11:00:33 +05:30 |
|
ChillarAnand
|
66e92d423e
|
chore: Added healthcare deprecation warning patch
|
2021-09-02 20:02:11 +05:30 |
|
rtdany10
|
ff19113677
|
feat: currency exchange settings
|
2021-09-02 19:52:12 +05:30 |
|
ChillarAnand
|
e913e277d9
|
chore: Rename imports from erpnext to healthcare
|
2021-09-02 19:47:39 +05:30 |
|
GangaManoj
|
ebdc568e85
|
fix: Rename 'Action if Same Rate is Not Maintained' to 'Action if Same Rate is Not Maintained Throughout Sales Cycle'
|
2021-09-02 19:32:51 +05:30 |
|
Deepesh Garg
|
e1fffdb262
|
fix: Linting issues
|
2021-09-02 19:10:49 +05:30 |
|
Deepesh Garg
|
c85242e03d
|
Merge branch 'develop' of https://github.com/frappe/erpnext into gstr_1_cdnr_unregistered_json_develop
|
2021-09-02 18:59:59 +05:30 |
|
Deepesh Garg
|
e8a5dc371b
|
fix: Add payment entry custom fields
|
2021-09-02 18:56:04 +05:30 |
|
ChillarAnand
|
5d4133ecac
|
chore: Removed healthcare demo, patch files
|
2021-09-02 18:25:36 +05:30 |
|
ChillarAnand
|
bcb3f0fedb
|
chore: Removed healthcare module
|
2021-09-02 18:14:34 +05:30 |
|
Ankush Menat
|
eec40513be
|
fix: minor linting issues (#27314)
* fix: syntax error in gratuity
* fix: unpacking None into three variables
* fix: unexpected kwarg for delete_accounting_dimensions
|
2021-09-02 17:42:45 +05:30 |
|
Ankush Menat
|
60185c8c71
|
chore: linting
[skip ci]
|
2021-09-02 17:36:05 +05:30 |
|
Ankush Menat
|
8b1a61be29
|
chore: ignore import cleanup commit in blame
|
2021-09-02 16:46:25 +05:30 |
|
Chillar Anand
|
915b34391c
|
chore: Clean up imports (#27302)
* chore: Added isort to pre-commit config
* chore: Sort imports with isort
* chore: Clean up imports with pycln
* chore: Sort imports with isort
* chore: Fix import issues
* chore: Clean up sider issues
* chore: Remove import errors from flake8 ignore list
* chore: Clean up lint issues
|
2021-09-02 16:44:59 +05:30 |
|
Ankush Menat
|
b25d28e023
|
fix(patch): delete stale shopify doctypes (#27313)
|
2021-09-02 14:53:06 +05:30 |
|
Saqib
|
366012817f
|
Merge branch 'develop' into fix-selling-settings
|
2021-09-02 11:13:52 +05:30 |
|
Saqib
|
a158b825fc
|
Merge pull request #27124 from GangaManoj/gross-profit-product-bundle
feat: Improve Product Bundle handling
|
2021-09-02 11:12:56 +05:30 |
|
Devin Slauenwhite
|
43c476ddf7
|
fix: (Backport-develop) track salary slip ytd gross salary. (#27242)
* fix: track salary slip ytd gross salary.
* fix: ytd gross salary unique label
* Revert "fix: ytd gross salary unique label"
This reverts commit a68b387ac21e32c250d042caf75ef301b5a49a1a.
* fix: gross ytd salary unique label
|
2021-09-02 09:39:35 +05:30 |
|