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

36671 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
shariquerik
82d7986a2f fix: sider fix 2021-03-26 17:02:37 +05:30
Saqib
f66aab6d98
fix: e-invoicing option visible even if settings disabled (#25021) 2021-03-26 16:40:51 +05:30
shariquerik
1989375be4 fix: Employee profile pic upload access for erpnext user 2021-03-26 16:34:22 +05:30
Prssanna Desai
1bbd5c98d3
Merge pull request #24996 from prssanna/help-links-fix 2021-03-26 16:04:25 +05:30
prssanna
5243eea532 style: fix formatting 2021-03-26 15:47:08 +05:30
prssanna
0ae0368d34 fix: re-execute add_standard_navbar_items patch 
- check that same items aren't appended again
 2021-03-26 15:47:07 +05:30
prssanna
eeb3121622 fix: missing help links in navbar help dropdown 2021-03-26 15:47:07 +05:30
Prssanna Desai
3da2df55f4
Merge branch 'develop' into help-links-fix 2021-03-26 15:35:17 +05:30
Sagar Vora
0b569b3e43
fix: allow creating stock entry based on work order for customer provided items (#24885) 2021-03-26 14:40:15 +05:30
prssanna
dd2a315d06 style: fix formatting 2021-03-26 14:35:47 +05:30
hasnain2808@gmail.com
e9c801e4bd fix: ams integration breaks when error raised 2021-03-26 14:32:02 +05:30
Nabin Hait
2a39b74ad2
fix: Fixes on job card and salary slip (#25011) 
* fix: map conversion factor while making stock entry from job card

* fix: fetch additional salary in salary slip
 2021-03-26 10:49:39 +05:30
Marica
ffb4e3f280
Merge pull request #24937 from ankush/hide_alt_field 
fix: hide alt tag if item is not shown in website
 2021-03-25 20:14:52 +05:30
Anurag Mishra
344c14c9ca
Merge pull request #25004 from ruchamahabal/fix-exchange-rate-in-salary-slip 
fix(Payroll): Exchange Rate not getting set in Salary Slip
 2021-03-25 18:12:11 +05:30
Deepesh Garg
74200bcd62
Merge pull request #24975 from frappe/revert-24039-fixed-incorrect-gstr-report-issue 
Revert "fix: GSTR B2C report"
 2021-03-25 16:50:10 +05:30
Deepesh Garg
7b8742bd70
Merge pull request #24998 from frappe/revert-24318-fix-currency-validation-for-party 
Revert "fix: validating party currency with doc currency"
 2021-03-25 16:49:50 +05:30
Rucha Mahabal
b2b12f303e fix(Payroll): Exchange Rate not getting set in Salary Slip 2021-03-25 14:48:08 +05:30
pateljannat
c0b4eea415 fix: sider 2021-03-25 14:39:05 +05:30
pateljannat
6597bf7dd7 feat: profitability report default working hours and tests 2021-03-25 13:31:43 +05:30
Mohammad Hasnain Mohsin Rajan
52701dcbbc
fix: patch regional fields for old companies (#24988) 2021-03-25 12:56:33 +05:30
Mohammad Hasnain Mohsin Rajan
f29c075bc3
fix: patch regional fields for old companies (#24999) 
* fix: patch regional fields for old companies

* chore: fix sider
 2021-03-25 12:56:13 +05:30
Marica
36d125a720
Merge branch 'develop' into item-dashboard-fixes 2021-03-25 12:32:47 +05:30
Nabin Hait
d4499277b4 chore: Added change log 2021-03-25 12:18:22 +05:30
Marica
7c6f72fd39
Merge branch 'develop' into hide_alt_field 2021-03-25 12:15:58 +05:30
Nabin Hait
91026e026f chore: Added change log 2021-03-25 11:53:07 +05:30
Syed Mujeer Hashmi
f8b44e05c4
refactor: Add student mobile number to student attendance (#24990) 
To setup SMS alert notification for student attendance we need student mobile
number in this doctype.

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
 2021-03-25 11:48:29 +05:30
Anupam Kumar
b4e842e25e
fix: opportunity-quotation mapping order status (#25001) 2021-03-25 11:45:57 +05:30
Deepesh Garg
1a6e6320cf Revert "fix: validating party currency with doc currency (#24318)" 
This reverts commit 02142c41bb.
 2021-03-24 21:26:04 +05:30
Prssanna Desai
8a87ffc8f6
fix: POS print receipt (#24924) 
* fix: POS print receipt

* fix: print recepit dialog
 2021-03-24 19:52:39 +05:30
Saqib
dd39a6b47c
fix(pos): mode of payments disappear on loading draft pos invoice (#24917) 2021-03-24 17:56:24 +05:30
rohitwaghchaure
d7d7df2fdd
Merge pull request #24995 from rohitwaghchaure/incorrect-field-for-company 
fix: incorrect fieldname
 2021-03-24 16:45:41 +05:30
prssanna
194dd12882 fix: re-execute add_standard_navbar_items patch 
- check that same items aren't appended again
 2021-03-24 16:45:32 +05:30
prssanna
97aab3ac21 fix: missing help links in navbar help dropdown 2021-03-24 16:44:49 +05:30
Rohit Waghchaure
244f3eeedc fix: incorrect fieldname 2021-03-24 16:42:22 +05:30
Anurag Mishra
4217a4b1ff
Merge branch 'develop' into item-dashboard-fixes 2021-03-24 15:35:33 +05:30
Anupam Kumar
d1bbb4c311
Merge branch 'develop' into planning 2021-03-24 15:12:04 +05:30
rohitwaghchaure
3c490088c4
Merge pull request #24991 from rohitwaghchaure/repost-not-completed-transactions-pre 
fix: repost not completed backdated transactions
 2021-03-24 12:38:42 +05:30
Ishan Loya
de774ae080
Correct state code for 'Other Territory' 
Corrects state code for 'Other Territory' to match e-invoicing state codes list. Attempts to fix #24992
 2021-03-24 12:30:51 +05:30
Rohit Waghchaure
9165327cf6 fix: repost not completed backdated transactions 2021-03-24 11:32:26 +05:30
rohitwaghchaure
575f8f226b
fix: repost not completed backdated transactions (#24980) 2021-03-24 11:30:53 +05:30
Deepesh Garg
734f5c2533
Merge pull request #24971 from deepeshgarg007/loan_security_shortfall_process_update 
fix: Pending shortfall update  on processing loan security shortfall
 2021-03-24 11:24:49 +05:30
Anupam Kumar
5ce0569f80
fix: validate_series (#24984) 2021-03-23 21:13:41 +05:30
Anupam Kumar
5c172044d7
fix: validate_series (#24987) 2021-03-23 21:13:06 +05:30
Deepesh Garg
d26ed25c3e
fix: Period list for exponential smoothing forecasting report (#24983) 2021-03-23 21:11:06 +05:30
Deepesh Garg
82983369fa
fix: Period list for exponential smoothing forecasting report (#24982) 2021-03-23 21:11:01 +05:30
Jannat Patel
d7b139182b
fix: serial no trim issue (#24981) 
* fix: serial no trim issue

* fix: sider
 2021-03-23 21:09:54 +05:30
Jannat Patel
12f0923a61
fix: serial no trim issue (#24949) 
* fix: serial no trim issue

* fix: valid serial nos

* fix: sider

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-03-23 21:09:49 +05:30
Afshan
02142c41bb
fix: validating party currency with doc currency (#24318) 
* fix: validating supplier currency

* fix: compare current currency with company currency as well.

* fix: replaced or with add in condition

* fix: conditioning to get proper payment terms values

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-03-23 20:53:56 +05:30
Syed Mujeer Hashmi
f114da2f67
refactor: Make Discharge Schedule Date as Datetime (#24940) 
* refactor: Make Discharge Schedule Date as Datetime

Like Admitted Datetime make discharge date as discharge datetime.

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>

* fix: Add patch for renaming discharge_date to discharge_datetime

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>

* fix: quote style

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-03-23 17:48:25 +05:30
Anupam
940c75f8ac fix: validate_series 2021-03-23 16:54:54 +05:30