Nabin Hait
a3d1b6973a
fix: merge conflict
2021-05-31 11:21:33 +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
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
Anupam Kumar
1033cf72f6
fix: added flag for dont_fetch_price_list_rate in transaction ( #25041 )
2021-03-31 19:39:45 +05:30
rohitwaghchaure
d5759bab11
Merge pull request #24922 from rohitwaghchaure/feat-recursice-pricing-rule
...
feat: recursive pricing rule
2021-03-26 19:10:10 +05:30
Anupam Kumar
d1bbb4c311
Merge branch 'develop' into planning
2021-03-24 15:12:04 +05:30
Jannat Patel
12f0923a61
fix: serial no trim issue ( #24949 )
...
* fix: serial no trim issue
* fix: valid serial nos
* fix: sider
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-03-23 21:09:49 +05:30
Anupam
4980dd616b
fix: resolving commits
2021-03-22 11:23:47 +05:30
Rohit Waghchaure
77add49c6a
fix: don't club same free item
2021-03-17 18:49:54 +05:30
Rohit Waghchaure
a9b1347600
fix: nonetype object has no attribute options
2021-03-17 14:30:34 +05:30
Rohit Waghchaure
ff70e61d7a
feat: recursive product discount
2021-03-17 14:30:34 +05:30
Anupam Kumar
ed42afc5e8
feat: price margin in buying ( #24685 )
2021-03-15 11:11:28 +05:30
Marica
63eb6bdb3c
Merge pull request #24643 from CaseSolvedUK/sinvfix-v13
...
fix: Don't throw exception on invoice lines when there is no item_code
2021-03-11 10:47:24 +05:30
casesolved-co-uk
a780306ec7
fix: Don't throw exception on invoice lines when there is no item_code ( fixes #24640 )
2021-03-10 15:50:45 +00:00
Afshan
d95b59e90c
fix: call function when arguments available
2021-03-08 18:19:53 +05:30
Deepesh Garg
6a5ef261f2
feat: Normal rounding for GST Taxes ( #24488 )
...
* feat: Normal rounding for GST Taxes
* fix: Add test case
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-19 14:30:23 +05:30
Anupam Kumar
7e1dcf911d
feat: capture Rate of stock UOM in purchase ( #24315 )
...
* feat: capture Rate of stock UOM in purchase
* fix: review changes
* added server side code
* added stock uom rate in sales transactions
* fix: review changes
* fix: resolving conflicts
* adding patch
* fix: removing patch
2021-02-11 20:19:30 +05:30
Afshan
ee87484134
fix: calculated discount percentage ( #24510 )
...
* fix: calculated discount percentage
* fix: slider
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-11 20:11:58 +05:30
Suraj Shetty
0a8939e1c1
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-29 08:56:22 +05:30
Deepesh Garg
b4be292217
fix: Item valuation for internal stock transfers ( #24200 )
...
* fix: Item valuation for internal stocktransfers
* fix: Consider conversion factor for invoices
* fix: Add missing set warehouse fields
* fix: Add validations and other fixes
* fix: Fixes in flow
* fix: Internal sales item link in Purchase Invoice
* fix: Debugging
* fix: Debug travis
* fix: Remove commented code
* fix: Rate forcing in sales order
* fix: Unreallized profit in Sales Register
* fix: Item wise gst sales register fix
* fix: From warehouse in Purchase Order
* fix: Target field in Sales Invoice
* fix: remove self
* fix: GST Purchasse register and other fixes
* fix: Add shipping_address to no field map
* fix: Ref doc map
* fix: Test Cases
* fix: address mapping between sales and purchase document
* fix: Import Error
* fix: Tax updation for internal invoices
* fix: Purchase Order and Invoice linking
* fix: Internal Party validation fix
* fix: validation
* fix(india): GST Taxes for intra state transfer
* fix(india): GST Taxes for intra state transfer
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-01-28 13:09:56 +05:30
Deepesh Garg
16bcd01f6d
feat: Provision to disable serial no and batch selector ( #24398 )
...
* feat: feat: Provision to disbale serial no and batch selector
* fix: Sider issues
* fix: Linting issues
2021-01-28 12:09:35 +05:30