Anupam
5d994d8aa1
fix: unable to submit stock entry
2021-03-27 00:54:19 +05:30
Anupam
096da429ed
fix: unable to submit stock entry
2021-03-27 00:45:31 +05:30
rohitwaghchaure
d5759bab11
Merge pull request #24922 from rohitwaghchaure/feat-recursice-pricing-rule
...
feat: recursive pricing rule
2021-03-26 19:10:10 +05:30
rohitwaghchaure
e825d2ab51
Merge pull request #25027 from rohitwaghchaure/feat-recursice-pricing-rule-pre
...
Feat recursice pricing rule pre
2021-03-26 19:09:39 +05:30
Rohit Waghchaure
256b9c7bf9
fix: total weight not set for free items
2021-03-26 19:05:46 +05:30
Rohit Waghchaure
0486276789
fix: don't club same free item
2021-03-26 19:05:45 +05:30
Rohit Waghchaure
fce552b811
fix: nonetype object has no attribute options
2021-03-26 19:05:45 +05:30
Rohit Waghchaure
cd8422a840
feat: recursive product discount
2021-03-26 19:05:43 +05:30
rohitwaghchaure
2c191c105f
Merge pull request #25026 from ruchamahabal/production-raw-material-enhancements-v13
...
feat(Production Plan): Enhancements in Material Request Plan Item
2021-03-26 18:59:34 +05:30
rohitwaghchaure
86628ea287
Merge pull request #25025 from ruchamahabal/production-raw-material-enhancements
...
feat(Production Plan): Enhancements in Material Request Plan Item
2021-03-26 18:59:23 +05:30
Rucha Mahabal
44853da7c2
feat: Show Required Qty as per BOM in Material Request Items
2021-03-26 18:55:16 +05:30
Rucha Mahabal
4cd68cdecb
feat: Add more fields to raw material download
2021-03-26 18:55:08 +05:30
Rucha Mahabal
d74ff72527
fix: Ordered and Reserved Qty for Production not getting fetched in Items
2021-03-26 18:55:00 +05:30
Rucha Mahabal
28a885a3a9
feat: show ordered and reserved qty in Material Request Plan Item table
2021-03-26 18:54:51 +05:30
Rucha Mahabal
efe2b425b1
feat(Production Plan): Consider Safety Stock in Required Qty Calculation
2021-03-26 18:54:34 +05:30
Rucha Mahabal
87a70fe8cb
feat: Show Required Qty as per BOM in Material Request Items
2021-03-26 18:37:50 +05:30
Rucha Mahabal
9dbabb92df
feat: Add more fields to raw material download
2021-03-26 18:37:40 +05:30
Rucha Mahabal
07409990a0
fix: Ordered and Reserved Qty for Production not getting fetched in Items
2021-03-26 18:37:24 +05:30
Rucha Mahabal
1f86471656
feat: show ordered and reserved qty in Material Request Plan Item table
2021-03-26 18:36:52 +05:30
Rucha Mahabal
66bae19c16
feat(Production Plan): Consider Safety Stock in Required Qty Calculation
2021-03-26 18:36:33 +05:30
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
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