Deepesh Garg
bd9bdc5797
feat: Batch wise item pricing ( #24470 )
...
* feat: Batch wise item pricing
* fix: Rate for items with no batch
* fix: Add test case for batch pricing
* fix: Sider Issues
* fix: Add item filter for batch
2021-01-28 12:05:57 +05:30
marination
27bac2aaec
fix: Missing semi-colon
2021-01-28 12:04:14 +05:30
marination
bc370b3ee5
chore: Set Stock Entry Form Indicators in setup
...
- Makes it easier to override via customisations
- Style consistency with other forms that set indicator in setup as well
2021-01-28 11:44:26 +05:30
Marica
ea7c2dbfaf
Merge branch 'develop' into stock-entry-qi
2021-01-28 11:31:43 +05:30
Afshan
907e2990d0
fix: remove function to get earning deduction components ( #24465 )
...
* fix: remove function to get earning deduction components
* fix: slider
2021-01-27 15:34:42 +05:30
Saqib
5ba2f58355
fix: e_invoice print format not showing other charges ( #24474 )
2021-01-27 12:34:08 +05:30
Deepesh Garg
dade7a4583
fix: Translation Syntax
2021-01-26 21:11:55 +05:30
Deepesh Garg
a0d61524c1
fix: Add distribute manually option in LCV
2021-01-26 17:05:00 +05:30
Deepesh Garg
ff3adfd1cf
Merge pull request #24468 from deepeshgarg007/lse_report_fix
...
fix: Division by 0 error in security exposure reports
2021-01-26 10:13:39 +05:30
Deepesh Garg
7a4db2214a
fix: Division by 0 error in security exposure reports
2021-01-26 10:10:35 +05:30
Deepesh Garg
224fdf34e4
Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency
2021-01-25 22:16:02 +05:30
Raffael Meyer
1991ba7910
feat: temporary against account ( #24086 )
...
* feat: add temporaray against account nmber to datev settings
* feat: use temporary against account in datev report
* test: add temp against account number to test data
* test: include temp against aaccount in filters
2021-01-25 21:22:10 +05:30
Marica
35455d2de6
Merge branch 'develop' into project-naming-series-patch
2021-01-25 21:16:02 +05:30
marination
b0ef8fb7c5
fix: Always show QI Template in Item
2021-01-25 21:00:24 +05:30
rohitwaghchaure
fa3ec3c346
Merge pull request #23969 from marination/putaway
...
feat: Putaway
2021-01-25 16:42:04 +05:30
Suraj Shetty
0c34a711eb
Merge branch 'develop' of github.com:frappe/erpnext into version-13-beta-pre-release
2021-01-25 16:06:38 +05:30
Marica
62a1caf6c4
Merge branch 'develop' into lcv_multicurrency
2021-01-25 12:39:16 +05:30
Marica
ec4f42d4a9
Merge branch 'develop' into project-naming-series-patch
2021-01-25 11:29:23 +05:30
Deepesh Garg
164079127f
Merge pull request #24446 from deepeshgarg007/patch-fix-1-new
...
fix: Project Template patch
2021-01-25 10:37:43 +05:30
Deepesh Garg
befe32cbe1
Merge pull request #24456 from deepeshgarg007/ltv_in_report
...
fix: Add loan to value field in Loan Interest Report
2021-01-24 19:18:42 +05:30
Deepesh Garg
91eb9bb5c2
fix: Add loan to value field in Loan Interest Report
2021-01-24 19:15:57 +05:30
Kaviya Periyasamy
c680547be3
fix(einvoice): QRCode generation ( #24412 )
2021-01-24 10:59:37 +05:30
rohitwaghchaure
13df7a0ca6
Merge pull request #24033 from ruchamahabal/patient-history-enhancements
...
feat: Patient History Enhancements
2021-01-23 18:19:16 +05:30
Rucha Mahabal
8dc9d2f103
Merge pull request #24410 from ruchamahabal/service-units-in-appointment
...
feat: Allow selecting admission service unit in Patient Appointment for inpatients
2021-01-23 15:14:17 +05:30
Rucha Mahabal
ab920b55a7
Merge branch 'develop' into service-units-in-appointment
2021-01-23 13:27:03 +05:30
Rucha Mahabal
edf5da3394
Merge branch 'develop' into patient-history-enhancements
2021-01-23 13:26:36 +05:30
Rucha Mahabal
ee28328006
fix(travis): Issue Analytics Report Test ( #24453 )
2021-01-23 13:26:24 +05:30
Rucha Mahabal
6f4ad3b73d
fix: sider
2021-01-23 12:52:41 +05:30
Rucha Mahabal
cb1da4d07c
fix: doctype meta not loading while setting up fields
2021-01-22 19:26:56 +05:30
Marica
6b0d334d25
Merge pull request #24399 from pateljannat/item-wise-purchase-registry-item-name-error
...
fix: Item wise purchase registry item_name error
2021-01-22 19:20:51 +05:30
Deepesh Garg
5b4ece5054
fix: Update patch
2021-01-22 17:12:35 +05:30
marination
7ba60570e7
fix: Spaces to Tabs
2021-01-22 16:55:06 +05:30
marination
c908deea61
fix: Patch to Add Naming Series to old projects
2021-01-22 16:10:01 +05:30
Rucha Mahabal
75a93d9057
feat: fetch date field for custom doctypes
2021-01-22 15:51:25 +05:30
Afshan
217440952f
fix: slider
2021-01-22 15:39:59 +05:30
Afshan
02d495f1fb
fix: added query for fetching salary component
2021-01-22 15:39:59 +05:30
Rucha Mahabal
6058ea88e8
fix: SLA not applied automatically when priority is missing ( #24447 )
2021-01-22 13:35:08 +05:30
Marica
5631d014a7
Merge branch 'develop' into item-wise-purchase-registry-item-name-error
2021-01-22 12:35:35 +05:30
Deepesh Garg
0d26d24164
Merge pull request #24414 from Alchez/dev-irs-1099-year
...
fix: use supplied year for IRS 1099 forms
2021-01-22 12:17:43 +05:30
Deepesh Garg
cf7209f3d4
fix: Project Template patch
2021-01-22 11:47:13 +05:30
Jannat Patel
02a7af1e6c
fix: full form for opportunity in crm dashboard ( #24436 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-01-22 10:03:29 +05:30
Rucha Mahabal
858ad20dd0
Merge branch 'develop' into service-units-in-appointment
2021-01-22 09:09:29 +05:30
Rucha Mahabal
7201498801
Merge branch 'develop' into patient-history-enhancements
2021-01-22 09:04:37 +05:30
Rucha Mahabal
b9a21c4824
feat: added search to the Select fields dialog in Patient History Settings
2021-01-22 09:00:40 +05:30
Rucha Mahabal
ded08245cc
fix: duplicate filters added on patient change
2021-01-22 08:52:17 +05:30
rohitwaghchaure
3afc6b1333
Merge pull request #24437 from AfshanKhan/fix-stock-ageing
...
fix: stock ageing should not take cancelled stock entries.
2021-01-21 23:09:41 +05:30
Rucha Mahabal
8d60d301c8
Merge pull request #23865 from scmmishra/membership-enhancements-2
...
feat: enhancements to erpnext membership
2021-01-21 21:10:53 +05:30
Rucha Mahabal
7a21e40527
Merge branch 'develop' into membership-enhancements-2
2021-01-21 20:21:17 +05:30
Rucha Mahabal
02e424fae2
chore: Add description for settings
2021-01-21 20:16:17 +05:30
Rucha Mahabal
bcc0674d37
fix: test
2021-01-21 19:52:13 +05:30
