Anurag Mishra
|
b864b09d40
|
Merge branch 'develop' into gratuity
|
2021-01-05 14:47:38 +05:30 |
|
Anurag Mishra
|
112b3894cc
|
Merge pull request #24296 from AfshanKhan/fix-add-comp-in-leave-ledger
fix: set company in leave allocation and leave ledger entry
|
2021-01-05 14:45:16 +05:30 |
|
Marica
|
eab1867235
|
Merge branch 'develop' into qi-ux
|
2021-01-05 14:23:05 +05:30 |
|
Anurag Mishra
|
239fe7336e
|
fix: charts not displaying when tree_type changed
fix: charts not displaying when tree_type changed
|
2021-01-05 14:03:03 +05:30 |
|
Saqib
|
60460a6d23
|
fix(e-invoicing): minor calculation fixes (#24282)
|
2021-01-05 13:54:04 +05:30 |
|
Saqib
|
1f591ab02e
|
fix(e-invoicing): minor calculation fixes (#24285)
|
2021-01-05 13:53:51 +05:30 |
|
Afshan
|
f79c4d3560
|
Merge branch 'develop' into fix-add-comp-in-leave-ledger
|
2021-01-05 13:27:15 +05:30 |
|
Jannat Patel
|
16a809483b
|
fix: indentation
|
2021-01-05 12:28:45 +05:30 |
|
marination
|
b8aeb9ea88
|
fix: Indentation and missing semi-colon
- Fix incorrect indentation after merge conflict
- Sider
|
2021-01-05 12:16:25 +05:30 |
|
Rucha Mahabal
|
d643bb7c4b
|
Merge branch 'develop' into allow-discharge
|
2021-01-05 12:07:26 +05:30 |
|
Jannat Patel
|
06a401ffbf
|
fix: incoming rate attribute error (#24287)
Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
|
2021-01-05 11:54:34 +05:30 |
|
Marica
|
41ea77ce31
|
Merge branch 'develop' into putaway
|
2021-01-05 11:24:05 +05:30 |
|
Marica
|
95344f01e6
|
Merge branch 'develop' into qi-ux
|
2021-01-05 10:44:52 +05:30 |
|
Jannat Patel
|
7d0f35c4ab
|
Merge branch 'develop' into partially-submit-drop-ship-items-issue
|
2021-01-05 10:42:30 +05:30 |
|
Rucha Mahabal
|
f97e668130
|
Merge branch 'develop' into allow-discharge
|
2021-01-05 10:38:16 +05:30 |
|
Deepesh Garg
|
bfa71c23ae
|
Merge pull request #23965 from vorasmit/remarks-fix-develop
fix: add remarks to sales invoice
|
2021-01-05 09:54:53 +05:30 |
|
Nabin Hait
|
72fa368e8f
|
Merge branch 'develop' into mr-se-warehouse-validation
|
2021-01-05 09:30:16 +05:30 |
|
Nabin Hait
|
5a8f141eda
|
Merge branch 'develop' into fix-add-comp-in-leave-ledger
|
2021-01-05 09:29:44 +05:30 |
|
Marica
|
099162814c
|
Merge branch 'develop' into qi-ux
|
2021-01-05 09:27:40 +05:30 |
|
Nabin Hait
|
517fd8b9e6
|
fix: Ignore customer and supplier while deleting company transactions (#24279)
* fix: Ignore customer and supplier while deleting company transactions
* fix: Test cases fixed based on Travis
|
2021-01-05 09:23:39 +05:30 |
|
Afshan
|
0da201c6a5
|
fix: set company in leave allocation and leave ledger entry
|
2021-01-04 19:04:05 +05:30 |
|
marination
|
0c883853b3
|
fix: Dont validate warehouse values between MR to Stock Entry
- Remove validation thta checks if warehouse in Stock Entry is the same as MR that it was pulled from
|
2021-01-04 18:48:50 +05:30 |
|
Anupam
|
27fd9e4d7d
|
fix: added empty value in Quality Inspection Reading status
|
2021-01-04 18:18:00 +05:30 |
|
Deepesh Garg
|
797a742cb2
|
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
|
2021-01-04 14:24:00 +05:30 |
|
Deepesh Garg
|
a873ae0d9f
|
fix: Check for custom dimensions
|
2021-01-04 14:23:31 +05:30 |
|
Jannat Patel
|
5f9a219429
|
Merge pull request #4 from frappe/develop
sync fork
|
2021-01-04 12:18:54 +05:30 |
|
Rucha Mahabal
|
7206e12c2f
|
test: Allow Discharge despite Unbilled Services
|
2021-01-04 12:11:00 +05:30 |
|
Rucha Mahabal
|
03b25be9e9
|
feat: Allow Discharge despite Unbilled Healthcare Services
|
2021-01-04 11:16:59 +05:30 |
|
marination
|
7877d5a7c2
|
fix: Create QI Parameters (links) in test cases
|
2021-01-04 11:10:04 +05:30 |
|
Saurabh
|
adb8bbe958
|
Merge branch 'version-13-beta-pre-release' into version-13-beta
|
2021-01-02 19:59:56 +05:30 |
|
Saurabh
|
0feaab5261
|
bumped to version 13.0.0-beta.9
|
2021-01-02 20:19:56 +05:50 |
|
Afshan
|
a245f667d0
|
fix: pos error pop up (#24237)
|
2021-01-02 10:30:22 +05:30 |
|
Deepesh Garg
|
ffca52a348
|
Merge pull request #24254 from nextchamp-saqib/loan-patch-fix
fix: update old loan patch
|
2021-01-01 13:50:52 +05:30 |
|
vorasmit
|
3ef965f253
|
Update patches.txt
|
2021-01-01 10:55:20 +05:30 |
|
vorasmit
|
8c39ab68df
|
Delete update_sales_invoice_remarks.py
|
2021-01-01 10:54:57 +05:30 |
|
rohitwaghchaure
|
2adf8d07b6
|
Merge pull request #24266 from rohitwaghchaure/incorrect-valudation-rate-fg
fix: incorrect valuation rate for finished good
|
2020-12-31 20:53:52 +05:30 |
|
Anurag Mishra
|
b901d4002a
|
Merge pull request #24264 from AfshanKhan/fix-sal-struc-assign-payroll-acc
fix: setting correct account for sal struct assignment if not specified.
|
2020-12-31 18:26:46 +05:30 |
|
Anurag Mishra
|
f5e566a29c
|
Merge pull request #24265 from AfshanKhan/allow-cancel-leave-policy
fix: allow leave policy assignment to be canceled.
|
2020-12-31 18:26:08 +05:30 |
|
Afshan
|
47bc42740b
|
Merge branch 'develop' into fix-sal-struc-assign-payroll-acc
|
2020-12-31 17:41:44 +05:30 |
|
Afshan
|
4edcf813e7
|
Merge branch 'develop' into allow-cancel-leave-policy
|
2020-12-31 17:41:34 +05:30 |
|
Rohit Waghchaure
|
16bce49f18
|
fix: incorrect valuation rate for finished good
|
2020-12-31 17:39:52 +05:30 |
|
Anurag Mishra
|
d7ea2bd705
|
Merge pull request #24177 from AfshanKhan/fix-perm-empl-sal-slip
fix: error popup for submitted doc
|
2020-12-31 17:07:30 +05:30 |
|
Afshan
|
e69148c266
|
fix: allow leave policy assignment to be cancelled.
|
2020-12-31 16:45:00 +05:30 |
|
Afshan
|
8b60fe6125
|
fix: setting correct account for sal struct assignment if not specified.
|
2020-12-31 16:10:39 +05:30 |
|
Saqib
|
f8f015c961
|
fix: cannot submit e-invoice if legal name not found
|
2020-12-31 13:28:08 +05:30 |
|
Saqib
|
2b67d57480
|
fix: cannot submit e-invoice if legal name not found
|
2020-12-31 13:26:05 +05:30 |
|
Saqib Ansari
|
d5d571ab9d
|
fix: update old loan patch
|
2020-12-31 12:55:35 +05:30 |
|
Saurabh
|
5049d83a0c
|
Merge branch 'version-13-beta-pre-release' into version-13-beta
|
2020-12-31 11:52:59 +05:30 |
|
Saurabh
|
08b89d1ce0
|
bumped to version 13.0.0-beta.8
|
2020-12-31 12:12:58 +05:50 |
|
Saqib
|
fc7a11e2aa
|
fix (e-invoicing): item & invoice value calculation (#24253)
|
2020-12-31 11:35:46 +05:30 |
|