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

35961 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
0b9aa58b81 Merge branch 'develop' of https://github.com/frappe/erpnext into psoa_fixes 2021-04-26 14:51:20 +05:30
Deepesh Garg
968ec110f3 fix: Linting and translation issues 2021-04-26 14:51:00 +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
Saqib Ansari
c5c9f9a941 feat: set dynamic labels for payment schedule fields 2021-04-23 15:34:58 +05:30
Saqib Ansari
d552fe6778 feat: base payment amount in payment schedule 2021-04-23 14:46:52 +05:30
Suraj Shetty
52ea6b126b Revert "fix: email digest user not found" 
This reverts commit 188657d05a.
 2021-04-23 14:14:47 +05:30
Saqib Ansari
242242c43f Merge branch 'develop' of https://github.com/frappe/erpnext into payment-term-amount-display-currency-fix 2021-04-23 13:54:13 +05:30
Revant Nandgaonkar
68b514b1f5 docs: add docker repo link in README 2021-04-23 13:06:13 +05:30
meike289
8787ebf83d
Apply suggestions from code review 
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
 2021-04-23 08:06:29 +02:00
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
Saqib
3d4acf9e5c
fix: permission error after submitting exchange rate revaluation (#25432) 2021-04-22 16:16:03 +05:30
Rucha Mahabal
e3b8057eb4
fix: Laboratory Module patch (#25431) 2021-04-22 16:11:17 +05:30
Rucha Mahabal
3847452b60
fix: Laboratory Module patch (#25436) 2021-04-22 16:11:01 +05:30
pateljannat
2004fec8eb fix: removed multicurrency 2021-04-22 14:52:36 +05:30
Saqib
19b73968d7
fix(pos): validations & minor ui issues (#25351) 
* fix: pos print format

* fix: stock validation on pos invoice creation
 2021-04-22 13:38:20 +05:30
Saqib Ansari
b0e160ff78 fix: ignore fraction difference while making round off gl entry 2021-04-22 13:23:50 +05:30
pateljannat
ba6ad7f5be fix: escape for format and msg for working hours if not set 2021-04-22 11:19:44 +05:30
Mohammad Hasnain Mohsin Rajan
7f932cfb30
fix: display reconcile tool when closing balance 0 (#25417) 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-04-22 04:53:09 +05:30
Alan
157b388209
fix: change subcontracted item display (#25425) 2021-04-21 21:00:22 +05:30
Ernesto Ruiz
090177494d
fix: Make strings translatable 
Make strings translatable
 2021-04-21 09:04:06 -06:00
Deepesh Garg
e5e20c50a9
Merge branch 'develop' into purchase-invoice-to-purchase-receipt-develop 2021-04-21 19:09:41 +05:30
pateljannat
485464d1f4 fix: added back a hook 2021-04-21 18:04:58 +05:30
Nabin Hait
db76612462 Merge branch 'version-13-pre-release' into version-13 2021-04-21 12:34:49 +05:30
Nabin Hait
29d4ac13ac Merge branch 'version-13' into develop 2021-04-21 12:34:49 +05:30
Nabin Hait
c3b7c1b998 bumped to version 13.1.0 2021-04-21 12:54:49 +05:50
pateljannat
a92560d79f Merge branch 'profitability-report' of https://github.com/pateljannat/erpnext into profitability-report 2021-04-21 12:32:31 +05:30