Nabin Hait
a3d1b6973a
fix: merge conflict
2021-05-31 11:21:33 +05:30
Suraj Shetty
5f4527a6a1
refactor: Use css variables for breakpoint value
2021-05-28 08:55:38 +05:30
Suraj Shetty
8612558433
Merge branch 'develop' into website-theme-fixes
2021-05-27 13:56:28 +05:30
Suraj Shetty
45bc14408e
refactor: Remove redundant variables.scss import
2021-05-25 15:57:33 +05:30
Suraj Shetty
c0bad3d138
Merge pull request #25804 from surajshetty3416/fix-email-style
2021-05-23 13:42:19 +05:30
Suraj Shetty
540c82712a
Merge pull request #25803 from surajshetty3416/fix-extend-cscript
2021-05-23 13:39:09 +05:30
Suraj Shetty
815aad1003
fix: Rename email.bundle to erpnext_email.bundle
...
to avoid override of frappe email styles
2021-05-23 13:31:54 +05:30
Rucha Mahabal
59961f70ee
refactor: timesheet
2021-05-22 10:21:04 +05:30
Suraj Shetty
81d49e9c71
fix: Use extend_cscript function to properly extend class methods to cscript
2021-05-21 17:03:09 +05:30
rohitwaghchaure
651e934415
Merge pull request #25683 from noahjacob/supplier_item_group_link
...
feat: linking supplier with an item group for filtering items
2021-05-21 12:07:53 +05:30
Rucha Mahabal
be247ec3de
fix: error message placeholders and sider issues
2021-05-20 22:17:20 +05:30
prssanna
60ea785dfd
fix: ensure website theme is applied correctly
2021-05-18 15:42:13 +05:30
noahjacob
ca2fb47d44
feat: updates item_code filters if item_group is linked to supplier
2021-05-18 15:01:05 +05:30
Suraj Shetty
a83d2aacd9
Merge branch 'develop' into esbuild
2021-05-18 14:48:28 +05:30
Nabin Hait
8b2fef11b1
fix: merge conflict
2021-05-17 11:37:14 +05:30
Anupam
35137ba9e0
removing currency filter and added rate conversion while fetching timesheets in SI
2021-05-16 14:17:56 +05:30
Anupam
fd4743cc31
refactor: timesheet
2021-05-15 20:01:17 +05:30
Alan
55c2fec683
feat: add pending qty section to batch/serial selector dialog ( #25519 )
...
* feat: add pending qty section to batch/serial selector dialog
* fix: call attach in setup and refresh, fix conditional
* refactor: camel to snake casing
2021-05-14 12:36:41 +05:30
Alan
eca86290bc
fix: show uom for item in selector dialog ( #25697 )
2021-05-14 12:21:38 +05:30
Prssanna Desai
0eb3a38c9d
fix: quiz evalutation issue ( #25671 )
2021-05-13 12:17:28 +05:30
Deepesh Garg
83f98f6992
Merge pull request #25653 from deepeshgarg007/tax_labels
...
fix: Client script breaking while settings tax labels
2021-05-10 18:24:02 +05:30
Deepesh Garg
9f0823a164
fix: Linting issues
2021-05-10 16:07:41 +05:30
Saqib
55d47a2baa
fix(pos): UI fixes related to overflowing payment section ( #25652 )
...
* fix: additional fields overflowing in payment section
* fix: pos profile filter in pos opening dialog
* fix: item quantity pill
2021-05-10 15:59:37 +05:30
Deepesh Garg
13dfb9734c
fix: Lable for transaction child tables
2021-05-10 15:38:32 +05:30
Deepesh Garg
1a48eb49cf
fix: Client script breaking while settings tax labels
2021-05-10 14:37:10 +05:30
Alan
c6dc9eaf2e
feat!: add pick batch button ( #25413 )
...
* feat!: add pick batch button
BREAKING CHANGE: replaces setup_serial_no with setup_serial_or_batch_no.
* refactor: use setup_serial_or_batch_no instead of setup_serial_no
* refactor: use setup_serial_or_batch_no instead of setup_serial_no
* refactor: use setup_serial_or_batch_no instead of setup_serial_no
* style: add sider review changes
* refactor: make consice, extract function
* refactor: camel to snake casing
2021-05-07 20:30:04 +05:30
Faris Ansari
f97cc0367b
fix: initialize filters in constructor
2021-05-07 15:32:06 +05:30
Faris Ansari
69eb6d476e
Merge remote-tracking branch 'upstream/develop' into esbuild
2021-05-07 15:21:33 +05:30
Faris Ansari
464d838447
fix: Update bundle paths
2021-05-07 14:53:42 +05:30
Faris Ansari
ff3b71d2e7
fix: Make css bundles
2021-05-07 14:52:13 +05:30
Faris Ansari
f751738267
fix: Make js bundles
2021-05-07 14:51:05 +05:30
Nabin Hait
7481f54e0c
Merge branch 'version-13' into develop
2021-05-06 19:18:18 +05:30
Deepesh Garg
daf6c124a9
fix: Check if payment schedule exists
2021-05-06 16:47:02 +05:30
Deepesh Garg
be66ee9723
fix: Check if payment schedule exits before updating label
2021-05-06 16:46:55 +05:30
Deepesh Garg
a0ed517c85
fix: function call to update payment schedule labels
2021-05-06 16:46:47 +05:30
Deepesh Garg
ffea9d4126
fix: Check if payment schedule exists
2021-05-05 12:28:40 +05:30
Deepesh Garg
1bb7bb74ad
fix: Check if payment schedule exits before updating label
2021-05-05 12:19:57 +05:30
Deepesh Garg
04923d6a65
fix: function call to update payment schedule labels
2021-05-04 21:01:12 +05:30
Saqib
cdc99cdd49
fix(pos): incorrect expense account set in pos invoice ( #25543 )
2021-05-03 11:54:55 +05:30
Saqib Ansari
3e83542360
fix: sider issues
2021-04-29 18:12:47 +05:30
Saqib Ansari
973afeac3c
feat: set dynamic labels for payment schedule fields
2021-04-29 18:12:27 +05:30
Saqib Ansari
a91eebf6aa
feat: base payment amount in payment schedule
2021-04-29 18:12:23 +05:30
Saqib Ansari
6fb417590f
fix: sider issues
2021-04-29 14:05:20 +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
Faris Ansari
1fe891b287
refactor: Replace Class.extend with native class
2021-04-23 08:04:00 +05:30
Alan
157b388209
fix: change subcontracted item display ( #25425 )
2021-04-21 21:00:22 +05:30
Marica
e8bc912ffc
perf: Fetching exchange rate on every line item slows down PO ( #25345 )
...
* fix: Dont fetch exchange rates for each line item once fetched at parent
`
* perf: Use price list conversion rate from parent
- If price list conversion rate exists in args already from earlier call, use that
- `get_price_list_currency_and_exchange_rate` wont be called for each child row
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-04-19 11:05:21 +05:30
Jannat Patel
dcdd3bebbe
feat: Timer in LMS Quiz ( #24246 )
...
* feat: new fields in quiz doctypes
* feat: timer in lms quiz
* fix: variable initialisation
* fix: context, exception fix
* fix:sider
* fix:sider
* fix: indentation
* fix: timer
* fix: sider
* fix: return value and format
* fix: show time taken only after all attempts are over
* fix: sider
Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-04-19 10:36:40 +05:30
rohitwaghchaure
72929aab38
Merge pull request #24878 from anupamvs/planning
...
feat: add total available stock field in PO
2021-04-15 16:28:49 +05:30
