Nabin Hait
d17217c4e2
Merge pull request #25831 from deepeshgarg007/tds_advance_payment_v13
...
feat: Tax deduction against advance payments
2021-06-10 20:25:30 +05:30
Deepesh Garg
5434dd048b
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into dynamic_gst_rates
2021-06-10 18:56:39 +05:30
Deepesh Garg
758db793be
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13
2021-06-09 13:39:07 +05:30
pateljannat
7ace06ac21
fix: sider
2021-06-08 18:26:23 +05:30
pateljannat
bbf07d9214
fix: quiz timer issues
2021-06-08 17:05:44 +05:30
Deepesh Garg
6f2dacc60c
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13
2021-06-06 19:31:50 +05:30
Deepesh Garg
3646c301ed
fix: Linting issues
2021-06-05 13:21:03 +05:30
Deepesh Garg
8a7e283926
feat: Item Taxes based on net rate
2021-06-04 22:53:26 +05:30
Rohan Bansal
a06ec03efc
test: add test for new QI function
2021-06-02 14:55:31 +05:30
Rohan Bansal
11aff80dea
Merge remote-tracking branch 'upstream/version-13-hotfix' into dev-quality-inspection-accounts
2021-06-02 14:22:32 +05:30
Deepesh Garg
2f5885627d
fix: Labeling and other fixes
2021-06-01 11:07:18 +05:30
anushka19
04dfaf3b2a
fix: Broken help links fixed
2021-05-27 17:45:37 +05:30
Rohan Bansal
1cdf5a0dba
fix: add requested changes
2021-05-26 14:42:15 +05:30
Rohan Bansal
c5b074269a
Merge remote-tracking branch 'upstream/version-13-hotfix' into dev-quality-inspection-accounts
2021-05-26 14:32:14 +05:30
Ankush Menat
ff96bdf0c1
fix(ux): fix unstranslated text in msgprint/throw
2021-05-25 20:59:20 +05:30
Deepesh Garg
36d47f97f4
fix: Linting issues
2021-05-25 17:40:04 +05:30
Deepesh Garg
b07f7d1b70
fix: Linting and other fixes
2021-05-25 17:39:04 +05:30
Deepesh Garg
e2f83ffaa4
fix: Linting fixes and other checks
2021-05-25 17:35:41 +05:30
Deepesh Garg
fd380d34f9
fix: Linting errors
2021-05-25 17:35:05 +05:30
Deepesh Garg
c26de28613
fix: TDS against Purhase Orders
2021-05-25 17:25:13 +05:30
Deepesh Garg
61c5e478af
feat: Tax deduction against advance payments
2021-05-25 17:20:52 +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
noahjacob
ca2fb47d44
feat: updates item_code filters if item_group is linked to supplier
2021-05-18 15:01:05 +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
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
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
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
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
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
Sun Howwrongbum
c50fbc6897
fix: list lookup with undefined variable ( #25210 )
...
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-04-15 14:52:13 +05:30
Anupam Kumar
ee0dda6ba5
Merge branch 'develop' into planning
2021-04-15 12:48:25 +05:30
Marica
4e25aa77dd
Merge branch 'develop' into dev-quality-inspection-accounts
2021-04-14 19:06:14 +05:30
Marica
f045fde9f4
Merge branch 'develop' into patch-8
2021-04-14 18:56:15 +05:30
Marica
24e45163d5
fix: Sider
2021-04-14 18:53:15 +05:30
Rohan Bansal
03f711e3a2
style: sider issues
2021-04-14 14:41:55 +05:30
