35835 Commits

Author SHA1 Message Date
Nabin Hait
ec2ba6bc1f Merge branch 'version-13-pre-release' into version-13 v13.2.1 2021-05-06 19:18:17 +05:30
Nabin Hait
ae18efaa0a bumped to version 13.2.1 2021-05-06 19:38:17 +05:50
Nabin Hait
0e41295c0e perf: Performance enhancement on setup wizard (#25606)
* perf: Performance enhancement on setup wizard

* fix: create departments without updating nsm
2021-05-06 19:14:06 +05:30
Saqib
92cefd5655 feat(pos): ability to retry on pos closing failure (#25604)
* feat(pos): ability to retry on pos closing failure

* fix: sider issues

* fix: sider issues

* fix: mark all queued closing entry as failed

* feat: add headline message
2021-05-06 17:03:16 +05:30
Deepesh Garg
daf6c124a9 fix: Check if payment schedule exists 2021-05-06 16:47:02 +05:30
Deepesh Garg
be66ee9723 fix: Check if payment schedule exits before updating label 2021-05-06 16:46:55 +05:30
Deepesh Garg
a0ed517c85 fix: function call to update payment schedule labels 2021-05-06 16:46:47 +05:30
Nabin Hait
a2fcca85a5 fix: Fixed merge conflict v13.2.0 2021-05-01 14:53:13 +05:30
Nabin Hait
d8cd5a95cb bumped to version 13.2.0 2021-05-01 15:12:44 +05:50
Nabin Hait
3c788f0325 chore: Add release note for v13.2.0 2021-05-01 14:42:30 +05:30
rohitwaghchaure
2e38f1514f fix: stock ledger entry created against draft stock entry (#25539) 2021-05-01 13:53:46 +05:30
Afshan
1fd1e2bb60 fix: fieldname when updating docfield property (#25517) 2021-04-30 18:41:26 +05:30
Afshan
5a4615fd4e fix: allow to cancel loan with cancelled replayment entry (#25508) 2021-04-30 18:40:43 +05:30
Nabin Hait
a19c6a9278 fix: Fetch total stock at company in PO (#25533) 2021-04-30 18:38:49 +05:30
Deepesh Garg
89120695a6 Merge pull request #25529 from deepeshgarg007/psoa_fixes_v13_pre_release
fix: Ageing errors in PSOA
2021-04-30 16:33:26 +05:30
Deepesh Garg
88d40e8dc4 fix: Remove extra space 2021-04-30 15:33:33 +05:30
Deepesh Garg
1deef5229e fix: Linting and translation issues 2021-04-30 15:20:55 +05:30
Deepesh Garg
bd5ee7d725 fix: Use party account currency 2021-04-30 15:20:45 +05:30
Deepesh Garg
9cbca06f4e fix: Updated filters for process statement of accounts 2021-04-30 15:20:31 +05:30
Deepesh Garg
303f6d2d36 Merge branch 'version-13-pre-release' of https://github.com/frappe/erpnext into psoa_fixes_v13_pre_release 2021-04-30 15:17:07 +05:30
Deepesh Garg
178938b2f0 fix: Ageing errors in PSOA 2021-04-30 15:14:24 +05:30
Deepesh Garg
3d9fa2b8de Merge pull request #25528 from Anuja-pawar/fix_allocated_amt_pre_release
fix: update allocated amount after paid amount is changed in PE version13 pre release
2021-04-30 14:42:18 +05:30
Anuja P
435e93bda9 fix: allocated amount change wrt paid amount change 2021-04-30 13:52:48 +05:30
Deepesh Garg
1ec53c1cf2 Merge pull request #25518 from nextchamp-saqib/payment-term-amount-currency-fix-v13
fix: payment amount showing in foreign currency
2021-04-30 11:09:58 +05:30
Saqib Ansari
3e83542360 fix: sider issues 2021-04-29 18:12:47 +05:30
Saqib
2bde1baa38 fix: remove print statement 2021-04-29 18:12:42 +05:30
Saqib Ansari
6dd1c5cf92 refactor: remove extra fields 2021-04-29 18:12:36 +05:30
Saqib Ansari
3a5ecb7587 fix: test 2021-04-29 18:12:32 +05:30
Saqib Ansari
973afeac3c feat: set dynamic labels for payment schedule fields 2021-04-29 18:12:27 +05:30
Saqib Ansari
a91eebf6aa feat: base payment amount in payment schedule 2021-04-29 18:12:23 +05:30
Saqib Ansari
e70d9c925c fix: payment amount showing in foreign currency 2021-04-29 18:12:17 +05:30
Nabin Hait
f085c89994 Merge branch 'version-13-hotfix' into version-13 v13.1.1 2021-04-27 20:08:01 +05:30
Nabin Hait
3e5c6424ed bumped to version 13.1.1 2021-04-27 20:28:01 +05:50
Rucha Mahabal
a86a51f020 fix(HR): Permission error while adding weekly holidays (#25450) 2021-04-27 20:01:49 +05:30
Saqib
7b3dd3585b fix: unexpected keyword argument 'merge_logs' (#25489)
* fix: unexpected keyword arguement 'merge_logs'

* fix: reference error

* fix: test
2021-04-27 20:01:08 +05:30
Nabin Hait
2ddca77243 Merge branch 'develop' into version-13-pre-release 2021-04-26 21:12:07 +05:30
Saqib
b643776c53 feat(e-invoicing): auto calculate distance for e-way bill generations (#25480) 2021-04-26 17:12:20 +05:30
Rucha Mahabal
1608658700 Merge pull request #25209 from NagariaHussain/employee-util-report
feat: Employee Hours Utilization Report
2021-04-26 17:04:35 +05:30
Saqib
34ce4edf29 fix: cannot scan spacebar character in pos (#25479) 2021-04-26 16:38:57 +05:30
Rucha Mahabal
d5ca9474ce fix: add employee name in report data 2021-04-26 16:10:06 +05:30
Rucha Mahabal
926a9aed58 Merge branch 'develop' into employee-util-report 2021-04-26 16:03:39 +05:30
Rucha Mahabal
7a84d76489 fix: tests 2021-04-26 16:03:10 +05:30
Ankush Menat
9178d95cca fix: can not create item variants (#25433)
* fix: item_code assigned to function returning None

* fix: ignore has_variants and attributes in variant

* fix: patch to remove has_variants and attributes

* chore: fix whitespace in translation
2021-04-26 15:37:17 +05:30
Jannat Patel
616f1d3624 fix: issue in project custom status (#25452) 2021-04-26 15:35:49 +05:30
Sagar Vora
71342320ce fix(Italy): multiple fixes in import supplier invoice (#25466)
* fix(Italy): remove incorrect method, use defined variable

* fix: show attach section after save; use db_set
2021-04-26 15:32:28 +05:30
Ankush Menat
c2de4f6b35 chore: update snyk (#25477) 2021-04-26 15:28:17 +05:30
Deepesh Garg
4c8d15b487 fix: Incorrect GL Entry validation (#25474)
* fix: Incorrect GL Entry validation

* fix: Add validation for party accounts

* fix: Scrub labels

* fix: Translation
2021-04-26 15:24:34 +05:30
Deepesh Garg
ab7664e595 Merge pull request #25444 from deepeshgarg007/gstr_backward_compatiability
fix: Backward compatibility for GSTR-1 report
2021-04-26 15:09:55 +05:30
Deepesh Garg
cac3fd3a24 Merge pull request #25460 from Anuja-pawar/fix_allocated_amt_in_PE
fix: to update Allocated amount after Paid Amount is changed in PE
2021-04-26 13:29:17 +05:30
Rucha Mahabal
4716ebea5a feat: Add % Utilization (Billed Only)
- Added billed utilization metric in report summary
2021-04-26 11:40:26 +05:30