rohitwaghchaure
d849ce7ce0
Merge pull request #17980 from adityahase/fix-buying-items-rate
...
fix: Consider discount_amount only when provided to calculate rate
2019-06-19 14:47:06 +05:30
Faris Ansari
2632107129
fix: User MultiSelectList control for Party filter ( #17943 )
...
* fix: User MultiSelectList control for Party filter
The comma based filter wouldn't work for values that had comma in them
* fix: Replace with MultiSelectList in reports
* fix: Parse json instead of string split
2019-06-19 12:15:37 +05:30
Aditya Hase
48585c94ff
fix: Consider discount_amount only when provided to calculate rate
...
After selecting item_code in items table and not entering rate,
Clicking elsewhere will set rate to NaN.
All DocTypes on buying side have this bug.
2019-06-18 19:11:17 +05:30
deepeshgarg007
946eefe039
fix: Codacy fixes
2019-06-17 23:10:36 +05:30
deepeshgarg007
dfe006be19
Merge branch 'develop' of https://github.com/frappe/erpnext into dimension-fixes
2019-06-17 15:26:05 +05:30
deepeshgarg007
d1e0f42fea
fix: Styling fix
2019-06-17 12:47:39 +05:30
deepeshgarg007
7e3a98ba33
fix: Is group filter fixes in dimensions
2019-06-17 12:44:49 +05:30
Faris Ansari
8e99aaf605
fix: Add erpnext website theme import
2019-06-14 20:06:54 +05:30
deepeshgarg007
9297829804
fix: Codacy
2019-06-10 17:50:52 +05:30
deepeshgarg007
30f7e7be87
fix: Available qty not shown in item batch selector for batch
2019-06-10 17:46:16 +05:30
Rohit Waghchaure
3cf24366a9
feat: provision to set multiple manufacturer in the item master
2019-06-06 19:53:32 +05:30
Shivam Mishra
76fe1b1e9f
Merge pull request #17674 from scmmishra/lms-refactor
...
refactor: lms
2019-06-06 16:32:17 +05:30
Rushabh Mehta
6744febedd
Merge pull request #17769 from deepeshgarg007/dimensions
...
feat: Configurable Accounting Dimensions
2019-06-03 17:00:58 +05:30
Shivam Mishra
8ddb63adae
feat: added auto course enrollment for enrolled programs
2019-06-03 14:40:52 +05:30
Nabin Hait
49133c5620
Merge pull request #17835 from deepeshgarg007/serial-no-devlop
...
fix: Serial no filtering issue for delivered items
2019-06-03 14:24:56 +05:30
Nabin Hait
37fdeee367
Merge pull request #17805 from nabinhait/discount-rounding-adjustment-dev
...
fix: Rounding adjustment while additional discount amount is applied on grand total
2019-06-03 13:09:04 +05:30
deepeshgarg007
545fef9934
fix: Pass delivery document no as empty string
2019-06-03 13:06:37 +05:30
Shivam Mishra
d1a252190b
refactor: refactored quiz api and added quiz.js
2019-06-03 12:57:38 +05:30
deepeshgarg007
853a561f11
fix: Serial no filtering issue for delivered items
2019-06-03 12:11:54 +05:30
deepeshgarg007
55b894bfef
Merge branch develop into dimensions
2019-06-01 23:13:36 +05:30
Rohit Waghchaure
4fd704dbb6
fix: POS cash mode of payment css
2019-05-30 23:25:41 +05:30
deepeshgarg007
52ea2874ec
fix: Multiple fixes in accounting dimensions
2019-05-30 22:09:36 +05:30
Shivam Mishra
253a2bd260
refactor: goodbye Vue 👋
2019-05-30 18:54:11 +05:30
Nabin Hait
d060890817
fix: Rounding adjustment while additional discount amount is aplied on grand total
2019-05-30 16:05:30 +05:30
deepeshgarg007
ffec8be85f
fix: Styling and test case fixes
2019-05-28 17:56:07 +05:30
deepeshgarg007
e025aabef0
fix: Indentation fixes
2019-05-28 16:25:55 +05:30
deepeshgarg007
a8cb00f31f
fix: Styling and test case fixes
2019-05-28 16:03:08 +05:30
deepeshgarg007
acc2422167
Merge branch develop into dimensions
2019-05-28 12:18:32 +05:30
deepeshgarg007
f5b6ee9ae7
fix: Multiple fixes in accounting doctype
2019-05-28 12:15:56 +05:30
deepeshgarg007
50ea99e35b
fix: Is group filter for dimensions for doctype
2019-05-28 12:13:53 +05:30
Nabin Hait
aafd64d9b4
fix: On change of currency, set margin amount based on exchange rate ( #17712 )
2019-05-27 17:15:47 +05:30
deepeshgarg007
e9c6e644f7
fix: Multiple changes in dimension creation logic
2019-05-26 12:34:13 +05:30
deepeshgarg007
d330519f7c
fix: Merge branch develop into dimensions
2019-05-25 18:18:08 +05:30
Nabin Hait
318ba2b538
Merge branch 'develop' into lms-refactor
2019-05-22 15:15:51 +05:30
Rushabh Mehta
8c78299158
fix(readme): logo
2019-05-21 11:57:33 +05:30
Shivam Mishra
823c79588b
feat: Moving to Jinja
2019-05-19 16:01:45 +05:30
Shivam Mishra
8a976ba8ab
feat: LMS is now compatible with Frappe Theme ( #17600 )
...
* style: UI fixes for frappe_theme compatibility
* chore: minor ui fixes
2019-05-16 16:38:13 +05:30
Nabin Hait
3fccfaa7ce
feat: Added 'Add Multiple' options in all sales / purchase transactions
2019-05-16 14:54:05 +05:30
deepeshgarg007
60f4dd0736
Merge branch 'develop' of https://github.com/frappe/erpnext into dimensions
2019-05-14 15:51:12 +05:30
Shivam Mishra
f82d0a6074
fix: show video duration and publish date only if data exists
2019-05-14 12:02:51 +05:30
Shivam Mishra
2430fd3a4c
chore: show description on course card
2019-05-14 11:24:51 +05:30
deepeshgarg007
e64c357216
fix: Commified function to get dimensions
2019-05-14 08:50:45 +05:30
deepeshgarg007
d83cf65be1
fix: Added dimensions in financial reports and general ledger
2019-05-12 18:34:23 +05:30
Faris Ansari
cb03bb1c00
fix: Allow variant attributes to be optional
2019-05-03 13:41:50 +05:30
Nabin Hait
b8103ac077
Merge branch 'develop' into item-discount
2019-05-01 12:23:30 +05:30
Faris Ansari
1e55c2e713
Remove old style custom scripts ( #17077 )
...
* fix: Move Newsletter script from frappe to erpnext
* fix: Remove old style client scripts
* C-Form
* fix: Cost Center
* fix: Fiscal Year
* fix: Monthly Distribution
* fix: Payment Gateway Account
* fix: Pricing Rule
* fix: Missing semicolon
2019-04-30 10:18:09 +05:30
Suraj Shetty
c87b47a575
fix: Price list conversion for other UOM from stock UOM item price ( #17386 )
...
* fix: Price list for UOM other than stock UOM
-Fixes conversion from default UOM item price to other UOMs
* fix: Typo
2019-04-29 23:18:47 +05:30
Shivam Mishra
9fe7257bfc
fix (ui): refactored breadcrumbs
2019-04-25 19:44:37 +05:30
Shivam Mishra
2428485ebb
fix (ui): Card layout
2019-04-25 19:33:22 +05:30
scmmishra
bf7d13a7be
Merge branch 'develop' of https://github.com/frappe/erpnext into lms-beta-v2
2019-04-24 09:50:19 +05:30
