Ankush
fd84847f2b
fix: syntax fixes for native class ( #26064 )
2021-06-16 11:14:40 +05:30
Nabin Hait
0950481253
fix: merge conflict
2021-06-15 20:18:06 +05:30
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
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
Deepesh Garg
2f5885627d
fix: Labeling and other fixes
2021-06-01 11:07:18 +05:30
Nabin Hait
a3d1b6973a
fix: merge conflict
2021-05-31 11:21:33 +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
fd380d34f9
fix: Linting errors
2021-05-25 17:35:05 +05:30
Deepesh Garg
61c5e478af
feat: Tax deduction against advance payments
2021-05-25 17:20:52 +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
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
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
Faris Ansari
69eb6d476e
Merge remote-tracking branch 'upstream/develop' into esbuild
2021-05-07 15:21:33 +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
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
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
Rohan Bansal
03f711e3a2
style: sider issues
2021-04-14 14:41:55 +05:30
Rohan Bansal
7f8b95efe8
fix: move QI logic to stock module
2021-04-14 14:15:45 +05:30
Deepesh Garg
b67058869a
fix: Round off final tax amount instead of current tax amount ( #25188 )
...
* fix: Round off final tax amount instead of current tax amount
* fix: Syntax error
* fix: Indentation
* fix: Round Off taxes order execution
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-04-14 11:20:27 +05:30
Rushabh Mehta
65f25c27b3
fix(minor): fix dynamically changing grid properties
2021-04-13 11:58:16 +05:30
Anupam Kumar
cd2aedd0c6
Merge branch 'develop' into planning
2021-04-09 17:59:47 +05:30
Jannat Patel
d9fa79de99
fix: serial no refresh issue ( #25127 )
...
* fix: serial no refresh issue
* fix: sider
2021-04-08 16:04:57 +05:30
Anupam Kumar
dfdf72cbb2
Merge branch 'develop' into planning
2021-04-08 10:58:05 +05:30
Rohan Bansal
a93b514b2f
feat: create Quality Inspections from account and stock documents
2021-04-06 17:20:16 +05:30
