Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,813 Commits 3 Branches 0 Tags 1 GiB
9cbca06f4e
Commit Graph

35813 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Anuja Pawar
fee9a56d4e
Merge branch 'develop' into fix_allocated_amt_in_PE 2021-04-26 11:36:10 +05:30
Anuja P
802518b8ac Merge branch 'fix_allocated_amt_in_PE' of https://github.com/Anuja-pawar/erpnext into fix_allocated_amt_in_PE 2021-04-26 11:34:33 +05:30
Anuja P
f74d8d2e16 fix: suggested changes 2021-04-26 11:31:51 +05:30
Rucha Mahabal
2a1a472371 chore: clean-up 
- set default date filters for last month instead of year

- added abbreviations for columns to use them in the metrics labels
 2021-04-26 11:18:32 +05:30
Shadrak Gurupnor
b9d4719285
fix: circular loop in project task (#25454) 
* fix: circular loop in project task
 2021-04-26 11:14:07 +05:30
Rucha Mahabal
0decc2b66a fix: validate Standard Working Hours 
- use standard working hours in metrics calculation
 2021-04-26 11:00:54 +05:30
Rucha Mahabal
b7a7e1b11a
Merge branch 'develop' into employee-util-report 2021-04-26 10:25:42 +05:30
Rucha Mahabal
9d6520d4a7
Merge pull request #24944 from pateljannat/profitability-report 
feat: Project Profitability Report
 2021-04-26 10:02:36 +05:30
Rucha Mahabal
e939da982e
Merge branch 'develop' into profitability-report 2021-04-26 09:17:12 +05:30
Rucha Mahabal
2a25c7505e fix: report column widths 2021-04-25 20:29:14 +05:30
Walstan Baptista
4a805b5622
chore: frappe.whitelist for doc methods (#25465) 2021-04-24 14:23:08 +05:30
Anuja Pawar
dc215ec08d
Merge branch 'develop' into fix_allocated_amt_in_PE 2021-04-23 22:06:15 +05:30
Rucha Mahabal
e63f3b2f36 fix: standard working hours message and link for HR Settings 2021-04-23 20:33:42 +05:30
Rucha Mahabal
184317d5bd
fix(HR): Permission error while adding weekly holidays (#25450) 2021-04-23 20:03:50 +05:30
Anuja P
dc599e0164 fix: to update Allocated amount after Paid Amount is changed 2021-04-23 19:24:53 +05:30
gavin
1b1c1bcbd0
Merge pull request #25455 from revant/docs-docker-readme 
docs: add docker repo link in README
 2021-04-23 16:31:41 +05:30
gavin
62d2df5815
docs: Add Frappe reference in Containerized Install section 2021-04-23 16:31:13 +05:30
Revant Nandgaonkar
68b514b1f5 docs: add docker repo link in README 2021-04-23 13:06:13 +05:30
Rucha Mahabal
373e248e9f
fix(patch): lab module patch fix (#25447) (#25449) 
* fix(patch): lab module patch fix

* fix: param

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>

Co-authored-by: Anoop <3326959+akurungadam@users.noreply.github.com>
 2021-04-22 22:47:39 +05:30
Anoop
c21ce42559
fix(patch): lab module patch fix (#25447) 
* fix(patch): lab module patch fix

* fix: param

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-04-22 22:44:44 +05:30
Deepesh Garg
eed60bf035 fix: Backward compatibility for GSTR-1 report 2021-04-22 17:11:22 +05:30
pateljannat
84ef7419da fix: sider 2021-04-22 16:31:16 +05:30