Kenneth Sequeira
90a249527d
fix: update dead links in help_links.js ( #27860 )
2021-10-08 13:27:16 +05:30
Kenneth Sequeira
07c680d7cc
fix: help links for purchase cycle and JV ( #27856 )
2021-10-07 20:27:10 +05:30
Kenneth Sequeira
646fd29f0e
fix: update help links for Sales Invoice page ( #27853 )
2021-10-07 18:38:37 +05:30
rohitwaghchaure
e740fec8d0
Merge pull request #27851 from rohitwaghchaure/option-to-set-size-for-multi-select-dialog
...
feat: option to set the width for the multi-select dialog box
2021-10-07 17:38:19 +05:30
Rohit Waghchaure
69ffddf747
feat: option to set the width for the multi-select dialog box
2021-10-07 17:33:58 +05:30
Marica
4e7ec8a068
fix: Hero Slider Control & Alignment fixes ( #27611 )
...
* fix: Creating unique hash for slider id instead of slider name
* fix: Fixed alignment of Title, Subtitle, Action Button
* chore: linter fix
2021-10-02 17:06:33 +05:30
Rucha Mahabal
9e08229b7b
fix(Org Chart): use attribute selectors instead of ID selector for node IDs with special characters ( #27717 )
...
* fix(Org Chart): use attribute selectors instead of ID selector for node IDs with special chars
* fix: UI tests
2021-09-30 18:32:10 +05:30
Marica
c75c709114
Merge branch 'develop' into scan-batch
2021-09-30 14:07:54 +05:30
marination
abf450dc70
fix: Increment batch qty if pre-existing batch is scanned
2021-09-30 14:03:40 +05:30
Alan
72c081fd8f
fix: apply price list after batch or serial no insertion ( #27566 )
2021-09-28 12:56:26 +05:30
marination
596cf3951d
fix: Batch scans get overwritten on the same row
2021-09-27 15:06:46 +05:30
Shariq Ansari
18918e1b4f
chore: linter fix
2021-09-27 14:08:44 +05:30
Shariq Ansari
0de735f20b
fix: Fixed alignment of Title, Subtitle, Action Button
2021-09-27 13:50:19 +05:30
Frappe PR Bot
4f7af79c31
fix: PO/PINV - Check if doctype has company_address field before setting the value ( #27441 ) ( #27576 )
...
Co-authored-by: Vama Mehta <vama.mehta@inqubit.in>
(cherry picked from commit 666eaae6ce976c5d820b3b9f91d23a0ed28a263a)
Co-authored-by: vama <vamagithub@gmail.com>
2021-09-18 13:34:27 +05:30
Saqib
e03d9aa889
fix: unecessary keyword args were passed in mapper functions ( #27563 )
2021-09-17 13:03:27 +05:30
Saqib
7292f5476d
feat: (get_items_from) filter material request item in purchase order ( #27449 )
2021-09-13 12:13:43 +05:30
Sagar Vora
dae0a1c1d6
fix: Template Error due to use of single quote ( #27433 )
2021-09-11 17:54:21 +05:30
rohitwaghchaure
7b4a65484a
fix: manually added weight per unit reset to zero after save ( #27330 )
2021-09-03 22:00:14 +05:30
Rucha Mahabal
f828d853e3
fix: Org Chart fixes ( #27290 )
...
* fix(org chart): multiple root nodes not expanding on clicking Expand All
* fix: unstable filter inserts duplicate nodes
2021-09-01 23:07:26 +05:30
Ankush Menat
b147b85e6a
chore: whitespace / eof fixes
2021-09-01 16:57:21 +05:30
Deepesh Garg
fd467e6d32
fix: Correct company address not getting copied from Purchase Order to Invoice ( #27217 )
...
* fix: Correct company adderess not getting copied from Purchase Order to Invoice
* fix: Linting issues
2021-08-30 17:53:59 +05:30
marination
7b78473da3
fix: Indentation and removed f-strings
...
- Sider: fixed indentation in js
- Dont use f-strings in queries
2021-08-30 12:50:24 +05:30
marination
2a3ef03388
fix: Popup stale build and data consistency
...
- Include `supplier_quick_entry.js` in erpnext.bundle.js
- Create primary supplier address on update
- Set newly created address (quick entry) in Supplier and Customer
- Clear address set in supplier and customer on delete (dependency)
2021-08-27 18:06:51 +05:30
marination
bf72ec0598
feat: (consistency) Add Primary Address and Contact section in Supplier
...
- The same is present in customer and is inconsistent with supplier
- Helps quickly create primary address and contact via quick entry
2021-08-27 15:51:31 +05:30
Frappe PR Bot
255b99ebdc
feat: Employee reminders ( #25735 ) ( #27115 )
...
* feat: Add reminders section to HR Settings
* refactor: Extract generic function for getting Employees
* feat: Employee Work Anniversary Reminder
* feat: Daily Holiday Reminder
* fix: Unnecessary params and replace [] with .get()
* test: Daily Holiday Reminders
* test: is_holiday basic tests
* refactor: Move employee reminders code to separate module
* feat: Add advance reminder to HR settings
* feat: Advance Holiday Reminders
* refactor: get_holidays_for_employee
* feat: Email holiday reminders in advance + tests
* fix: Remove unused import
* refactor: HR Setting Reminder Section
* refactor: Remove Daily Holiday Reminders feat
* feat: Reminder miss warning
* fix: Failing test and function name change
* chore: Add patch for field rename
* chore: Rename frequency label
* fix: Failing patch test
* fix: sider and removed description of fields
* fix: email alignment
Co-authored-by: pateljannat <pateljannat2308@gmail.com>
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
(cherry picked from commit 24b2a315818d08ad4cb03347ccf5297df916a5ac)
Co-authored-by: Mohammad Hussain Nagaria <34810212+NagariaHussain@users.noreply.github.com>
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
2021-08-24 20:19:22 +05:30
Subin Tom
d4d5a4221a
feat: coupon code discount in pos invoice ( #27004 )
2021-08-24 16:22:46 +05:30
Ankush Menat
6de7b8ea93
fix: discard empty rows from update items ( #27021 )
2021-08-24 12:18:40 +05:30
Subin Tom
7d627df4db
fix: pos return payment mode issue ( #26872 )
2021-08-23 11:05:07 +05:30
Saqib
153fe1cdb4
refactor: scan barcode field scanning ( #26990 )
2021-08-20 11:09:51 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
Afshan
dc7280eef0
fix: filtering of items in Sales and Purchase Orders ( #26936 )
...
* fix: filtering of items in Sales and Purchase Orders
* fix: slider
* fix: slider
2021-08-18 17:44:40 +05:30
Rohit Waghchaure
eb1e3181a4
fix: conflicts while merging brnach version-13 to develop
2021-08-17 10:53:19 +05:30
Rucha Mahabal
67e3971c3b
fix: Org Chart fixes ( #26952 )
...
* fix: add z-index to filter to avoid svg wrapper overlapping
* fix: expand all nodes not working when there are only 2 levels
- added dom freeze while expanding all nodes and exporting
2021-08-16 10:38:39 +05:30
Rucha Mahabal
0b4959966c
fix: expand all nodes not working when there are only 2 levels
...
- added dom freeze while expanding all nodes and exporting
2021-08-16 10:19:48 +05:30
Rucha Mahabal
4c612b7cb2
fix: add z-index to filter to avoid svg wrapper overlapping
2021-08-15 21:32:39 +05:30
Rucha Mahabal
4981746b9a
Merge branch 'develop' into org-chart-develop
2021-08-15 20:50:56 +05:30
Suraj Shetty
1514916520
fix: Nest .level
class style under .hierarchy
class ( #26905 )
...
fix: Nest `.level` class style under `.hierarchy` class
2021-08-15 20:43:16 +05:30
Deepesh Garg
a7054560da
Merge branch 'develop' into po-payment-terms
2021-08-11 19:31:30 +05:30
Suraj Shetty
99658ceb4e
fix: Nest .level class style under .hierarchy class
...
- To avoid style overrides in list view
2021-08-11 14:19:07 +05:30
Deepesh Garg
bff3b0962a
fix: Override template only if setting is enabled
2021-08-10 23:58:27 +05:30
Rucha Mahabal
9855bbb95e
fix(style): apply svg container margin only in desktop view ( #26894 )
2021-08-10 23:53:02 +05:30
Rucha Mahabal
15cb248d9e
fix(style): apply svg container margin only in desktop view
2021-08-10 23:44:08 +05:30
Frappe PR Bot
1167a9bf94
fix: unsetting of payment if no pos profile found ( #26891 )
...
* fix: unseting of payment if no pos profile found (#26884 )
(cherry picked from commit b614834efe
)
# Conflicts:
# erpnext/public/js/controllers/taxes_and_totals.js
* fix: conflicts
* fix: conflicts
* fix: conflicts
* fix: conflicts
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Co-authored-by: Afshan <afshan13k@gmail.com>
2021-08-10 23:18:23 +05:30
Afshan
b614834efe
fix: unseting of payment if no pos profile found ( #26884 )
2021-08-10 21:33:58 +05:30
Rucha Mahabal
52cd007292
fix: make bundled assets for hierarchy chart
2021-08-10 20:13:28 +05:30
Frappe PR Bot
1a39d1a311
fix: cost center & account validation in Sales/Purchase Taxes and Charges ( #26881 )
2021-08-10 19:38:39 +05:30
Rucha Mahabal
f9afade7dc
fix: test
2021-08-10 18:02:41 +05:30
Rucha Mahabal
5f0edca3f3
fix(style): longer titles overflowing
2021-08-10 18:02:21 +05:30
Rucha Mahabal
78f50a9809
feat: Export chart option in desktop view
2021-08-10 18:02:05 +05:30
Rucha Mahabal
6f799d17ce
feat: Expand All nodes option in Desktop view
2021-08-10 18:01:15 +05:30